bolognese 0.9.79 → 0.9.80

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55a73ea6e167c7c06a36a5af075dee766544ce148ede9f10c557ede013b120bb
-  data.tar.gz: a2b426ec2d2d57ecf4ec5bdf9937d10726c4371017c03ed1e2040fd5806c9202
+  metadata.gz: 63268aa42d12dee8d65c43ee18b4ef1737fc3a763b198b64fe31b6bfa714804d
+  data.tar.gz: 4b7d9245ff0cd109321010acec951d05c646876f462a17c31cf6c15197077818
 SHA512:
-  metadata.gz: cea2c6a8c37845539b8fc183e76987ca20e20748b143ce2b86c8fc6a444aa985969d8bd755017c1d8bee535868250376f40078686430a4382aa0f8752d9321d2
-  data.tar.gz: ea2b13fb57874cef658861714f70db5dce430156986ad4d8d453108ce57a15ca991943048a0ed391afdce6ab7e2d78dd07f93fc2d1ca00782563a24084fcafad
+  metadata.gz: f3dbbcb1a839d6a552e53913c0165e0e080e2716eb9905608f00c77d6ce815167a26b3f97540d99d799da5b90ebdc33ce633f4c2a6f31f442e2783898e61c4f8
+  data.tar.gz: a7e9ffbad8c3a991efce56f907ce13932ae3cdc853d15007f9212a50985d2796f07c959d56c00f9f25d71baf286a3bdc2ef9d9b004252a2cd6bb79f5ad5b62a7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bolognese (0.9.79)
+    bolognese (0.9.80)
       activesupport (>= 4.2.5, < 6)
       benchmark_methods (~> 0.7)
       bibtex-ruby (~> 4.1)
@@ -78,7 +78,7 @@ GEM
     loofah (2.2.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    maremma (4.0)
+    maremma (4.0.2)
       activesupport (>= 4.2.5, < 6)
       addressable (>= 2.3.6)
       builder (~> 3.2, >= 3.2.2)

data/lib/bolognese/metadata.rb

@@ -61,7 +61,7 @@ module Bolognese
     include Bolognese::Writers::SchemaOrgWriter
     include Bolognese::Writers::TurtleWriter
 
-    attr_accessor :id, :doi, :author, :title, :publisher, :contributor, :license,
+    attr_accessor :id, :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,
@@ -116,6 +116,20 @@ module Bolognese
       @metadata = @from.present? ? send("read_" + @from, string: string, id: id, sandbox: options[:sandbox], doi: options[:doi], url: options[:url]) : {}
       @raw = string.present? ? string.strip : nil
 
+      # input specific metadata elements required for DataCite
+      @doi = options[:doi].presence
+      @author = options[:author].presence
+      @title = options[:title].presence
+      @publisher = options[:publisher].presence
+      @publication_year = options[:publication_year].presence
+      @resource_type_general = options[:resource_type_general].presence
+
+      # input specific metadata elements recommended for DataCite
+      @additional_type = options[:additional_type].presence
+      @description = options[:description].presence
+      @license = options[:license].presence
+      @date_published = options[:date_published].presence
+
       # replace DOI in XML if provided in options
       if @from == "datacite" && options[:doi].present? && string.present?
         doc = Nokogiri::XML(string, nil, 'UTF-8', &:noblanks)
@@ -380,7 +394,7 @@ module Bolognese
     end
 
     def publication_year
-      date_published.present? ? date_published[0..3].to_i.presence : nil
+      @publication_year ||= date_published.present? ? date_published[0..3].to_i.presence : nil
     end
 
     def container_title

data/lib/bolognese/readers/datacite_reader.rb

@@ -95,8 +95,7 @@ module Bolognese
 
         { "id" => id,
           "type" => type,
-          "additional_type" => meta.fetch("resourceType", {}).fetch("__content__", nil) ||
-            meta.fetch("resourceType", {}).fetch("resourceTypeGeneral", nil),
+          "additional_type" => meta.fetch("resourceType", {}).fetch("__content__", nil),
           "citeproc_type" => Bolognese::Utils::DC_TO_CP_TRANSLATIONS[resource_type_general.to_s.dasherize] || "article",
           "bibtex_type" => Bolognese::Utils::SO_TO_BIB_TRANSLATIONS[type] || "misc",
           "ris_type" => Bolognese::Utils::DC_TO_RIS_TRANSLATIONS[resource_type_general.to_s.dasherize] || "GEN",

data/lib/bolognese/version.rb

@@ -1,3 +1,3 @@
 module Bolognese
-  VERSION = "0.9.79"
+  VERSION = "0.9.80"
 end

data/spec/readers/datacite_reader_spec.rb

@@ -78,7 +78,6 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.valid?).to be true
       expect(subject.id).to eq("https://doi.org/10.5281/zenodo.48440")
       expect(subject.type).to eq("SoftwareSourceCode")
-      expect(subject.additional_type).to eq("Software")
       expect(subject.resource_type_general).to eq("Software")
       expect(subject.author).to eq("type"=>"Person", "name"=>"Kristian Garza", "givenName"=>"Kristian", "familyName"=>"Garza")
       expect(subject.title).to eq("Analysis Tools For Crossover Experiment Of Ui Using Choice Architecture")
@@ -117,7 +116,6 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.valid?).to be true
       expect(subject.id).to eq("https://doi.org/10.5281/zenodo.1239")
       expect(subject.type).to eq("Dataset")
