bolognese 0.13.2 → 0.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d80546e87d2832b4408b869a0b9dbe8cd6fd47b718fa96cb4680187e37266361
-  data.tar.gz: 5266faafe16fd6750af63857bc6029232e7a0ff45dba74114283bbdd45c536fc
+  metadata.gz: c6a7c798a8ea465ed7c94ffb395c4f44c6728430e408a2690367afb78610552e
+  data.tar.gz: 3d2e408ca2cbfa8ea3fb183f52b462a8fcf4ebc6c50752467f6ef7251cb31f7c
 SHA512:
-  metadata.gz: 1f427e13c17577fbc48d309c1dfc37916cd4e8f8567c3b7da97074fad49631e88463e4e007c8c915db51de09e24359db7930a1e5d3604a550d2bfde5eb6d7715
-  data.tar.gz: bc0b392d86d63786ffd1e175440ad866b6ca1eb68cf313feb290f2f7b48721357fdf84c52929b0e3d544c93cce7f39c96954deeae140ad7ad4b7c71532425572
+  metadata.gz: a6c3b485dba221c416990278b66a83b5e50b6fed6dd597808fa1524e43a961b87f94c6b2c0c8f4ee46e13615bdb96c5263b9040d4d0f7c713c58e34ff064857f
+  data.tar.gz: 58f43340d776f40d80f66d68b67b2400e1186b9a8d869bbe9dd5d4d69cc8a87863ec43440ef6a7ce5eb560332791d5a88006d8ae5be605fed0e24f68918c7168

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bolognese (0.13.2)
+    bolognese (0.13.3)
       activesupport (>= 4.2.5, < 6)
       benchmark_methods (~> 0.7)
       bibtex-ruby (~> 4.1)

data/lib/bolognese/utils.rb

@@ -356,16 +356,16 @@ module Bolognese
         "crossref"
       elsif options[:ext] == ".xml" && Nokogiri::XML(string, nil, 'UTF-8', &:noblanks).collect_namespaces.find { |k, v| v.start_with?("http://datacite.org/schema/kernel") }      
         "datacite"
+      elsif options[:ext] == ".json" && Maremma.from_json(string).to_h.dig("@context").to_s.start_with?("http://schema.org", "https://schema.org")
+        "schema_org"
+      elsif options[:ext] == ".json" && Maremma.from_json(string).to_h.dig("@context") == ("https://raw.githubusercontent.com/codemeta/codemeta/master/codemeta.jsonld")
+        "codemeta"
       elsif options[:ext] == ".json" && Maremma.from_json(string).to_h.dig("ris_type")
         "crosscite"
       elsif options[:ext] == ".json" && Maremma.from_json(string).to_h.dig("schemaVersion").to_s.start_with?("http://datacite.org/schema/kernel")
         "datacite_json"
       elsif options[:ext] == ".json" && Maremma.from_json(string).to_h.dig("issued", "date-parts").present?
         "citeproc"
-      elsif options[:ext] == ".json" && Maremma.from_json(string).to_h.dig("@context").to_s.start_with?("http://schema.org", "https://schema.org")
-        "schema_org"
-      elsif options[:ext] == ".json" && Maremma.from_json(string).to_h.dig("@context") == ("https://raw.githubusercontent.com/codemeta/codemeta/master/codemeta.jsonld")
-        "codemeta"
       end
     end
 
@@ -376,14 +376,14 @@ module Bolognese
         "datacite"
       elsif Maremma.from_json(string).to_h.dig("ris_type").present?
         "crosscite"
-      elsif Maremma.from_json(string).to_h.dig("schemaVersion").to_s.start_with?("http://datacite.org/schema/kernel")
-        "datacite_json"
-      elsif Maremma.from_json(string).to_h.dig("issued", "date-parts").present?
-        "citeproc"
       elsif Maremma.from_json(string).to_h.dig("@context").to_s.start_with?("http://schema.org", "https://schema.org")
         "schema_org"
       elsif Maremma.from_json(string).to_h.dig("@context") == ("https://raw.githubusercontent.com/codemeta/codemeta/master/codemeta.jsonld")
         "codemeta"
+      elsif Maremma.from_json(string).to_h.dig("schemaVersion").to_s.start_with?("http://datacite.org/schema/kernel")
+        "datacite_json"
+      elsif Maremma.from_json(string).to_h.dig("issued", "date-parts").present?
+        "citeproc"
       elsif string.start_with?("TY  - ")
         "ris"
       elsif BibTeX.parse(string).first

data/lib/bolognese/version.rb

@@ -1,3 +1,3 @@
 module Bolognese
-  VERSION = "0.13.2"
+  VERSION = "0.13.3"
 end

data/spec/find_from_format_spec.rb

@@ -56,7 +56,7 @@ describe Bolognese::CLI do
     end
 
     it "schema_org" do
-      string = IO.read(fixture_path + 'schema_org.json').strip
+      string = IO.read(fixture_path + 'schema_org_topmed.json').strip
       expect(subject.find_from_format_by_string(string)).to eq("schema_org")
     end
 

data/spec/readers/schema_org_reader_spec.rb

@@ -131,7 +131,7 @@ describe Bolognese::Metadata, vcr: true do
 
     it "GTEx dataset" do
       input = fixture_path + 'schema_org_gtex.json'
-      subject = Bolognese::Metadata.new(input: input, from: 'schema_org')
+      subject = Bolognese::Metadata.new(input: input)
 
       expect(subject.valid?).to be true
       expect(subject.identifier).to eq("https://doi.org/10.25491/d50j-3083")
@@ -172,7 +172,7 @@ describe Bolognese::Metadata, vcr: true do
 
     it "TOPMed dataset" do
       input = fixture_path + 'schema_org_topmed.json'
-      subject = Bolognese::Metadata.new(input: input, from: 'schema_org')
+      subject = Bolognese::Metadata.new(input: input)
 
       expect(subject.valid?).to be true
       expect(subject.identifier).to eq("https://doi.org/10.23725/8na3-9s47")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bolognese
 version: !ruby/object:Gem::Version
-  version: 0.13.2
+  version: 0.13.3
 platform: ruby
 authors:
 - Martin Fenner