Rename iso v1 to v3 (#73)

* Update .gitignore

* Limited Updates

* Full revert - this seems to be working

* Gemfile updates

* Fix mdTranslator Committed Version

* Add -3 Option

* Update Gemfile.lock

* Update .ruby-version to 2.7.7

* Update Dockerfile

Using ruby v2.7.7 and bundler v2.4.21.
Exposing port 8080 instead of 3000.

* Update Welcome Text

* Update Writers Lists Text

* Update Writers Dropdown Text

* Update mdTranslator version

* Update Gemfile.lock

Author: jwaspin

Dockerfile

@@ -10,7 +10,7 @@ WORKDIR /app
 
 # Install dependencies
 COPY Gemfile Gemfile.lock ./
-RUN bundle config set --local without 'development test' && bundle install --jobs 4 --retry 3
+RUN gem install bundler:2.4.21 && bundle config set --local without 'development test' && bundle install --jobs 4 --retry 3
 
 # Copy the rest of the application files
 COPY . .
@@ -23,9 +23,6 @@ FROM ruby:2.7.7-slim
 RUN apt-get update -q && apt-get install -y --no-install-recommends \
     nodejs
 
-# Add non-root user
-RUN useradd -ms /bin/bash safeuser
-
 # Set the working directory
 WORKDIR /app
 
@@ -36,4 +33,4 @@ COPY --from=base /usr/local/bundle /usr/local/bundle
 EXPOSE 8080
 
 # Start the Rails server
-CMD ["rails", "server", "-b", "0.0.0.0", "-e", "production", "-p", "8080"]
+CMD ["rails", "server", "-b", "0.0.0.0", "-e", "production", "-p", "8080"]

Gemfile

@@ -55,7 +55,7 @@ gem 'json-schema'
 # Alaska Data Integration working group schema definition
 gem 'adiwg-mdjson_schemas', '2.8.1'
 # Alaska Data Integration working group metadata translator
-gem 'adiwg-mdtranslator', '2.18.2'
+gem 'adiwg-mdtranslator', '2.18.4'
 # Alaska Data Integration working group metadata code lists
 gem 'adiwg-mdcodes', '2.8.4'
 

Gemfile.lock

@@ -56,20 +56,20 @@ GEM
       minitest (~> 5.1)
       tzinfo (~> 1.1)
       zeitwerk (~> 2.2, >= 2.2.2)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.5)
+      public_suffix (>= 2.0.2, < 6.0)
     adiwg-mdcodes (2.8.4)
       json (~> 2.0)
     adiwg-mdjson_schemas (2.8.1)
-    adiwg-mdtranslator (2.18.2)
-      adiwg-mdcodes (~> 2.8)
-      adiwg-mdjson_schemas (~> 2.8)
+    adiwg-mdtranslator (2.18.4)
+      adiwg-mdcodes (= 2.8.4)
+      adiwg-mdjson_schemas (= 2.8.1)
       builder (~> 3.2)
       coderay (~> 1.1)
       jbuilder (~> 2.5)
       json (~> 2.0)
       json-schema (~> 2.7)
-      kramdown (~> 1.13)
+      kramdown (>= 1.13, < 3.0)
       nokogiri (~> 1.7)
       thor (~> 0.19)
       uuidtools (~> 2.1)
@@ -141,7 +141,7 @@ GEM
       racc (~> 1.4)
     psych (4.0.3)
       stringio
-    public_suffix (5.0.3)
+    public_suffix (5.0.4)
     puma (5.6.7)
       nio4r (~> 2.0)
     racc (1.7.1)
@@ -239,7 +239,7 @@ PLATFORMS
 DEPENDENCIES
   adiwg-mdcodes (= 2.8.4)
   adiwg-mdjson_schemas (= 2.8.1)
-  adiwg-mdtranslator (= 2.18.2)
+  adiwg-mdtranslator (= 2.18.4)
   bootsnap (>= 1.4.2)
   builder
   coderay
@@ -249,7 +249,7 @@ DEPENDENCIES
   json
   json-schema
   kramdown
-  puma (~> 4.3.11)
+  puma (~> 5.6.7)
   rack-cors
   rack-proxy
   rack-timeout
@@ -268,4 +268,4 @@ RUBY VERSION
    ruby 2.7.7p221
 
 BUNDLED WITH
-   2.4.21
+   2.4.21

app/models/option.rb

@@ -12,7 +12,7 @@ class Option
    def self.getOptionList
       {
          reader: %w[mdJson sbJson fgdc],
-         writer: %w[iso19115_2 iso19110 html mdJson sbJson fgdc simple_html],
+         writer: %w[iso19115_3 iso19115_2 iso19110 html mdJson sbJson fgdc simple_html],
          format: %w[auto plain json xml],
          validate: %w[none normal strict],
          showAllTags: %w[true false],

app/views/api/v3/demos/show.html.erb

@@ -77,8 +77,9 @@
                         <option value="html" selected="selected">html</option>
                         <option value="fgdc">fgdc</option>
                         <option value="iso19110">iso19110</option>
-                        <option value="iso19115_1">iso19115_1</option>
-                        <option value="iso19115_2">iso19115_2</option>
+                        <option value="iso19115_3">iso19115_1 (alias of iso19115_3)</option>
+                        <option value="iso19115_2">iso19115_2/19139 (deprecated)</option>
+                        <option value="iso19115_3">iso19115_3</option>
                         <option value="mdJson">mdJson</option>
                         <option value="sbJson">sbJson</option>
                         <option value="">-none-</option>

app/views/api/writers/index.html.erb

@@ -23,14 +23,18 @@
  : Federal Geographic Data Committee's Content Standard for Digital Geospatial Metadata - FGDC-STD-001-1998
  Includes Biological Data Profile
 
- [iso19115_1](./writers/iso19115_1)
+ [iso19115_1](./writers/iso19115_1) (via iso19115_3)
 
  : International Standards Organization Geographic Information - Metadata 19115-1:2014
 
  [iso19115_2](./writers/iso19115_2)
 
  : International Standards Organization Geographic Information - Metadata 19115-2:2009
 
+ [iso19115_3](./writers/iso19115_3)
+
+ : International Standards Organization Geographic Information - Metadata 19115-3:2014
+
  [iso19110](./writers/iso19110)
 
  : International Standards Organization Geographic Information - Feature Catalogue 19110:2005

app/views/welcome/index.html.erb

@@ -55,8 +55,8 @@ Alaska Ocean Observing Systems (AOOS), Nuna Technologies, U.S. Fish & Wildlife S
 National Climate Change and Wildlife Science Centers (NCCWSC - USGS).  Together these organizations developed
 the six extensible components of the ADIwg ISO Metadata Developer's Toolkit listed below:
 
- * __mdJson__ - a simple but thorough JSON format for scientific metadata that fully supports the ISO 19115-1,
- ISO 19115-2, ISO 19110, FGDC, and other metadata standards.
+ * __mdJson__ - a simple but thorough JSON format for scientific metadata that fully supports the ISO 19115-1 (via ISO 19115-3),
+ ISO 19115-2/19139 (deprecated), ISO 19115-3, ISO 19110, FGDC, and other metadata standards.
  * __mdTranslator__ - a public hosted web service for translation of mdJson to other metadata
  standards.  The mdTranslator is also available as a Ruby Gem 'adiwg-mdtranslator' and as source
  code from our GitHub repository.