bolognese 1.9.4 → 1.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8f8cb84bf74f8a75d2469aa5a3e49dd4ba0adbd9b465d60e11bdbbd8252c267
-  data.tar.gz: 3fc9719de82891ce908fd4af271f05fc1f024442d0a1e6bc88b65db438118ab3
+  metadata.gz: b05a742623de63d8886a0537b8c967bddcec647de85d65897153bd1639524a78
+  data.tar.gz: adc7f82baf4a99cf8a4c3978a1b9b06278c1284127375d78fccba2c5d120dbb9
 SHA512:
-  metadata.gz: 797b852b3dafd982249bb57a91dff364bd2dcc6d2b52cb50494dcc6a5cfec7a2fc714a27eed6cd46dde158c495ca93154a858ca0f1800a3990b3f6708878fcec
-  data.tar.gz: c19d5e7833401549a98b71a13e9063b52bbdfaaa70ff2165272aff311b2d3df6ae765ae79a4ad62ae45fb259520a3e3b39ada0dbef838cc602972ecdad50305b
+  metadata.gz: 13fbe8970222b3de01236c11f5d0b7cb5c8fc639be3b39ece95e60a9eda1d21c25873acfece64b7805c73754a5b2e841306c1c59bda6244d98ce0b297e3b278c
+  data.tar.gz: 8a297ae52be86a370b4249f0be999696c70ab039e4d1f4303eb7d25a27541ab37c161864667d233223bbb3aefda967281a428ff6ce99de95e6b3789b445d126e

data/CHANGELOG.md

@@ -1,8 +1,8 @@
 # Changelog
 
-## [Unreleased](https://github.com/datacite/bolognese/tree/HEAD)
+## [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...HEAD)
+[Full Changelog](https://github.com/datacite/bolognese/compare/1.9.3...1.9.4)
 
 **Implemented enhancements:**
 
@@ -535,6 +535,10 @@
 
 - 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)
@@ -633,7 +637,6 @@
 
 **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.4)
+    bolognese (1.9.5)
       activesupport (>= 4.2.5)
       benchmark_methods (~> 0.7)
       bibtex-ruby (>= 5.1.0)
@@ -123,7 +123,7 @@ GEM
     nokogiri (1.11.2)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
-    oj (3.11.3)
+    oj (3.11.5)
     oj_mimic_json (1.0.1)
     optimist (3.0.1)
     postrank-uri (1.0.24)

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"],

data/lib/bolognese/version.rb

@@ -1,3 +1,3 @@
 module Bolognese
-  VERSION = "1.9.4"
+  VERSION = "1.9.5"
 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: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/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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolognese
 version: !ruby/object:Gem::Version
-  version: 1.9.4
+  version: 1.9.5
 platform: ruby
 authors:
 - Martin Fenner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-13 00:00:00.000000000 Z
+date: 2021-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: maremma
@@ -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