adiwg-mdtranslator 2.19.0.pre.beta.30 → 2.20.0.pre.beta.3

data/lib/adiwg/mdtranslator/writers/simple_html/sections/html_timeInstant.rb

@@ -66,7 +66,7 @@ module ADIWG
                   # time instant - identifier {identifier}
                   unless hInstant[:identifier].empty?
                      @html.div do
-                        @html.h5('Identifier', 'class' => 'h5')
+                        @html.div('Identifier', 'class' => 'h5')
                         @html.div(:class => 'block') do
                            identifierClass.writeHtml(hInstant[:identifier])
                         end

data/lib/adiwg/mdtranslator/writers/simple_html/sections/html_timePeriod.rb

@@ -70,7 +70,7 @@ module ADIWG
                   # time period - start geologic age {geologic age}
                   unless hPeriod[:startGeologicAge].empty?
                      @html.div do
-                        @html.h5('Starting Geologic Age', 'class' => 'h5')
+                        @html.div('Starting Geologic Age', 'class' => 'h5')
                         @html.div(:class => 'block') do
                            geoAgeClass.writeHtml(hPeriod[:startGeologicAge])
                         end
@@ -80,7 +80,7 @@ module ADIWG
                   # time period - end geologic age {geologic age}
                   unless hPeriod[:endGeologicAge].empty?
                      @html.div do
-                        @html.h5('Ending Geologic Age', 'class' => 'h5')
+                        @html.div('Ending Geologic Age', 'class' => 'h5')
                         @html.div(:class => 'block') do
                            geoAgeClass.writeHtml(hPeriod[:endGeologicAge])
                         end
@@ -90,7 +90,7 @@ module ADIWG
                   # time period - identifier {identifier}
                   unless hPeriod[:identifier].empty?
                      @html.div do
-                        @html.h5('Identifier', 'class' => 'h5')
+                        @html.div('Identifier', 'class' => 'h5')
                         @html.div(:class => 'block') do
                            identifierClass.writeHtml(hPeriod[:identifier])
                         end
@@ -100,7 +100,7 @@ module ADIWG
                   # time period - time interval
                   unless hPeriod[:timeInterval].empty?
                      @html.div do
-                        @html.h5('Time Interval', 'class' => 'h5')
+                        @html.div('Time Interval', 'class' => 'h5')
                         @html.div(:class => 'block') do
                            intervalClass.writeHtml(hPeriod[:timeInterval])
                         end
@@ -110,7 +110,7 @@ module ADIWG
                   # time period - duration
                   unless hPeriod[:duration].empty?
                      @html.div do
-                        @html.h5('Duration', 'class' => 'h5')
+                        @html.div('Duration', 'class' => 'h5')
                         @html.div(:class => 'block') do
                            durationClass.writeHtml(hPeriod[:duration])
                         end

data/lib/adiwg/mdtranslator/writers/simple_html/sections/html_transferOption.rb

@@ -68,7 +68,7 @@ module ADIWG
                   # transfer options - transfer frequency {duration}
                   unless hOption[:transferFrequency].empty?
                      @html.div do
-                        @html.h5('Transfer Frequency', 'class' => 'h5')
+                        @html.div('Transfer Frequency', 'class' => 'h5')
                         @html.div(:class => 'block') do
                            durationClass.writeHtml(hOption[:transferFrequency])
                         end
@@ -78,7 +78,7 @@ module ADIWG
                   # transfer options - distribution formats [] {format}
                   hOption[:distributionFormats].each do |hFormat|
                      @html.div do
-                        @html.h5('Distribution Format Option', 'class' => 'h5')
+                        @html.div('Distribution Format Option', 'class' => 'h5')
                         @html.div(:class => 'block') do
                            formatClass.writeHtml(hFormat)
                         end

data/lib/adiwg/mdtranslator/writers/simple_html/sections/html_usage.rb

