bolognese 0.9 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 290c7cb9287a0b5e018ff3392821d45d41af4360
-  data.tar.gz: 9e687bbe98ed2bafc223bb49044b8fc2ea2a44d3
+  metadata.gz: d40cf8b928ab072eab3a6754cc530bc5676ac75c
+  data.tar.gz: 49d554f33bae5b3db5f21ccd8e8d213609b6101c
 SHA512:
-  metadata.gz: 2dcaac0f7918491a15d02f08154e94130cdd2c5579c65669e04bce2ec27643f3a4376c70537a700ea61ce3bc18d634bab3de152555d6c68ac5110ccfa43bf96e
-  data.tar.gz: 2add919c630f4c2f211337d36366a556b3e9e00c6b41e5a82cf145064c8bf7ca1ad815eeaae155fd20d7fcee3d431af34fd4ed024726cf43a64e3278cc89bc55
+  metadata.gz: 7dc8970c946ecef2ef35e01b0fe1879ecc6d9e491eceba3d60702015bfa070a5f9f2c9e11942ca9c317dfcd79f2533c251b6f1179933acb6a68e916ad70d9d06
+  data.tar.gz: c7318840d589c14f1db6ad56cbd0057ad07c66abf3f58457fe77d87ac8ae2f1d11aa9c3b2046985a1d69bb50946155cad169621f965f4f7d5a24186f92ffdfa5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bolognese (0.9)
+    bolognese (0.9.1)
       activesupport (~> 4.2, >= 4.2.5)
       bibtex-ruby (~> 4.1)
       builder (~> 3.2, >= 3.2.2)
@@ -95,7 +95,7 @@ GEM
     rack-test (0.6.3)
       rack (>= 1.0)
     rake (12.0.0)
-    rdf (2.2.5)
+    rdf (2.2.6)
       hamster (~> 3.0)
       link_header (~> 0.0, >= 0.0.8)
     rdf-aggregate-repo (2.2.0)
@@ -169,4 +169,4 @@ DEPENDENCIES
   webmock (~> 1.22, >= 1.22.3)
 
 BUNDLED WITH
-   1.12.5
+   1.14.6

data/README.md

@@ -79,13 +79,6 @@ Bolognese reads and/or writes these metadata formats:
       <td>Yes</td>
       <td>Yes</td>
     </tr>
-    <tr>
-      <td><a href='https://github.com/scholix/schema'>Scholix</a></td>
-      <td>scholix</td>
-      <td>application/vnd.scholix+json</td>
-      <td>No</td>
-      <td>Yes</td>
-    </tr>
     <tr>
       <td><a href='http://en.wikipedia.org/wiki/BibTeX'>BibTeX</a></td>
       <td>bibtex</td>

data/lib/bolognese/cli.rb

@@ -33,14 +33,13 @@ module Bolognese
         from = options[:from] || find_from_format(id: id)
       else
         ext = File.extname(input)
-        filename = File.basename(input)
-        if %w(.bib .xml).include?(ext) || filename == "codemeta.json"
+        if %w(.bib .ris .xml .json).include?(ext)
           string = IO.read(input)
         else
           $stderr.puts "File type #{ext} not supported"
           exit 1
         end
-        from = options[:from] || find_from_format(string: string, ext: ext, filename: filename)
+        from = options[:from] || find_from_format(string: string, ext: ext)
       end
 
       to = options[:to] || "schema_org"

data/lib/bolognese/utils.rb

@@ -35,17 +35,19 @@ module Bolognese
     def find_from_format_by_string(string, options={})
       if options[:ext] == ".bib"
         "bibtex"
+      elsif options[:ext] == ".ris"
+        "ris"
       elsif options[:ext] == ".xml" && Maremma.from_xml(string).dig("doi_records", "doi_record", "crossref")
         "crossref"
       elsif options[:ext] == ".xml" && Maremma.from_xml(string).dig("resource", "xmlns").start_with?("http://datacite.org/schema/kernel")
         "datacite"
-      elsif options[:ext] == ".json" && Maremma.from_json(string).dig("resource", "xmlns").to_s.start_with?("http://datacite.org/schema/kernel")
+      elsif options[:ext] == ".json" && Maremma.from_json(string).dig("schemaVersion").to_s.start_with?("http://datacite.org/schema/kernel")
         "datacite_json"
-      elsif options[:ext] == ".json" && Maremma.from_json(string).dig("resource", "xmlns").to_s.start_with?("http://datacite.org/schema/kernel")
+      elsif options[:ext] == ".json" && Maremma.from_json(string).dig("issued", "date-parts").present?
         "citeproc"
