bolognese 0.9.82 → 0.9.83

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfab5330f0ed1e74c60ee18061665e3136abc0fafd9f5fca3eaba979830010ca
-  data.tar.gz: 67110135d26ff28e76c89f9c46e50f97a0e7e14f31b982fe45a1373dd4466990
+  metadata.gz: 2e52069454439f8145657e5ccf472fe86c474732ee011a958a8293649698f33b
+  data.tar.gz: 42114ed33d07570de88e156f311e8b23dbc4751ed20a889c7b4a263b5a12c2f5
 SHA512:
-  metadata.gz: 32e0d7b164f75198bcf5f8ed9b2b96fef5aafc5fd759b34c348437d36c41eefe1aac15752c3bc4b7c556b95b0d3e22c1d7a7fd4bbc0a6a0809dbaf7e1d5f650e
-  data.tar.gz: 0528fc884d41d5454985bd52b157533e30d3c60d4173dbae4952cae825a65cbac3798fdfebe2c6c5c31ff8fdb5446f432955b769248a0e56a112fc6534189375
+  metadata.gz: cb0d9fff17398712563e76a038745305b90972938faaea4d58f346609f608337717dfe886a7ee4cde6d491ee17fbeb40a76aa60ab2d5b8e89a4ff88013daa86e
+  data.tar.gz: 1faaa011c2ce692af45d92d9b2e5a17e5388a01e075456a6997a1f2db5815cd586015ae5544c549f5b4f68589fb4e1ed618577f35d22f9bbe1c9200a61032a8b

data/Gemfile.lock

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

data/lib/bolognese/metadata.rb

@@ -61,7 +61,7 @@ module Bolognese
     include Bolognese::Writers::SchemaOrgWriter
     include Bolognese::Writers::TurtleWriter
 
-    attr_accessor :id, :doi, :author, :creator, :title, :publisher, :contributor, :license,
+    attr_accessor :id, :identifier, :doi, :author, :creator, :title, :publisher, :contributor, :license,
       :date_accepted, :date_available, :date_copyrighted, :date_collected,
       :date_submitted, :date_valid, :date_created, :date_modified,
       :date_registered, :date_updated, :provider_id, :client_id, :journal,
@@ -202,6 +202,10 @@ module Bolognese
       @url ||= metadata.fetch("url", nil)
     end
 
+    def identifier
+      @identifier ||= metadata.fetch("id", nil)
+    end
+
     def state
       @state ||= metadata.fetch("state", nil)
     end

data/lib/bolognese/version.rb

@@ -1,3 +1,3 @@
 module Bolognese
-  VERSION = "0.9.82"
+  VERSION = "0.9.83"
 end

data/lib/bolognese/writers/bibtex_writer.rb

@@ -6,7 +6,7 @@ module Bolognese
 
         bib = {
           bibtex_type: bibtex_type.presence || "misc",
-          bibtex_key: id,
+          bibtex_key: identifier,
           doi: doi,
           url: url,
           author: authors_as_string(author),
@@ -16,7 +16,7 @@ module Bolognese
           journal: container_title,
           volume: volume,
           issue: issue,
-          pages: [first_page.to_s, last_page.to_s].join("-").presence,
+          pages: [first_page, last_page].compact.join("-").presence,
           publisher: publisher,
           year: publication_year
         }.compact

data/lib/bolognese/writers/citeproc_writer.rb

@@ -4,7 +4,7 @@ module Bolognese
       def citeproc
         hsh = {
           "type" => citeproc_type,
-          "id" => id,
+          "id" => identifier,
           "categories" => parse_attributes(keywords, content: "text"),
           "language" => language,
           "author" => to_citeproc(author),
@@ -15,7 +15,7 @@ module Bolognese
           "container-title" => container_title,
           "DOI" => doi,
           "issue" => issue,
-          "page" => [first_page, last_page].join("-").presence,
+          "page" => [first_page, last_page].compact.join("-").presence,
           "publisher" => publisher,
           "title" => parse_attributes(title, content: "text", first: true),
           "URL" => url,

data/lib/bolognese/writers/schema_org_writer.rb

@@ -23,7 +23,7 @@ module Bolognese
           "pageStart" => first_page,
           "pageEnd" => last_page,
           "spatialCoverage" => spatial_coverage,
-          "sameAs" => same_as,
+          "sameAs" => to_schema_org(is_identical_to),
           "isPartOf" => to_schema_org(is_part_of),
           "hasPart" => to_schema_org(has_part),
           "predecessor_of" => to_schema_org(is_previous_version_of),

data/spec/writers/bibtex_writer_spec.rb

@@ -40,6 +40,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(bibtex[:bibtex_key]).to eq("https://doi.org/10.17173/pretest8")
       expect(bibtex[:doi]).to eq("10.17173/pretest8")
       expect(bibtex[:title]).to eq("PIAAC-Longitudinal (PIAAC-L) 2015")
+      expect(bibtex[:pages]).to be_nil
     end
 
     it "maremma" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolognese
 version: !ruby/object:Gem::Version
-  version: 0.9.82
+  version: 0.9.83
 platform: ruby
 authors:
 - Martin Fenner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-07 00:00:00.000000000 Z
+date: 2018-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: maremma