@@ -37,7 +37,7 @@ module ADIWG
                   # resource usage - temporal extent
                   unless hUsage[:temporalExtents].empty?
                      @html.div do
-                        @html.h5('Times and Periods of Usage', 'class' => 'h5')
+                        @html.div('Times and Periods of Usage', 'class' => 'h5')
                         @html.div(:class => 'block') do
                            hUsage[:temporalExtents].each do |hTemporal|
                               temporalClass.writeHtml(hTemporal)
@@ -49,7 +49,7 @@ module ADIWG
                   # resource usage - limitation
                   unless hUsage[:userLimitation].nil? && hUsage[:limitationResponses].empty?
                      @html.div do
-                        @html.h5('User Defined Limitations', 'class' => 'h5')
+                        @html.div('User Defined Limitations', 'class' => 'h5')
                         @html.div(:class => 'block') do
 
                            # user limitation
@@ -75,7 +75,7 @@ module ADIWG
                   # resource usage - documented issue
                   unless hUsage[:identifiedIssue].empty?
                      @html.div do
-                        @html.h5('Cited Issue', 'class' => 'h5')
+                        @html.div('Cited Issue', 'class' => 'h5')
                         @html.div(:class => 'block') do
                            citationClass.writeHtml(hUsage[:identifiedIssue])
                         end
@@ -85,7 +85,7 @@ module ADIWG
                   # resource usage - additional documentation
                   hUsage[:additionalDocumentation].each do |hCitation|
                      @html.div do
-                        @html.h5('Additional Documentation', 'class' => 'h5')
+                        @html.div('Additional Documentation', 'class' => 'h5')
                         @html.div(:class => 'block') do
                            citationClass.writeHtml(hCitation)
                         end
@@ -99,7 +99,7 @@ module ADIWG
                         @html.div(:class => 'block') do
                            hUsage[:userContacts].each do |hContact|
                               @html.div do
-                                 @html.h5(hContact[:roleName], 'class' => 'h5')
+                                 @html.div(hContact[:roleName], 'class' => 'h5')
                                  @html.div(:class => 'block') do
                                     responsibilityClass.writeHtml(hContact)
                                  end

data/lib/adiwg/mdtranslator/writers/simple_html/sections/html_vectorRepresentation.rb

@@ -28,7 +28,7 @@ module ADIWG
                   # vector representation - scope
                   hVector[:scope].each do |scope|
                      @html.div do
-                        @html.h5('Scope ', 'class' => 'h5')
+                        @html.div('Scope ', 'class' => 'h5')
                         @html.div(:class => 'block') do
                            scopeClass.writeHtml(hVector[:scope])
                         end
@@ -46,7 +46,7 @@ module ADIWG
                   # vector representation - vector object []
                   hVector[:vectorObject].each do |hObject|
                      @html.div do
-                        @html.h5('Vector Object ', 'class' => 'h5')
+                        @html.div('Vector Object ', 'class' => 'h5')
                         @html.div(:class => 'block') do
                            objectClass.writeHtml(hObject)
                         end

data/lib/adiwg/mdtranslator_cli.rb

@@ -39,7 +39,7 @@ and to choose the level of validation for mdJson input files.
                  :enum => %w{mdJson sbJson fgdc}, :required => true
    method_option :writer, :aliases => '-w',
                  :desc => 'Writer to create your output metadata file, leave blank to validate input only',
-                 :enum => %w{fgdc html iso19110 iso19115_1 iso19115_2 iso19115_3 mdJson sbJson simple_html }
+                 :enum => %w{fgdc html iso19110 iso19115_1 iso19115_2 iso19115_3 mdJson sbJson simple_html dcat_us}
    method_option :validate, :aliases => '-v', :desc => 'Specify level of validation to be performed',
                  :enum => %w{none normal strict}, :default => 'normal'
    method_option :forceValid, :aliases => '-f', :desc => 'Insert tags for required elements missing from input',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adiwg-mdtranslator
 version: !ruby/object:Gem::Version