-      expect(subject.additional_type).to eq("Dataset")
       expect(subject.resource_type_general).to eq("Dataset")
       expect(subject.author.length).to eq(4)
       expect(subject.author.first).to eq("type"=>"Person", "name"=>"Najko Jahn", "givenName"=>"Najko", "familyName"=>"Jahn")
@@ -335,7 +333,6 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.valid?).to be true
       expect(subject.id).to eq("https://handle.test.datacite.org/10.22002/d1.694")
       expect(subject.type).to eq("Dataset")
-      expect(subject.additional_type).to eq("Dataset")
       expect(subject.resource_type_general).to eq("Dataset")
       expect(subject.author).to eq("name"=>"Tester")
       expect(subject.title).to eq("Test license")
@@ -352,7 +349,6 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.valid?).to be true
       expect(subject.id).to eq("https://handle.test.datacite.org/10.21956/gatesopenres.530.r190")
       expect(subject.type).to eq("ScholarlyArticle")
-      expect(subject.additional_type).to eq("Text")
       expect(subject.resource_type_general).to eq("Text")
       expect(subject.author.length).to eq(5)
       expect(subject.author.first).to eq("type"=>"Person", "name"=>"Lina Patel", "givenName"=>"Lina", "familyName"=>"Patel")
@@ -403,4 +399,145 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.state).to eq("registered")
     end
   end
