bolognese 2.3.7 → 2.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c05f0dab0bec984086a16ee896eb4c11e96dc0dea3dfafb06dfc850c21509d6e
-  data.tar.gz: 553fbf418f768e5d5be884f14faa196f0b8be525db318199782f2567f4864fad
+  metadata.gz: 5490a2fbec4b0acaad6edf965cd5a7c27a9b9edc2e0f9c2e8bc1041e1f8701d8
+  data.tar.gz: d74808cfadf7fbc3469c56a248479d23526ad34d32af4e75bffb843846055bee
 SHA512:
-  metadata.gz: 73754eb7b9a63ba680fa54d350ae0a3f72c936bddb0135f20723858f570fdab014e49fcbf075e69119d9f5296e00108a61dcf18e27e7ccbb7f55b2526a220d04
-  data.tar.gz: 84db456e50757438cdea6405c03b006eb827033e7a46fb4c7ef1d52473f7de69d6f77b05168569d98f6fa3bc23ba516337335906da78a5c05eb804ab627f3cd3
+  metadata.gz: a7e9f5e56b9c1c5429bb32174b1392e46fb83208f07106f20ca56c86fe8f25847d7308cd490c897752b9812cabc934b0cac59b6f1d136340b50eb7635a24c37d
+  data.tar.gz: 34caaba62200f9e8c203f8e55d97acb3423e9f4d865c6726dc81aae3de2b15934cdef9cc26ae7dc6cf619baf63ee5cdbb5b6d5d6f50f307407fcb3c40a34765a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bolognese (2.3.7)
+    bolognese (2.3.9)
       activesupport (>= 4.2.5)
       benchmark_methods (~> 0.7)
       bibtex-ruby (>= 5.1.0)

data/README.md

@@ -11,7 +11,7 @@ Ruby gem and command-line utility for conversion of DOI metadata from and to dif
 
 ## Features
 
-Bolognese reads and/or writes these metadata formats:
+Bolognese reads and/or writes these metadata formats: 
 
 <table class="table table-bordered table-striped">
   <thead>

data/bolognese.gemspec

@@ -53,7 +53,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'json-canonicalization', '0.3.1'
 
   s.require_paths = ["lib"]
-  s.files       = `git ls-files`.split($/)
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.files = `git ls-files`.split($/).reject { |f| f.match(%r{^(test|spec|features)/}) }
   s.executables = ["bolognese"]
 end

data/lib/bolognese/datacite_utils.rb

@@ -387,9 +387,16 @@ module Bolognese
             if geo_location["geoLocationPolygon"]
               xml.geoLocationPolygon do
                 Array.wrap(geo_location["geoLocationPolygon"]).each do |polygon_point|
-                  xml.polygonPoint do
-                    xml.pointLatitude(polygon_point.dig("polygonPoint", "pointLatitude"))
-                    xml.pointLongitude(polygon_point.dig("polygonPoint", "pointLongitude"))
+                  if polygon_point.has_key?("polygonPoint")
+                    xml.polygonPoint do
+                      xml.pointLatitude(polygon_point.dig("polygonPoint", "pointLatitude"))
+                      xml.pointLongitude(polygon_point.dig("polygonPoint", "pointLongitude"))
+                    end
+                  else
+                    xml.inPolygonPoint do
+                      xml.pointLatitude(polygon_point.dig("inPolygonPoint", "pointLatitude"))
+                      xml.pointLongitude(polygon_point.dig("inPolygonPoint", "pointLongitude"))
+                    end
                   end
                 end
               end

data/lib/bolognese/readers/datacite_reader.rb

@@ -262,17 +262,13 @@ 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.
+            ## Array of geoLocationPolygons within a geoLocation is Unsupported in JSON.
             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
+              geoLocationPolygon = nil
             else
-              geoLocationPolygon = Array.wrap(gl.dig("geoLocationPolygon", "polygonPoint")).map { |glp| { "polygonPoint" => glp } }.compact.presence
+              geoLocationPolygon = Array.wrap(gl.dig("geoLocationPolygon", "polygonPoint")).map { |glp| { "polygonPoint" => glp } }
+                .push(Array.wrap(gl.dig("geoLocationPolygon", "inPolygonPoint")).map { |glp| { "inPolygonPoint" => glp } }.first)
+                .compact.presence             
             end
 
             {

data/lib/bolognese/utils.rb

@@ -932,8 +932,10 @@ module Bolognese
               "address" => gl["geoLocationPlace"],
               "polygon" => Array.wrap(gl.dig("geoLocationPolygon")).map do |glp|
                 Array.wrap(glp).map do |glpp|
-                  [glpp.dig("polygonPoint", "pointLongitude"), glpp.dig("polygonPoint", "pointLatitude")].compact
-                end.compact
+                  if glpp.dig("polygonPoint")
+                    [glpp.dig("polygonPoint", "pointLongitude"), glpp.dig("polygonPoint", "pointLatitude")].compact
+                  end
+                end.compact.presence
               end.compact.presence,
               }
           }

data/lib/bolognese/version.rb

@@ -1,3 +1,3 @@
 module Bolognese
-  VERSION = "2.3.7"
+  VERSION = "2.3.9"
 end