bolognese 0.9.96 → 0.9.97

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 287cf1f78523ddfcae6883ae9fb97e722481978f2c6d2eceb7fe8b2e5d21fd4f
-  data.tar.gz: 9b21f0508c2f690614312b95623fc1c79185df7af0fcbd7ed32bf99e41213da0
+  metadata.gz: 4e0934c41291533eceeaf3993f6fa4ea1187f00a803dda629499bcaaac66c927
+  data.tar.gz: 3f6c5a43da5797dc333eff72e5e5e6b195ad4d6c7724e3c17d30ea6e5dbc09f1
 SHA512:
-  metadata.gz: 1d340dcd70c9f0a9235ebfc56474a1e711a2a818c516d82f46b901b51b6915b2d014bbe8c53c29563b441b3b2865b63e48a0de13f32963b9f1d4148e61c0b688
-  data.tar.gz: 924501ab8bf513ff19106696ecf530bc3b151a6f1e3ff1e72b22cc2b03a5c6535789eff8b12fde01ba297dc3686e568758874eca222dce01afc5a1ddb24a2bac
+  metadata.gz: 3b488400d7ac418d56df127c9566f06103cf0ebf5aa4f6ad9465e70ec9d7adb126b486541e9cb840588323d493f1620f4dbcbcab44614da84955430d119a902a
+  data.tar.gz: 1276d995665ffde0d217677306404802fae09b219687bf43845be78948a1ad5606bc94a548737dc9b67d9c536f96d063e8cae9f3f02b8f965a195bb41c8e8b0c

data/Gemfile.lock

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

data/lib/bolognese/datacite_utils.rb

@@ -152,9 +152,9 @@ module Bolognese
     end
 
     def insert_version(xml)
-      return xml unless version.present?
+      return xml unless b_version.present?
 
-      xml.version(version)
+      xml.version(b_version)
     end
 
     def rel_identifier

data/lib/bolognese/metadata.rb

@@ -1,9 +1,59 @@
 require_relative 'metadata_utils'
 
+require_relative 'readers/bibtex_reader'
+require_relative 'readers/citeproc_reader'
+require_relative 'readers/codemeta_reader'
+require_relative 'readers/crosscite_reader'
+require_relative 'readers/crossref_reader'
+require_relative 'readers/datacite_json_reader'
+require_relative 'readers/datacite_reader'
+require_relative 'readers/ris_reader'
+require_relative 'readers/schema_org_reader'
+
+require_relative 'writers/bibtex_writer'
+require_relative 'writers/citation_writer'
+require_relative 'writers/citeproc_writer'
+require_relative 'writers/codemeta_writer'
+require_relative 'writers/crosscite_writer'
+require_relative 'writers/crossref_writer'
+require_relative 'writers/datacite_writer'
+require_relative 'writers/datacite_json_writer'
+require_relative 'writers/jats_writer'
+require_relative 'writers/rdf_xml_writer'
+require_relative 'writers/ris_writer'
+require_relative 'writers/schema_org_writer'
+require_relative 'writers/turtle_writer'
+
 module Bolognese
   class Metadata
+    include Bolognese::Readers::BibtexReader
+    include Bolognese::Readers::CiteprocReader
+    include Bolognese::Readers::CodemetaReader
+    include Bolognese::Readers::CrossciteReader
+    include Bolognese::Readers::CrossrefReader
+    include Bolognese::Readers::DataciteReader
+    include Bolognese::Readers::DataciteJsonReader
+    include Bolognese::Readers::RisReader
+    include Bolognese::Readers::SchemaOrgReader
+
+    include Bolognese::Writers::BibtexWriter
+    include Bolognese::Writers::CitationWriter
+    include Bolognese::Writers::CiteprocWriter
+    include Bolognese::Writers::CodemetaWriter
+    include Bolognese::Writers::CrossciteWriter
+    include Bolognese::Writers::CrossrefWriter
+    include Bolognese::Writers::DataciteWriter
+    include Bolognese::Writers::DataciteJsonWriter
+    include Bolognese::Writers::JatsWriter
+    include Bolognese::Writers::RdfXmlWriter
+    include Bolognese::Writers::RisWriter
+    include Bolognese::Writers::SchemaOrgWriter
+    include Bolognese::Writers::TurtleWriter
+
     include Bolognese::MetadataUtils
 
+    attr_writer :id, :provider_id, :client_id, :doi, :b_url, :b_version, 
+
     def initialize(input: nil, from: nil, **options)
       id = normalize_id(input, options)
 
@@ -53,5 +103,42 @@ module Bolognese
       @provider_id = hsh.to_h["provider_id"].presence
       @client_id = hsh.to_h["client_id"].presence
     end
+
+    def id
+      @id ||= meta.fetch("id", nil)
+    end
+
+    def doi
+      @doi ||= @identifier.present? ? doi_from_url(@identifier) : meta.fetch("doi", nil)
+    end
+
+    def b_url
+      @b_url ||= meta.fetch("b_url", nil)
+    end
+
+    def b_version
+      @b_version ||= meta.fetch("b_version", nil)
+    end
+
+    def provider_id
+      @provider_id ||= meta.fetch("provider_id", nil)
+    end
+
+    def client_id
+      @client_id ||= meta.fetch("client_id", nil)
+    end
+
+    def exists?
+      meta.fetch("state", "not_found") != "not_found"
+    end
+
+    def valid?
+      exists? && errors.nil?
+    end
+
+    # validate against DataCite schema, unless there are already errors in the reader
+    def errors
+      meta.fetch("errors", nil) || datacite_errors(xml: datacite, schema_version: schema_version)
+    end
   end
 end

data/lib/bolognese/metadata_utils.rb

@@ -3,30 +3,6 @@ require_relative 'author_utils'
 require_relative 'datacite_utils'
 require_relative 'utils'
 