-  version: 2.19.0.pre.beta.30
+  version: 2.20.0.pre.beta.3
 platform: ruby
 authors:
 - Stan Smith
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-27 00:00:00.000000000 Z
+date: 2024-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -129,28 +129,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.9.5
+        version: 2.9.3.pre.beta.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.9.5
+        version: 2.9.3.pre.beta.0
 - !ruby/object:Gem::Dependency
   name: adiwg-mdcodes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 2.9.4.pre.beta.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 2.9.4.pre.beta.0
 - !ruby/object:Gem::Dependency
   name: jbuilder
   requirement: !ruby/object:Gem::Requirement
@@ -232,6 +232,7 @@ files:
 - ".jsbeautifyrc"
 - ".travis.yml"
 - CHANGELOG.md
+- DCAT-US.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -474,6 +475,38 @@ files:
 - lib/adiwg/mdtranslator/readers/sbJson/sbJson_reader.rb
 - lib/adiwg/mdtranslator/readers/sbJson/version.rb
 - lib/adiwg/mdtranslator/version.rb
+- lib/adiwg/mdtranslator/writers/dcat_us/dcat_us_writer.rb
+- lib/adiwg/mdtranslator/writers/dcat_us/readme.md
+- lib/adiwg/mdtranslator/writers/dcat_us/sections/dcat_us_access_level.rb
+- lib/adiwg/mdtranslator/writers/dcat_us/sections/dcat_us_access_url.rb
+- lib/adiwg/mdtranslator/writers/dcat_us/sections/dcat_us_accrualPeriodicity.rb
+- lib/adiwg/mdtranslator/writers/dcat_us/sections/dcat_us_bureau_code.rb
+- lib/adiwg/mdtranslator/writers/dcat_us/sections/dcat_us_contact_point.rb
+- lib/adiwg/mdtranslator/writers/dcat_us/sections/dcat_us_dcat_us.rb
+- lib/adiwg/mdtranslator/writers/dcat_us/sections/dcat_us_described_by.rb
+- lib/adiwg/mdtranslator/writers/dcat_us/sections/dcat_us_described_by_type.rb
+- lib/adiwg/mdtranslator/writers/dcat_us/sections/dcat_us_description.rb
+- lib/adiwg/mdtranslator/writers/dcat_us/sections/dcat_us_distribution.rb
+- lib/adiwg/mdtranslator/writers/dcat_us/sections/dcat_us_download_url.rb
+- lib/adiwg/mdtranslator/writers/dcat_us/sections/dcat_us_identifier.rb
+- lib/adiwg/mdtranslator/writers/dcat_us/sections/dcat_us_is_part_of.rb
+- lib/adiwg/mdtranslator/writers/dcat_us/sections/dcat_us_issued.rb
+- lib/adiwg/mdtranslator/writers/dcat_us/sections/dcat_us_keyword.rb
+- lib/adiwg/mdtranslator/writers/dcat_us/sections/dcat_us_landing_page.rb
+- lib/adiwg/mdtranslator/writers/dcat_us/sections/dcat_us_language.rb
+- lib/adiwg/mdtranslator/writers/dcat_us/sections/dcat_us_license.rb
+- lib/adiwg/mdtranslator/writers/dcat_us/sections/dcat_us_media_type.rb
+- lib/adiwg/mdtranslator/writers/dcat_us/sections/dcat_us_modified.rb
+- lib/adiwg/mdtranslator/writers/dcat_us/sections/dcat_us_primaryITInvestmentUII.rb
+- lib/adiwg/mdtranslator/writers/dcat_us/sections/dcat_us_program_code.rb
+- lib/adiwg/mdtranslator/writers/dcat_us/sections/dcat_us_publisher.rb
+- lib/adiwg/mdtranslator/writers/dcat_us/sections/dcat_us_references.rb
+- lib/adiwg/mdtranslator/writers/dcat_us/sections/dcat_us_rights.rb
+- lib/adiwg/mdtranslator/writers/dcat_us/sections/dcat_us_spatial.rb
+- lib/adiwg/mdtranslator/writers/dcat_us/sections/dcat_us_system_of_records.rb
+- lib/adiwg/mdtranslator/writers/dcat_us/sections/dcat_us_temporal.rb
+- lib/adiwg/mdtranslator/writers/dcat_us/sections/dcat_us_theme.rb
+- lib/adiwg/mdtranslator/writers/dcat_us/version.rb
 - lib/adiwg/mdtranslator/writers/fgdc/classes/class_address.rb
 - lib/adiwg/mdtranslator/writers/fgdc/classes/class_attribute.rb
 - lib/adiwg/mdtranslator/writers/fgdc/classes/class_browse.rb
