adiwg-mdtranslator 2.13.2 → 2.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d447daf990acea59e6e75f64cbd5b77a1484a8f
-  data.tar.gz: d06cfba19d5862412ff07e426d21f6f798866694
+  metadata.gz: d2e846bab923dba1c4af51d308e33eb83ae5ea96
+  data.tar.gz: bbb0ab9ad5191e0dc43cf2889594d44ca31bdb08
 SHA512:
-  metadata.gz: aaa8026fdbdee161e854b6b6d9fbb9a842ae1e4a646e0da71beb54cae91ad58e93ff0588928aedf798090fd02dbe37e9b01578eb2a19e2ecd846fa51417326c7
-  data.tar.gz: 0d9323bd60d486b000444e800fe16ca415998c17d2919244cc9fde44964c1c2e266089a0978722b06df59fbab37ec4d4516b0c819ba46a7651fd943b3e9c652e
+  metadata.gz: 76dc16abf989aba99ec3775be2e6f59344d41ec74759d7392f3309343de73443bdc61a9615c7b1933bb6605ab03b47a9a04031d2713d97f9a42e5186bba8b757
+  data.tar.gz: 99126f4e0bafae3d8118889f18216c1c70a45f3c886281fafda0a2b70086de8bf9cd4b058c8843dc44fff7e651706015fbb067f04964520105c99a4f166e78d3

data/CHANGELOG.md

@@ -1,7 +1,22 @@
 # Change Log
 
-## [v2.13.2](https://github.com/adiwg/mdTranslator/tree/v2.13.2)
+## [v2.13.3](https://github.com/adiwg/mdTranslator/tree/v2.13.3)
 