-require_relative 'readers/bibtex_reader'
-require_relative 'readers/citeproc_reader'
-require_relative 'readers/codemeta_reader'
-require_relative 'readers/crosscite_reader'
-require_relative 'readers/crossref_reader'
-require_relative 'readers/datacite_json_reader'
-require_relative 'readers/datacite_reader'
-require_relative 'readers/ris_reader'
-require_relative 'readers/schema_org_reader'
-
-require_relative 'writers/bibtex_writer'
-require_relative 'writers/citation_writer'
-require_relative 'writers/citeproc_writer'
-require_relative 'writers/codemeta_writer'
-require_relative 'writers/crosscite_writer'
-require_relative 'writers/crossref_writer'
-require_relative 'writers/datacite_writer'
-require_relative 'writers/datacite_json_writer'
-require_relative 'writers/jats_writer'
-require_relative 'writers/rdf_xml_writer'
-require_relative 'writers/ris_writer'
-require_relative 'writers/schema_org_writer'
-require_relative 'writers/turtle_writer'
-
 module Bolognese
   module MetadataUtils
     # include BenchmarkMethods
@@ -35,62 +11,25 @@ module Bolognese
     include Bolognese::DataciteUtils
     include Bolognese::Utils
 
-    include Bolognese::Readers::BibtexReader
-    include Bolognese::Readers::CiteprocReader
-    include Bolognese::Readers::CodemetaReader
-    include Bolognese::Readers::CrossciteReader
-    include Bolognese::Readers::CrossrefReader
-    include Bolognese::Readers::DataciteReader
-    include Bolognese::Readers::DataciteJsonReader
-    include Bolognese::Readers::RisReader
-    include Bolognese::Readers::SchemaOrgReader
-
-    include Bolognese::Writers::BibtexWriter
-    include Bolognese::Writers::CitationWriter
-    include Bolognese::Writers::CiteprocWriter
-    include Bolognese::Writers::CodemetaWriter
-    include Bolognese::Writers::CrossciteWriter
-    include Bolognese::Writers::CrossrefWriter
-    include Bolognese::Writers::DataciteWriter
-    include Bolognese::Writers::DataciteJsonWriter
-    include Bolognese::Writers::JatsWriter
-    include Bolognese::Writers::RdfXmlWriter
-    include Bolognese::Writers::RisWriter
-    include Bolognese::Writers::SchemaOrgWriter
-    include Bolognese::Writers::TurtleWriter
-
-    attr_accessor :string, :identifier, :from, :author,
-                  :creator, :title, :publisher, :contributor, :license,
-                  :date_accepted, :date_available, :date_copyrighted, :date_collected,
-                  :date_submitted, :date_valid, :date_created, :date_modified, :date_updated, :provider_id, :client_id, :journal,
-                  :volume, :issue, :first_page, :last_page, :b_doi, :b_url, :b_version, :keywords, :editor,
-                  :description, :alternate_name, :language, :content_size, :spatial_coverage,
-                  :schema_version, :has_part, :same_as,
-                  :is_previous_version_of, :is_new_version_of, :is_cited_by, :cites,
-                  :is_supplement_to, :is_supplemented_by, :is_continued_by, :continues,
-                  :has_metadata, :is_metadata_for, :is_referenced_by, :references,
-                  :is_documented_by, :documents, :is_compiled_by, :compiles,
-                  :is_variant_form_of, :is_original_form_of, :is_reviewed_by, :reviews,
-                  :is_derived_from, :is_source_of, :format, :funding, :style, :locale, :state, :regenerate, :sandbox
+    attr_accessor :string, :from, :sandbox, :b_doi, :regenerate, :issue, :contributor,
+                  :spatial_coverage
+
+    attr_writer :identifier, :author, :title, :publisher, :license,
+                :date_accepted, :date_available, :date_copyrighted, :date_collected,
+                :date_submitted, :date_valid, :date_created, :date_modified, :date_updated, 
+                :journal, :volume, :first_page, :last_page,
+                :keywords, :editor, :description, :alternate_name, :language, :content_size,
+                :schema_version, :has_part, :same_as,
+                :is_previous_version_of, :is_new_version_of, :is_cited_by, :cites,
+                :is_supplement_to, :is_supplemented_by, :is_continued_by, :continues,
+                :has_metadata, :is_metadata_for, :is_referenced_by, :references,
+                :is_documented_by, :documents, :is_compiled_by, :compiles,
+                :is_variant_form_of, :is_original_form_of, :is_reviewed_by, :reviews,
+                :is_derived_from, :is_source_of, :format, :funding, :style, :locale, :state,
+                :type, :additional_type, :citeproc_type, :bibtex_type, :ris_type, :meta
 
     attr_reader :doc, :service_provider, :page_start, :page_end, :related_identifier, :reverse, :name_detector
 
-    attr_writer :id, :type, :additional_type, :citeproc_type, :bibtex_type, :doi,
-                :ris_type, :meta
-
-    def exists?
-      meta.fetch("state", "not_found") != "not_found"
-    end
-
-    def valid?
-      exists? && errors.nil?
-    end
-
-    # validate against DataCite schema, unless there are already errors in the reader
-    def errors
-      meta.fetch("errors", nil) || datacite_errors(xml: datacite, schema_version: schema_version)
-    end
-
     # replace DOI in XML if provided in options
     def raw
       r = string.present? ? string.strip : nil
@@ -110,15 +49,11 @@ module Bolognese
     # the id might change
     def meta
       m = from.present? ? send("read_" + from, string: string, sandbox: sandbox) : {}
-      @id = b_doi || m.fetch("id", nil) || m.fetch("identifier", nil)
+      @identifier = b_doi || m.fetch("id", nil) || m.fetch("identifier", nil)
 
       m
     end
 
-    def id
-      @id ||= meta.fetch("id", nil)
-    end
-
     def type
       @type ||= meta.fetch("type", nil)
     end
