bolognese 1.0.21 → 1.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f0e15fffb108ad3df33fbc6e975cbefe42a2c60baf7f2d5514607dcb2547951
-  data.tar.gz: c936de8f51aa9d5c0070f284fbada6fe713da4f2e827021a0b663c22f7742688
+  metadata.gz: c4eb2e4d5da338dbabff08512052ec0d9442279d8924b07ca0ce925fc46e59a0
+  data.tar.gz: '0258b0e5068ee36fecb9b536272e42faece525db6aeed5c7bfa8b28c980d3f9e'
 SHA512:
-  metadata.gz: 3f0c1a6adaacdfb4fb2155dea5215f351633efced879408f07f4bb9cb2cb28edc4c9dad890817547cab7ae2d375d713477fd8765f05d32d877d6d9a6001cb83b
-  data.tar.gz: 002b0ba55541605373b07591d717359688a032b087a76fc7f5e6c31ba2f9bc7ab49f3a633d4f87ea1315d65764bcf4835993d802ec75e45b0c8d8804f74a90b4
+  metadata.gz: 276a307518bf5bb8c284c0bfbc8fc89f2e31e9c5cd23cd0924d1ed4f80a015052541d2fd0e99ee886d62d3f139a181c5337e7632af837c3064ea6841a9cc1c7f
+  data.tar.gz: 1ad177666f1977d1db8a27754e60ed93fdbbf7a5310c929ffb08980c43e9d1ad74858e2355963979949036232cc416b08f945cd0a1ba8b63f875c4fcb456c921

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bolognese (1.0.21)
+    bolognese (1.0.23)
       activesupport (>= 4.2.5, < 6)
       benchmark_methods (~> 0.7)
       bibtex-ruby (~> 4.1)
@@ -28,7 +28,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.1)
+    activesupport (5.2.1.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -63,7 +63,7 @@ GEM
     edtf (3.0.4)
       activesupport (>= 3.0, < 6.0)
     excon (0.62.0)
-    faraday (0.15.3)
+    faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
     faraday-encoding (0.0.5)
       faraday

data/lib/bolognese/metadata.rb

@@ -7,7 +7,7 @@ module Bolognese
     include Bolognese::MetadataUtils
 
     attr_writer :id, :provider_id, :client_id, :doi, :identifier, :creator, :contributor, :titles, :publisher, 
-                :rights_list, :dates, :publication_year, :volume, :first_page, :last_page, :url, :version,
+                :rights_list, :dates, :publication_year, :volume, :first_page, :last_page, :url, :version_info,
                 :subjects, :contributor, :descriptions, :alternate_identifiers, :language, :sizes,
                 :formats, :schema_version, :meta, :periodical, :agency,
                 :format, :funding_references, :state, :geo_locations,
@@ -90,7 +90,7 @@ module Bolognese
         :publication_year,
         :descriptions,
         :rights_list,
-        :version,
+        :version_info,
         :subjects,
         :language,
         :geo_locations,
@@ -173,8 +173,8 @@ module Bolognese
       @url ||= meta.fetch("url", nil)
     end
 
-    def version
-      @version ||= meta.fetch("version", nil)
+    def version_info
+      @version_info ||= meta.fetch("version_info", nil)
     end
 
     def publication_year

data/lib/bolognese/metadata_utils.rb

@@ -142,7 +142,7 @@ module Bolognese
         "publisher" => publisher,
         "title" => parse_attributes(titles, content: "title", first: true),
         "URL" => url,
-        "version" => version,
+        "version" => version_info,
         "volume" => volume
       }.compact.symbolize_keys
     end

data/lib/bolognese/readers/citeproc_reader.rb

@@ -98,7 +98,7 @@ module Bolognese
           #{}"pagination" => meta.pages.to_s.presence,
           "descriptions" => meta.fetch("abstract", nil).present? ? [{ "description" => sanitize(meta.fetch("abstract")), "descriptionType" => "Abstract" }] : [],
           "rights_list" => rights_list,
-          "version" => meta.fetch("version", nil),
+          "version_info" => meta.fetch("version", nil),
           "subjects" => subjects,
           "state" => state
         }.merge(read_options)

