bolognese 0.14.1 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0fc93964fad4674d2b9b1705322f339ea987df39e06ef8ce9602c8dea7d428af
-  data.tar.gz: f44720740d5692689a13ba38ef81fbddde3b8354e9a80ba875c256cb60d69058
+  metadata.gz: 56b32be20dd588df8f23c07a7eb09f45eb2be130b440d7ec495e51808b1fd733
+  data.tar.gz: 32003c5ce802d4d16a68dfe2f6faa590509ae3f1f46e1b7b5a51ce175e6a2623
 SHA512:
-  metadata.gz: 3445861477d2947e799acd2ce142567dbb47dcd1a7642d45d0a42351d79a75df2a2a706788051b4fe87241a369b339d6eff68148c4be8734b8c48a5a54f12cf3
-  data.tar.gz: 5e5393f09097cd2190d8803397e03ac5d22cf9c7cc9a76dab60ca1d0b02db3bdadc7a5a328f123bbd65497d01e471c7c61ab6ce99acb6263cd898eab441a4fee
+  metadata.gz: 1c8fbcac163ce7a30c5eb2cdcfcd869c2c1a6b5d6c77c56c639edfa01b2cb17f4e9f09810ebf77399093d1d8626a3d980bbb6d5b939172650eef7a964b6ca1fa
+  data.tar.gz: e2b9346f1bd5e26ed4fdc08876878bf0ddbcd9a381a00d6751eb716c52e314a3b9a747d0ac0f6b43cf25f0e75d515fdfe9645d1e7d744d5629f438c955e1b012

data/.travis.yml

@@ -4,6 +4,9 @@ rvm:
   - 2.4.1
 
 addons:
+  apt:
+    packages:
+      - language-pack-de
   code_climate:
     repo_token: $CODECLIMATE_REPO_TOKEN
 

data/Gemfile.lock

@@ -1,19 +1,22 @@
 PATH
   remote: .
   specs:
-    bolognese (0.14.1)
+    bolognese (0.15.1)
       activesupport (>= 4.2.5, < 6)
       benchmark_methods (~> 0.7)
       bibtex-ruby (~> 4.1)
       builder (~> 3.2, >= 3.2.2)
+      citeproc-ruby (~> 1.1, >= 1.1.10)
       colorize (~> 0.8.1)
+      csl-styles (~> 1.0, >= 1.0.1.8)
+      edtf (~> 3.0, >= 3.0.4)
       gender_detector (~> 0.1.2)
       iso8601 (~> 0.9.1)
       json-ld (~> 2.1, >= 2.1.2)
       jsonlint (~> 0.2.0)
       loofah (~> 2.0, >= 2.0.3)
       maremma (>= 3.5.7, < 5)
-      namae (~> 0.11.3)
+      namae (~> 1.0)
       nokogiri (~> 1.8.1)
       oj (>= 2.8.3)
       postrank-uri (~> 1.0, >= 1.0.18)
@@ -35,22 +38,33 @@ GEM
     bibtex-ruby (4.4.7)
       latex-decode (~> 0.0)
     builder (3.2.3)
-    codeclimate-test-reporter (1.0.8)
+    citeproc (1.0.9)
+      namae (~> 1.0)
+    citeproc-ruby (1.1.10)
+      citeproc (~> 1.0, >= 1.0.9)
+      csl (~> 1.5)
+    codeclimate-test-reporter (1.0.9)
       simplecov (<= 0.13)
     colorize (0.8.1)
     concurrent-ruby (1.0.5)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     crass (1.0.4)
+    csl (1.5.0)
+      namae (~> 1.0)
+    csl-styles (1.0.1.8)
+      csl (~> 1.0)
     diff-lcs (1.3)
     docile (1.1.5)
-    ebnf (1.1.2)
-      rdf (>= 2.2, < 4.0)
+    ebnf (1.1.3)
+      rdf (~> 3.0)
       sxp (~> 1.0)
+    edtf (3.0.4)
+      activesupport (>= 3.0, < 6.0)
     excon (0.62.0)
-    faraday (0.15.2)
+    faraday (0.15.3)
       multipart-post (>= 1.2, < 3)
-    faraday-encoding (0.0.4)
+    faraday-encoding (0.0.5)
       faraday
     faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
@@ -93,8 +107,8 @@ GEM
     minitest (5.11.3)
     multi_json (1.13.1)
     multipart-post (2.0.0)
-    namae (0.11.3)
-    nokogiri (1.8.4)
+    namae (1.0.1)
+    nokogiri (1.8.5)
       mini_portile2 (~> 2.3.0)
     oj (2.18.5)
     postrank-uri (1.0.23)