+[Full Changelog](https://github.com/adiwg/mdTranslator/compare/v2.13.2...v2.13.3)
+
+**Fixed bugs:**
+
+- sbJSON contacts inherited from associated records [\#202](https://github.com/adiwg/mdTranslator/issues/202)
+
+**Closed issues:**
+
+- Errors Translating FGDC to HTML [\#201](https://github.com/adiwg/mdTranslator/issues/201)
+
+**Merged pull requests:**
+
+- Fix issues with sbJson writer and fgdc reader [\#203](https://github.com/adiwg/mdTranslator/pull/203) ([stansmith907](https://github.com/stansmith907))
+
+## [v2.13.2](https://github.com/adiwg/mdTranslator/tree/v2.13.2) (2018-08-01)
 [Full Changelog](https://github.com/adiwg/mdTranslator/compare/v2.13.1...v2.13.2)
 
 **Merged pull requests:**

data/lib/adiwg/mdtranslator/readers/fgdc/modules/module_identification.rb

@@ -2,6 +2,7 @@
 # unpack fgdc metadata identification
 
 # History:
+#  Stan Smith 2018-09-06 bug fix - change crossReference processing to an array
 #  Stan Smith 2018-04-06 change mdJson taxonomy to an array
 #  Stan Smith 2017-08-15 original script
 
@@ -235,15 +236,17 @@ module ADIWG
                      hResourceInfo[:environmentDescription] = native
                   end
 
-                  # identification information 1.14 (crossref) - cross reference {associatedResource}
-                  xCitation = xIdInfo.xpath('./crossref')
-                  unless xCitation.empty?
-                     hCitation = Citation.unpack(xCitation, hResponseObj)
-                     unless hCitation.empty?
-                        hAssociatedResource = intMetadataClass.newAssociatedResource
-                        hAssociatedResource[:associationType] = 'crossReference'
-                        hAssociatedResource[:resourceCitation] = hCitation
-                        hMetadata[:associatedResources] << hAssociatedResource
+                  # identification information 1.14 (crossref) - cross reference [] {associatedResource}
+                  axCitation = xIdInfo.xpath('./crossref')
+                  unless axCitation.empty?
+                     axCitation.each do |xCitation|
+                        hCitation = Citation.unpack(xCitation, hResponseObj)
+                        unless hCitation.empty?
+                           hAssociatedResource = intMetadataClass.newAssociatedResource
+                           hAssociatedResource[:associationType] = 'crossReference'
+                           hAssociatedResource[:resourceCitation] = hCitation
+                           hMetadata[:associatedResources] << hAssociatedResource
+                        end
                      end
                   end
 

data/lib/adiwg/mdtranslator/version.rb

@@ -1,6 +1,8 @@
 # adiwg mdTranslator
 
 # version 2 history
+# 2.13.3 2018-09-06 bug fix #201 change crossReference processing to an array
+# 2.13.3 2018-09-05 bug fix #202 skip responsibility contacts in associatedResource for sbJson
 # 2.13.2 2018-07-31 fix timeInterval check to allow real and integer
 # 2.13.2 2018-07-31 add minitest for adiwg-mdJson_schema example
 # 2.13.1 2018-07-02 fix bug in ISO 19110 writer when dictionary empty
@@ -89,7 +91,7 @@
 module ADIWG
    module Mdtranslator
       # current mdtranslator version
-      VERSION = "2.13.2"
+      VERSION = "2.13.3"
    end
 end
 

data/lib/adiwg/mdtranslator/writers/sbJson/sbJson_writer.rb

@@ -1,6 +1,7 @@
 # sbJson 1.0 writer
 
 # History:
+#  Stan Smith 2018-09-05 allow nested_obj_by_element to skip specified objects
 #  Stan Smith 2017-05-12 refactored for mdJson/mdTranslator 2.0
 #  Josh Bradley original script
 
@@ -62,18 +63,25 @@ module ADIWG
             end
 
             # find all nested objects in 'obj' that contain the element 'ele'
-            def self.nested_objs_by_element(obj, ele)
+            def self.nested_objs_by_element(obj, ele, excludeList = [])
                aCollected = []
                obj.each do |key, value|
+                  skipThisOne = false
+                  excludeList.each do |exclude|
+                     if key == exclude.to_sym
+                        skipThisOne = true
+                     end
+                  end
+                  next if skipThisOne
                   if key == ele.to_sym
                      aCollected << obj
                   elsif obj.is_a?(Array)
                      if key.respond_to?(:each)
-                        aReturn = nested_objs_by_element(key, ele)
+                        aReturn = nested_objs_by_element(key, ele, excludeList)
                         aCollected = aCollected.concat(aReturn) unless aReturn.empty?
                      end
                   elsif obj[key].respond_to?(:each)
-                     aReturn = nested_objs_by_element(value, ele)
+                     aReturn = nested_objs_by_element(value, ele, excludeList)
                      aCollected = aCollected.concat(aReturn) unless aReturn.empty?
                   end
                end

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

@@ -1,6 +1,7 @@
 # sbJson 1.0 writer
 
 # History:
+#  Stan Smith 2018-09-05 skip responsibility objects in associatedResource
 #  Stan Smith 2017-05-25 refactored for mdJson/mdTranslator 2.0
 #  Josh Bradley original script
 
@@ -20,7 +21,8 @@ module ADIWG
                def self.get_contact_list(intObj)
 
                   # gather all responsibility objects in intObj
-                  aResponsibility = @Namespace.nested_objs_by_element(intObj, 'roleName')
+                  # skip those in associatedResources[]
+                  aResponsibility = @Namespace.nested_objs_by_element(intObj, 'roleName', ['associatedResources'])
 
                   # set an additional 'Material Request Contact' for each distributor contact
                   aMRContacts = @Namespace.nested_objs_by_element(intObj[:metadata][:distributorInfo], 'roleName')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adiwg-mdtranslator
 version: !ruby/object:Gem::Version
-  version: 2.13.2
+  version: 2.13.3
 platform: ruby
 authors:
 - Stan Smith
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-01 00:00:00.000000000 Z
+date: 2018-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -855,7 +855,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: The mdtranslator (metadata translator) is a tool for translating metadata