@@ -789,8 +822,6 @@ files:
 - lib/adiwg/mdtranslator/writers/iso19115_3/classes/class_distribution.rb
 - lib/adiwg/mdtranslator/writers/iso19115_3/classes/class_distributor.rb
 - lib/adiwg/mdtranslator/writers/iso19115_3/classes/class_email.rb
-- lib/adiwg/mdtranslator/writers/iso19115_3/classes/class_enumerationList.rb
-- lib/adiwg/mdtranslator/writers/iso19115_3/classes/class_extension.rb
 - lib/adiwg/mdtranslator/writers/iso19115_3/classes/class_extent.rb
 - lib/adiwg/mdtranslator/writers/iso19115_3/classes/class_feature.rb
 - lib/adiwg/mdtranslator/writers/iso19115_3/classes/class_featureCatalog.rb

data/lib/adiwg/mdtranslator/writers/iso19115_3/classes/class_enumerationList.rb

@@ -1,52 +0,0 @@
-# ISO <<CodeLists>> Enumerations
-# 19115-2 writer output in XML
-
-# History:
-#  Stan Smith 2016-12-12 refactored for mdTranslator/mdJson 2.0
-#  Stan Smith 2015-07-14 refactored to eliminate namespace globals $WriterNS and $IsoNS
-#  Stan Smith 2015-07-14 refactored to make iso19110 independent of iso19115_2 classes
-#  Stan Smith 2015-06-22 replace global ($response) with passed in object (responseObj)
-#  Stan Smith 2015-06-12 refactored to use mdCodes gem for codelist contents
-#  Stan Smith 2014-12-15 replaced NOAA CT_CodelistCatalogue with mdTranslator CT_CodelistCatalogue
-#  Stan Smith 2014-12-12 refactored to handle namespacing readers and writers
-#  Stan Smith 2014-10-15 allow non-ISO codesNames to be rendered
-# 	Stan Smith 2013-08-09 original script
-
-require 'adiwg-mdcodes'
-
-module ADIWG
-   module Mdtranslator
-      module Writers
-         module Iso19115_3
-
-            class MD_EnumerationList
-
-               def initialize(xml, responseObj)
-                  @xml = xml
-                  @hResponseObj = responseObj
-               end
-
-               def writeXML(codeList, codeName)
-
-                  # get requested codelist from the adiwg-mdcodes gem
-                  mdCodelist = ADIWG::Mdcodes.getCodelistDetail(codeList)
-
-                  sourceName = mdCodelist['sourceName']
-                  codelist = mdCodelist['codelist']
-
-                  # search the codelist for a matching codeName
-                  # only valid enumeration values can be written in ISO
-                  codelist.each do |code|
-                     if code['codeName'] == codeName
-                        @xml.tag!('gmd:' + "#{sourceName}", codeName)
-                        break
-                     end
-                  end
-
-               end # writeXML
-            end # MD_EnumerationList class
-
-         end
-      end
-   end
-end

data/lib/adiwg/mdtranslator/writers/iso19115_3/classes/class_extension.rb

