bolognese 1.9.3 → 1.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32f019db25256fb71b8a6d0b2b45abcc97e0ca6266d2e4d03519a9ac07cafe9c
-  data.tar.gz: 65ba122b12a9bfb50aac24d499d966f9d88007cf0cf84f2f7b81f24ebf5bf08b
+  metadata.gz: f8f8cb84bf74f8a75d2469aa5a3e49dd4ba0adbd9b465d60e11bdbbd8252c267
+  data.tar.gz: 3fc9719de82891ce908fd4af271f05fc1f024442d0a1e6bc88b65db438118ab3
 SHA512:
-  metadata.gz: 15804e0a56cae442744b5ade6478b085a66c7cd375c88a86d0166d7e0d86845fbc5e293f85854d424140550e49672136a9d6f5a156e8e68d47a0f13b166db756
-  data.tar.gz: 32e48adcca39c6de5100777e468fe850324c0a736ab75d2ca758091bb692fa98c9c47047c32f5d36aa192b0d464983fadcfe246a2dfea7cc5f7fd57b3128360a
+  metadata.gz: 797b852b3dafd982249bb57a91dff364bd2dcc6d2b52cb50494dcc6a5cfec7a2fc714a27eed6cd46dde158c495ca93154a858ca0f1800a3990b3f6708878fcec
+  data.tar.gz: c19d5e7833401549a98b71a13e9063b52bbdfaaa70ff2165272aff311b2d3df6ae765ae79a4ad62ae45fb259520a3e3b39ada0dbef838cc602972ecdad50305b

data/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog
 