-      elsif options[:ext] == ".ris"
-        "ris"
-      elsif options[:filename] == "codemeta.json"
+      elsif options[:ext] == ".json" && Maremma.from_json(string).dig("@context").to_s.start_with?("http://schema.org")
+        "schema_org"
+      elsif options[:ext] == ".json" && Maremma.from_json(string).dig("@context") == ("https://raw.githubusercontent.com/codemeta/codemeta/master/codemeta.jsonld")
         "codemeta"
       end
     end

data/lib/bolognese/version.rb

@@ -1,3 +1,3 @@
 module Bolognese
-  VERSION = "0.9"
+  VERSION = "0.9.1"
 end

data/spec/fixtures/crossref.ris

@@ -0,0 +1,13 @@
+TY - JOUR
+T1 - Automated quantitative histology reveals vascular morphodynamics during Arabidopsis hypocotyl secondary growth
+T2 - eLife
+AU - Sankar, Martial
+AU - Nieminen, Kaisa
+AU - Ragni, Laura
+AU - Xenarios, Ioannis
+AU - Hardtke, Christian S
+DO - 10.7554/eLife.01567
+UR - http://elifesciences.org/lookup/doi/10.7554/eLife.01567
+PY - 2014
+VL - 3
+ER - 

data/spec/metadata_spec.rb

@@ -42,27 +42,60 @@ describe Bolognese::Metadata, vcr: true do
   end
 
   context "find from format from file" do
-    let(:file) { fixture_path + "crossref.bib" }
-
     it "bibtex" do
+      file = fixture_path + "crossref.bib"
       string = IO.read(file)
       ext = File.extname(file)
       expect(subject.find_from_format(string: string, ext: ext)).to eq("bibtex")
     end
 
+    it "ris" do
+      file = fixture_path + "crossref.ris"
+      string = IO.read(file)
+      ext = File.extname(file)
+      expect(subject.find_from_format(string: string, ext: ext)).to eq("ris")
+    end
+
     it "crossref" do
-      string = IO.read(fixture_path + "crossref.xml")
-      expect(subject.find_from_format(string: string, ext: ".xml")).to eq("crossref")
+      file = fixture_path + "crossref.xml"
+      string = IO.read(file)
+      ext = File.extname(file)
+      expect(subject.find_from_format(string: string, ext: ext)).to eq("crossref")
     end
 
     it "datacite" do
-      string = IO.read(fixture_path + "datacite.xml")
-      expect(subject.find_from_format(string: string, ext: ".xml")).to eq("datacite")
+      file = fixture_path + "datacite.xml"
+      string = IO.read(file)
+      ext = File.extname(file)
+      expect(subject.find_from_format(string: string, ext: ext)).to eq("datacite")
+    end
+
+    it "datacite_json" do
+      file = fixture_path + "datacite.json"
+      string = IO.read(file)
+      ext = File.extname(file)
+      expect(subject.find_from_format(string: string, ext: ext)).to eq("datacite_json")
+    end
+
+    it "schema_org" do
+      file = fixture_path + "schema_org.json"
+      string = IO.read(file)
+      ext = File.extname(file)
+      expect(subject.find_from_format(string: string, ext: ext)).to eq("schema_org")
+    end
+
+    it "citeproc" do
+      file = fixture_path + "citeproc.json"
+      string = IO.read(file)
+      ext = File.extname(file)
+      expect(subject.find_from_format(string: string, ext: ext)).to eq("citeproc")
     end
 
     it "codemeta" do
-      string = IO.read(fixture_path + "codemeta.json")
-      expect(subject.find_from_format(string: string, filename: "codemeta.json")).to eq("codemeta")
+      file = fixture_path + "codemeta.json"
+      string = IO.read(file)
+      ext = File.extname(file)
+      expect(subject.find_from_format(string: string, ext: ext)).to eq("codemeta")
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolognese
 version: !ruby/object:Gem::Version
-  version: '0.9'
+  version: 0.9.1
 platform: ruby
 authors:
 - Martin Fenner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-15 00:00:00.000000000 Z
+date: 2017-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: maremma
@@ -482,6 +482,7 @@ files:
 - spec/fixtures/citeproc.json
 - spec/fixtures/codemeta.json
 - spec/fixtures/crossref.bib
+- spec/fixtures/crossref.ris
 - spec/fixtures/crossref.xml
 - spec/fixtures/datacite.json
 - spec/fixtures/datacite.xml