bolognese 1.9.14 → 1.9.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ba10d4692952a5c5c4032f160b97fbbdaaf4bfe29bb687a34295bf419ffa8bb
-  data.tar.gz: 485add29ad628c4ac8ecdf019c42037db3edfa6f7222e5750691b3fe6d6591bf
+  metadata.gz: dd97b1d21783c57768cd25908cbd6be7d676c1f6993a0c242d5c3f254ad22b93
+  data.tar.gz: 10a5d72f8291eb95773b0f65b3ebc161072c98ff62fd7ac7c90263fa1be63578
 SHA512:
-  metadata.gz: 410a666e4784f93feed5053e7c187e1022e2d68d38004cf28e210962a1d21a432ed472bc049b256daf117180fb77f5dcb3c1730f1c43babb322935ce0be17647
-  data.tar.gz: 550841a2e9ed10210b083702f2a25b0ef5fa968753a39b76d00fa3f63b1817366e52001e19c14fdfeb7a6e46ce5c3df628c42d1f9906aac9227762ea5417363f
+  metadata.gz: 6d05090c57b150bf61a9111a57aab3432d7fceaf60b75949476571344b61838b25140a816d2b2bd3b052f071428193f3dc9bcfdc6a452552cf7af1212c97060b
+  data.tar.gz: ebf7a1b66b48cfe38ab3cdd308c9c936638fffb64fd3b756ec0d5b51c89545bdb07c23e0443d9536c18d2761c16a9133e860c703e102e1b66b01ed2c40b153ad

data/.gitignore

@@ -57,3 +57,4 @@ coverage/
 !.env.travis
 
 .vscode
+.ruby-version

data/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog
 
