adiwg-mdtranslator 2.8.0 → 2.9.0

data/lib/adiwg/mdtranslator/writers/iso19115_2/classes/class_miMetadata.rb

@@ -2,31 +2,32 @@
 # 19115-2 writer output in XML.
 
 # History:
-#   Stan Smith 2016-11-15 refactored for mdTranslator/mdJson 2.0
-#   Stan Smith 2015-08-27 added support for content information
-#   Stan Smith 2015-07-30 added support for grid information
-#   Stan Smith 2015-07-28 added support for PT_Locale
-#   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-12 added support for user to specify metadataCharacterSet
-#   Stan Smith 2015-06-11 change all codelists to use 'class_codelist' method
-#   Stan Smith 2014-12-29 set builder object '@xml' into string 'metadata'
-#   Stan Smith 2014-12-15 refactored to handle namespacing readers and writers
-#   Stan Smith 2014-11-06 changed hierarchy level to load values from resourceInfo > resourceType
-#   Stan Smith 2014-10-10 modified to pass minimum metadata input test
+#  Stan Smith 2018-01-27 add metadata constraints
+#  Stan Smith 2016-11-15 refactored for mdTranslator/mdJson 2.0
+#  Stan Smith 2015-08-27 added support for content information
+#  Stan Smith 2015-07-30 added support for grid information
+#  Stan Smith 2015-07-28 added support for PT_Locale
+#  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-12 added support for user to specify metadataCharacterSet
+#  Stan Smith 2015-06-11 change all codelists to use 'class_codelist' method
+#  Stan Smith 2014-12-29 set builder object '@xml' into string 'metadata'
+#  Stan Smith 2014-12-15 refactored to handle namespacing readers and writers
+#  Stan Smith 2014-11-06 changed hierarchy level to load values from resourceInfo > resourceType
+#  Stan Smith 2014-10-10 modified to pass minimum metadata input test
 #   ... test were added to handle a missing metadata > metadataInfo block in the input
-#   Stan Smith 2014-10-07 changed source of dataSetURI to
+#  Stan Smith 2014-10-07 changed source of dataSetURI to
 #   ... metadata: {resourceInfo: {citation: {citOlResources[0]: {olResURI:}}}}
-#   Stan Smith 2014-09-19 changed file identifier to read from internal storage as
+#  Stan Smith 2014-09-19 changed file identifier to read from internal storage as
 #   ... an MD_Identifier class.  To support version 0.8.0 json.
-#   Stan Smith 2014-09-03 replaced spatial reference system code with named, epsg, and
+#  Stan Smith 2014-09-03 replaced spatial reference system code with named, epsg, and
 #   ... wkt reference system descriptions using RS_Identifier for 0.7.0
-#   Stan Smith 2014-08-18 add dataSetURI
-#   Stan Smith 2014-07-08 modify require statements to function in RubyGem structure
-#   Stan Smith 2014-05-28 added resource URI
-#   Stan Smith 2014-05-14 refactored method calls to be consistent w/ other classes
-#   Stan Smith 2014-05-14 modify for JSON schema 0.4.0
+#  Stan Smith 2014-08-18 add dataSetURI
+#  Stan Smith 2014-07-08 modify require statements to function in RubyGem structure
+#  Stan Smith 2014-05-28 added resource URI
+#  Stan Smith 2014-05-14 refactored method calls to be consistent w/ other classes
+#  Stan Smith 2014-05-14 modify for JSON schema 0.4.0
 # 	Stan Smith 2013-12-27 added parent identifier
 # 	Stan Smith 2013-09-25 added reference system info
 # 	Stan Smith 2013-09-25 added metadata maintenance
@@ -47,6 +48,9 @@ require_relative 'class_dataIdentification'
 require_relative 'class_coverageDescription'
 require_relative 'class_distribution'
 require_relative 'class_dataQuality'
+require_relative 'class_useConstraints'
+require_relative 'class_legalConstraints'
+require_relative 'class_securityConstraints'
 require_relative 'class_maintenance'
 require_relative 'class_gcoDateTime'
 
