adiwg-mdtranslator 1.4.0.beta8 → 1.4.0.beta9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a561a8015225d2849aa09e5ce21000346a493e0
-  data.tar.gz: 4499efd48369282b94137ad265509fec57658158
+  metadata.gz: 2f912542c0adac2bbf714499e51a64e7818941b2
+  data.tar.gz: 0ccf2affad60913562a3fe1f9b6335ae353812fb
 SHA512:
-  metadata.gz: 03b73ea497272fae1f77f36a27f289ffcbae7ce27d55abda0165d0804ea3b6f5a2e7f40155d5f58eac4a7cd0afa3c213eeca16ff074441cf5981e183f064343b
-  data.tar.gz: 40960e4a899fc09f009429a2dfda69fe3b70f74f75ab4383256b3b0cd72fec00ad99e9aa8a5afa4f97fa6a4bf72558cc6af2510155d58bdd520465a2fa6e4a93
+  metadata.gz: 07e290749a1ffe4d755d8d9e41e3e9de56699d7036296e0eb96d01427a6f93bdf63d80f86e903ba64a57bb6c45e82a1ac6f6be64afc93b0b522fc26b85149189
+  data.tar.gz: 7d9de3d3e2ecd01ec58ae6724f23d9be655b925bdf93315444a63a77e21192a86bdcb66479ac216f5575c22f44f3ad6bc57d2ef26ca16cb9f69f4902d668f0a1

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

@@ -93,7 +93,8 @@ class InternalMetadata
             address: {},
             onlineRes: [],
             contactInstructions: nil,
-            internal: false
+            internal: false,
+            primaryRole: nil
         }
     end
 

data/lib/adiwg/mdtranslator/readers/mdJson/modules_v1/module_contacts.rb

@@ -81,6 +81,14 @@ module ADIWG
                             end
                         end
 
+                        # primary role
+                        if hContact.has_key?('primaryRole')
+                            s = hContact['primaryRole']
+                            if s != ''
+                                intCont[:primaryRole] = s
+                            end
+                        end
+
                         # online resources
                         if hContact.has_key?('onlineResource')
                             aOlRes = hContact['onlineResource']

data/lib/adiwg/mdtranslator/readers/mdJson/modules_v1/module_responsibleParty.rb

@@ -32,27 +32,28 @@ module ADIWG
                         # responsible party - contact
                         if hRParty.has_key?('contactId')
                             s = hRParty['contactId']
-                            if s != ''
-                                intResById[:contactId] = s
-                                if (!ADIWG::Mdtranslator::Readers::MdJson.findContact(s))
-                                    responseObj[:readerExecutionPass] = false
-                                    responseObj[:readerExecutionMessages] << "Responsible Party contact ID #{s} does not match with any contact provided\n"
-                                end
-                            else
+                        end
+                        if s && s != ''
+                            intResById[:contactId] = s
+                            contact = ADIWG::Mdtranslator::Readers::MdJson.findContact(s)
+                            if (!contact)
                                 responseObj[:readerExecutionPass] = false
-                                responseObj[:readerExecutionMessages] << 'Responsible Party is missing the contact ID\n'
+                                responseObj[:readerExecutionMessages] << "Responsible Party contact ID #{s} does not match with any contact provided\n"
                             end
+                        else
+                            responseObj[:readerExecutionPass] = false
+                            responseObj[:readerExecutionMessages] << 'Responsible Party is missing the contact ID\n'
                         end
 
                         # responsible party - role - required
                         if hRParty.has_key?('role')
-                            s = hRParty['role']
-                            if s != ''
-                                intResById[:roleName] = s
-                            else
-                                responseObj[:readerExecutionPass] = false
-                                responseObj[:readerExecutionMessages] << 'Responsible Party is missing the contact role\n'
-                            end
+                            rl = hRParty['role'] || contact[:primaryRole]
+                        end
+                        if rl && rl != ''
+                            intResById[:roleName] = rl
+                        else
+                            responseObj[:readerExecutionPass] = false
+                            responseObj[:readerExecutionMessages] << 'Responsible Party is missing the contact role\n'
                         end
 
                         return intResById