+## [1.9.16](https://github.com/datacite/bolognese/tree/1.9.16) (2022-07-04)
+
+[Full Changelog](https://github.com/datacite/bolognese/compare/1.9.15...1.9.16)
+
+## [1.9.15](https://github.com/datacite/bolognese/tree/1.9.15) (2022-07-04)
+
+[Full Changelog](https://github.com/datacite/bolognese/compare/1.9.14...1.9.15)
+
+**Merged pull requests:**
+
+- Fix issue Bracco 521 [\#138](https://github.com/datacite/bolognese/pull/138) ([richardhallett](https://github.com/richardhallett))
+
+## [1.9.14](https://github.com/datacite/bolognese/tree/1.9.14) (2022-05-25)
+
+[Full Changelog](https://github.com/datacite/bolognese/compare/1.9.13...1.9.14)
+
+**Merged pull requests:**
+
+- Update critical dependencies [\#134](https://github.com/datacite/bolognese/pull/134) ([jrhoads](https://github.com/jrhoads))
+
 ## [1.9.13](https://github.com/datacite/bolognese/tree/1.9.13) (2022-01-06)
 
 [Full Changelog](https://github.com/datacite/bolognese/compare/1.9.12...1.9.13)
@@ -87,6 +107,10 @@
 
 - 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)
@@ -187,7 +211,6 @@
 
 **Merged pull requests:**
 
-- Support returning single geoLocationPolygon [\#111](https://github.com/datacite/bolognese/pull/111) ([richardhallett](https://github.com/richardhallett))
 - Allow some pre-1.0 versions of thor [\#102](https://github.com/datacite/bolognese/pull/102) ([cjcolvar](https://github.com/cjcolvar))
 
 ## [1.8.5](https://github.com/datacite/bolognese/tree/1.8.5) (2020-07-30)
@@ -339,6 +362,10 @@
 
 [Full Changelog](https://github.com/datacite/bolognese/compare/1.5.17...1.5.18)
 
+**Merged pull requests:**
+
+- fixes missing version attribute when data comes from datacite\_json [\#85](https://github.com/datacite/bolognese/pull/85) ([kjgarza](https://github.com/kjgarza))
+
 ## [1.5.17](https://github.com/datacite/bolognese/tree/1.5.17) (2020-04-18)
 
 [Full Changelog](https://github.com/datacite/bolognese/compare/1.5.16...1.5.17)
@@ -445,7 +472,6 @@
 
 **Merged pull requests:**
 
-- fixes missing version attribute when data comes from datacite\_json [\#85](https://github.com/datacite/bolognese/pull/85) ([kjgarza](https://github.com/kjgarza))
 - Bump rack from 2.0.7 to 2.0.8 [\#79](https://github.com/datacite/bolognese/pull/79) ([dependabot[bot]](https://github.com/apps/dependabot))
 
 ## [v.1.4.1](https://github.com/datacite/bolognese/tree/v.1.4.1) (2019-12-15)
@@ -1334,15 +1360,15 @@
 
 ## [v.0.9.70](https://github.com/datacite/bolognese/tree/v.0.9.70) (2018-01-12)
 
-[Full Changelog](https://github.com/datacite/bolognese/compare/v.0.9.69...v.0.9.70)
+[Full Changelog](https://github.com/datacite/bolognese/compare/v.0.6.69...v.0.9.70)
 
-## [v.0.9.69](https://github.com/datacite/bolognese/tree/v.0.9.69) (2018-01-11)
+## [v.0.6.69](https://github.com/datacite/bolognese/tree/v.0.6.69) (2018-01-11)
 
-[Full Changelog](https://github.com/datacite/bolognese/compare/v.0.6.69...v.0.9.69)
+[Full Changelog](https://github.com/datacite/bolognese/compare/v.0.9.69...v.0.6.69)
 
-## [v.0.6.69](https://github.com/datacite/bolognese/tree/v.0.6.69) (2018-01-11)
+## [v.0.9.69](https://github.com/datacite/bolognese/tree/v.0.9.69) (2018-01-11)
 
-[Full Changelog](https://github.com/datacite/bolognese/compare/v.0.9.68...v.0.6.69)
+[Full Changelog](https://github.com/datacite/bolognese/compare/v.0.9.68...v.0.9.69)
 
 ## [v.0.9.68](https://github.com/datacite/bolognese/tree/v.0.9.68) (2018-01-11)
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bolognese (1.9.14)
+    bolognese (1.9.17)
       activesupport (>= 4.2.5)
       benchmark_methods (~> 0.7)
       bibtex-ruby (>= 5.1.0)
@@ -119,14 +119,14 @@ GEM
       oj_mimic_json (~> 1.0, >= 1.0.1)
     matrix (0.4.2)
     mini_portile2 (2.8.0)
-    minitest (5.15.0)
+    minitest (5.16.2)
     multi_json (1.15.0)
-    multipart-post (2.1.1)
+    multipart-post (2.2.3)
     namae (1.1.1)
     nokogiri (1.13.6)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    oj (3.13.13)
+    oj (3.13.15)
     oj_mimic_json (1.0.1)
     optimist (3.0.1)
     postrank-uri (1.0.24)
@@ -135,13 +135,13 @@ GEM
       public_suffix (>= 2.0.0, < 2.1)
     public_suffix (2.0.5)
     racc (1.6.0)
-    rack (2.2.3)
+    rack (2.2.3.1)
     rack-test (0.8.3)
       rack (>= 1.0, < 3)
     rake (12.3.3)
-    rdf (3.2.7)
+    rdf (3.2.8)
       link_header (~> 0.0, >= 0.0.8)
-    rdf-aggregate-repo (3.2.0)
+    rdf-aggregate-repo (3.2.1)
       rdf (~> 3.2)
     rdf-rdfa (3.2.0)
       haml (~> 5.2)
@@ -155,7 +155,7 @@ GEM
       rdf (~> 3.2)
       rdf-rdfa (~> 3.2)
       rdf-xsd (~> 3.2)
-    rdf-turtle (3.2.0)
+    rdf-turtle (3.2.1)
       ebnf (~> 2.3)
       rdf (~> 3.2)
     rdf-vocab (3.2.1)
@@ -201,7 +201,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    zeitwerk (2.5.4)
+    zeitwerk (2.6.0)
 
 PLATFORMS
   ruby
@@ -219,4 +219,4 @@ DEPENDENCIES
   webmock (~> 3.0, >= 3.0.1)
 
 BUNDLED WITH
-   2.3.14
+   2.3.17

data/lib/bolognese/readers/schema_org_reader.rb

@@ -28,11 +28,10 @@ module Bolognese
 
         url = normalize_id(id)
         response = Maremma.get(url)
-        doc = Nokogiri::XML(response.body.fetch("data", nil), nil, 'UTF-8')
 
-        # workaround for xhtml documents
-        nodeset = doc.css("script")
-        string = nodeset.find { |element| element["type"] == "application/ld+json" }
+        # Find the schema.org json from the html body
+        doc = Nokogiri::HTML(response.body.fetch("data", nil))
+        string = doc.at('script[type="application/ld+json"]')
         string = string.text if string.present?
 
         { "string" => string }

data/lib/bolognese/version.rb

@@ -1,3 +1,3 @@
 module Bolognese
-  VERSION = "1.9.14"
+  VERSION = "1.9.17"
 end

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:388]"])
+      expect(response.first).to include("expected comma, not a string (after doi)")
     end
 
     it "overlapping_keys" 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:388]"])
+      expect(subject.errors.first).to include("expected comma, not a string (after doi)")
       expect(subject.codemeta).to be_nil
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolognese
 version: !ruby/object:Gem::Version
-  version: 1.9.14
+  version: 1.9.17
 platform: ruby
 authors:
 - Martin Fenner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-25 00:00:00.000000000 Z
+date: 2022-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: maremma