bolognese 1.9.2 → 1.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06d651b8877944fead2a1d1ba18ec5847ea327a4c835ace217dffe544e9f04e1
-  data.tar.gz: 4c7af71d22ae44861acac86d234deb81561ed83327e6e39adebac01af44ab21d
+  metadata.gz: a01fe4851a13d779fd983f0fd3dc3c3e14a9374ddee6f9802f305e11c802156e
+  data.tar.gz: 49d2105471c6bc0270c5e6c326f4564503668537a7ffc26a241293ca2f0ae877
 SHA512:
-  metadata.gz: bd4d06c35507d50add44947a5c26e66ecdd8f593c2e984b772add2126bf42a162d6861ff2af027b4fbe0d78c7ddf1b17693a8f5f47d217bc86aca498efcdd96b
-  data.tar.gz: bd81ea7482839d1c87afa18b64ba08f85e237faca63a4bda1ec827cc44a261a601fa20610d0806cc758011265dd92d2ffb43ca040a9c26f89a5a21825de52a54
+  metadata.gz: 6e6d56a5bb01f18d4bc5812520828d73c19ec9f52f5a3650d31ba9c58f7a19715b59161c8f4bfdfe1cdaf565a94bfc9963b928a1587d86c4cd17ee0579f9b77a
+  data.tar.gz: 0ca356314c8b16aadb0e9d0f30ebc21e77ee13baf2e73d90a9b8437e83201fa56f3091d6df802824bde0e3b900cc3aa09166caac75c6131378dccc48551de3b1

data/CHANGELOG.md

@@ -1,5 +1,51 @@
 # Changelog
 