data/lib/bolognese/readers/codemeta_reader.rb

@@ -59,7 +59,7 @@ module Bolognese
           "publication_year" => publication_year,
           "descriptions" => meta.fetch("description", nil).present? ? [{ "description" => sanitize(meta.fetch("description")), "descriptionType" => "Abstract" }] : nil,
           "rights_list" => [{ "rightsUri" => meta.fetch("license", nil) }.compact],
-          "version" => meta.fetch("version", nil),
+          "version_info" => meta.fetch("version", nil),
           "subjects" => subjects,
           "state" => state
         }.merge(read_options)

data/lib/bolognese/readers/crossref_reader.rb

@@ -125,7 +125,7 @@ module Bolognese
           "last_page" => bibliographic_metadata.dig("pages", "last_page"),
           "descriptions" => crossref_description(bibliographic_metadata),
           "rights_list" => crossref_license(program_metadata),
-          "version" => nil,
+          "version_info" => nil,
           "subjects" => nil,
           "language" => nil,
           "sizes" => nil,

data/lib/bolognese/readers/datacite_json_reader.rb

@@ -45,7 +45,7 @@ module Bolognese
           "publication_year" => meta.fetch("publicationYear", nil),
           "descriptions" => meta.fetch("descriptions", nil),
           "rights_list" => meta.fetch("rightsList", nil),
-          "version" => meta.fetch("version", nil),
+          "version_info" => meta.fetch("version", nil),
           "subjects" => meta.fetch("subjects", nil),
           "language" => meta.fetch("language", nil),
           "sizes" => meta.fetch("sizes", nil),

data/lib/bolognese/readers/datacite_reader.rb

@@ -204,7 +204,7 @@ module Bolognese
           "publication_year" => parse_attributes(meta.fetch("publicationYear", nil), first: true).to_s.strip.presence,
           "descriptions" => descriptions,
           "rights_list" => rights_list,
-          "version" => meta.fetch("version", nil).to_s.presence,
+          "version_info" => meta.fetch("version", nil).to_s.presence,
           "subjects" => subjects,
           "language" => parse_attributes(meta.fetch("language", nil), first: true).to_s.strip.presence,
           "geo_locations" => geo_locations,

data/lib/bolognese/readers/schema_org_reader.rb

@@ -155,7 +155,7 @@ module Bolognese
           "dates" => dates,
           "descriptions" => meta.fetch("description", nil).present? ? [{ "description" => sanitize(meta.fetch("description")), "descriptionType" => "Abstract" }] : nil,
           "rights_list" => rights_list,
-          "version" => meta.fetch("version", nil).to_s.presence,
+          "version_info" => meta.fetch("version", nil).to_s.presence,
           "subjects" => subjects,
           "state" => state,
           "schema_version" => meta.fetch("schemaVersion", nil).to_s.presence,

data/lib/bolognese/version.rb

@@ -1,3 +1,3 @@
 module Bolognese
-  VERSION = "1.0.21"
+  VERSION = "1.0.23"
 end

data/lib/bolognese/writers/codemeta_writer.rb

@@ -15,7 +15,7 @@ module Bolognese
           "title" => parse_attributes(titles, content: "title", first: true),
           "agents" => creator,
           "description" => parse_attributes(descriptions, content: "description", first: true),
-          "version" => version,
+          "version" => version_info,
           "tags" => subjects.present? ? Array.wrap(subjects).map { |k| parse_attributes(k, content: "subject", first: true) } : nil,
           "datePublished" => get_date(dates, "Issued"),
           "dateModified" => get_date(dates, "Updated"),

data/lib/bolognese/writers/crosscite_writer.rb

@@ -21,7 +21,7 @@ module Bolognese
           "alternate_identifiers" => alternate_identifiers,
           "sizes" => sizes,
           "formats" => formats,
-          "version" => version,
+          "version" => version_info,
           "rights_list" => rights_list,
           "descriptions" => descriptions,
           "volume" => volume,

data/lib/bolognese/writers/datacite_json_writer.rb

@@ -22,7 +22,7 @@ module Bolognese
           "relatedIdentifiers" => to_datacite_json(related_identifiers),
           "sizes" => sizes,
           "formats" => formats,