@@ -143,14 +78,6 @@ module Bolognese
       @resource_type_general ||= meta.fetch("resource_type_general", nil)
     end
 
-    def doi
-      @doi ||= @id.present? ? doi_from_url(@id) : meta.fetch("doi", nil)
-    end
-
-    def b_url
-      @b_url ||= meta.fetch("b_url", nil)
-    end
-
     def identifier
       @identifier ||= meta.fetch("id", nil)
     end
@@ -247,10 +174,6 @@ module Bolognese
       @license ||= meta.fetch("license", nil)
     end
 
-    def b_version
-      @b_version ||= meta.fetch("b_version", nil)
-    end
-
     def keywords
       @keywords ||= meta.fetch("keywords", nil)
     end
@@ -271,14 +194,6 @@ module Bolognese
       @funding ||= meta.fetch("funding", nil)
     end
 
-    def provider_id
-      @provider_id ||= meta.fetch("provider_id", nil)
-    end
-
-    def client_id
-      @client_id ||= meta.fetch("client_id", nil)
-    end
-
     def is_identical_to
       meta.fetch("is_identical_to", nil)
     end

data/lib/bolognese/version.rb

@@ -1,3 +1,3 @@
 module Bolognese
-  VERSION = "0.9.96"
+  VERSION = "0.9.97"
 end

data/spec/readers/bibtex_reader_spec.rb

@@ -13,7 +13,7 @@ describe Bolognese::Metadata, vcr: true do
     it "string" do
       Bolognese::Metadata.new(input: IO.read(input).strip)
       expect(subject.valid?).to be true
-      expect(subject.id).to eq("https://doi.org/10.7554/elife.01567")
+      expect(subject.identifier).to eq("https://doi.org/10.7554/elife.01567")
     end
   end
 
@@ -26,7 +26,7 @@ describe Bolognese::Metadata, vcr: true do
   context "get bibtex metadata" do
     it "Crossref DOI" do
       expect(subject.valid?).to be true
-      expect(subject.id).to eq("https://doi.org/10.7554/elife.01567")
+      expect(subject.identifier).to eq("https://doi.org/10.7554/elife.01567")
       expect(subject.type).to eq("ScholarlyArticle")
       expect(subject.b_url).to eq("http://elifesciences.org/lookup/doi/10.7554/eLife.01567")
       expect(subject.resource_type_general).to eq("Text")

data/spec/readers/citeproc_reader_spec.rb

@@ -14,7 +14,7 @@ describe Bolognese::Metadata, vcr: true do
   context "get citeproc metadata" do
     it "BlogPosting" do
       expect(subject.valid?).to be true
-      expect(subject.id).to eq("https://doi.org/10.5438/4k3m-nyvg")
+      expect(subject.identifier).to eq("https://doi.org/10.5438/4k3m-nyvg")
       expect(subject.b_url).to eq("https://blog.datacite.org/eating-your-own-dog-food")
       expect(subject.type).to eq("BlogPosting")
       expect(subject.resource_type_general).to eq("Text")

data/spec/readers/codemeta_reader_spec.rb

@@ -16,7 +16,7 @@ describe Bolognese::Metadata, vcr: true do
   context "get codemeta metadata" do
     it "maremma" do
       expect(subject.valid?).to be true
-      expect(subject.id).to eq("https://doi.org/10.5438/qeg0-3gm3")
+      expect(subject.identifier).to eq("https://doi.org/10.5438/qeg0-3gm3")
       expect(subject.b_url).to eq("https://github.com/datacite/maremma")
       expect(subject.type).to eq("SoftwareSourceCode")
       expect(subject.author).to eq("type"=>"Person", "id"=>"http://orcid.org/0000-0003-0077-4738", "name"=>"Martin Fenner", "givenName"=>"Martin", "familyName"=>"Fenner")
@@ -32,7 +32,7 @@ describe Bolognese::Metadata, vcr: true do
     it "rdataone" do
       input = fixture_path + 'codemeta.json'
       subject = Bolognese::Metadata.new(input: input)