+## [Unreleased](https://github.com/datacite/bolognese/tree/HEAD)
+
+[Full Changelog](https://github.com/datacite/bolognese/compare/1.9.5...HEAD)
+
+**Fixed bugs:**
+
+- Missing affiliationIdentiifer when used with schemaURI raises an error [\#116](https://github.com/datacite/bolognese/issues/116)
+- Optional numberType being treated as required generating error [\#112](https://github.com/datacite/bolognese/issues/112)
+
+**Closed issues:**
+
+- Book metadata seems to be ignored [\#113](https://github.com/datacite/bolognese/issues/113)
+- Namespaced XML Tags [\#109](https://github.com/datacite/bolognese/issues/109)
+
+**Merged pull requests:**
+
+- Fix missing affiliation identifier [\#117](https://github.com/datacite/bolognese/pull/117) ([richardhallett](https://github.com/richardhallett))
+
+## [1.9.5](https://github.com/datacite/bolognese/tree/1.9.5) (2021-04-20)
+
+[Full Changelog](https://github.com/datacite/bolognese/compare/1.9.4...1.9.5)
+
+## [1.9.4](https://github.com/datacite/bolognese/tree/1.9.4) (2021-04-13)
+
+[Full Changelog](https://github.com/datacite/bolognese/compare/1.9.3...1.9.4)
+
+**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)
+
 ## [1.9.1](https://github.com/datacite/bolognese/tree/1.9.1) (2021-03-25)
 
 [Full Changelog](https://github.com/datacite/bolognese/compare/1.9...1.9.1)
@@ -973,14 +1019,14 @@
 
 [Full Changelog](https://github.com/datacite/bolognese/compare/v.0.11.15...v.0.11.16)
 
-## [v.0.11.15](https://github.com/datacite/bolognese/tree/v.0.11.15) (2018-08-01)
-
-[Full Changelog](https://github.com/datacite/bolognese/compare/v.0.11.14...v.0.11.15)
-
 **Fixed bugs:**
 
 - Handle xs:string attribute [\#32](https://github.com/datacite/bolognese/issues/32)
 
+## [v.0.11.15](https://github.com/datacite/bolognese/tree/v.0.11.15) (2018-08-01)
+
+[Full Changelog](https://github.com/datacite/bolognese/compare/v.0.11.14...v.0.11.15)
+
 ## [v.0.11.14](https://github.com/datacite/bolognese/tree/v.0.11.14) (2018-07-28)
 
 [Full Changelog](https://github.com/datacite/bolognese/compare/v.0.11.3...v.0.11.14)
@@ -1462,8 +1508,10 @@
 **Closed issues:**
 
 - Fix error handling alternate names in ris writer [\#14](https://github.com/datacite/bolognese/issues/14)
+- Error displaying container-title [\#13](https://github.com/datacite/bolognese/issues/13)
 - Error parsing funding information [\#12](https://github.com/datacite/bolognese/issues/12)
 - crossref author id to orcid id?  [\#10](https://github.com/datacite/bolognese/issues/10)
+- Support funding information [\#7](https://github.com/datacite/bolognese/issues/7)
 - datacite: support subjectScheme and subjectURI [\#4](https://github.com/datacite/bolognese/issues/4)
 
 ## [v.0.9.21](https://github.com/datacite/bolognese/tree/v.0.9.21) (2017-06-03)
@@ -1472,10 +1520,8 @@
 
 **Closed issues:**
 
-- Error displaying container-title [\#13](https://github.com/datacite/bolognese/issues/13)
 - Abstract should be a string in Citeproc writer [\#11](https://github.com/datacite/bolognese/issues/11)
 - the Bolognese gem doesn't properly handle the optional language attribute. [\#8](https://github.com/datacite/bolognese/issues/8)
-- Support funding information [\#7](https://github.com/datacite/bolognese/issues/7)
 - datacite: support xml:lang in title [\#3](https://github.com/datacite/bolognese/issues/3)
 
 ## [v.0.9.20](https://github.com/datacite/bolognese/tree/v.0.9.20) (2017-05-13)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bolognese (1.9.2)
+    bolognese (1.9.7)
       activesupport (>= 4.2.5)
       benchmark_methods (~> 0.7)
       bibtex-ruby (>= 5.1.0)
@@ -19,7 +19,7 @@ PATH
       loofah (~> 2.0, >= 2.0.3)
       maremma (>= 4.7, < 5)
       namae (~> 1.0)
-      nokogiri (~> 1.10.4)
+      nokogiri (~> 1.11.2)
       oj (~> 3.10)
       oj_mimic_json (~> 1.0, >= 1.0.1)
       postrank-uri (~> 1.0, >= 1.0.18)
@@ -30,7 +30,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.3)
+    activesupport (6.1.3.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -38,6 +38,7 @@ GEM
       zeitwerk (~> 2.3)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
+    amazing_print (1.3.0)
     benchmark_methods (0.7)
     bibtex-ruby (6.0.0)
       latex-decode (~> 0.0)
@@ -54,15 +55,17 @@ GEM
     crass (1.0.6)
     csl (1.5.2)
       namae (~> 1.0)
-    csl-styles (1.0.1.10)
+    csl-styles (1.0.1.11)
       csl (~> 1.0)
     diff-lcs (1.4.4)
     docile (1.3.5)
-    ebnf (2.1.2)
+    ebnf (2.1.3)
+      amazing_print (~> 1.2)
       htmlentities (~> 4.3)
       rdf (~> 3.1)
       scanf (~> 1.0)
       sxp (~> 1.1)
+      unicode-types (~> 1.6)
     edtf (3.0.6)
       activesupport (>= 3.0, < 7.0)
     excon (0.71.1)
@@ -81,7 +84,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,10 +104,10 @@ 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.2)
+    maremma (4.7.4)
       activesupport (>= 4.2.5)
       addressable (>= 2.3.6)
       builder (~> 3.2, >= 3.2.2)
@@ -112,17 +115,18 @@ GEM
       faraday (~> 0.17.3)
       faraday-encoding (~> 0.0.4)
       faraday_middleware (~> 0.14.0)
-      nokogiri (~> 1.10.4)
+      nokogiri (~> 1.11.2)
       oj (>= 2.8.3)
       oj_mimic_json (~> 1.0, >= 1.0.1)
-    mini_portile2 (2.4.0)
+    mini_portile2 (2.5.0)
     minitest (5.14.4)
     multi_json (1.15.0)
     multipart-post (2.1.1)
     namae (1.1.1)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
-    oj (3.11.3)
+    nokogiri (1.11.2)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
+    oj (3.11.5)
     oj_mimic_json (1.0.1)
     optimist (3.0.1)
     postrank-uri (1.0.24)
@@ -130,6 +134,7 @@ GEM
       nokogiri (>= 1.8.0)
       public_suffix (>= 2.0.0, < 2.1)
     public_suffix (2.0.5)
+    racc (1.5.2)
     rack (2.2.3)
     rack-test (0.8.3)
       rack (>= 1.0, < 3)
@@ -154,7 +159,7 @@ GEM
     rdf-turtle (3.1.3)
       ebnf (~> 2.1)
       rdf (~> 3.1, >= 3.1.8)
-    rdf-vocab (3.1.12)
+    rdf-vocab (3.1.13)
       rdf (~> 3.1, >= 3.1.12)
     rdf-xsd (3.1.1)
       rdf (~> 3.1)
@@ -189,6 +194,7 @@ GEM
     tilt (2.0.10)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
+    unicode-types (1.6.0)
     unicode_utils (1.4.0)
     vcr (3.0.3)
     webmock (3.12.1)
@@ -213,4 +219,4 @@ DEPENDENCIES
   webmock (~> 3.0, >= 3.0.1)
 
 BUNDLED WITH
-   2.2.15
+   2.2.18

data/bolognese.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   # Declare dependencies here, rather than in the Gemfile
   s.add_dependency 'maremma', '>= 4.7', '< 5'
   s.add_dependency 'faraday', '~> 0.17.3'
-  s.add_dependency 'nokogiri', '~> 1.10.4'
+  s.add_dependency 'nokogiri', '~> 1.11.2'
   s.add_dependency 'loofah', '~> 2.0', '>= 2.0.3'
   s.add_dependency 'builder', '~> 3.2', '>= 3.2.2'
   s.add_dependency 'activesupport', '>= 4.2.5'

data/lib/bolognese/author_utils.rb

@@ -138,14 +138,19 @@ module Bolognese
 
     def get_affiliations(affiliations)
       Array.wrap(affiliations).map do |a|
+        affiliation_identifier = nil
         if a.is_a?(String)
           name = a.squish
-          affiliation_identifier = nil
           affiliation_identifier_scheme = nil
           scheme_uri = nil
         else
-          affiliation_identifier = a["affiliationIdentifier"]
-          affiliation_identifier = !affiliation_identifier.to_s.start_with?("https://") && a["schemeURI"].present? ? normalize_id(a["schemeURI"] + affiliation_identifier) : normalize_id(affiliation_identifier)
+          if a["affiliationIdentifier"].present?
+            affiliation_identifier = a["affiliationIdentifier"]
+            if a["schemeURI"].present?
+              schemeURI = a["schemeURI"].end_with?("/") ? a["schemeURI"] : a["schemeURI"] + "/"
+            end
+            affiliation_identifier = !affiliation_identifier.to_s.start_with?("https://") && schemeURI.present? ? normalize_id(schemeURI + affiliation_identifier) : normalize_id(affiliation_identifier)
+          end
           name = a["__content__"].to_s.squish.presence
           affiliation_identifier_scheme = a["affiliationIdentifierScheme"]
           scheme_uri = a["SchemeURI"]

data/lib/bolognese/doi_utils.rb

@@ -9,10 +9,11 @@ module Bolognese
     end
 
     def validate_funder_doi(doi)
-      doi = Array(/\A(?:(http|https):\/(\/)?(dx\.)?(doi.org|handle.test.datacite.org)\/)?(doi:)?(10\.13039\/)?(5.+)\z/.match(doi)).last
+      doi = Array(/\A(?:(http|https):\/(\/)?(dx\.)?(doi.org|handle.test.datacite.org)\/)?(doi:)?(10\.13039\/)?([1-9]\d+)\z/.match(doi)).last
+
       # remove non-printing whitespace and downcase
       if doi.present?
-        doi.delete("\u200B").downcase 
+        doi.delete("\u200B").downcase
         "https://doi.org/10.13039/#{doi}"
       end
     end

data/lib/bolognese/readers/crossref_reader.rb

@@ -56,10 +56,10 @@ module Bolognese
           #               book_series_metadata.dig("publisher", "publisher_name")
           #             end
         when "conference"
-          event_metadata = meta.dig("crossref", "conference", "event_metadata") || {}
+          event_metadata = meta.dig("crossref", "conference", "event_metadata") || {}
           bibliographic_metadata = meta.dig("crossref", "conference", "conference_paper").to_h
         when "journal"
-          journal_metadata = meta.dig("crossref", "journal", "journal_metadata") || {}
+          journal_metadata = meta.dig("crossref", "journal", "journal_metadata") || {}
           journal_issue = meta.dig("crossref", "journal", "journal_issue") || {}
           journal_article = meta.dig("crossref", "journal", "journal_article") || {}
           bibliographic_metadata = journal_article.presence || journal_issue.presence || journal_metadata
@@ -140,7 +140,8 @@ module Bolognese
         state = meta.present? || read_options.present? ? "findable" : "not_found"
 
         related_identifiers = Array.wrap(crossref_is_part_of(journal_metadata)) + Array.wrap(crossref_references(bibliographic_metadata))
-        container = if journal_metadata.present? || book_metadata.present?
+
+        container = if journal_metadata.present?
                       issn = normalize_issn(journal_metadata.to_h.fetch("issn", nil))
 
                       { "type" => "Journal",
@@ -151,6 +152,19 @@ module Bolognese
                         "issue" => parse_attributes(journal_issue.dig("issue")),
                         "firstPage" => bibliographic_metadata.dig("pages", "first_page") || parse_attributes(journal_article.to_h.dig("publisher_item", "item_number"), first: true),
                         "lastPage" => bibliographic_metadata.dig("pages", "last_page") }.compact
+
+                    # By using book_metadata, we can account for where resource_type is `BookChapter` and not assume its a whole book
+                    elsif book_metadata.present?
+                      identifiers = crossref_alternate_identifiers(book_metadata)
+
+                      {
+                        "type" => "Book",
+                        "title" => book_metadata.dig("titles", "title"),
+                        "firstPage" => bibliographic_metadata.dig("pages", "first_page"),
+                        "lastPage" => bibliographic_metadata.dig("pages", "last_page"),
+                        "identifiers" => identifiers,
+                      }.compact
+
                     elsif book_series_metadata.to_h.fetch("series_metadata", nil).present?
                       issn = normalize_issn(book_series_metadata.dig("series_metadata", "issn"))
 
@@ -162,7 +176,10 @@ module Bolognese
                     end
 
         id = normalize_doi(options[:doi] || options[:id] || bibliographic_metadata.dig("doi_data", "doi"))
-        identifiers = crossref_alternate_identifiers(bibliographic_metadata)
+
+        # Let sections override this in case of alternative metadata structures, such as book chapters, which
+        # have their meta inside `content_item`, but the main book indentifers inside of `book_metadata`
+        identifiers ||= crossref_alternate_identifiers(bibliographic_metadata)
 
         { "id" => id,
           "types" => types,

data/lib/bolognese/readers/datacite_reader.rb

@@ -203,6 +203,15 @@ module Bolognese
             "schemeType" => rii["schemeType"]
           }.compact
 
+          number = ri["number"]
+          if number.is_a?(String)
+            number = number
+            numberType = nil
+          else
+            number = ri.dig("number", "__content__")
+            numberType = ri.dig("number", "numberType")
+          end
+
           {
             "relationType" => ri["relationType"],
             "relatedItemType" => ri["relatedItemType"],
@@ -212,8 +221,8 @@ module Bolognese
             "publicationYear" => ri["publicationYear"],
             "volume" => ri["volume"],
             "issue" => ri["issue"],
-            "number" => ri.dig("number", "__content__"),
-            "numberType" => ri.dig("number", "numberType"),
+            "number" => number,
+            "numberType" => numberType,
             "firstPage" => ri["firstPage"],
             "lastPage" => ri["lastPage"],
             "publisher" => ri["publisher"],
@@ -226,6 +235,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 +259,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/utils.rb

@@ -1306,8 +1306,8 @@ module Bolognese
         return [{
           "subject" => sanitize(hsh["__content__"] || hsh["subject"]),
           "subjectScheme" => hsh["subjectScheme"],
-          "schemeUri" => hsh["schemeURI"],
-          "valueUri" => hsh["valueURI"],
+          "schemeUri" => hsh["schemeURI"] || hsh["schemeUri"],
+          "valueUri" => hsh["valueURI"] || hsh["valueUri"],
           "classificationCode" => hsh["classificationCode"],
           "lang" => hsh["lang"] }.compact,
         {
@@ -1339,8 +1339,8 @@ module Bolognese
           "subject" => sanitize(hsh["__content__"] || hsh["subject"]),
           "subjectScheme" => hsh["subjectScheme"],
           "classificationCode" => hsh["classificationCode"],
-          "schemeUri" => hsh["schemeURI"],
-          "valueUri" => hsh["valueURI"],
+          "schemeUri" => hsh["schemeURI"] || hsh["schemeUri"],
+          "valueUri" => hsh["valueURI"] || hsh["valueUri"],
           "lang" => hsh["lang"] }.compact,
         {
           "subject" => "FOS: " + subject["fosLabel"],
@@ -1352,8 +1352,8 @@ module Bolognese
           "subject" => sanitize(hsh["__content__"] || hsh["subject"]),
           "subjectScheme" => hsh["subjectScheme"],
           "classificationCode" => hsh["classificationCode"],
-          "schemeUri" => hsh["schemeURI"],
-          "valueUri" => hsh["valueURI"],
+          "schemeUri" => hsh["schemeURI"] || hsh["schemeUri"],
+          "valueUri" => hsh["valueURI"] || hsh["valueUri"],
           "lang" => hsh["lang"] }.compact]
       end
     end

data/lib/bolognese/version.rb

@@ -1,3 +1,3 @@
 module Bolognese
-  VERSION = "1.9.2"
+  VERSION = "1.9.7"
 end

data/lib/bolognese/writers/jats_writer.rb

@@ -76,7 +76,9 @@ module Bolognese
       end
 
       def insert_source(xml)
-        if is_article? || is_data? || is_chapter?
+        if is_chapter?
+          xml.source(publisher)
+        elsif is_article? || is_data?
           xml.source(container && container["title"] || publisher)
         else
           xml.source(parse_attributes(titles, content: "title", first: true))

data/spec/doi_utils_spec.rb

@@ -272,6 +272,18 @@ describe Bolognese::Metadata, vcr: true do
       response = subject.validate_funder_doi(doi)
       expect(response).to be_nil
     end
+
+    it { expect(subject.validate_funder_doi("10.13039/100000050")).to eq "https://doi.org/10.13039/100000050" }
+    it { expect(subject.validate_funder_doi("10.13039/100006492")).to eq "https://doi.org/10.13039/100006492" }
+    it { expect(subject.validate_funder_doi('http://handle.test.datacite.org/10.13039/100000080')).to eq "https://doi.org/10.13039/100000080" }
+    it { expect(subject.validate_funder_doi('https://doi.org/10.13039/100000001')).to eq "https://doi.org/10.13039/100000001" }
+    it { expect(subject.validate_funder_doi('http://doi.org/10.13039/501100001711')).to eq "https://doi.org/10.13039/501100001711" }
+    it { expect(subject.validate_funder_doi('https://dx.doi.org/10.13039/501100001711')).to eq "https://doi.org/10.13039/501100001711" }
+    it { expect(subject.validate_funder_doi('doi:10.13039/501100001711')).to eq "https://doi.org/10.13039/501100001711" }
+    it { expect(subject.validate_funder_doi('10.13039/501100001711')).to eq "https://doi.org/10.13039/501100001711" }
+    it { expect(subject.validate_funder_doi('501100001711')).to eq "https://doi.org/10.13039/501100001711" }
+    it { expect(subject.validate_funder_doi("https://doi.org/10.13039/5monkeymonkey")).to be_nil }
+    it { expect(subject.validate_funder_doi('10.13039/5monkeymonkey')).to be_nil }
   end
 
   context "validate prefix" do

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/metadata_spec.rb

@@ -153,7 +153,7 @@ describe Bolognese::Metadata, vcr: true do
     it "missing_comma" do
       json = IO.read(fixture_path + "datacite_software_missing_comma.json")
       response = subject.jsonlint(json)
-      expect(response).to eq(["expected comma, not a string (after doi) at line 4, column 11 [parse.c:364]"])
+      expect(response).to eq(["expected comma, not a string (after doi) at line 4, column 11 [parse.c:388]"])
     end
 
     it "overlapping_keys" do

data/spec/readers/crossref_reader_spec.rb

@@ -372,6 +372,11 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.publication_year).to eq("2015")
       expect(subject.publisher).to eq("Springer Science and Business Media LLC")
       expect(subject.agency).to eq("crossref")
+      expect(subject.container["type"]).to eq("Book")
+      expect(subject.container["title"]).to eq("Shoulder Stiffness")
+      expect(subject.container["firstPage"]).to eq("155")
+      expect(subject.container["lastPage"]).to eq("158")
+      expect(subject.container["identifiers"]).to eq([{"identifier"=>"978-3-662-46369-7", "identifierType"=>"ISBN"}])
     end
 
     it "another book chapter" do
@@ -387,6 +392,10 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.publication_year).to eq("2018")
       expect(subject.publisher).to eq("Springer Science and Business Media LLC")
       expect(subject.agency).to eq("crossref")
+      expect(subject.container["type"]).to eq("Book Series")
+      expect(subject.container["title"]).to eq("SpringerBriefs in Medical Earth Sciences")
+      expect(subject.container["identifier"]).to eq("2523-3629")
+      expect(subject.container["identifierType"]).to eq("ISSN")
     end
 
     it "yet another book chapter" do
@@ -402,6 +411,11 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.publication_year).to eq("2012")
       expect(subject.publisher).to eq("IGI Global")
       expect(subject.agency).to eq("crossref")
+      expect(subject.container["type"]).to eq("Book")
+      expect(subject.container["title"]).to eq("Graph-Based Methods in Computer Vision")
+      expect(subject.container["firstPage"]).to eq("72")
+      expect(subject.container["lastPage"]).to eq("94")
+      expect(subject.container["identifiers"]).to eq([{"identifier"=>"9781466618916", "identifierType"=>"ISBN"}])
     end
 
     it "missing creator" do

data/spec/readers/datacite_json_reader_spec.rb

@@ -46,7 +46,7 @@ describe Bolognese::Metadata, vcr: true do
       input = fixture_path + "datacite_software_missing_comma.json"
       subject = Bolognese::Metadata.new(input: input, from: "datacite_json", show_errors: true)
       expect(subject.valid?).to be false
-      expect(subject.errors).to eq(["expected comma, not a string (after doi) at line 4, column 11 [parse.c:364]"])
+      expect(subject.errors).to eq(["expected comma, not a string (after doi) at line 4, column 11 [parse.c:388]"])
       expect(subject.codemeta).to be_nil
     end
 

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/utils_spec.rb

@@ -539,7 +539,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(response).to eq({"rightsUri"=>"info:eu-repo/semantics/openAccess"})
     end
   end
-  
+
   context "fos" do
     it "name_to_fos match" do
       name = "Biological sciences"
@@ -583,10 +583,23 @@ describe Bolognese::Metadata, vcr: true do
         "subjectScheme"=>"Fields of Science and Technology (FOS)"}])
     end
 
+    it "hsh_to_fos for with schemeUri in hash" do
+      hsh = {
+      "subject" => "FOS: Computer and information sciences",
+      "subjectScheme" => "Fields of Science and Technology (FOS)",
+      "schemeUri" => "http://www.oecd.org/science/inno/38235147.pdf"}
+      response = subject.hsh_to_fos(hsh)
+      expect(response).to eq([{
+      "subject" => "FOS: Computer and information sciences",
+      "subjectScheme" => "Fields of Science and Technology (FOS)",
+      "schemeUri" => "http://www.oecd.org/science/inno/38235147.pdf"}])
+    end
+
     it "hsh_to_fos no match" do
       hsh = { "__content__"=>"Random tag" }
       response = subject.hsh_to_fos(hsh)
       expect(response).to eq([{"subject"=>"Random tag"}])
     end
+
   end
 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.2
+  version: 1.9.7
 platform: ruby
 authors:
 - Martin Fenner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-25 00:00:00.000000000 Z
+date: 2021-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: maremma
@@ -50,14 +50,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.4
+        version: 1.11.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.4
+        version: 1.11.2
 - !ruby/object:Gem::Dependency
   name: loofah
   requirement: !ruby/object:Gem::Requirement
@@ -1274,7 +1274,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Ruby client library for conversion of DOI Metadata