bolognese 0.9.58 → 0.9.59

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 325e7c67f90b425a1498add3572540a3f5172e46
-  data.tar.gz: 43d1bc36ba1a0a9135349e5d4189ab2bb2387b79
+  metadata.gz: e87af9e86d74a99d56b53a7d7219e58e9db14ac9
+  data.tar.gz: 134a6bf718133bcfbe88d9fe7fc3ebcb9739cda5
 SHA512:
-  metadata.gz: dd66c9e2b9b6f4966f7daa4c620664faf66310a770d7229714ebc294681f1d906dd776150ecf919cb805926deb9901f0ada550c2fe03ec7cf48707e1b049572e
-  data.tar.gz: a7ace8155d4e47908d867f7dca076f8de4de90f96a20b3479db8ee16d3a5b32d401a1f3359d3f8c7cd0afff9a3d0032c843d16b4bb5282bad034b1f86cf9b157
+  metadata.gz: d71c700bf8342afbb5119dcaa88efc3da6ebe65a8e734a2e0fb71c336e2d26929ed61ae170db252c96aeb512085e1afaaebd65c3ab84c20503aa21cc58f067f3
+  data.tar.gz: 56a37a1ae6f79814c3be1bbb1d4f752836d9fdb07bd10a34ac5fa783a1e79a42247549fc96314c7d169a66ce39b72dd59f5f96f5d34e8c0a8db6964ef76aa986

data/Gemfile.lock

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

data/lib/bolognese/version.rb

@@ -1,3 +1,3 @@
 module Bolognese
-  VERSION = "0.9.58"
+  VERSION = "0.9.59"
 end

data/lib/bolognese/writers/jats_writer.rb

@@ -17,6 +17,9 @@ module Bolognese
         insert_publication_date(xml)
         insert_volume(xml) if volume.present?
         insert_issue(xml) if issue.present?
+        insert_fpage(xml) if first_page.present?
+        insert_lpage(xml) if last_page.present?
+        insert_version(xml) if version.present?
         insert_pub_id(xml)
       end
 
@@ -50,8 +53,9 @@ module Bolognese
       end
 
       def insert_citation_title(xml)
-        if type == "Dataset"
-          xml.send("data-title", title)
+        case publication_type.fetch('publication-type', nil)
+        when "data" then xml.send("data-title", title)
+        when "software" then xml.send("software-title", title)
         else
           xml.send("article-title", title)
         end
@@ -77,6 +81,18 @@ module Bolognese
         xml.issue(issue)
       end
 
+      def insert_fpage(xml)
+        xml.fpage(first_page)
+      end
+
+      def insert_lpage(xml)
+        xml.lpage(last_page)
+      end
+
+      def insert_version(xml)
+        xml.version(version)
+      end
+
       def insert_pub_id(xml)
         return nil unless doi.present?
         xml.send("pub-id", doi, "pub-id-type" => "doi")

data/spec/writers/jats_writer_spec.rb

@@ -41,6 +41,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(jats.dig("year")).to eq("iso_8601_date"=>"2006-12-20", "__content__"=>"2006")
       expect(jats.dig("month")).to eq("12")
       expect(jats.dig("day")).to eq("20")
+      expect(jats.dig("fpage")).to eq("e30")
       expect(jats.dig("pub_id")).to eq("pub_id_type"=>"doi", "__content__"=>"10.1371/journal.pone.0000030")
     end
 
@@ -53,6 +54,8 @@ describe Bolognese::Metadata, vcr: true do
       expect(jats.dig("source")).to eq("Jaypee Brothers Medical Publishers (P) Ltd.")
       expect(jats.dig("person_group", "name")).to eq("surname"=>"Saha", "given_names"=>"Ashis")
       expect(jats.dig("year")).to eq("iso_8601_date"=>"2015", "__content__"=>"2015")
+      expect(jats.dig("fpage")).to eq("27")
+      expect(jats.dig("lpage")).to eq("145")
       expect(jats.dig("pub_id")).to eq("pub_id_type"=>"doi", "__content__"=>"10.5005/jp/books/12414_3")
     end
 
@@ -89,13 +92,14 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input, from: "codemeta")
       jats = Maremma.from_xml(subject.jats).fetch("element_citation", {})
       expect(jats.dig("publication_type")).to eq("software")
-      expect(jats.dig("article_title")).to eq("R Interface to the DataONE REST API")
+      expect(jats.dig("software_title")).to eq("R Interface to the DataONE REST API")
       expect(jats.dig("source")).to eq("https://cran.r-project.org")
       expect(jats.dig("person_group", "name").length).to eq(3)
       expect(jats.dig("person_group", "name").first).to eq("surname"=>"Jones", "given_names"=>"Matt")
       expect(jats.dig("year")).to eq("iso_8601_date"=>"2016-05-27", "__content__"=>"2016")
       expect(jats.dig("month")).to eq("05")
       expect(jats.dig("day")).to eq("27")
+      expect(jats.dig("version")).to eq("2.0.0")
       expect(jats.dig("pub_id")).to eq("pub_id_type"=>"doi", "__content__"=>"10.5063/f1m61h5x")
     end
 
@@ -104,7 +108,7 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input, from: "codemeta")
       jats = Maremma.from_xml(subject.jats).fetch("element_citation", {})
       expect(jats.dig("publication_type")).to eq("software")
-      expect(jats.dig("article_title")).to eq("Maremma: a Ruby library for simplified network calls")
+      expect(jats.dig("software_title")).to eq("Maremma: a Ruby library for simplified network calls")
       expect(jats.dig("source")).to eq("DataCite")
       expect(jats.dig("person_group", "name")).to eq("surname"=>"Fenner", "given_names"=>"Martin")
       expect(jats.dig("year")).to eq("iso_8601_date"=>"2017-02-24", "__content__"=>"2017")

metadata

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