@@ -1,208 +0,0 @@
-# ISO <<Class>> MD_MetadataExtensionInformation
-# 19115-2 writer output in XML
-
-# History:
-#  Stan Smith 2019-03-22 replaced Enumeration class with method
-#  Stan Smith 2018-04-09 add error and warning messaging
-#  Stan Smith 2015-07-14 refactored to eliminate namespace globals $WriterNS and $IsoNS
-#  Stan Smith 2015-07-14 refactored to make iso19110 independent of iso19115_2 classes
-#  Stan Smith 2015-06-22 replace global ($response) with passed in object (hResponseObj)
-#  Stan Smith 2015-06-11 change all codelists to use 'class_codelist' method
-#  Stan Smith 2014-12-12 refactored to handle namespacing readers and writers
-#  Stan Smith 2014-07-08 modify require statements to function in RubyGem structure
-# 	Stan Smith 2013-11-22 original script.
-
-require 'adiwg/mdtranslator/internal/module_codelistFun'
-require_relative '../iso19115_3_writer'
-require_relative 'class_codelist'
-require_relative 'class_enumerationList'
-require_relative 'class_onlineResource'
-
-module ADIWG
-   module Mdtranslator
-      module Writers
-         module Iso19115_3
-
-            class MD_MetadataExtensionInformation
-
-               def initialize(xml, hResponseObj)
-                  @xml = xml
-                  @hResponseObj = hResponseObj
-                  @NameSpace = ADIWG::Mdtranslator::Writers::Iso19115_3
-               end
-
-               def writeXML(hExtension)
-
-                  # classes used
-                  codelistClass = MD_Codelist.new(@xml, @hResponseObj)
-                  olResClass = CI_OnlineResource.new(@xml, @hResponseObj)
-
-                  outContext = 'extension information'
-                  outContext = 'extension name ' + hExtension[:name] unless hExtension[:name].nil?
-
-                  @xml.tag!('gmd:MD_MetadataExtensionInformation') do
-
-                     # metadata extension - online resource {CI_OnLineResource}
-                     hOLResource = hExtension[:onLineResource]
-                     unless hOLResource.empty?
-                        @xml.tag!('gmd:extensionOnLineResource') do
-                           olResClass.writeXML(hOLResource, outContext)
-                        end
-                     end
-                     if hOLResource.empty? && @hResponseObj[:writerShowTags]
-                        @xml.tag!('gmd:extensionOnLineResource')
-                     end
-
-                     # metadata extension = extended element information
-                     @xml.tag!('gmd:extendedElementInformation') do
-                        @xml.tag!('gmd:MD_ExtendedElementInformation') do
-
-                           # extended element info - name (required)
-                           s = hExtension[:name]
-                           unless s.nil?
-                              @xml.tag!('gmd:name') do
-                                 @xml.tag!('gco:CharacterString', s)
-                              end
-                           end
-                           if s.nil?
-                              @NameSpace.issueWarning(100, 'gmd:name')
-                           end
-
-                           # extended element info - short name
-                           s = hExtension[:shortName]
-                           unless s.nil?
-                              @xml.tag!('gmd:shortName') do
-                                 @xml.tag!('gco:CharacterString', s)
-                              end
-                           end
-                           if s.nil? && @hResponseObj[:writerShowTags]
-                              @xml.tag!('gmd:shortName')
-                           end
-
-                           # extended element info - definition (required)
-                           s = hExtension[:definition]
-                           unless s.nil?
-                              @xml.tag!('gmd:definition') do
-                                 @xml.tag!('gco:CharacterString', s)
-                              end
-                           end
-                           if s.nil?
-                              @NameSpace.issueWarning(101, 'gmd:definition', outContext)
-                           end
-
-                           # extended element info - obligation {MD_ObligationCode}
-                           obligation = hExtension[:obligation]
-                           unless obligation.nil?
-                              if CodelistFun.validateItem('iso_obligation', obligation)
-                                 @xml.tag!('gmd:obligation') do
-                                    @xml.tag!('gmd:MD_ObligationCode', obligation)
-                                 end
-                              else
-                                 @NameSpace.issueWarning(380, 'gmd:obligation', "#{obligation}")
-                              end
-                           end
-                           if obligation.nil? && @hResponseObj[:writerShowTags]
-                              @xml.tag!('gmd:obligation')
-                           end
-
-                           # extended element info - data type (required)
-                           s = hExtension[:dataType]
-                           unless s.nil?
-                              @xml.tag!('gmd:dataType') do
-                                 codelistClass.writeXML('gmd', 'iso_entityClass', s)
-                              end
-                           end
-                           if s.nil?
-                              @NameSpace.issueWarning(102, 'gmd:dataType', outContext)
-                           end
-
-                           # extended element info - maximum occurrence
-                           s = hExtension[:maxOccurrence]
-                           unless s.nil?
-                              @xml.tag!('gmd:maximumOccurrence') do
-                                 @xml.tag!('gco:CharacterString', s)
-                              end
-                           end
-                           if s.nil? && @hResponseObj[:writerShowTags]
-                              @xml.tag!('gmd:maximumOccurrence')
-                           end
-
-                           # extended element info - parent entity [] (required)
-                           aParents = hExtension[:parentEntities]
-                           aParents.each do |parent|
-                              @xml.tag!('gmd:parentEntity') do
-                                 @xml.tag!('gco:CharacterString', parent)
-                              end
-                           end
-                           if aParents.empty?
-                              @NameSpace.issueWarning(103, 'gmd:parentEntity', outContext)
-                           end
-
-                           # extended element info - rule
-                           s = hExtension[:rule]
-                           unless s.nil?
-                              @xml.tag!('gmd:rule') do
-                                 @xml.tag!('gco:CharacterString', s)
-                              end
-                           end
-                           if s.nil?
-                              @NameSpace.issueWarning(104, 'gmd:rule', outContext)
-                           end
-
-                           # extended element info - rationale []
-                           aRations = hExtension[:rationales]
-                           aRations.each do |ration|
-                              @xml.tag!('gmd:rationale') do
-                                 @xml.tag!('gco:CharacterString', ration)
-                              end
-                           end
-                           if aRations.empty? && @hResponseObj[:writerShowTags]
-                              @xml.tag!('gmd:rationale')
-                           end
-
-                           # extended element info - source [] (required)
-                           # only allowing 1 for now
-                           role = hExtension[:sourceRole]
-                           unless role.nil?
-                              @xml.tag!('gmd:source') do
-                                 @xml.tag!('gmd:CI_ResponsibleParty') do
-                                    orgName = hExtension[:sourceOrganization]
-                                    unless orgName.nil?
-                                       @xml.tag!('gmd:organisationName') do
-                                          @xml.tag!('gco:CharacterString', orgName)
-                                       end
-                                    end
-                                    uri = hExtension[:sourceURI]
-                                    unless uri.nil?
-                                       @xml.tag!('gmd:contactInfo') do
-                                          @xml.tag!('gmd:CI_Contact') do
-                                             @xml.tag!('gmd:onlineResource') do
-                                                @xml.tag!('gmd:CI_OnlineResource') do
-                                                   @xml.tag!('gmd:linkage') do
-                                                      @xml.tag!('gmd:URL', uri)
-                                                   end
-                                                end
-                                             end
-                                          end
-                                       end
-                                    end
-                                    @xml.tag!('gmd:role') do
-                                       codelistClass.writeXML('gmd', 'iso_role', role)
-                                    end
-                                 end
-                              end
-                           end
-                           if role.nil?
-                              @NameSpace.issueWarning(105, 'gmd:source', outContext)
-                           end
-
-                        end # gmd:MD_ExtendedElementInformation tag
-                     end # gmd:extendedElementInformation
-                  end # gmd:MD_MetadataExtensionInformation
-               end # writeXML
-            end # MD_MetadataExtensionInformation class
-
-         end
-      end
-   end
-end