adiwg-mdtranslator 2.12.0 → 2.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2fa170cd4a52ddfb7a3c199790940238fb1083bc
-  data.tar.gz: e9afa18251d1553939d44089099fc32ba15334e4
+  metadata.gz: c53862414e84e7d0b81437fcb696fce2a6ecbc3b
+  data.tar.gz: 5a749d352492b147252d482d0dd71d16c4180e52
 SHA512:
-  metadata.gz: ff1a580d5260d18f0f21d219cbbc6e6ebc25c0f4bb5e88785cc1c9e644e853fc9247b24a01d8b238e4beafe665b9acdd730a5e6a66188b0fb8ea0d3fbf15ddb0
-  data.tar.gz: 14e780181f8a308cc1544fa5915ba068c8e5d4fa4926e53896fd9f085cbdf5cf2ed7bdb763307c6d13586e62334d0536ea415bc73edd84c96e396ffd9de39dd9
+  metadata.gz: e571c2edbd822f32dea0cd2387517bd6a1746ae253b9581e3fb059b6cac9ab2e5cecc6be96a1bb1fdefb31b109a51815f03f5c08baf931b139a41a190194055d
+  data.tar.gz: a59a0aedd8178f11d1d8fe7cd006f5d60ea48d494844b041efcbfd2ce2a2a80d8d6d669b465e056bba27c62ac99f55fd1a398feff54c894972b05cf115ba5474

data/CHANGELOG.md

@@ -1,7 +1,21 @@
 # Change Log
 
-## [v2.12.0.pre](https://github.com/adiwg/mdTranslator/tree/v2.12.0.pre)
+## [v2.13.0](https://github.com/adiwg/mdTranslator/tree/v2.13.0)
 