@@ -77,6 +81,9 @@ module ADIWG
                   coverageClass = CoverageDescription.new(@xml, @hResponseObj)
                   distClass = MD_Distribution.new(@xml, @hResponseObj)
                   dqClass = DQ_DataQuality.new(@xml, @hResponseObj)
+                  uConClass = MD_Constraints.new(@xml, @hResponseObj)
+                  lConClass = MD_LegalConstraints.new(@xml, @hResponseObj)
+                  sConClass = MD_SecurityConstraints.new(@xml, @hResponseObj)
                   maintenanceClass = MD_MaintenanceInformation.new(@xml, @hResponseObj)
                   dateTimeClass = GcoDateTime.new(@xml, @hResponseObj)
 
@@ -85,6 +92,7 @@ module ADIWG
                   hMetaInfo = hMetadata[:metadataInfo]
                   hResInfo = hMetadata[:resourceInfo]
                   aAssocRes = hMetadata[:associatedResources]
+                  aDistInfo = hMetadata[:distributorInfo]
                   version = @hResponseObj[:translatorVersion]
 
                   # document head
@@ -114,6 +122,7 @@ module ADIWG
 
                      # remote schema location - for deployment
                      # ftp://ftp.ncddc.noaa.gov/pub/Metadata/Online_ISO_Training/Intro_to_ISO/schemas/ISObio/schema.xsd
+
                      # local schema location - for development
                      # C:\Users\StanSmith\Projects\ISO\19115\NOAA\schema.xsd
 
@@ -286,7 +295,7 @@ module ADIWG
                      # metadata information - identification info - required
                      unless hResInfo.empty?
                         @xml.tag!('gmd:identificationInfo') do
-                           dataIdClass.writeXML(hResInfo, aAssocRes)
+                           dataIdClass.writeXML(hResInfo, aAssocRes, aDistInfo)
                         end
                      end
                      if hResInfo.empty?
@@ -307,7 +316,6 @@ module ADIWG
                      end
 
                      # metadata information - distribution info [0]
-                     aDistInfo = hMetadata[:distributorInfo]
                      unless aDistInfo.empty?
                         hDistInfo = aDistInfo[0]
                         unless hDistInfo.empty?
@@ -331,6 +339,26 @@ module ADIWG
                         @xml.tag!('gmd:dataQualityInfo')
                      end
 
+                     # metadata information - metadata constraints {}
+                     aCons = hMetaInfo[:metadataConstraints]
+                     aCons.each do |hCon|
+                        @xml.tag!('gmd:metadataConstraints') do
+                           type = hCon[:type]
+                           if type == 'use'
+                              uConClass.writeXML(hCon)
+                           end
+                           if type == 'legal'
+                              lConClass.writeXML(hCon)
+                           end
+                           if type == 'security'
+                              sConClass.writeXML(hCon)
+                           end
+                        end
+                     end
+                     if aCons.nil? && @hResponseObj[:writerShowTags]
+                        @xml.tag!('gmd:metadataConstraints')
+                     end
+
                      # metadata information - metadata maintenance
                      hMaintenance = hMetaInfo[:metadataMaintenance]
                      unless hMaintenance.empty?

data/lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_dictionary.rb

@@ -30,7 +30,7 @@ module ADIWG
                      json.recommendedUse hDictionary[:recommendedUses] unless hDictionary[:recommendedUses].empty?
                      json.locale @Namespace.json_map(hDictionary[:locales], Locale)
                      json.responsibleParty ResponsibleParty.build(hDictionary[:responsibleParty])
-                     json.dictionaryFormat hDictionary[:dictionaryFormat]
+                     json.dictionaryFunctionalLanguage hDictionary[:dictionaryFunctionalLanguage]
                      json.dictionaryIncludedWithResource hDictionary[:includedWithDataset]
                      json.domain @Namespace.json_map(hDictionary[:domains], Domain)
                      json.entity @Namespace.json_map(hDictionary[:entities], Entity)