data/lib/adiwg/mdtranslator/readers/sbJson/modules_v0/module_citation.rb

@@ -52,7 +52,7 @@ module ADIWG
                                     if hCitDate.has_key?('date')
                                         s = hCitDate['date']
                                         if s != ''
-                                            intDateTime = DateTime.unpack(s, responseObj)
+                                            intDateTime = SbDateTime.unpack(s, responseObj)
                                             if hCitDate.has_key?('dateType')
                                                 s = hCitDate['dateType']
                                                 if s != ''

data/lib/adiwg/mdtranslator/readers/sbJson/modules_v0/module_contacts.rb

@@ -36,11 +36,10 @@ module ADIWG
                             intCont[:position] = s if s != ''
                         end
 
-                        # SB Role, store the role for later lookup, not used
-                        # internally
+                        # SB Role
                         if hContact.key?('type')
                             s = hContact['type']
-                            intCont[:sbType] = s if s != ''
+                            intCont[:primaryRole] = s if s != ''
                         end
 
                         # contact instructions

data/lib/adiwg/mdtranslator/readers/sbJson/modules_v0/module_dateTime.rb

@@ -5,7 +5,7 @@ module ADIWG
         module Readers
             module SbJson
 
-                module DateTime
+                module SbDateTime
 
                     def self.unpack(sDateTime, responseObj)
 

data/lib/adiwg/mdtranslator/readers/sbJson/modules_v0/module_distributionInfo.rb

@@ -16,7 +16,7 @@ module ADIWG
                         # with a a role of "distributor", if none just use
                         # the default SB contact
                         aCust = {}
-                        dist = intObj[:contacts].find { |c| c[:sbType] == 'Distributor' }
+                        dist = intObj[:contacts].find { |c| c[:primaryRole] == 'Distributor' }
 
                         unless dist.nil?
                             aCust['contactId'] = dist[:contactId]

data/lib/adiwg/mdtranslator/readers/sbJson/modules_v0/module_metadata.rb

@@ -1,4 +1,5 @@
 require 'uri'
+require 'date'
 require ADIWG::Mdtranslator::Readers::SbJson.readerModule('module_metadataInfo')
 require ADIWG::Mdtranslator::Readers::SbJson.readerModule('module_resourceInfo')
 require ADIWG::Mdtranslator::Readers::SbJson.readerModule('module_distributionInfo')
@@ -23,7 +24,7 @@ module ADIWG
                         intMetadata[:resourceInfo] = ResourceInfo.unpack(hMetadata, responseObj, intObj)
 
                         # metadata - distribution info
-                        if hMetadata.key?('webLinks')
+                        if hMetadata.key?('distributionLinks')
                             intMetadata[:distributorInfo] << DistributionInfo.unpack(hMetadata, responseObj, intObj)
                         end
 