+
+  context "change datacite metadata on input" do
+    it "change doi" do
+      input = fixture_path + 'datacite.xml'
+      doi = "10.5061/dryad.8515"
+      subject = Bolognese::Metadata.new(input: input, doi: doi)
+      expect(subject.valid?).to be true
+      expect(subject.id).to eq("https://doi.org/10.5061/dryad.8515")
+      expect(subject.doi).to eq("10.5061/dryad.8515")
+      expect(subject.author).to eq("type"=>"Person", "id"=>"https://orcid.org/0000-0003-1419-2405", "name"=>"Fenner, Martin", "givenName"=>"Martin", "familyName"=>"Fenner")
+      expect(subject.title).to eq("Eating your own Dog Food")
+      expect(subject.publisher).to eq("DataCite")
+      expect(subject.publication_year).to eq(2016)
+    end
+
+    it "change author" do
+      input = fixture_path + 'datacite.xml'
+      author = { "type"=>"Person", "name"=>"Ollomo, Benjamin", "givenName"=>"Benjamin", "familyName"=>"Ollomo" }
+      subject = Bolognese::Metadata.new(input: input, author: author)
+      expect(subject.valid?).to be true
+      expect(subject.id).to eq("https://doi.org/10.5438/4k3m-nyvg")
+      expect(subject.doi).to eq("10.5438/4k3m-nyvg")
+      expect(subject.author).to eq("type"=>"Person", "name"=>"Ollomo, Benjamin", "givenName"=>"Benjamin", "familyName"=>"Ollomo")
+      expect(subject.title).to eq("Eating your own Dog Food")
+      expect(subject.publisher).to eq("DataCite")
+      expect(subject.publication_year).to eq(2016)
+    end
+
+    it "change title" do
+      input = fixture_path + 'datacite.xml'
+      title = "A new malaria agent in African hominids."
+      subject = Bolognese::Metadata.new(input: input, title: title)
+      expect(subject.valid?).to be true
+      expect(subject.id).to eq("https://doi.org/10.5438/4k3m-nyvg")
+      expect(subject.doi).to eq("10.5438/4k3m-nyvg")
+      expect(subject.title).to eq("A new malaria agent in African hominids.")
+      expect(subject.publisher).to eq("DataCite")
+      expect(subject.publication_year).to eq(2016)
+    end
+
+    it "change publisher" do
+      input = fixture_path + 'datacite.xml'
+      publisher = "Zenodo"
+      subject = Bolognese::Metadata.new(input: input, publisher: publisher)
+      expect(subject.valid?).to be true
+      expect(subject.id).to eq("https://doi.org/10.5438/4k3m-nyvg")
+      expect(subject.doi).to eq("10.5438/4k3m-nyvg")
+      expect(subject.title).to eq("Eating your own Dog Food")
+      expect(subject.publisher).to eq("Zenodo")
+      expect(subject.publication_year).to eq(2016)
+    end
+
+    it "change publication_year" do
+      input = fixture_path + 'datacite.xml'
+      publication_year = 2017
+      subject = Bolognese::Metadata.new(input: input, publication_year: publication_year)
+      expect(subject.valid?).to be true
+      expect(subject.id).to eq("https://doi.org/10.5438/4k3m-nyvg")
+      expect(subject.doi).to eq("10.5438/4k3m-nyvg")
+      expect(subject.title).to eq("Eating your own Dog Food")
+      expect(subject.publisher).to eq("DataCite")
+      expect(subject.publication_year).to eq(2017)
+      expect(subject.resource_type_general).to eq("Text")
+      expect(subject.additional_type).to eq("BlogPosting")
+    end
+
+    it "change resource_type_general" do
+      input = fixture_path + 'datacite.xml'
+      resource_type_general = "Software"
+      subject = Bolognese::Metadata.new(input: input, resource_type_general: resource_type_general)
+      expect(subject.valid?).to be true
+      expect(subject.id).to eq("https://doi.org/10.5438/4k3m-nyvg")
+      expect(subject.doi).to eq("10.5438/4k3m-nyvg")
+      expect(subject.title).to eq("Eating your own Dog Food")
+      expect(subject.publisher).to eq("DataCite")
+      expect(subject.publication_year).to eq(2016)
+      expect(subject.resource_type_general).to eq("Software")
+      expect(subject.additional_type).to eq("BlogPosting")
+    end
+
+    it "change additional_type" do
+      input = fixture_path + 'datacite.xml'
+      additional_type = "ScholarlyArticle"
+      subject = Bolognese::Metadata.new(input: input, additional_type: additional_type)
+      expect(subject.valid?).to be true
+      expect(subject.id).to eq("https://doi.org/10.5438/4k3m-nyvg")
+      expect(subject.doi).to eq("10.5438/4k3m-nyvg")
+      expect(subject.title).to eq("Eating your own Dog Food")
+      expect(subject.publisher).to eq("DataCite")
+      expect(subject.publication_year).to eq(2016)
+      expect(subject.resource_type_general).to eq("Text")
+      expect(subject.additional_type).to eq("ScholarlyArticle")
+      expect(subject.description).to eq("type"=>"Abstract", "text"=>"Eating your own dog food is a slang term to describe that an organization should itself use the products and services it provides. For DataCite this means that we should use DOIs with appropriate metadata and strategies for long-term preservation for...")
+    end
+
+    it "change description" do
+      input = fixture_path + 'datacite.xml'
+      description = "Eating your own dog food is a slang term to describe that an organization should itself use the products and services it provides. For DataCite this means that we should use DOIs with appropriate metadata and strategies for long-term preservation for..."
+      subject = Bolognese::Metadata.new(input: input, description: description)
+      expect(subject.valid?).to be true
+      expect(subject.id).to eq("https://doi.org/10.5438/4k3m-nyvg")
+      expect(subject.doi).to eq("10.5438/4k3m-nyvg")
+      expect(subject.title).to eq("Eating your own Dog Food")
+      expect(subject.publisher).to eq("DataCite")
+      expect(subject.publication_year).to eq(2016)
+      expect(subject.resource_type_general).to eq("Text")
+      expect(subject.additional_type).to eq("BlogPosting")
+      expect(subject.description).to eq(description)
+    end
+
+    it "change license" do
+      input = fixture_path + 'datacite.xml'
+      license = { "id"=>"http://creativecommons.org/publicdomain/zero/1.0" }
+      subject = Bolognese::Metadata.new(input: input, license: license)
+      expect(subject.valid?).to be true
+      expect(subject.id).to eq("https://doi.org/10.5438/4k3m-nyvg")
+      expect(subject.doi).to eq("10.5438/4k3m-nyvg")
+      expect(subject.title).to eq("Eating your own Dog Food")
+      expect(subject.publisher).to eq("DataCite")
+      expect(subject.publication_year).to eq(2016)
+      expect(subject.resource_type_general).to eq("Text")
+      expect(subject.additional_type).to eq("BlogPosting")
+      expect(subject.license).to eq(license)
+      expect(subject.date_published).to eq("2016-12-20")
+    end
+
+    it "change date_published" do
+      input = fixture_path + 'datacite.xml'
+      date_published = "2017-12-20"
+      subject = Bolognese::Metadata.new(input: input, date_published: date_published)
+      expect(subject.valid?).to be true
+      expect(subject.id).to eq("https://doi.org/10.5438/4k3m-nyvg")
+      expect(subject.doi).to eq("10.5438/4k3m-nyvg")
+      expect(subject.title).to eq("Eating your own Dog Food")
+      expect(subject.publisher).to eq("DataCite")
+      expect(subject.publication_year).to eq(2017)
+      expect(subject.resource_type_general).to eq("Text")
+      expect(subject.additional_type).to eq("BlogPosting")
+      expect(subject.date_published).to eq(date_published)
+    end
+  end
 end

metadata

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