-      expect(subject.id).to eq("https://doi.org/10.5063/f1m61h5x")
+      expect(subject.identifier).to eq("https://doi.org/10.5063/f1m61h5x")
       expect(subject.b_url).to eq("https://github.com/DataONEorg/rdataone")
       expect(subject.type).to eq("SoftwareSourceCode")
       expect(subject.author).to eq( [{"type"=>"Person",
@@ -60,7 +60,7 @@ describe Bolognese::Metadata, vcr: true do
       input = fixture_path + 'maremma/codemeta.json'
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
-      expect(subject.id).to eq("https://doi.org/10.5438/qeg0-3gm3")
+      expect(subject.identifier).to eq("https://doi.org/10.5438/qeg0-3gm3")
       expect(subject.b_url).to eq("https://github.com/datacite/maremma")
       expect(subject.type).to eq("SoftwareSourceCode")
       expect(subject.author).to eq("type"=>"Person", "id"=>"http://orcid.org/0000-0003-0077-4738", "name"=>"Martin Fenner", "givenName"=>"Martin", "familyName"=>"Fenner")

data/spec/readers/crosscite_reader_spec.rb

@@ -14,7 +14,7 @@ describe Bolognese::Metadata, vcr: true do
   context "get crosscite metadata" do
     it "SoftwareSourceCode" do
       expect(subject.valid?).to be true
-      expect(subject.id).to eq("https://doi.org/10.5281/zenodo.48440")
+      expect(subject.identifier).to eq("https://doi.org/10.5281/zenodo.48440")
       expect(subject.type).to eq("SoftwareSourceCode")
       expect(subject.resource_type_general).to eq("Software")
       expect(subject.author).to eq("type"=>"Person", "familyName" => "Garza", "givenName" => "Kristian", "name" => "Kristian Garza")
@@ -27,7 +27,7 @@ describe Bolognese::Metadata, vcr: true do
       input = IO.read(fixture_path + "crosscite.json")
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
-      expect(subject.id).to eq("https://doi.org/10.5281/zenodo.48440")
+      expect(subject.identifier).to eq("https://doi.org/10.5281/zenodo.48440")
       expect(subject.type).to eq("SoftwareSourceCode")
       expect(subject.resource_type_general).to eq("Software")
       expect(subject.author).to eq("type"=>"Person", "familyName" => "Garza", "givenName" => "Kristian", "name" => "Kristian Garza")

data/spec/readers/crossref_reader_spec.rb

@@ -16,7 +16,7 @@ describe Bolognese::Metadata, vcr: true do
   context "get crossref metadata" do
     it "DOI with data citation" do
       expect(subject.valid?).to be true
-      expect(subject.id).to eq("https://doi.org/10.7554/elife.01567")
+      expect(subject.identifier).to eq("https://doi.org/10.7554/elife.01567")
       expect(subject.type).to eq("ScholarlyArticle")
       expect(subject.b_url).to eq("https://elifesciences.org/articles/01567")
       expect(subject.additional_type).to eq("JournalArticle")
@@ -49,7 +49,7 @@ describe Bolognese::Metadata, vcr: true do
       input = "https://doi.org/10.1371/journal.pone.0000030"
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
-      expect(subject.id).to eq(input)
+      expect(subject.identifier).to eq(input)
       expect(subject.b_url).to eq("http://dx.plos.org/10.1371/journal.pone.0000030")
       expect(subject.type).to eq("ScholarlyArticle")
       expect(subject.additional_type).to eq("JournalArticle")
@@ -72,7 +72,7 @@ describe Bolognese::Metadata, vcr: true do
       input = "https://doi.org/10.1101/097196"
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
-      expect(subject.id).to eq(input)
+      expect(subject.identifier).to eq(input)
       expect(subject.b_url).to eq("http://biorxiv.org/lookup/doi/10.1101/097196")
       expect(subject.type).to eq("ScholarlyArticle")
       expect(subject.additional_type).to eq("PostedContent")
@@ -93,7 +93,7 @@ describe Bolognese::Metadata, vcr: true do
       input = "https://doi.org/10.1890/0012-9658(2006)87[2832:tiopma]2.0.co;2"
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
-      expect(subject.id).to eq("https://doi.org/10.1890/0012-9658(2006)87%5B2832:tiopma%5D2.0.co;2")
+      expect(subject.identifier).to eq("https://doi.org/10.1890/0012-9658(2006)87%5B2832:tiopma%5D2.0.co;2")
       expect(subject.b_url).to eq("http://doi.wiley.com/10.1890/0012-9658(2006)87[2832:TIOPMA]2.0.CO;2")
       expect(subject.type).to eq("ScholarlyArticle")
       expect(subject.additional_type).to eq("JournalArticle")
@@ -114,7 +114,7 @@ describe Bolognese::Metadata, vcr: true do
       input = "https://doi.org/10.1155/2012/291294"
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
-      expect(subject.id).to eq("https://doi.org/10.1155/2012/291294")
+      expect(subject.identifier).to eq("https://doi.org/10.1155/2012/291294")
       expect(subject.b_url).to eq("http://www.hindawi.com/journals/pm/2012/291294/")
       expect(subject.type).to eq("ScholarlyArticle")
       expect(subject.additional_type).to eq("JournalArticle")
@@ -136,7 +136,7 @@ describe Bolognese::Metadata, vcr: true do
       input = "https://doi.org/10.1016/j.ejphar.2015.03.018"
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
-      expect(subject.id).to eq(input)
+      expect(subject.identifier).to eq(input)
       expect(subject.b_url).to eq("http://linkinghub.elsevier.com/retrieve/pii/S0014299915002332")
       expect(subject.type).to eq("ScholarlyArticle")
       expect(subject.additional_type).to eq("JournalArticle")
@@ -155,7 +155,7 @@ describe Bolognese::Metadata, vcr: true do
       input = "10.2210/pdb4hhb/pdb"
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
-      expect(subject.id).to eq("https://doi.org/10.2210/pdb4hhb/pdb")
+      expect(subject.identifier).to eq("https://doi.org/10.2210/pdb4hhb/pdb")
       expect(subject.b_url).to eq("ftp://ftp.wwpdb.org/pub/pdb/data/structures/divided/pdb/hh/pdb4hhb.ent.gz")
       expect(subject.type).to eq("ScholarlyArticle")
       expect(subject.additional_type).to eq("SaComponent")
@@ -175,7 +175,7 @@ describe Bolognese::Metadata, vcr: true do
       input = "https://doi.org/10.1007/978-3-662-46370-3_13"
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
-      expect(subject.id).to eq("https://doi.org/10.1007/978-3-662-46370-3_13")
+      expect(subject.identifier).to eq("https://doi.org/10.1007/978-3-662-46370-3_13")
       expect(subject.b_url).to eq("http://link.springer.com/10.1007/978-3-662-46370-3_13")
       expect(subject.type).to eq("Chapter")
       expect(subject.additional_type).to eq("BookChapter")
@@ -193,7 +193,7 @@ describe Bolognese::Metadata, vcr: true do
       input = "https://doi.org/10.1111/nph.14619"
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
-      expect(subject.id).to eq(input)
+      expect(subject.identifier).to eq(input)
       expect(subject.b_url).to eq("http://doi.wiley.com/10.1111/nph.14619")
       expect(subject.type).to eq("ScholarlyArticle")
       expect(subject.additional_type).to eq("JournalArticle")
@@ -213,7 +213,7 @@ describe Bolognese::Metadata, vcr: true do
       input = "https://doi.org/10.7554/elife.01567x"
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be false
-      expect(subject.id).to eq("https://doi.org/10.7554/elife.01567x")
+      expect(subject.identifier).to eq("https://doi.org/10.7554/elife.01567x")
       expect(subject.doi).to eq("10.7554/elife.01567x")
       expect(subject.service_provider).to eq("Crossref")
       expect(subject.state).to eq("not_found")

data/spec/readers/datacite_json_reader_spec.rb

@@ -14,7 +14,7 @@ describe Bolognese::Metadata, vcr: true do
   context "get datacite_json metadata" do
     it "BlogPosting" do
       expect(subject.valid?).to be true
-      expect(subject.id).to eq("https://doi.org/10.5438/4k3m-nyvg")
+      expect(subject.identifier).to eq("https://doi.org/10.5438/4k3m-nyvg")
       expect(subject.type).to eq("ScholarlyArticle")
       expect(subject.additional_type).to eq("BlogPosting")
       expect(subject.resource_type_general).to eq("Text")

data/spec/readers/datacite_reader_spec.rb

@@ -16,7 +16,7 @@ describe Bolognese::Metadata, vcr: true do
   context "get datacite metadata" do
     it "Dataset" do
       expect(subject.valid?).to be true
-      expect(subject.id).to eq("https://doi.org/10.5061/dryad.8515")
+      expect(subject.identifier).to eq("https://doi.org/10.5061/dryad.8515")
       expect(subject.b_url).to eq("http://datadryad.org/resource/doi:10.5061/dryad.8515")
       expect(subject.type).to eq("Dataset")
       expect(subject.additional_type).to eq("DataPackage")
@@ -38,7 +38,7 @@ describe Bolognese::Metadata, vcr: true do
       input = "https://doi.org/10.5438/4K3M-NYVG"
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
-      expect(subject.id).to eq("https://doi.org/10.5438/4k3m-nyvg")
+      expect(subject.identifier).to eq("https://doi.org/10.5438/4k3m-nyvg")
       expect(subject.type).to eq("ScholarlyArticle")
       expect(subject.additional_type).to eq("BlogPosting")
       expect(subject.resource_type_general).to eq("Text")
@@ -59,7 +59,7 @@ describe Bolognese::Metadata, vcr: true do
       input = "https://doi.org/10.4230/lipics.tqc.2013.93"
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
-      expect(subject.id).to eq("https://doi.org/10.4230/lipics.tqc.2013.93")
+      expect(subject.identifier).to eq("https://doi.org/10.4230/lipics.tqc.2013.93")
       expect(subject.type).to eq("ScholarlyArticle")
       expect(subject.additional_type).to eq("ConferencePaper")
       expect(subject.resource_type_general).to eq("Text")
@@ -76,7 +76,7 @@ describe Bolognese::Metadata, vcr: true do
       input = "https://doi.org/10.5281/ZENODO.48440"
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
-      expect(subject.id).to eq("https://doi.org/10.5281/zenodo.48440")
+      expect(subject.identifier).to eq("https://doi.org/10.5281/zenodo.48440")
       expect(subject.type).to eq("SoftwareSourceCode")
       expect(subject.resource_type_general).to eq("Software")
       expect(subject.author).to eq("type"=>"Person", "name"=>"Kristian Garza", "givenName"=>"Kristian", "familyName"=>"Garza")
@@ -94,7 +94,7 @@ describe Bolognese::Metadata, vcr: true do
       input = "10.6084/M9.FIGSHARE.4234751.V1"
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
-      expect(subject.id).to eq("https://doi.org/10.6084/m9.figshare.4234751.v1")
+      expect(subject.identifier).to eq("https://doi.org/10.6084/m9.figshare.4234751.v1")
       expect(subject.type).to eq("Dataset")
       expect(subject.additional_type).to eq("Dataset")
       expect(subject.resource_type_general).to eq("Dataset")
@@ -114,7 +114,7 @@ describe Bolognese::Metadata, vcr: true do
       input = "https://doi.org/10.5281/ZENODO.1239"
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
-      expect(subject.id).to eq("https://doi.org/10.5281/zenodo.1239")
+      expect(subject.identifier).to eq("https://doi.org/10.5281/zenodo.1239")
       expect(subject.type).to eq("Dataset")
       expect(subject.resource_type_general).to eq("Dataset")
       expect(subject.author.length).to eq(4)
@@ -132,7 +132,7 @@ describe Bolognese::Metadata, vcr: true do
       input = "https://doi.org/10.14457/KMITL.RES.2006.17"
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
-      expect(subject.id).to eq("https://doi.org/10.14457/kmitl.res.2006.17")
+      expect(subject.identifier).to eq("https://doi.org/10.14457/kmitl.res.2006.17")
       expect(subject.type).to eq("Dataset")
       expect(subject.author.length).to eq(1)
       expect(subject.author.first).to eq(["name", "กัญจนา แซ่เตียว"])
@@ -142,7 +142,7 @@ describe Bolognese::Metadata, vcr: true do
       input = "https://doi.org/10.7910/DVN/EQTQYO"
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
-      expect(subject.id).to eq("https://doi.org/10.7910/dvn/eqtqyo")
+      expect(subject.identifier).to eq("https://doi.org/10.7910/dvn/eqtqyo")
       expect(subject.type).to eq("Dataset")
       expect(subject.author).to eq("name" => "Enos, Ryan (Harvard University); Fowler, Anthony (University Of Chicago); Vavreck, Lynn (UCLA)")
     end
@@ -151,7 +151,7 @@ describe Bolognese::Metadata, vcr: true do
       input = "https://doi.org/10.18429/JACOW-IPAC2016-TUPMY003"
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
-      expect(subject.id).to eq("https://doi.org/10.18429/jacow-ipac2016-tupmy003")
+      expect(subject.identifier).to eq("https://doi.org/10.18429/jacow-ipac2016-tupmy003")
       expect(subject.type).to eq("ScholarlyArticle")
       expect(subject.author.length).to eq(12)
       expect(subject.author.first).to eq("type"=>"Person", "id"=>"http://jacow.org/JACoW-00077389", "name"=>"Masashi Otani", "givenName"=>"Masashi", "familyName"=>"Otani")
@@ -161,7 +161,7 @@ describe Bolognese::Metadata, vcr: true do
       input = "https://doi.org/10.2314/COSCV1"
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
-      expect(subject.id).to eq("https://doi.org/10.2314/coscv1")
+      expect(subject.identifier).to eq("https://doi.org/10.2314/coscv1")
       expect(subject.type).to eq("ScholarlyArticle")
       expect(subject.author.length).to eq(14)
       expect(subject.author.first).to eq("type"=>"Person", "id"=>"https://orcid.org/0000-0003-0232-7085", "name"=>"Lambert Heller", "givenName"=>"Lambert", "familyName"=>"Heller")
@@ -171,7 +171,7 @@ describe Bolognese::Metadata, vcr: true do
       input = "https://doi.org/10.21233/n34n5q"
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
-      expect(subject.id).to eq("https://doi.org/10.21233/n34n5q")
+      expect(subject.identifier).to eq("https://doi.org/10.21233/n34n5q")
       expect(subject.keywords).to eq([{"subject_scheme"=>"Library of Congress", "scheme_uri"=>"http://id.loc.gov/authorities/subjects", "text"=>"Paleoecology"}])
     end
 
@@ -179,7 +179,7 @@ describe Bolognese::Metadata, vcr: true do
       input = "https://doi.org/10.15125/BATH-00114"
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
-      expect(subject.id).to eq("https://doi.org/10.15125/bath-00114")
+      expect(subject.identifier).to eq("https://doi.org/10.15125/bath-00114")
       expect(subject.type).to eq("Dataset")
       expect(subject.additional_type).to eq("Dataset")
       expect(subject.resource_type_general).to eq("Dataset")
@@ -199,7 +199,7 @@ describe Bolognese::Metadata, vcr: true do
       input = "https://doi.org/10.5438/6423"
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
-      expect(subject.id).to eq("https://doi.org/10.5438/6423")
+      expect(subject.identifier).to eq("https://doi.org/10.5438/6423")
       expect(subject.type).to eq("Collection")
       expect(subject.additional_type).to eq("Project")
       expect(subject.resource_type_general).to eq("Collection")
@@ -222,7 +222,7 @@ describe Bolognese::Metadata, vcr: true do
       input = fixture_path + "datacite.xml"
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
-      expect(subject.id).to eq("https://doi.org/10.5438/4k3m-nyvg")
+      expect(subject.identifier).to eq("https://doi.org/10.5438/4k3m-nyvg")
       expect(subject.type).to eq("ScholarlyArticle")
       expect(subject.additional_type).to eq("BlogPosting")
       expect(subject.resource_type_general).to eq("Text")
@@ -240,7 +240,7 @@ describe Bolognese::Metadata, vcr: true do
       input = fixture_path + "datacite-example-complicated-v4.1.xml"
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
-      expect(subject.id).to eq("https://doi.org/10.5072/testpub")
+      expect(subject.identifier).to eq("https://doi.org/10.5072/testpub")
       expect(subject.type).to eq("ScholarlyArticle")
       expect(subject.additional_type).to eq("Monograph")
       expect(subject.resource_type_general).to eq("Text")
@@ -259,7 +259,7 @@ describe Bolognese::Metadata, vcr: true do
       input = fixture_path + "datacite-example-complicated-v4.1.xml"
       subject = Bolognese::Metadata.new(input: input, doi: "10.5072/testpub2")
       expect(subject.valid?).to be true
-      expect(subject.id).to eq("https://doi.org/10.5072/testpub2")
+      expect(subject.identifier).to eq("https://doi.org/10.5072/testpub2")
       expect(subject.type).to eq("ScholarlyArticle")
       expect(subject.additional_type).to eq("Monograph")
       expect(subject.resource_type_general).to eq("Text")
@@ -278,7 +278,7 @@ describe Bolognese::Metadata, vcr: true do
       input = "https://doi.org/10.4232/1.2745"
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
-      expect(subject.id).to eq("https://doi.org/10.4232/1.2745")
+      expect(subject.identifier).to eq("https://doi.org/10.4232/1.2745")
       expect(subject.type).to eq("Dataset")
       expect(subject.resource_type_general).to eq("Dataset")
       expect(subject.author).to eq("name"=>"Europäische Kommission")
@@ -294,7 +294,7 @@ describe Bolognese::Metadata, vcr: true do
       input = "https://doi.org/10.18169/PAPDEOTTX00502"
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
-      expect(subject.id).to eq("https://doi.org/10.18169/papdeottx00502")
+      expect(subject.identifier).to eq("https://doi.org/10.18169/papdeottx00502")
       expect(subject.type).to eq("Dataset")
       expect(subject.additional_type).to eq("Disclosure")
       expect(subject.resource_type_general).to eq("Dataset")
@@ -310,7 +310,7 @@ describe Bolognese::Metadata, vcr: true do
       input = "https://doi.org/10.21944/temis-OZONE-MSR2"
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
-      expect(subject.id).to eq("https://doi.org/10.21944/temis-ozone-msr2")
+      expect(subject.identifier).to eq("https://doi.org/10.21944/temis-ozone-msr2")
       expect(subject.type).to eq("Dataset")
       expect(subject.additional_type).to eq("Satellite data")
       expect(subject.resource_type_general).to eq("Dataset")
@@ -340,7 +340,7 @@ describe Bolognese::Metadata, vcr: true do
       input = "https://doi.org/10.4124/05F6C379-DD68-4CDB-880D-33D3E9576D52/1"
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be false
-      expect(subject.id).to eq("https://doi.org/10.4124/05f6c379-dd68-4cdb-880d-33d3e9576d52/1")
+      expect(subject.identifier).to eq("https://doi.org/10.4124/05f6c379-dd68-4cdb-880d-33d3e9576d52/1")
       expect(subject.doi).to eq("10.4124/05f6c379-dd68-4cdb-880d-33d3e9576d52/1")
       expect(subject.service_provider).to eq("DataCite")
       expect(subject.state).to eq("not_found")
@@ -350,7 +350,7 @@ describe Bolognese::Metadata, vcr: true do
       input = "https://handle.test.datacite.org/10.22002/d1.694"
       subject = Bolognese::Metadata.new(input: input, sandbox: true)
       expect(subject.valid?).to be true
-      expect(subject.id).to eq("https://handle.test.datacite.org/10.22002/d1.694")
+      expect(subject.identifier).to eq("https://handle.test.datacite.org/10.22002/d1.694")
       expect(subject.type).to eq("Dataset")
       expect(subject.resource_type_general).to eq("Dataset")
       expect(subject.author).to eq("name"=>"Tester")
@@ -367,7 +367,7 @@ describe Bolognese::Metadata, vcr: true do
       input = "10.21956/gatesopenres.530.r190"
       subject = Bolognese::Metadata.new(input: input, sandbox: true)
       expect(subject.valid?).to be true
-      expect(subject.id).to eq("https://handle.test.datacite.org/10.21956/gatesopenres.530.r190")
+      expect(subject.identifier).to eq("https://handle.test.datacite.org/10.21956/gatesopenres.530.r190")
       expect(subject.type).to eq("ScholarlyArticle")
       expect(subject.resource_type_general).to eq("Text")
       expect(subject.author.length).to eq(5)
@@ -392,7 +392,7 @@ describe Bolognese::Metadata, vcr: true do
     it "change title" do
       subject.title = "A new malaria agent in African hominids."
       expect(subject.valid?).to be true
-      expect(subject.id).to eq("https://doi.org/10.5061/dryad.8515")
+      expect(subject.identifier).to eq("https://doi.org/10.5061/dryad.8515")
       expect(subject.doi).to eq("10.5061/dryad.8515")
       expect(subject.b_url).to eq("http://datadryad.org/resource/doi:10.5061/dryad.8515")
       expect(subject.type).to eq("Dataset")
@@ -402,7 +402,7 @@ describe Bolognese::Metadata, vcr: true do
     it "change state" do
       subject.state = "registered"
       expect(subject.valid?).to be true
-      expect(subject.id).to eq("https://doi.org/10.5061/dryad.8515")
+      expect(subject.identifier).to eq("https://doi.org/10.5061/dryad.8515")
       expect(subject.doi).to eq("10.5061/dryad.8515")
       expect(subject.b_url).to eq("http://datadryad.org/resource/doi:10.5061/dryad.8515")
       expect(subject.type).to eq("Dataset")
@@ -417,7 +417,7 @@ describe Bolognese::Metadata, vcr: true do
       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.identifier).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")

data/spec/readers/ris_reader_spec.rb

@@ -13,7 +13,7 @@ describe Bolognese::Metadata, vcr: true do
     it "string" do
       Bolognese::Metadata.new(input: IO.read(input).strip)
       expect(subject.valid?).to be true
-      expect(subject.id).to eq("https://doi.org/10.7554/elife.01567")
+      expect(subject.identifier).to eq("https://doi.org/10.7554/elife.01567")
     end
   end
 
@@ -26,7 +26,7 @@ describe Bolognese::Metadata, vcr: true do
   context "get ris metadata" do
     it "Crossref DOI" do
       expect(subject.valid?).to be true
-      expect(subject.id).to eq("https://doi.org/10.7554/elife.01567")
+      expect(subject.identifier).to eq("https://doi.org/10.7554/elife.01567")
       expect(subject.type).to eq("ScholarlyArticle")
       expect(subject.b_url).to eq("http://elifesciences.org/lookup/doi/10.7554/eLife.01567")
       expect(subject.resource_type_general).to eq("Text")

data/spec/readers/schema_org_reader_spec.rb

@@ -17,7 +17,7 @@ describe Bolognese::Metadata, vcr: true do
   context "get schema_org metadata" do
     it "BlogPosting" do
       expect(subject.valid?).to be true
-      expect(subject.id).to eq("https://doi.org/10.5438/4k3m-nyvg")
+      expect(subject.identifier).to eq("https://doi.org/10.5438/4k3m-nyvg")
       expect(subject.b_url).to eq("https://blog.datacite.org/eating-your-own-dog-food")
       expect(subject.type).to eq("BlogPosting")
       expect(subject.author).to eq("type"=>"Person", "id"=>"https://orcid.org/0000-0003-1419-2405", "name"=>"Martin Fenner", "givenName"=>"Martin", "familyName"=>"Fenner")
@@ -35,7 +35,7 @@ describe Bolognese::Metadata, vcr: true do
     it "BlogPosting with new DOI" do
       subject = Bolognese::Metadata.new(input: input, doi: "10.5438/0000-00ss")
       expect(subject.valid?).to be true
-      expect(subject.id).to eq("https://doi.org/10.5438/0000-00ss")
+      expect(subject.identifier).to eq("https://doi.org/10.5438/0000-00ss")
       expect(subject.doi).to eq("10.5438/0000-00ss")
       expect(subject.b_url).to eq("https://blog.datacite.org/eating-your-own-dog-food")
       expect(subject.type).to eq("BlogPosting")
@@ -46,7 +46,7 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input, from: "schema_org")
       expect(subject.errors.size).to eq(2)
       expect(subject.errors.first).to eq("43:0: ERROR: Element '{http://datacite.org/schema/kernel-4}publisher': [facet 'minLength'] The value has a length of '0'; this underruns the allowed minimum length of '1'.")
-      expect(subject.id).to eq("https://doi.org/10.5281/zenodo.1196821")
+      expect(subject.identifier).to eq("https://doi.org/10.5281/zenodo.1196821")
       expect(subject.doi).to eq("10.5281/zenodo.1196821")
       expect(subject.b_url).to eq("https://zenodo.org/record/1196821")
       expect(subject.type).to eq("Dataset")
@@ -59,7 +59,7 @@ describe Bolognese::Metadata, vcr: true do
       input = "https://doi.pangaea.de/10.1594/PANGAEA.836178"
       subject = Bolognese::Metadata.new(input: input, from: "schema_org")
       expect(subject.valid?).to be true
-      expect(subject.id).to eq("https://doi.org/10.1594/pangaea.836178")
+      expect(subject.identifier).to eq("https://doi.org/10.1594/pangaea.836178")
       expect(subject.doi).to eq("10.1594/pangaea.836178")
       expect(subject.b_url).to eq("https://doi.pangaea.de/10.1594/PANGAEA.836178")
       expect(subject.type).to eq("Dataset")
@@ -73,7 +73,7 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input, from: "schema_org")
       subject.id = "https://doi.org/10.3334/ornldaac/1418"
       expect(subject.valid?).to be true