data/lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_distribution.rb

@@ -20,6 +20,8 @@ module ADIWG
 
                   Jbuilder.new do |json|
                      json.description hDistribution[:description]
+                     json.liabilityStatement hDistribution[:liabilityStatement]
+                     json.technicalPrerequisite hDistribution[:technicalPrerequisite]
                      json.distributor @Namespace.json_map(hDistribution[:distributor], Distributor)
                   end
 

data/lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_domainItem.rb

@@ -4,6 +4,7 @@
 #   Stan Smith 2017-03-19 original script
 
 require 'jbuilder'
+require_relative 'mdJson_citation'
 
 module ADIWG
    module Mdtranslator
@@ -18,6 +19,9 @@ module ADIWG
                      json.name hItem[:itemName]
                      json.value hItem[:itemValue]
                      json.definition hItem[:itemDefinition]
+                     unless hItem[:itemReference].empty?
+                        json.reference Citation.build(hItem[:itemReference])
+                     end
                   end
 
                end # build

data/lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_metadataInfo.rb

@@ -11,6 +11,7 @@ require_relative 'mdJson_locale'
 require_relative 'mdJson_date'
 require_relative 'mdJson_responsibleParty'
 require_relative 'mdJson_onlineResource'
+require_relative 'mdJson_constraint'
 require_relative 'mdJson_maintenance'
 
 module ADIWG
@@ -32,6 +33,7 @@ module ADIWG
                      json.metadataContact @Namespace.json_map(hMetaInfo[:metadataContacts], ResponsibleParty)
                      json.metadataDate @Namespace.json_map(hMetaInfo[:metadataDates], Date)
                      json.metadataOnlineResource @Namespace.json_map(hMetaInfo[:metadataLinkages], OnlineResource)
+                     json.metadataConstraint @Namespace.json_map(hMetaInfo[:metadataConstraints], Constraint)
                      json.metadataMaintenance Maintenance.build(hMetaInfo[:metadataMaintenance]) unless hMetaInfo[:metadataMaintenance].empty?
                      json.alternateMetadataReference @Namespace.json_map(hMetaInfo[:alternateMetadataReferences], Citation)
                      json.metadataStatus hMetaInfo[:metadataStatus]

data/lib/adiwg/mdtranslator/writers/sbJson/sections/sbJson_rights.rb

@@ -12,7 +12,7 @@ module ADIWG
 
             module Rights
 
-               def self.build(aConstraints)
+               def self.build(aConstraints, aDistributionInfo)
 
                   rights = ''
 
@@ -37,6 +37,12 @@ module ADIWG
                      end
                   end
 
+                  aDistributionInfo.each do |hDistribution|
+                     unless hDistribution[:liabilityStatement].nil?
+                        rights += hDistribution[:liabilityStatement] + '; '
+                     end
+                  end
+
                   # clean off last semicolon
                   if rights.length > 2
                      rights = rights[0...-2]

data/lib/adiwg/mdtranslator/writers/sbJson/sections/sbJson_sbJson.rb

@@ -85,7 +85,18 @@ module ADIWG
                   json.identifiers @Namespace.json_map(aUniqIds, Identifier) unless aIdentifiers.empty?
 
                   json.purpose resourceInfo[:purpose]
-                  json.rights Rights.build(resourceInfo[:constraints]) unless resourceInfo[:constraints].empty?
+
+                  haveRights = false
+                  haveRights = true unless resourceInfo[:constraints].empty?
+                  distributorInfo.each do |hDistribution|
+                     unless hDistribution[:liabilityStatement].nil?
+                        haveRights = true
+                     end
+                  end
+                  if haveRights
+                     json.rights Rights.build(resourceInfo[:constraints], distributorInfo)
+                  end
+
                   json.provenance Provenance.build
                   json.materialRequestInstructions MaterialRequest.build(distributorInfo) unless distributorInfo.empty?
                   json.parentId ParentId.build(metadataInfo[:parentMetadata]) unless metadataInfo[:parentMetadata].empty?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adiwg-mdtranslator
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.9.0
 platform: ruby
 authors:
 - Stan Smith
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-24 00:00:00.000000000 Z
+date: 2018-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -129,14 +129,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.1
+        version: 2.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.1
+        version: 2.4.2
 - !ruby/object:Gem::Dependency
   name: adiwg-mdcodes
   requirement: !ruby/object:Gem::Requirement