+[Full Changelog](https://github.com/adiwg/mdTranslator/compare/v2.12.0...v2.13.0)
+
+**Closed issues:**
+
+- Replace local XSD reference in XML expected result files [\#194](https://github.com/adiwg/mdTranslator/issues/194)
+
+**Merged pull requests:**
+
+- Refactor ISO 19115-2 writer to use mdJson writer helpers [\#195](https://github.com/adiwg/mdTranslator/pull/195) ([stansmith907](https://github.com/stansmith907))
+
+## [v2.12.0](https://github.com/adiwg/mdTranslator/tree/v2.12.0) (2018-04-16)
+[Full Changelog](https://github.com/adiwg/mdTranslator/compare/v2.12.0.pre...v2.12.0)
+
+## [v2.12.0.pre](https://github.com/adiwg/mdTranslator/tree/v2.12.0.pre) (2018-04-12)
 [Full Changelog](https://github.com/adiwg/mdTranslator/compare/v2.10.0...v2.12.0.pre)
 
 **Implemented enhancements:**

data/adiwg-mdtranslator.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
    spec.add_runtime_dependency "thor", "~> 0.19"
    spec.add_runtime_dependency "uuidtools", "~> 2.1"
    spec.add_runtime_dependency "json-schema", "~> 2.7"
-   spec.add_runtime_dependency "adiwg-mdjson_schemas", ">= 2.4.8"
+   spec.add_runtime_dependency "adiwg-mdjson_schemas", ">= 2.4.9"
    spec.add_runtime_dependency "adiwg-mdcodes", "~> 2.6.3"
    spec.add_runtime_dependency "jbuilder", "~> 2.5"
    spec.add_runtime_dependency "kramdown", "~> 1.13"

data/lib/adiwg/mdtranslator/internal/internal_metadata_obj.rb

@@ -1026,6 +1026,8 @@ class InternalMetadata
       }
    end
 
+
+   # taxonomy --------------------------------
    def newTaxonomy
       {
          taxonSystem: [],

data/lib/adiwg/mdtranslator/readers/fgdc/fgdc_reader.rb

@@ -1,6 +1,7 @@
 # fgdc reader
 
 # History:
+#  Stan Smith 2018-05-04 add reader version to response object
 #  Stan Smith 2017-08-10 original script
 
 require 'nokogiri'
@@ -14,6 +15,9 @@ module ADIWG
 
             def self.readFile(file, hResponseObj)
 
+               # add FGDC reader version
+               hResponseObj[:readerVersionUsed] = ADIWG::Mdtranslator::Readers::Fgdc::VERSION
+
                # receive XML file
                if file.nil? || file == ''
                   hResponseObj[:readerStructureMessages] << 'XML file is missing'

data/lib/adiwg/mdtranslator/readers/mdJson/modules/module_entityAttribute.rb

@@ -107,7 +107,7 @@ module ADIWG
                      if hAttribute['allowMany'] === false
                         intAttribute[:mustBeUnique] = hAttribute['allowMany']
                         responseObj[:readerExecutionMessages] <<
-                           'WARNING: mdJson reader: data dictionary entity attribute "allowMany" is deprecated, use "mustBeUnique"'
+                           'NOTICE: mdJson reader: data dictionary entity attribute "allowMany" is deprecated, use "mustBeUnique"'
                         return nil
                      end
                   end

data/lib/adiwg/mdtranslator/readers/mdJson/modules/module_georectifiedRepresentation.rb

@@ -72,22 +72,17 @@ module ADIWG
                      return nil
                   end
 
-                  # georectified representation - center points (required)
+                  # georectified representation - center points
                   if hGeoRec.has_key?('centerPoint')
                      unless hGeoRec['centerPoint'].empty?
                         intGeoRec[:centerPoint] = hGeoRec['centerPoint']
                      end
-                  end
-                  if intGeoRec[:centerPoint].empty?
-                     responseObj[:readerExecutionMessages] << 'ERROR: mdJson reader: georectified spatial representation center point is missing'
-                     responseObj[:readerExecutionPass] = false
-                     return nil
-                  end
-                  unless intGeoRec[:centerPoint].length == 2
-                     responseObj[:readerExecutionMessages] <<
-                        'ERROR: mdJson reader: georectified spatial representation center point must be single 2D coordinate'
-                     responseObj[:readerExecutionPass] = false
-                     return nil
+                     unless intGeoRec[:centerPoint].length == 2
+                        responseObj[:readerExecutionMessages] <<
+                           'ERROR: mdJson reader: georectified spatial representation center point must be single 2D coordinate'
+                        responseObj[:readerExecutionPass] = false
+                        return nil
+                     end
                   end
 
                   # georectified representation - point in pixel (required)

data/lib/adiwg/mdtranslator/readers/mdJson/modules/module_resourceInfo.rb

@@ -5,7 +5,7 @@
 #  Stan Smith 2018-04-06 change taxonomy to an array
 #  Stan Smith 2018-02-19 refactored error and warning messaging
 #  Stan Smith 2017-05-16 deprecated topic category
-#   ... topic category is now handled as keyword list
+#  ... topic category is now handled as keyword list
 #  Stan Smith 2016-11-01 original script
 
 require 'adiwg/mdtranslator/internal/internal_metadata_obj'
@@ -105,19 +105,11 @@ module ADIWG
                      end
                   end
 
-                  # resource information - credits []
-                  if hResInfo.has_key?('credit')
-                     hResInfo['credit'].each do |item|
-                        unless item == ''
-                           intResInfo[:credits] << item
-                        end
-                     end
-                  end
-
                   # resource information - resource time period {timePeriod}
                   if hResInfo.has_key?('timePeriod')
                      hObject = hResInfo['timePeriod']
                      unless hObject.empty?
+                        hObject[:description] = 'resource time period' if hObject[:description].nil?
                         hReturn = TimePeriod.unpack(hObject, responseObj)
                         unless hReturn.nil?
                            intResInfo[:timePeriod] = hReturn
@@ -125,6 +117,15 @@ module ADIWG
                      end
                   end
 
+                  # resource information - credits []
+                  if hResInfo.has_key?('credit')
+                     hResInfo['credit'].each do |item|
+                        unless item == ''
+                           intResInfo[:credits] << item
+                        end
+                     end
+                  end
+
                   # resource information - status [] (required)
                   if hResInfo.has_key?('status')
                      hResInfo['status'].each do |item|
@@ -153,7 +154,7 @@ module ADIWG
                         end
                         hReturn = Keyword.unpack(hKeyword, responseObj)
                         unless hReturn.nil?
-                           intResInfo[:keywords] << hReturn[0]
+                           intResInfo[:keywords] << hReturn
                         end
                         responseObj[:readerExecutionMessages] <<
                            'NOTICE: mdJson reader: TopicCategory is deprecated, items were moved to keywords "isoTopicCategory"'

data/lib/adiwg/mdtranslator/readers/mdJson/modules/module_source.rb

@@ -35,6 +35,8 @@ module ADIWG
                   intMetadataClass = InternalMetadata.new
                   intSource = intMetadataClass.newDataSource
 
+                  haveRequired = false
+
                   # source - source ID
                   if hSource.has_key?('sourceId')
                      unless hSource['sourceId'] == ''
@@ -42,14 +44,12 @@ module ADIWG
                      end
                   end
 
-                  # source - description (required)
+                  # source - description (required if)
                   if hSource.has_key?('description')
-                     intSource[:description] = hSource['description']
-                  end
-                  if intSource[:description].nil? || intSource[:description] == ''
-                     responseObj[:readerExecutionMessages] << 'ERROR: mdJson reader: source description is missing'
-                     responseObj[:readerExecutionPass] = false
-                     return nil
+                     unless hSource['description'] == ''
+                        intSource[:description] = hSource['description']
+                        haveRequired = true
+                     end
                   end
 
                   # source - source citation
@@ -114,10 +114,18 @@ module ADIWG
                         hReturn = Scope.unpack(hObject, responseObj)
                         unless hReturn.nil?
                            intSource[:scope] = hReturn
+                           haveRequired = true
                         end
                      end
                   end
 
+                  unless haveRequired
+                     responseObj[:readerExecutionMessages] <<
+                        'ERROR: mdJson reader: source requires a description or scope'
+                     responseObj[:readerExecutionPass] = false
+                     return nil
+                  end
+
                   return intSource
 
                end

data/lib/adiwg/mdtranslator/readers/mdJson/modules/module_taxonomy.rb

@@ -53,7 +53,7 @@ module ADIWG
                      end
                   end
 
-                  # taxonomy - identification reference (required) [{identifier}]
+                  # taxonomy - identification reference [{identifier}]
                   if hTaxonomy.has_key?('identificationReference')
                      aItems = hTaxonomy['identificationReference']
                      aItems.each do |hItem|
@@ -65,11 +65,6 @@ module ADIWG
                         end
                      end
                   end
-                  if intTaxonomy[:idReferences].empty?
-                     responseObj[:readerExecutionMessages] << 'ERROR: mdJson reader: taxonomy identification reference object is missing'
-                     responseObj[:readerExecutionPass] = false
-                     return nil
-                  end
 
                   # taxonomy - observer [responsibleParty]
                   if hTaxonomy.has_key?('observer')

data/lib/adiwg/mdtranslator/readers/mdJson/modules/module_timePeriod.rb

@@ -113,12 +113,13 @@ module ADIWG
                   # error messages
                   unless haveTime
                      responseObj[:readerExecutionMessages] <<
-                        'ERROR: mdJson reader: time period must have a starting time, ending time, or geologic age'
+                        'ERROR: mdJson reader: time period must have a start and/or end dateTime, or geologic age'
                      responseObj[:readerExecutionPass] = false
                      return nil
                   end
 
                   # time period - time interval
+                  # time interval must have a start and/or end time
                   if hTimePeriod.has_key?('timeInterval')
                      unless hTimePeriod['timeInterval'].empty?
                         hReturn = TimeInterval.unpack(hTimePeriod['timeInterval'], responseObj)
@@ -126,9 +127,16 @@ module ADIWG
                            intTimePer[:timeInterval] = hReturn
                         end
                      end
+                     if intTimePer[:startDateTime].empty? && intTimePer[:endDateTime].empty?
+                        responseObj[:readerExecutionMessages] <<
+                           'ERROR: mdJson reader: time interval must be accompanied by a start and/or end dateTime'
+                        responseObj[:readerExecutionPass] = false
+                        return nil
+                     end
                   end
 
                   # time period - time duration
+                  # duration must have a start and/or end time
                   if hTimePeriod.has_key?('duration')
                      unless hTimePeriod['duration'].empty?
                         hReturn = Duration.unpack(hTimePeriod['duration'], responseObj)
@@ -136,6 +144,12 @@ module ADIWG
                            intTimePer[:duration] = hReturn
                         end
                      end
+                     if intTimePer[:startDateTime].empty? && intTimePer[:endDateTime].empty?
+                        responseObj[:readerExecutionMessages] <<
+                           'ERROR: mdJson reader: duration must be accompanied by a start and/or end dateTime'
+                        responseObj[:readerExecutionPass] = false
+                        return nil
+                     end
                   end
 
                   return intTimePer

data/lib/adiwg/mdtranslator/readers/mdJson/modules/module_transferOption.rb

@@ -90,9 +90,7 @@ module ADIWG
                   # error messages
                   unless haveOption
                      responseObj[:readerExecutionMessages] <<
-                        'ERROR: mdJson reader: transfer option must have an online or offline option'
-                     responseObj[:readerExecutionPass] = false
-                     return nil
+                        'WARNING: mdJson reader: transfer option did not provide an online or offline option'
                   end
 
                   return intTransOpt

data/lib/adiwg/mdtranslator/version.rb

@@ -1,6 +1,10 @@
 # adiwg mdTranslator
 
 # version 2 history
+# 2.13.0 2018-05-08 add contact name in addition to ID in outContext messaging
+# 2.13.0 2018-05-30 changed local schema reference in ISO writer tests to remote
+# 2.13.0 2018-05-03 refactor ISO19115-2 test mdJson to use mdJson generation helpers
+# 2.13.0 2018-04-09 refactored messaging for ISO19115-2
 # 2.12.0 2018-04-07 add 'fgdc' option to reader and writer enum list
 # 2.12.0 2018-04-06 rename taxonomicRank to taxonomicLevel
 # 2.12.0 2018-04-06 rename latinName to taxonomicNamel
@@ -78,7 +82,7 @@
 module ADIWG
    module Mdtranslator
       # current mdtranslator version
-      VERSION = "2.12.0"
+      VERSION = "2.13.0"
    end
 end
 

data/lib/adiwg/mdtranslator/writers/fgdc/classes/class_citation.rb

@@ -172,7 +172,7 @@ module ADIWG
                         if hResource[:associationType] == 'largerWorkCitation'
                            unless hResource[:resourceCitation].empty?
                               @xml.tag!('lworkcit') do
-                                 citationClass.writeXML(hResource[:resourceCitation], [])
+                                 citationClass.writeXML(hResource[:resourceCitation], [], inContext + ' larger work citation')
                                  haveLarger = true
                               end
                               break

data/lib/adiwg/mdtranslator/writers/fgdc/classes/class_contact.rb

@@ -28,8 +28,10 @@ module ADIWG
                   addressClass = Address.new(@xml, @hResponseObj)
                   phoneClass = Phone.new(@xml, @hResponseObj)
 
-                  # address outContext
-                  outContext = 'contactId ' + hContact[:contactId]
+                  # outContext
+                  outContext = 'contact'
+                  outContext +=  ' ' + hContact[:name] unless hContact[:name].nil?
+                  outContext += ' (' + hContact[:contactId] + ')' unless hContact[:contactId].nil?
 
                   # set contact type and names
                   contactType = nil

data/lib/adiwg/mdtranslator/writers/fgdc/classes/class_geologicAge.rb

@@ -62,7 +62,7 @@ module ADIWG
                   hGeoAge[:ageReferences].each do |hCitation|
                      unless hCitation.empty?
                         @xml.tag!('geolcit') do
-                           citationClass.writeXML(hCitation, {})
+                           citationClass.writeXML(hCitation, [], 'geologic age')
                         end
                      end
                   end

data/lib/adiwg/mdtranslator/writers/fgdc/classes/class_identification.rb

@@ -196,7 +196,7 @@ module ADIWG
                      if hAssocRes[:associationType] == 'crossReference'
                         haveXRef = true
                         @xml.tag!('crossref') do
-                           citationClass.writeXML(hAssocRes[:resourceCitation], [])
+                           citationClass.writeXML(hAssocRes[:resourceCitation], [], 'identification section cross reference')
                         end
                      end
                   end

data/lib/adiwg/mdtranslator/writers/fgdc/classes/class_method.rb

@@ -69,7 +69,7 @@ module ADIWG
                         hLineage[:lineageCitation].each do |hCitation|
                            unless hCitation.empty?
                               @xml.tag!('methcite') do
-                                 citationClass.writeXML(hCitation, [])
+                                 citationClass.writeXML(hCitation, [], 'lineage method')
                               end
                            end
                         end

data/lib/adiwg/mdtranslator/writers/fgdc/classes/class_source.rb

@@ -43,7 +43,7 @@ module ADIWG
                      # <- resourceLineage.source.sourceCitation
                      unless hSource[:sourceCitation].empty?
                         @xml.tag!('srccite') do
-                           citationClass.writeXML(hSource[:sourceCitation], [])
+                           citationClass.writeXML(hSource[:sourceCitation], [], 'lineage source')
                         end
                      end
                      if hSource[:sourceCitation].empty?

data/lib/adiwg/mdtranslator/writers/fgdc/classes/class_taxonomyKeywords.rb

@@ -23,11 +23,11 @@ module ADIWG
                def writeXML(aKeywords)
 
                   # taxonomy bio (keywtax) - taxonomic keywords (required)
-                  haveTaxon = false
+                  haveTaxKeyword = false
                   aKeywords.each do |hKeySet|
                      type = hKeySet[:keywordType]
                      if type == 'taxon'
-                        haveTaxon = true
+                        haveTaxKeyword = true
                         @xml.tag!('keywtax') do
                            aKeywords = hKeySet[:keywords]
                            thesaurus = hKeySet[:thesaurus]
@@ -49,8 +49,8 @@ module ADIWG
                         end
                      end
                   end
-                  unless haveTaxon
-                     @NameSpace.issueError(422)
+                  unless haveTaxKeyword
+                     @NameSpace.issueWarning(422)
                   end
 
                end # writeXML

data/lib/adiwg/mdtranslator/writers/fgdc/classes/class_taxonomySystem.rb

@@ -35,7 +35,7 @@ module ADIWG
                         # taxonomic system (classcit) - system citation (required) {citation}
                         unless hSystem[:citation].empty?
                            @xml.tag!('classcit') do
-                              citationClass.writeXML(hSystem[:citation], [])
+                              citationClass.writeXML(hSystem[:citation], [], 'taxonomic classification system')
                            end
                         end
                         if hSystem[:citation].empty?

data/lib/adiwg/mdtranslator/writers/iso19110/classes/class_fcFeatureCatalogue.rb

@@ -2,6 +2,7 @@
 # writer output in XML
 
 # History:
+#  Stan Smith 2018-05-03 add variable for changing XSD location
 #  Stan Smith 2018-04-03 refactored error and warning messaging
 #  Stan Smith 2017-01-20 refactored for mdJson/mdTranslator 2.0
 #  Stan Smith 2015-07-14 refactored to eliminate namespace globals $WriterNS and $IsoNS
@@ -50,6 +51,11 @@ module ADIWG
                   @xml.comment!('ADIwg is not responsible for the content of this metadata record')
                   @xml.comment!('This metadata record was generated by mdTranslator ' + version + ' at ' + Time.now.to_s)
 
+                  # schema locations
+                  # set to 'remoteSchema' before publishing
+                  localSchema = 'C:\Users\StanSmith\Projects\ISO\19115\NOAA\schema\gfc\gfc.xsd'
+                  remoteSchema = 'ftp://ftp.ncddc.noaa.gov/pub/Metadata/Online_ISO_Training/Intro_to_ISO/schemas/ISObio/gfc/gfc.xsd'
+
                   # FC_FeatureCatalogue
                   @xml.tag!('gfc:FC_FeatureCatalogue',
                             {'xmlns:gmi' => 'http://www.isotc211.org/2005/gmi',
@@ -63,13 +69,7 @@ module ADIWG
                              'xmlns:gfc' => 'http://www.isotc211.org/2005/gfc',
                              'xmlns:xlink' => 'http://www.w3.org/1999/xlink',
                              'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
-                             'xsi:schemaLocation' => 'http://www.isotc211.org/2005/gfc ftp://ftp.ncddc.noaa.gov/pub/Metadata/Online_ISO_Training/Intro_to_ISO/schemas/ISObio/gfc/gfc.xsd'}) do
-
-                     # local schema for development
-                     # 'xsi:schemaLocation' => 'http://www.isotc211.org/2005/gfc C:\Users\StanSmith\Projects\ISO\19115\NOAA\schema\gfc\gfc.xsd'}) do
-
-                     # remote schema for publication
-                     # 'xsi:schemaLocation' => 'http://www.isotc211.org/2005/gfc ftp://ftp.ncddc.noaa.gov/pub/Metadata/Online_ISO_Training/Intro_to_ISO/schemas/ISObio/gfc/gfc.xsd'}) do
+                             'xsi:schemaLocation' => "http://www.isotc211.org/2005/gfc #{remoteSchema}"}) do
 
                      # feature catalogue - name, version, version date are
                      # are taken from citation