-      expect(subject.id).to eq("https://doi.org/10.3334/ornldaac/1418")
+      expect(subject.identifier).to eq("https://doi.org/10.3334/ornldaac/1418")
       expect(subject.doi).to eq("10.3334/ornldaac/1418")
       expect(subject.b_url).to eq("https://doi.org/10.3334/ornldaac/1418")
       expect(subject.type).to eq("DataSet")
@@ -86,7 +86,7 @@ describe Bolognese::Metadata, vcr: true do
       input = "https://dataverse.harvard.edu/dataset.xhtml?persistentId=doi:10.7910/DVN/GAOC03"
       subject = Bolognese::Metadata.new(input: input, from: "schema_org")
       expect(subject.valid?).to be true
-      expect(subject.id).to eq("https://doi.org/10.7910/dvn/gaoc03")
+      expect(subject.identifier).to eq("https://doi.org/10.7910/dvn/gaoc03")
       expect(subject.doi).to eq("10.7910/dvn/gaoc03")
       expect(subject.type).to eq("Dataset")
       expect(subject.title).to eq("The National Labor Force : SAKERNAS, 2008")
@@ -100,7 +100,7 @@ describe Bolognese::Metadata, vcr: true do
       input = fixture_path + 'schema_org.json'
       subject = Bolognese::Metadata.new(input: input)
 