-          "version" => version,
+          "version" => version_info,
           "rightsList" => to_datacite_json(rights_list),
           "descriptions" => to_datacite_json(descriptions),
           "geoLocations" => to_datacite_json(geo_locations),

data/lib/bolognese/writers/jats_writer.rb

@@ -22,7 +22,7 @@ module Bolognese
         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_version(xml) if version_info.present?
         insert_pub_id(xml)
       end
 
@@ -112,7 +112,7 @@ module Bolognese
       end
 
       def insert_version(xml)
-        xml.version(version)
+        xml.version(version_info)
       end
 
       def insert_pub_id(xml)

data/lib/bolognese/writers/schema_org_writer.rb

@@ -15,7 +15,7 @@ module Bolognese
           "editor" => to_schema_org(contributor),
           "description" => parse_attributes(descriptions, content: "description", first: true),
           "license" => Array.wrap(rights_list).map { |l| l["rightsUri"] }.compact.unwrap,
-          "version" => version,
+          "version" => version_info,
           "keywords" => subjects.present? ? Array.wrap(subjects).map { |k| parse_attributes(k, content: "subject", first: true) }.join(", ") : nil,
           "inLanguage" => language,
           "contentSize" => Array.wrap(sizes).unwrap,

data/spec/readers/codemeta_reader_spec.rb

@@ -50,7 +50,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.titles).to eq([{"title"=>"R Interface to the DataONE REST API"}])
       expect(subject.descriptions.first["description"]).to start_with("Provides read and write access to data and metadata")
       expect(subject.subjects).to eq([{"subject"=>"data sharing"}, {"subject"=>"data repository"}, {"subject"=>"DataONE"}])
-      expect(subject.version).to eq("2.0.0")
+      expect(subject.version_info).to eq("2.0.0")
       expect(subject.dates).to eq([{"date"=>"2016-05-27", "dateType"=>"Issued"}, {"date"=>"2016-05-27", "dateType"=>"Created"}, {"date"=>"2016-05-27", "dateType"=>"Updated"}])
       expect(subject.publication_year).to eq("2016")
       expect(subject.publisher).to eq("https://cran.r-project.org")

data/spec/readers/datacite_reader_spec.rb

@@ -672,7 +672,7 @@ describe Bolognese::Metadata, vcr: true do
                                      "givenName"=>"Henk",
                                      "familyName"=>"Eskes"}])
       expect(subject.titles).to eq([{"title"=>"Multi-Sensor Reanalysis (MSR) of total ozone, version 2"}])
-      expect(subject.version).to eq("2")
+      expect(subject.version_info).to eq("2")
       expect(subject.dates).to eq([{"date"=>"2014-04-25", "dateType"=>"Available"}, {"date"=>"1970-04-01 / (:tba)", "dateType"=>"Collected"}, {"date"=>"2015", "dateType"=>"Issued"}])
       expect(subject.publication_year).to eq("2015")
       expect(subject.publisher).to eq("Royal Netherlands Meteorological Institute (KNMI)")

data/spec/readers/schema_org_reader_spec.rb

@@ -141,7 +141,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.types).to eq("bibtex"=>"misc", "citeproc"=>"dataset", "resourceType"=>"Gene expression matrices", "resourceTypeGeneral"=>"Dataset", "ris"=>"DATA", "schemaOrg"=>"Dataset")
       expect(subject.creator).to eq([{"name"=>"The GTEx Consortium", "type"=>"Organization"}])
       expect(subject.titles).to eq([{"title"=>"Fully processed, filtered and normalized gene expression matrices (in BED format) for each tissue, which were used as input into FastQTL for eQTL discovery"}])
-      expect(subject.version).to eq("v7")
+      expect(subject.version_info).to eq("v7")
       expect(subject.subjects).to eq([{"subject"=>"gtex"}, {"subject"=>"annotation"}, {"subject"=>"phenotype"}, {"subject"=>"gene regulation"}, {"subject"=>"transcriptomics"}])
       expect(subject.dates).to eq([{"date"=>"2017", "dateType"=>"Issued"}])
       expect(subject.publication_year).to eq("2017")

metadata

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