+## [Unreleased](https://github.com/datacite/bolognese/tree/HEAD)
+
+[Full Changelog](https://github.com/datacite/bolognese/compare/1.9.3...HEAD)
+
+**Implemented enhancements:**
+
+- Should we resolve the Namespace URL for schema [\#62](https://github.com/datacite/bolognese/issues/62)
+
+**Fixed bugs:**
+
+- Singular geoLocationPolygons are wrapped in additional array [\#110](https://github.com/datacite/bolognese/issues/110)
+
+**Merged pull requests:**
+
+- Support returning single geoLocationPolygon [\#111](https://github.com/datacite/bolognese/pull/111) ([richardhallett](https://github.com/richardhallett))
+
+## [1.9.3](https://github.com/datacite/bolognese/tree/1.9.3) (2021-03-26)
+
+[Full Changelog](https://github.com/datacite/bolognese/compare/1.9.2...1.9.3)
+
 ## [1.9.2](https://github.com/datacite/bolognese/tree/1.9.2) (2021-03-25)
 
 [Full Changelog](https://github.com/datacite/bolognese/compare/1.9.1...1.9.2)
@@ -515,10 +535,6 @@
 
 - Error when schema.org in put has array value for @type [\#66](https://github.com/datacite/bolognese/issues/66)
 
-**Merged pull requests:**
-
-- Default to `ScholarlyArticle` type for `citation` and `isBasedOn` relationships with datasets [\#64](https://github.com/datacite/bolognese/pull/64) ([chrisgorgo](https://github.com/chrisgorgo))
-
 ## [v.1.2.16](https://github.com/datacite/bolognese/tree/v.1.2.16) (2019-07-07)
 
 [Full Changelog](https://github.com/datacite/bolognese/compare/v.1.2.15...v.1.2.16)
@@ -617,6 +633,7 @@
 
 **Merged pull requests:**
 
+- Default to `ScholarlyArticle` type for `citation` and `isBasedOn` relationships with datasets [\#64](https://github.com/datacite/bolognese/pull/64) ([chrisgorgo](https://github.com/chrisgorgo))
 - When authors is a plain string, don't try to parse [\#60](https://github.com/datacite/bolognese/pull/60) ([richardhallett](https://github.com/richardhallett))
 
 ## [v.1.1.12](https://github.com/datacite/bolognese/tree/v.1.1.12) (2019-04-15)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bolognese (1.9.3)
+    bolognese (1.9.4)
       activesupport (>= 4.2.5)
       benchmark_methods (~> 0.7)
       bibtex-ruby (>= 5.1.0)
@@ -30,7 +30,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.3)
+    activesupport (6.1.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -81,7 +81,7 @@ GEM
       concurrent-ruby (~> 1.0)
     hashdiff (1.0.1)
     htmlentities (4.3.4)
-    i18n (1.8.9)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     iso8601 (0.9.1)
     json (2.5.1)
@@ -101,7 +101,7 @@ GEM
       optimist (~> 3)
     latex-decode (0.3.2)
     link_header (0.0.8)
-    loofah (2.9.0)
+    loofah (2.9.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     maremma (4.7.4)
@@ -215,4 +215,4 @@ DEPENDENCIES
   webmock (~> 3.0, >= 3.0.1)
 
 BUNDLED WITH
-   2.2.14
+   2.2.16

data/lib/bolognese/readers/datacite_reader.rb

@@ -226,6 +226,19 @@ module Bolognese
           if !gl.is_a?(Hash) || gl["geoLocationPoint"].is_a?(String) || gl["geoLocationBox"].is_a?(String) || gl["geoLocationPolygon"].is_a?(String)
             nil
           else
+
+            # Handle scenario where multiple geoLocationPolygons are allowed within a single geoLocation
+            # we want to return an array if it's already an array (i.e. multiple geoLocationPolygons)
+            # vs if it's singular just return the object
+            # This is for backwards compatability to allow both scenarios.
+            if gl.dig("geoLocationPolygon").kind_of?(Array)
+              geoLocationPolygon = gl.dig("geoLocationPolygon").map do |glp|
+                Array.wrap(glp.dig("polygonPoint")).map { |glpp| { "polygonPoint" => glpp } }.compact.presence
+              end.compact.presence
+            else
+              geoLocationPolygon = Array.wrap(gl.dig("geoLocationPolygon", "polygonPoint")).map { |glp| { "polygonPoint" => glp } }.compact.presence
+            end
+
             {
               "geoLocationPoint" => {
                 "pointLatitude" => gl.dig("geoLocationPoint", "pointLatitude"),
@@ -237,9 +250,7 @@ module Bolognese
                 "southBoundLatitude" => gl.dig("geoLocationBox", "southBoundLatitude"),
                 "northBoundLatitude" => gl.dig("geoLocationBox", "northBoundLatitude")
               }.compact.presence,
-              "geoLocationPolygon" => Array.wrap(gl.dig("geoLocationPolygon")).map do |glp|
-                Array.wrap(glp.dig("polygonPoint")).map { |glpp| { "polygonPoint" => glpp } }.compact.presence
-              end.compact.presence,
+              "geoLocationPolygon" => geoLocationPolygon,
               "geoLocationPlace" => parse_attributes(gl["geoLocationPlace"], first: true).to_s.strip.presence
             }.compact
           end

data/lib/bolognese/version.rb

@@ -1,3 +1,3 @@
 module Bolognese
-  VERSION = "1.9.3"
+  VERSION = "1.9.4"
 end

data/spec/fixtures/datacite-geolocationpolygons-multiple.xml

@@ -52,5 +52,25 @@
         </polygonPoint>
       </geoLocationPolygon>
     </geoLocation>
+    <geoLocation>
+      <geoLocationPolygon>
+        <polygonPoint>
+          <pointLongitude>65</pointLongitude>
+          <pointLatitude>80</pointLatitude>
+        </polygonPoint>
+        <polygonPoint>
+          <pointLongitude>55</pointLongitude>
+          <pointLatitude>75</pointLatitude>
+        </polygonPoint>
+        <polygonPoint>
+          <pointLongitude>45</pointLongitude>
+          <pointLatitude>73</pointLatitude>
+        </polygonPoint>
+        <polygonPoint>
+          <pointLongitude>65</pointLongitude>
+          <pointLatitude>80</pointLatitude>
+        </polygonPoint>
+      </geoLocationPolygon>
+    </geoLocation>
   </geoLocations>
 </resource>

data/spec/readers/datacite_reader_spec.rb

@@ -1314,7 +1314,7 @@ describe Bolognese::Metadata, vcr: true do
     expect(subject.agency).to eq("datacite")
     expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
     expect(subject.geo_locations.first["geoLocationPlace"]).to eq("Zandmotor, sand suppletion area on the Dutch coast.")
-    expect(subject.geo_locations.first["geoLocationPolygon"][0].first).to eq("polygonPoint"=>{"pointLatitude"=>"52.03913926329928", "pointLongitude"=>"4.1738852605822"})
+    expect(subject.geo_locations.first["geoLocationPolygon"].first).to eq("polygonPoint"=>{"pointLatitude"=>"52.03913926329928", "pointLongitude"=>"4.1738852605822"})
   end
 
   it "Schema 4.4 from string" do
@@ -1562,7 +1562,15 @@ describe Bolognese::Metadata, vcr: true do
           {"polygonPoint"=>{"pointLatitude"=>"73", "pointLongitude"=>"45"}},
           {"polygonPoint"=>{"pointLatitude"=>"80", "pointLongitude"=>"65"}}
         ]
-      ] }
+      ] },
+      { "geoLocationPolygon"=>
+        [
+          {"polygonPoint"=>{"pointLatitude"=>"80", "pointLongitude"=>"65"}},
+          {"polygonPoint"=>{"pointLatitude"=>"75", "pointLongitude"=>"55"}},
+          {"polygonPoint"=>{"pointLatitude"=>"73", "pointLongitude"=>"45"}},
+          {"polygonPoint"=>{"pointLatitude"=>"80", "pointLongitude"=>"65"}}
+        ]
+      }
       ]
     )
   end

data/spec/writers/schema_org_writer_spec.rb

@@ -281,7 +281,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(json["name"]).to eq("Meteo measurements at the Sand Motor")
       expect(json["author"]).to eq("@type"=>"Person", "familyName"=>"Den Heijer", "givenName"=>"C", "name"=>"C Den Heijer")
       expect(json["includedInDataCatalog"]).to be_nil
-      expect(json["spatialCoverage"].dig("geo", "polygon")[0].length).to eq(34)
+      expect(json["spatialCoverage"].dig("geo", "polygon").length).to eq(34)
       expect(json["spatialCoverage"].dig("geo", "polygon")[0].first).to eq(["4.1738852605822", "52.03913926329928"])
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolognese
 version: !ruby/object:Gem::Version
-  version: 1.9.3
+  version: 1.9.4
 platform: ruby
 authors:
 - Martin Fenner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-26 00:00:00.000000000 Z
+date: 2021-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: maremma