-      expect(subject.id).to eq("https://doi.org/10.5438/4k3m-nyvg")
+      expect(subject.identifier).to eq("https://doi.org/10.5438/4k3m-nyvg")
       expect(subject.b_url).to eq("https://blog.datacite.org/eating-your-own-dog-food")
       expect(subject.type).to eq("BlogPosting")
       expect(subject.author).to eq("type"=>"Person", "id"=>"http://orcid.org/0000-0003-1419-2405", "name"=>"Martin Fenner", "givenName"=>"Martin", "familyName"=>"Fenner")

data/spec/writers/datacite_writer_spec.rb

@@ -98,7 +98,7 @@ describe Bolognese::Metadata, vcr: true do
       input = "https://doi.org/10.23640/07243.5153971"
       subject = Bolognese::Metadata.new(input: input, from: "datacite")
       expect(subject.valid?).to be true
-      expect(subject.id).to eq("https://doi.org/10.23640/07243.5153971")
+      expect(subject.identifier).to eq("https://doi.org/10.23640/07243.5153971")
       expect(subject.type).to eq("ScholarlyArticle")
       expect(subject.additional_type).to eq("Paper")
       expect(subject.resource_type_general).to eq("Text")
@@ -117,7 +117,7 @@ describe Bolognese::Metadata, vcr: true do
       input = "https://doi.org/10.23640/07243.5153971"
       subject = Bolognese::Metadata.new(input: input, from: "datacite", doi: "10.5072/07243.5153971")
       expect(subject.valid?).to be true