@@ -46,6 +47,10 @@ module ADIWG
                                         'resourceType' => hAddDoc['type'],
                                         'citation' => {
                                             'title' => hAddDoc['title'] || hAddDoc['typeLabel'],
+                                            'date' => [{
+                                              'date' => DateTime.now.iso8601,
+                                              'dateType' => 'distribution'
+                                              }],
                                             'onlineResource' => [
                                                 {
                                                     'uri' => hAddDoc['uri'],

data/lib/adiwg/mdtranslator/readers/sbJson/modules_v0/module_metadataInfo.rb

@@ -58,14 +58,14 @@ module ADIWG
             firstCont = intObj[:contacts][0]
             aCust = {}
             aCust['contactId'] = firstCont[:contactId]
-            aCust['role'] = firstCont[:sbType]
+            aCust['role'] = firstCont[:primaryRole]
             intMetadataInfo[:metadataCustodians] << ResponsibleParty.unpack(aCust, responseObj)
 
             # metadata - creation date
             if hMetadataInfo.key?('provenance')
               s = hMetadataInfo['provenance']['dateCreated']
               if s != ''
-                hDateTime = DateTime.unpack(s, responseObj)
+                hDateTime = SbDateTime.unpack(s, responseObj)
                 hDateTime[:dateType] = 'creation'
                 intMetadataInfo[:metadataCreateDate] = hDateTime
               end
@@ -75,7 +75,7 @@ module ADIWG
             if hMetadataInfo.key?('provenance')
               s = hMetadataInfo['provenance']['lastUpdated']
               if s != ''
-                hDateTime = DateTime.unpack(s, responseObj)
+                hDateTime = SbDateTime.unpack(s, responseObj)
                 hDateTime[:dateType] = 'lastUpdate'
                 intMetadataInfo[:metadataUpdateDate] = hDateTime
               end

data/lib/adiwg/mdtranslator/readers/sbJson/modules_v0/module_resourceInfo.rb

@@ -84,7 +84,7 @@ module ADIWG
                             hResourceInfo['dates'].each do |date|
                                 s = date['dateString']
                                 next unless s != ''
-                                hDateTime = DateTime.unpack(s, responseObj)
+                                hDateTime = SbDateTime.unpack(s, responseObj)
                                 hDateTime[:dateType] = date['type']
                                 hCitation[:citDate] << hDateTime
                             end
@@ -119,7 +119,7 @@ module ADIWG
                         firstCont = intObj[:contacts][0]
                         aCust = {}
                         aCust['contactId'] = firstCont[:contactId]
-                        aCust['role'] = firstCont[:sbType]
+                        aCust['role'] = firstCont[:primaryRole]
                         intResInfo[:pointsOfContact] << ResponsibleParty.unpack(aCust, responseObj)
 
                         # resource information - abstract
@@ -137,13 +137,13 @@ module ADIWG
                         # resource information - status
                         # project status is sometimes available
                         # otherwise just defaults to "published"
-                        if projectFacet.nil?
+                        if not projectFacet.nil?
 
-                            if hResourceInfo.key?('status')
-                                s = hResourceInfo['status']
+                            if projectFacet.key?('projectStatus')
+                                status = projectFacet['projectStatus']
                             end
-                            intResInfo[:status] = s.nil? ? 'published' : s
                         end
+                        intResInfo[:status] = status.nil? ? 'published' : status
 
                         # resource information - has mappable location
                         intResInfo[:hasMapLocation?] = hResourceInfo.key?('spatial')

data/lib/adiwg/mdtranslator/version.rb

@@ -61,6 +61,6 @@
 module ADIWG
     module Mdtranslator
         # current mdtranslator version
-        VERSION = "1.4.0.beta8"
+        VERSION = "1.4.0.beta9"
     end
 end

data/lib/adiwg/mdtranslator/writers/mdJson/mdJson_writer.rb

@@ -5,38 +5,48 @@ require_relative 'sections/mdJson_metadata'
 require_relative 'sections/mdJson_dictionary'
 
 module ADIWG
-    module Mdtranslator
-        module Writers
-            module MdJson
-                def self.startWriter(_intObj, responseObj, _paramsObj)
-                    #set output flag for null properties
-                    Jbuilder::ignore_nil(!responseObj[:writerShowTags])
-                    # set the format of the output file based on the writer specified
-                    responseObj[:writerFormat] = 'json'
-                    responseObj[:writerVersion] = ADIWG::Mdtranslator::Writers::MdJson::VERSION
-
-                    # version
-                    metadata = Jbuilder.new do |json|
-                        json.version do
-                            json.name 'mdJson'
-                            json.version responseObj[:writerVersion]
-                        end
-
-                        json.contact _intObj[:contacts].map { |obj| Contact.build(obj).attributes!}
-                        json.metadata Metadata.build(_intObj[:metadata])
-                        json.dataDictionary _intObj[:dataDictionary].map { |obj| Dictionary.build(obj).attributes!}
-                    end
-
-                    # set writer pass to true if no messages
-                    # false or warning will be set by code that places the message
-                    responseObj[:writerPass] = true if responseObj[:writerMessages].empty?
-
-                    # j = JSON.parse(metadata.target!)
-                    # puts JSON.pretty_generate(j)
-
-                    metadata.target!
-                end
+  module Mdtranslator
+    module Writers
+      module MdJson
+        def self.startWriter(_intObj, responseObj, _paramsObj)
+          @intObj = _intObj
+
+          # set output flag for null properties
+          Jbuilder.ignore_nil(!responseObj[:writerShowTags])
+          # set the format of the output file based on the writer specified
+          responseObj[:writerFormat] = 'json'
+          responseObj[:writerVersion] = ADIWG::Mdtranslator::Writers::MdJson::VERSION
+
+          # version
+          metadata = Jbuilder.new do |json|
+            json.version do
+              json.name 'mdJson'
+              json.version responseObj[:writerVersion]
             end
+
+            json.contact _intObj[:contacts].map { |obj| Contact.build(obj).attributes! }
+            json.metadata Metadata.build(_intObj[:metadata])
+            json.dataDictionary _intObj[:dataDictionary].map { |obj| Dictionary.build(obj).attributes! }
+          end
+
+          # set writer pass to true if no messages
+          # false or warning will be set by code that places the message
+          responseObj[:writerPass] = true if responseObj[:writerMessages].empty?
+
+          # j = JSON.parse(metadata.target!)
+          # puts JSON.pretty_generate(j)
+
+          metadata.target!
+        end
+
+        # find contact in contact array and return the contact hash
+        def self.getContact(contactID)
+          @intObj[:contacts].each do |hContact|
+            return hContact if hContact[:contactId] == contactID
+          end
+          {}
         end
+      end
     end
+  end
 end

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

@@ -17,7 +17,7 @@ module ADIWG
               Jbuilder.new do |json|
                 json.title cite[:citTitle]
                 json.alternateTitle cite[:citAltTitle]
-                json.date json_map(cite[:citDate], DateTime)
+                json.date json_map(cite[:citDate], DateTime) unless cite[:citDate].empty?
                 json.edition cite[:citEdition]
                 json.identifier json_map(cite[:citResourceIds], ResourceIdentifier)
                 json.responsibleParty json_map(cite[:citResponsibleParty], ResponsibleParty)

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

@@ -28,7 +28,7 @@ module ADIWG
             Jbuilder.new do |json|
               json.resourceType _info[:resourceType]
               json.citation Citation.build(_info[:citation])
-              json.resourceTimePeriod TimePeriod.build(_info[:timePeriod]) # unless _info[:timePeriod].empty?
+              json.resourceTimePeriod TimePeriod.build(_info[:timePeriod]) unless _info[:timePeriod].empty?
               json.pointOfContact json_map(_info[:pointsOfContact], ResponsibleParty)
               json.abstract _info[:abstract]
               json.shortAbstract _info[:shortAbstract]
@@ -48,7 +48,7 @@ module ADIWG
               json.resourceSpecificUsage json_map(_info[:resourceUses], Usage)
               json.graphicOverview json_map(_info[:graphicOverview], GraphicOverview)
               json.constraint Constraint.build(_info[:useConstraints], _info[:legalConstraints], _info[:securityConstraints])
-              json.taxonomy Taxonomy.build(_info[:taxonomy])
+              json.taxonomy Taxonomy.build(_info[:taxonomy]) unless _info[:taxonomy].empty?
               json.spatialReferenceSystem SpatialReference.build(_info[:spatialReferenceSystem])
               json.spatialResolution (_info[:spatialResolutions]) do |sr|
                 json.equivalentScale sr[:equivalentScale]

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

@@ -8,7 +8,7 @@ module ADIWG
           def self.build(intObj)
             Jbuilder.new do |json|
               json.contactId intObj[:contactId]
-              json.role intObj[:roleName]
+              json.role intObj[:roleName] || MdJson.getContact(intObj[:contactId])[:primaryRole]
             end
           end
         end

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

@@ -13,6 +13,7 @@ module ADIWG
                 type = intObj[:indName].nil? ? 'organization' : 'person'
                 json.name intObj[:indName] || intObj[:orgName]
                 json.contactType type
+                json.type intObj[:primaryRole]
                 json.email intObj[:address][:eMailList][0] unless intObj[:address].empty?
                 json.organization type == 'person' ? {:displayText => intObj[:orgName]} : nil
                 json.primaryLocation do

data/test/readers/mdJson/v1/tc_reader_mdjson_translation.rb

@@ -35,6 +35,7 @@ class TestTranslation_mdJson_v1 < MiniTest::Test
     assert_equal(version[0], metadata[:readerVersionUsed].split('.')[0])
 
     assert metadata[:readerValidationPass], "reader validation failed: \n" + metadata[:readerValidationMessages].join(',')
+    assert metadata[:readerExecutionPass], "reader execution failed: \n" + metadata[:readerExecutionMessages].join(',')
     assert_equal(@@writer, metadata[:writerName])
     assert metadata[:writerPass], "writer validation failed: \n" + metadata[:writerMessages].join(',')
     refute_nil metadata[:writerOutput]
@@ -56,6 +57,7 @@ class TestTranslation_mdJson_v1 < MiniTest::Test
     assert metadata[:readerStructurePass], metadata[:readerStructureMessages].join(',')
     assert_equal(@@reader, metadata[:readerRequested])
     assert metadata[:readerValidationPass], "reader validation failed: \n" + metadata[:readerValidationMessages].join(',')
+    assert metadata[:readerExecutionPass], "reader execution failed: \n" + metadata[:readerExecutionMessages].join(',')
     assert_equal(@@writer, metadata[:writerName])
     assert metadata[:writerPass], "writer validation failed: \n" + metadata[:writerMessages].join(',')
     refute_nil metadata[:writerOutput]

data/test/readers/mdJson/v1/tc_translation_19110.rb

@@ -49,6 +49,7 @@ class TestTranslation_v1 < MiniTest::Test
         assert metadata[:readerStructurePass], metadata[:readerStructureMessages].join(',')
         assert_equal(@@reader, metadata[:readerRequested])
         assert metadata[:readerValidationPass], "reader validation failed: \n" + metadata[:readerValidationMessages].join(',')
+        assert metadata[:readerExecutionPass], "reader execution failed: \n" + metadata[:readerExecutionMessages].join(',')
         assert_equal('iso19110', metadata[:writerName])
         assert metadata[:writerPass], "writer validation failed: \n" + metadata[:writerMessages].join(',')
         refute_nil metadata[:writerOutput]

data/test/readers/sbJson/v0/tc_reader_sbjson_translation.rb

@@ -31,6 +31,7 @@ class TestTranslation_sbJson_v0 < MiniTest::Test
     assert_equal(version[0], metadata[:readerVersionUsed].split('.')[0])
 
     assert metadata[:readerValidationPass], "reader validation failed: \n" + metadata[:readerValidationMessages].join(',')
+    assert metadata[:readerExecutionPass], "reader execution failed: \n" + metadata[:readerExecutionMessages].join(',')
     assert_equal(@@writer, metadata[:writerName])
     assert metadata[:writerPass], "writer validation failed: \n" + metadata[:writerMessages].join(',')
     refute_nil metadata[:writerOutput]
@@ -52,6 +53,7 @@ class TestTranslation_sbJson_v0 < MiniTest::Test
     assert metadata[:readerStructurePass], metadata[:readerStructureMessages].join(',')
     assert_equal(@@reader, metadata[:readerRequested])
     assert metadata[:readerValidationPass], "reader validation failed: \n" + metadata[:readerValidationMessages].join(',')
+    assert metadata[:readerExecutionPass], "reader execution failed: \n" + metadata[:readerExecutionMessages].join(',')
     assert_equal(@@writer, metadata[:writerName])
     assert metadata[:writerPass], "writer validation failed: \n" + metadata[:writerMessages].join(',')
     refute_nil metadata[:writerOutput]

data/test/readers/sbJson/v0/test.json

@@ -110,8 +110,8 @@
             "building": "COLUMBIA TECH CENTER",
             "buildingCode": "WWA",
             "roomNumber": "asdf",
-            "officePhone": "asdf",
-            "faxPhone": "asdfasdf",
+            "officePhone": "999-9999",
+            "faxPhone": "999-9999",
             "latitude": 12,
             "longitude": 12,
             "streetAddress": {

data/test/writers/mdJson/v1/tc_writer_mdJson.rb

@@ -32,6 +32,7 @@ class Test_Write_mdJSONv1 < MiniTest::Test
     assert_equal(version[0], metadata[:readerVersionUsed].split('.')[0])
 
     assert metadata[:readerValidationPass], "reader validation failed: \n" + metadata[:readerValidationMessages].join(',')
+    assert metadata[:readerExecutionPass], "reader execution failed: \n" + metadata[:readerExecutionMessages].join(',')
     assert_equal(@@writer, metadata[:writerName])
     assert metadata[:writerPass], "writer validation failed: \n" + metadata[:writerMessages].join(',')
     refute_nil metadata[:writerOutput]
@@ -53,6 +54,7 @@ class Test_Write_mdJSONv1 < MiniTest::Test
     assert metadata[:readerStructurePass], metadata[:readerStructureMessages].join(',')
     assert_equal(@@reader, metadata[:readerRequested])
     assert metadata[:readerValidationPass], "reader validation failed: \n" + metadata[:readerValidationMessages].join(',')
+    assert metadata[:readerExecutionPass], "reader execution failed: \n" + metadata[:readerExecutionMessages].join(',')
     assert_equal(@@writer, metadata[:writerName])
     assert metadata[:writerPass], "writer validation failed: \n" + metadata[:writerMessages].join(',')
     refute_nil metadata[:writerOutput]

data/test/writers/sbJson/v0/tc_writer_sbJson.rb

@@ -32,6 +32,7 @@ class Test_Write_sbJSONv0 < MiniTest::Test
     assert_equal(version[0], metadata[:readerVersionUsed].split('.')[0])
 
     assert metadata[:readerValidationPass], "reader validation failed: \n" + metadata[:readerValidationMessages].join(',')
+    assert metadata[:readerExecutionPass], "reader execution failed: \n" + metadata[:readerExecutionMessages].join(',')
     assert_equal(@@writer, metadata[:writerName])
     assert metadata[:writerPass], "writer validation failed: \n" + metadata[:writerMessages].join(',')
     refute_nil metadata[:writerOutput]
@@ -53,6 +54,7 @@ class Test_Write_sbJSONv0 < MiniTest::Test
     assert metadata[:readerStructurePass], metadata[:readerStructureMessages].join(',')
     assert_equal(@@reader, metadata[:readerRequested])
     assert metadata[:readerValidationPass], "reader validation failed: \n" + metadata[:readerValidationMessages].join(',')
+    assert metadata[:readerExecutionPass], "reader execution failed: \n" + metadata[:readerExecutionMessages].join(',')
     assert_equal(@@writer, metadata[:writerName])
     assert metadata[:writerPass], "writer validation failed: \n" + metadata[:writerMessages].join(',')
     refute_nil metadata[:writerOutput]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adiwg-mdtranslator
 version: !ruby/object:Gem::Version
-  version: 1.4.0.beta8
+  version: 1.4.0.beta9
 platform: ruby
 authors:
 - Stan Smith
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-18 00:00:00.000000000 Z
+date: 2016-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -563,7 +563,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: The mdtranslator (metadata translator) is a tool for translating metadata