bolognese 1.7.3 → 1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ac0ee73b69d1bcb02c47710f614f155f29c749dfe11bdbac818543ff7a4d552
-  data.tar.gz: c887eb61cf622633d71c36437eac5926fa4e40638f5a7fe5ae4c894ed52b39ad
+  metadata.gz: 4db42ab310128e14958777f979522287564747fcd8888350b05d0c1447f3b322
+  data.tar.gz: 1595844b30af956ab7c1d778b0c1ee13b8fa7bbfdb44d64c96360d1ab6e55262
 SHA512:
-  metadata.gz: d617a7cd669a789a7b12a92c2e7c958fb1a1f0ac8953d105218ea2f027d63b635bd973504688ff958f91183a0894111c542410a013bbcdf1c7e2dfa30a580a51
-  data.tar.gz: 14024d1535562346ca08c236c9bbf7403bcae3b8b06e2db264ef7717e136c7d1e633fa6f96ff859d78b3ddc7d513bf7dc65b944be2dc18e3dffbbf3df0b9c51c
+  metadata.gz: c28f7e14d5536470ff45df9d47705fecf70ca29c11ad5e77af7842f38614e664d6bc4b6989c3b5018c3cff64d649ceef1426736d99abb44b5b2f3bf400d04a41
+  data.tar.gz: 4eb706157bf726ab4c56282f8826b467414a1bb25df6aae29e7a4eab2780573a5c24406d82ed3ebf00c326a1df28cdc8036a8680001bac02e1a2e021e4b0613e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bolognese (1.7.3)
+    bolognese (1.8)
       activesupport (>= 4.2.5)
       benchmark_methods (~> 0.7)
       bibtex-ruby (>= 5.1.0)
@@ -119,7 +119,7 @@ GEM
     namae (1.0.1)
     nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
-    oj (3.10.6)
+    oj (3.10.7)
     oj_mimic_json (1.0.1)
     optimist (3.0.1)
     postrank-uri (1.0.24)

data/lib/bolognese/metadata.rb

@@ -15,12 +15,13 @@ module Bolognese
                 :format, :funding_references, :state, :geo_locations,
                 :types, :content_url, :related_identifiers, :style, :locale, :date_registered
 
-    def initialize(input: nil, from: nil, **options)
-      id = normalize_id(input, options)
+    def initialize(options={})
+      options.symbolize_keys!
+      id = normalize_id(options[:input], options)
       ra = nil
 
       if id.present?
-        @from = from || find_from_format(id: id)
+        @from = options[:from] || find_from_format(id: id)
 
         # mEDRA, KISTI, JaLC and OP DOIs are found in the Crossref index
         if @from == "medra"
@@ -37,9 +38,9 @@ module Bolognese
         hsh = @from.present? ? send("get_" + @from, id: id, sandbox: options[:sandbox]) : {}
         string = hsh.fetch("string", nil)
 
-      elsif input.present? && File.exist?(input)
-        filename = File.basename(input)
-        ext = File.extname(input)
+      elsif options[:input].present? && File.exist?(options[:input])
+        filename = File.basename(options[:input])
+        ext = File.extname(options[:input])
         if %w(.bib .ris .xml .json).include?(ext)
           hsh = { 
             "url" => options[:url],
@@ -49,8 +50,8 @@ module Bolognese
             "provider_id" => options[:provider_id],
             "client_id" => options[:client_id],
             "content_url" => options[:content_url] }
-          string = IO.read(input)
-          @from = from || find_from_format(string: string, filename: filename, ext: ext)
+          string = IO.read(options[:input])
+          @from = options[:from] || find_from_format(string: string, filename: filename, ext: ext)
         else
           $stderr.puts "File type #{ext} not supported"
           exit 1
@@ -69,8 +70,8 @@ module Bolognese
           "titles" => options[:titles],
           "publisher" => options[:publisher],
           "publication_year" => options[:publication_year] }
-        string = input
-        @from = from || find_from_format(string: string)
+        string = options[:input]
+        @from = options[:from] || find_from_format(string: string)
       end
 
       # make sure input is encoded as utf8

data/lib/bolognese/version.rb

@@ -1,3 +1,3 @@
 module Bolognese
-  VERSION = "1.7.3"
+  VERSION = "1.8"
 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 (doi) at line 4, column 11 [parse.c:373]"])
+      expect(response).to eq(["expected comma, not a string (after doi) at line 4, column 11 [parse.c:373]"])
     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 (doi) at line 4, column 11 [parse.c:373]"])
+      expect(subject.errors).to eq(["expected comma, not a string (after doi) at line 4, column 11 [parse.c:373]"])
       expect(subject.codemeta).to be_nil
     end
 

data/spec/readers/datacite_reader_spec.rb

@@ -340,7 +340,8 @@ describe Bolognese::Metadata, vcr: true do
           "funderIdentifier"=>"https://doi.org/10.13039/501100000780",
           "funderIdentifierType"=>"Crossref Funder ID",
           "funderName"=>"European Commission"}],
-        types: { "resourceTypeGeneral" => "Dataset", "schemaOrg" => "Dataset" })
+        types: { "resourceTypeGeneral" => "Dataset", "schemaOrg" => "Dataset" },
+        "identifiers" => [{ "identifierType"=>"Repository ID", "identifier"=>"123" }])
 
       expect(subject.valid?).to be true
       expect(subject.doi).to eq("10.5281/zenodo.1239")
@@ -359,6 +360,7 @@ describe Bolognese::Metadata, vcr: true do
         "funderIdentifier"=>"https://doi.org/10.13039/501100000780",
         "funderIdentifierType"=>"Crossref Funder ID",
         "funderName"=>"European Commission"}])
+      expect(subject.identifiers).to eq([{"identifier"=>"123", "identifierType"=>"Repository ID"}])
       expect(subject.agency).to eq("DataCite")
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
       expect(subject.state).to eq("findable")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolognese
 version: !ruby/object:Gem::Version
-  version: 1.7.3
+  version: '1.8'
 platform: ruby
 authors:
 - Martin Fenner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-13 00:00:00.000000000 Z
+date: 2020-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: maremma