@@ -443,13 +443,20 @@ files:
 - lib/adiwg/mdtranslator/readers/sbJson/version.rb
 - lib/adiwg/mdtranslator/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
 - lib/adiwg/mdtranslator/writers/fgdc/classes/class_citation.rb
 - lib/adiwg/mdtranslator/writers/fgdc/classes/class_constraint.rb
 - lib/adiwg/mdtranslator/writers/fgdc/classes/class_contact.rb
+- lib/adiwg/mdtranslator/writers/fgdc/classes/class_dataDomain.rb
 - lib/adiwg/mdtranslator/writers/fgdc/classes/class_dateRange.rb
 - lib/adiwg/mdtranslator/writers/fgdc/classes/class_dateSingle.rb
 - lib/adiwg/mdtranslator/writers/fgdc/classes/class_description.rb
+- lib/adiwg/mdtranslator/writers/fgdc/classes/class_dictionary.rb
+- lib/adiwg/mdtranslator/writers/fgdc/classes/class_digitalForm.rb
+- lib/adiwg/mdtranslator/writers/fgdc/classes/class_distribution.rb
+- lib/adiwg/mdtranslator/writers/fgdc/classes/class_entityDetail.rb
+- lib/adiwg/mdtranslator/writers/fgdc/classes/class_entityOverview.rb
 - lib/adiwg/mdtranslator/writers/fgdc/classes/class_fgdc.rb
 - lib/adiwg/mdtranslator/writers/fgdc/classes/class_geodeticReference.rb
 - lib/adiwg/mdtranslator/writers/fgdc/classes/class_geographicResolution.rb
@@ -461,8 +468,12 @@ files:
 - lib/adiwg/mdtranslator/writers/fgdc/classes/class_localSystem.rb
 - lib/adiwg/mdtranslator/writers/fgdc/classes/class_mapCoordinateInfo.rb
 - lib/adiwg/mdtranslator/writers/fgdc/classes/class_mapProjection.rb
+- lib/adiwg/mdtranslator/writers/fgdc/classes/class_metadataInfo.rb
 - lib/adiwg/mdtranslator/writers/fgdc/classes/class_method.rb
 - lib/adiwg/mdtranslator/writers/fgdc/classes/class_methodKeywords.rb
+- lib/adiwg/mdtranslator/writers/fgdc/classes/class_offlineOption.rb
+- lib/adiwg/mdtranslator/writers/fgdc/classes/class_onlineOption.rb
+- lib/adiwg/mdtranslator/writers/fgdc/classes/class_orderProcess.rb
 - lib/adiwg/mdtranslator/writers/fgdc/classes/class_phone.rb
 - lib/adiwg/mdtranslator/writers/fgdc/classes/class_planarReference.rb
 - lib/adiwg/mdtranslator/writers/fgdc/classes/class_process.rb
@@ -480,6 +491,7 @@ files:
 - lib/adiwg/mdtranslator/writers/fgdc/classes/class_taxonomyKeywords.rb
 - lib/adiwg/mdtranslator/writers/fgdc/classes/class_taxonomySystem.rb
 - lib/adiwg/mdtranslator/writers/fgdc/classes/class_timePeriod.rb
+- lib/adiwg/mdtranslator/writers/fgdc/classes/class_transferInfo.rb
 - lib/adiwg/mdtranslator/writers/fgdc/classes/class_verticalDatum.rb
 - lib/adiwg/mdtranslator/writers/fgdc/fgdc_writer.rb
 - lib/adiwg/mdtranslator/writers/fgdc/readme.md