-      expect(subject.id).to eq("https://doi.org/10.5072/07243.5153971")
+      expect(subject.identifier).to eq("https://doi.org/10.5072/07243.5153971")
       expect(subject.type).to eq("ScholarlyArticle")
       expect(subject.additional_type).to eq("Paper")
       expect(subject.resource_type_general).to eq("Text")
@@ -136,7 +136,7 @@ describe Bolognese::Metadata, vcr: true do
       input = "https://doi.org/10.5061/DRYAD.8515"
       subject = Bolognese::Metadata.new(input: input, from: "datacite", regenerate: true)
       expect(subject.valid?).to be true
-      expect(subject.id).to eq("https://doi.org/10.5061/dryad.8515")
+      expect(subject.identifier).to eq("https://doi.org/10.5061/dryad.8515")
       expect(subject.type).to eq("Dataset")
       expect(subject.additional_type).to eq("DataPackage")
       expect(subject.resource_type_general).to eq("Dataset")
@@ -171,7 +171,7 @@ describe Bolognese::Metadata, vcr: true do
       input = "https://doi.org/10.4124/05F6C379-DD68-4CDB-880D-33D3E9576D52/1"
       subject = Bolognese::Metadata.new(input: input, from: "datacite")
       expect(subject.valid?).to be false
-      expect(subject.id).to eq("https://doi.org/10.4124/05f6c379-dd68-4cdb-880d-33d3e9576d52/1")
+      expect(subject.identifier).to eq("https://doi.org/10.4124/05f6c379-dd68-4cdb-880d-33d3e9576d52/1")
       expect(subject.doi).to eq("10.4124/05f6c379-dd68-4cdb-880d-33d3e9576d52/1")
       expect(subject.service_provider).to eq("DataCite")
       expect(subject.state).to eq("not_found")

metadata

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