@@ -106,7 +120,7 @@ GEM
     rack-test (0.8.3)
       rack (>= 1.0, < 3)
     rake (12.3.1)
-    rdf (3.0.2)
+    rdf (3.0.4)
       hamster (~> 3.0)
       link_header (~> 0.0, >= 0.0.8)
     rdf-aggregate-repo (2.2.1)
@@ -125,7 +139,7 @@ GEM
     rdf-turtle (2.2.2)
       ebnf (~> 1.1)
       rdf (>= 2.2, < 4.0)
-    rdf-xsd (3.0.0)
+    rdf-xsd (3.0.1)
       rdf (~> 3.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
@@ -133,7 +147,7 @@ GEM
       rspec-mocks (~> 3.8.0)
     rspec-core (3.8.0)
       rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.1)
+    rspec-expectations (3.8.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-mocks (3.8.0)

data/README.md

@@ -66,12 +66,19 @@ Bolognese reads and/or writes these metadata formats:
       <td>Yes</td>
     </tr>
     <tr>
-      <td><a href='http://gsl-nagoya-u.net/http/pub/citeproc-doc.html'>Citeproc JSON</a></td>
+      <td><a href='https://citationstyles.org/'>Citeproc JSON</a></td>
       <td>citeproc</td>
       <td>application/vnd.citationstyles.csl+json</td>
       <td>Yes</td>
       <td>Yes</td>
     </tr>
+    <tr>
+      <td><a href='https://citationstyles.org/'>Formatted text citation</a></td>
+      <td>citation</td>
+      <td>text/x-bibliography</td>
+      <td>No</td>
+      <td>Yes</td>
+    </tr>
     <tr>
       <td><a href='https://codemeta.github.io/'>Codemeta</a></td>
       <td>codemeta</td>

data/bolognese.gemspec

@@ -24,7 +24,10 @@ Gem::Specification.new do |s|
   s.add_dependency 'bibtex-ruby', '~> 4.1'
   s.add_dependency 'thor', '~> 0.19'
   s.add_dependency 'colorize', '~> 0.8.1'
-  s.add_dependency 'namae', '~> 0.11.3'
+  s.add_dependency 'namae', '~> 1.0'
+  s.add_dependency 'edtf', '~> 3.0', '>= 3.0.4'
+  s.add_dependency 'citeproc-ruby', '~> 1.1', '>= 1.1.10'
+  s.add_dependency 'csl-styles', '~> 1.0', '>= 1.0.1.8'
   s.add_dependency 'iso8601', '~> 0.9.1'
   s.add_dependency 'postrank-uri', '~> 1.0', '>= 1.0.18'
   s.add_dependency 'json-ld', '~> 2.1', '>= 2.1.2'

data/lib/bolognese.rb

@@ -15,6 +15,9 @@ require 'iso8601'
 require 'jsonlint'
 require 'benchmark_methods'
 require 'gender_detector'
+require 'citeproc/ruby'
+require 'citeproc'
+require 'csl/styles'
 
 require "bolognese/version"
 require "bolognese/metadata"

data/lib/bolognese/metadata_utils.rb

@@ -339,6 +339,29 @@ module Bolognese
       RDF::Graph.new << JSON::LD::API.toRdf(schema_hsh)
     end
 
+    def citeproc_hsh
+      {
+        "type" => citeproc_type,
+        "id" => identifier,
+        "categories" => Array.wrap(keywords).map { |k| parse_attributes(k, content: "text", first: true) }.presence,
+        "language" => language,
+        "author" => to_citeproc(author),
+        "editor" => to_citeproc(editor),
+        "issued" => date_published ? get_date_parts(date_published) : nil,
+        "submitted" => date_submitted ? get_date_parts(date_submitted) : nil,
+        "abstract" => parse_attributes(description, content: "text", first: true),
+        "container-title" => container_title,
+        "DOI" => doi,
+        "issue" => issue,
+        "page" => [first_page, last_page].compact.join("-").presence,
+        "publisher" => publisher,
+        "title" => parse_attributes(title, content: "text", first: true),
+        "URL" => b_url,
+        "version" => b_version,
+        "volume" => volume
+      }.compact.symbolize_keys
+    end
+
     def style
       @style ||= "apa"
     end

data/lib/bolognese/version.rb

@@ -1,3 +1,3 @@
 module Bolognese
-  VERSION = "0.14.1"
+  VERSION = "0.15.1"
 end

data/lib/bolognese/writers/citation_writer.rb

@@ -4,10 +4,10 @@ module Bolognese
   module Writers
     module CitationWriter
       def citation
-        params = { style: style, locale: locale }
-        citation_url = "https://citation.crosscite.org/format?" + URI.encode_www_form(params)
-        response = Maremma.post citation_url, content_type: 'json', data: citeproc
-        response.body.fetch("data", nil)
+        cp = CiteProc::Processor.new(style: style, locale: locale, format: 'html')
+        cp.import Array.wrap(citeproc_hsh)
+        bibliography = cp.render :bibliography, id: identifier
+        bibliography.first
       end
     end
   end

data/lib/bolognese/writers/citeproc_writer.rb

@@ -4,27 +4,7 @@ module Bolognese
   module Writers
     module CiteprocWriter
       def citeproc
-        hsh = {
-          "type" => citeproc_type,
-          "id" => identifier,
-          "categories" => Array.wrap(keywords).map { |k| parse_attributes(k, content: "text", first: true) }.presence,
-          "language" => language,
-          "author" => to_citeproc(author),
-          "editor" => to_citeproc(editor),
-          "issued" => date_published ? get_date_parts(date_published) : nil,
-          "submitted" => date_submitted ? get_date_parts(date_submitted) : nil,
-          "abstract" => parse_attributes(description, content: "text", first: true),
-          "container-title" => container_title,
-          "DOI" => doi,
-          "issue" => issue,
-          "page" => [first_page, last_page].compact.join("-").presence,
-          "publisher" => publisher,
-          "title" => parse_attributes(title, content: "text", first: true),
-          "URL" => b_url,
-          "version" => b_version,
-          "volume" => volume
-        }.compact
-        JSON.pretty_generate hsh.presence
+        JSON.pretty_generate citeproc_hsh.presence
       end
     end
   end

data/spec/writers/citation_writer_spec.rb

@@ -9,16 +9,16 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input, from: "crossref")
       expect(subject.style).to eq("apa")
       expect(subject.locale).to eq("en-US")
-      expect(subject.citation).to eq("Sankar, M., Nieminen, K., Ragni, L., Xenarios, I., & Hardtke, C. S. (2014). Automated quantitative histology reveals vascular morphodynamics during Arabidopsis hypocotyl secondary growth. eLife, 3. https://doi.org/10.7554/elife.01567")
+      expect(subject.citation).to eq("Sankar, M., Nieminen, K., Ragni, L., Xenarios, I., &amp; Hardtke, C. S. (2014). Automated quantitative histology reveals vascular morphodynamics during Arabidopsis hypocotyl secondary growth. <i>ELife</i>, <i>3</i>. https://doi.org/10.7554/elife.01567")
     end
 
-    it "Journal article vancouver style" do
-      input = "10.7554/eLife.01567"
-      subject = Bolognese::Metadata.new(input: input, from: "crossref", style: "vancouver", locale: "de-de")
-      expect(subject.style).to eq("vancouver")
-      expect(subject.locale).to eq("de-de")
-      expect(subject.citation).to eq("1. Sankar M, Nieminen K, Ragni L, Xenarios I, Hardtke CS. Automated quantitative histology reveals vascular morphodynamics during Arabidopsis hypocotyl secondary growth. eLife [Internet]. 2014 Feb 11;3. Available from: https://elifesciences.org/articles/01567")
-    end
+    # it "Journal article vancouver style" do
+    #   input = "10.7554/eLife.01567"
+    #   subject = Bolognese::Metadata.new(input: input, from: "crossref", style: "vancouver", locale: "de-de")
+    #   expect(subject.style).to eq("vancouver")
+    #   expect(subject.locale).to eq("de-de")
+    #   expect(subject.citation).to eq("Sankar M, Nieminen K, Ragni L, Xenarios I, Hardtke CS. Automated quantitative histology reveals vascular morphodynamics during Arabidopsis hypocotyl secondary growth. eLife [Internet]. 11. Februar 2014;3. Verfügbar unter: https://elifesciences.org/articles/01567")
+    # end
 
     it "Dataset" do
       input = "https://doi.org/10.5061/DRYAD.8515"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolognese
 version: !ruby/object:Gem::Version
-  version: 0.14.1
+  version: 0.15.1
 platform: ruby
 authors:
 - Martin Fenner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-08 00:00:00.000000000 Z
+date: 2018-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: maremma
@@ -152,14 +152,74 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.3
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: edtf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.3
+        version: '3.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.4
+- !ruby/object:Gem::Dependency
+  name: citeproc-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.10
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.10
+- !ruby/object:Gem::Dependency
+  name: csl-styles
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.1.8
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.1.8
 - !ruby/object:Gem::Dependency
   name: iso8601
   requirement: !ruby/object:Gem::Requirement