bolognese 0.9.89 → 0.9.91

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c65e0d018f38032f50e090618a92ff8a72d08c30b674e716652c8c1b5f813bb
-  data.tar.gz: 465e6671b6324e7c6d78d5218acd6572ea3ec5e3e694e7bfea065239dfea7c82
+  metadata.gz: 42571f806fa0ddb4fa5e9fc9bd69acd8ad632cf935e4632521b4a42bc0151a93
+  data.tar.gz: f79d228d759b0b9f0ae68755311490e8f80bddcc9b0ad00333317496ae5ef029
 SHA512:
-  metadata.gz: 1350a292f8d26c5a5872c370828eb34de5192def69abbc1a1c03fcc78f48ebe66db1d2888e20b68418ceac63483c0b28351c6c5db02fadaa3b6d66b31823766e
-  data.tar.gz: 0aeda7e14667ad79de35b85cc0997c7b04b828bb2b1e3dfe72b81f5520f2efc653845bd873d203a5473409d81befaa78ff9459e24e8f8c17448c2f73864bdcaa
+  metadata.gz: 44eea3f6e8013da74b50dd291c74d8a9add5450f5759adab0ed0e057a007515a36fd4a34f091f4fbb75c105b5103f6deb150a46857d65b74074b1c9fe9024541
+  data.tar.gz: 89cc85c5a62e5ad783b805b312b4574ce2aa55c0a41b22d3070130b213a20914105e8e3992cdc202287b4d47028b603f2b77336f27f67ba10505996d0f435072

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bolognese (0.9.89)
+    bolognese (0.9.91)
       activesupport (>= 4.2.5, < 6)
       benchmark_methods (~> 0.7)
       bibtex-ruby (~> 4.1)
@@ -47,7 +47,7 @@ GEM
     ebnf (1.1.2)
       rdf (>= 2.2, < 4.0)
       sxp (~> 1.0)
-    excon (0.60.0)
+    excon (0.61.0)
     faraday (0.14.0)
       multipart-post (>= 1.2, < 3)
     faraday-encoding (0.0.4)
@@ -78,7 +78,7 @@ GEM
     loofah (2.2.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    maremma (4.0.2)
+    maremma (4.0.5)
       activesupport (>= 4.2.5, < 6)
       addressable (>= 2.3.6)
       builder (~> 3.2, >= 3.2.2)

data/lib/bolognese/metadata.rb

@@ -65,7 +65,7 @@ module Bolognese
       :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,
-      :volume, :issue, :first_page, :last_page, :url, :version, :keywords, :editor,
+      :volume, :issue, :first_page, :last_page, :b_url, :b_version, :keywords, :editor,
       :description, :alternate_name, :language, :content_size, :spatial_coverage,
       :schema_version, :additional_type, :has_part, :same_as,
       :is_previous_version_of, :is_new_version_of, :is_cited_by, :cites,
@@ -99,7 +99,7 @@ module Bolognese
           exit 1
         end
       else
-        hsh = { "url" => options[:url],
+        hsh = { "b_url" => options[:b_url],
                 "state" => options[:state],
                 "date_registered" => options[:date_registered],
                 "date_updated" => options[:date_updated],
@@ -113,7 +113,7 @@ module Bolognese
       string = string.force_encoding("UTF-8") if string.present?
 
       # generate name for method to call dynamically
-      @metadata = @from.present? ? send("read_" + @from, string: string, id: id, sandbox: options[:sandbox], doi: options[:doi], url: options[:url]) : {}
+      @metadata = @from.present? ? send("read_" + @from, string: string, id: id, sandbox: options[:sandbox], doi: options[:doi], b_url: options[:b_url]) : {}
       @raw = string.present? ? string.strip : nil
 
       # input specific metadata elements required for DataCite
@@ -139,7 +139,7 @@ module Bolognese
 
       @should_passthru = (@from == "datacite") && !regenerate
 
-      @url = hsh.to_h["url"].presence
+      @b_url = hsh.to_h["b_url"].presence
       @state = hsh.to_h["state"].presence
       @date_registered = hsh.to_h["date_registered"].presence
       @date_updated = hsh.to_h["date_updated"].presence
@@ -197,8 +197,8 @@ module Bolognese
       @doi ||= @id.present? ? doi_from_url(@id) : metadata.fetch("doi", nil)
     end
 
-    def url
-      @url ||= metadata.fetch("url", nil)
+    def b_url
+      @b_url ||= metadata.fetch("b_url", nil)
     end
 
     def identifier
@@ -297,8 +297,8 @@ module Bolognese
       @license ||= metadata.fetch("license", nil)
     end
 
-    def version
-      @version ||= metadata.fetch("version", nil)
+    def b_version
+      @b_version ||= metadata.fetch("b_version", nil)
     end
 
     def keywords

data/lib/bolognese/readers/bibtex_reader.rb

@@ -52,7 +52,7 @@ module Bolognese
           "ris_type" => BIB_TO_RIS_TRANSLATIONS[meta.type.to_s] || "GEN",
           "resource_type_general" => Metadata::SO_TO_DC_TRANSLATIONS[type],
           "doi" => doi,
-          "url" => meta.url.to_s,
+          "b_url" => meta.url.to_s,
           "title" => meta.title.to_s,
           "author" => author,
           "publisher" => meta.publisher.to_s.presence,

data/lib/bolognese/readers/citeproc_reader.rb

@@ -56,7 +56,7 @@ module Bolognese
           "ris_type" => CP_TO_RIS_TRANSLATIONS[type] || "GEN",
           "resource_type_general" => Bolognese::Utils::SO_TO_DC_TRANSLATIONS[type],
           "doi" => doi_from_url(doi),
-          "url" => normalize_id(meta.fetch("URL", nil)),
+          "b_url" => normalize_id(meta.fetch("URL", nil)),
           "title" => meta.fetch("title", nil),
           "author" => author,
           "container_title" => container_title,
@@ -67,7 +67,7 @@ module Bolognese
           #{}"pagination" => meta.pages.to_s.presence,
           "description" => meta.fetch("abstract", nil).present? ? { "text" => sanitize(meta.fetch("abstract")) } : nil,
           #{ }"license" => { "id" => meta.field?(:copyright) && meta.copyright.to_s.presence },
-          "version" => meta.fetch("version", nil),
+          "b_version" => meta.fetch("version", nil),
           "keywords" => meta.fetch("categories", nil),
           "state" => state
         }

data/lib/bolognese/readers/codemeta_reader.rb

@@ -35,7 +35,7 @@ module Bolognese
           "resource_type_general" => Bolognese::Utils::SO_TO_DC_TRANSLATIONS[type],
           "identifier" => identifier,
           "doi" => validate_doi(id),
-          "url" => normalize_id(meta.fetch("codeRepository", nil)),
+          "b_url" => normalize_id(meta.fetch("codeRepository", nil)),
           "title" => meta.fetch("title", nil),
           "alternate_name" => meta.fetch("alternateName", nil),
           "author" => author,
@@ -47,7 +47,7 @@ module Bolognese
           "date_modified" => meta.fetch("dateModified", nil),
           "description" => meta.fetch("description", nil).present? ? { "text" => sanitize(meta.fetch("description")) } : nil,
           "license" => { "id" => meta.fetch("license", nil) },
-          "version" => meta.fetch("version", nil),
+          "b_version" => meta.fetch("version", nil),
           "keywords" => meta.fetch("tags", nil),
           "state" => state
         }

data/lib/bolognese/readers/crossref_reader.rb

@@ -144,7 +144,7 @@ module Bolognese
           "ris_type" => Bolognese::Utils::CR_TO_RIS_TRANSLATIONS[additional_type] || "JOUR",
           "resource_type_general" => Bolognese::Utils::SO_TO_DC_TRANSLATIONS[type],
           "doi" => doi,
-          "url" => bibliographic_metadata.dig("doi_data", "resource"),
+          "b_url" => bibliographic_metadata.dig("doi_data", "resource"),
           "title" => parse_attributes(bibliographic_metadata.dig("titles", "title")),
           "alternate_name" => crossref_alternate_name(bibliographic_metadata),
           "author" => crossref_people(bibliographic_metadata, "author"),
@@ -162,7 +162,7 @@ module Bolognese
           "last_page" => bibliographic_metadata.dig("pages", "last_page"),
           "description" => crossref_description(bibliographic_metadata),
           "license" => crossref_license(program_metadata),
-          "version" => nil,
+          "b_version" => nil,
           "keywords" => nil,
           "language" => nil,
           "content_size" => nil,

data/lib/bolognese/readers/datacite_json_reader.rb

@@ -19,7 +19,7 @@ module Bolognese
           "ris_type" => Bolognese::Utils::SO_TO_RIS_TRANSLATIONS[resource_type_general.to_s.dasherize] || "GEN",
           "resource_type_general" => resource_type_general,
           "doi" => validate_doi(meta.fetch("doi", nil)),
-          "url" => normalize_id(meta.fetch("url", nil)),
+          "b_url" => normalize_id(meta.fetch("url", nil)),
           "title" => meta.fetch("title", nil),
           "alternate_name" => meta.fetch("alternate-identifier", nil),
           "author" => meta.fetch("creator", nil),
@@ -41,7 +41,7 @@ module Bolognese
           "date_modified" => meta.fetch("date-modified", nil),
           "description" => meta.fetch("description", nil),
           "license" => meta.fetch("license", nil),
-          "version" => meta.fetch("version", nil),
+          "b_version" => meta.fetch("version", nil),
           "keywords" => meta.fetch("subject", nil),
           "language" => meta.fetch("language", nil),
           "content_size" => meta.fetch("size", nil),

data/lib/bolognese/readers/datacite_reader.rb

@@ -33,7 +33,7 @@ module Bolognese
         end
 
         { "string" => string,
-          "url" => attributes.fetch("url", nil),
+          "b_url" => attributes.fetch("url", nil),
           "state" => attributes.fetch("state", nil),
           "date_registered" => attributes.fetch("registered", nil),
           "date_updated" => attributes.fetch("updated", nil),
@@ -127,7 +127,7 @@ module Bolognese
           "date_modified" => datacite_date(dates, "Updated"),
           "description" => description,
           "license" => license,
-          "version" => meta.fetch("version", nil),
+          "b_version" => meta.fetch("version", nil),
           "keywords" => keywords,
           "language" => meta.fetch("language", nil),
           "content_size" => meta.fetch("size", nil),

data/lib/bolognese/readers/ris_reader.rb

@@ -54,7 +54,7 @@ module Bolognese
           "ris_type" => ris_type,
           "resource_type_general" => Metadata::SO_TO_DC_TRANSLATIONS[type],
           "doi" => doi,
-          "url" => meta.fetch("UR", nil),
+          "b_url" => meta.fetch("UR", nil),
           "title" => meta.fetch("T1", nil),
           "alternate_name" => meta.fetch("AN", nil),
           "author" => get_authors(author),

data/lib/bolognese/readers/schema_org_reader.rb

@@ -51,7 +51,7 @@ module Bolognese
           "ris_type" => Bolognese::Utils::SO_TO_RIS_TRANSLATIONS[resource_type_general.to_s.dasherize] || "GEN",
           "resource_type_general" => resource_type_general,
           "doi" => validate_doi(id),
-          "url" => normalize_id(meta.fetch("url", nil)),
+          "b_url" => normalize_id(meta.fetch("url", nil)),
           "title" => meta.fetch("name", nil),
           "alternate_name" => meta.fetch("alternateName", nil),
           "author" => author,
@@ -69,7 +69,7 @@ module Bolognese
           "date_modified" => meta.fetch("dateModified", nil),
           "description" => meta.fetch("description", nil).present? ? { "text" => sanitize(meta.fetch("description")) } : nil,
           "license" => { "id" => meta.fetch("license", nil) },
-          "version" => meta.fetch("version", nil),
+          "b_version" => meta.fetch("version", nil),
           "keywords" => meta.fetch("keywords", nil).to_s.split(", "),
           "state" => state
         }

data/lib/bolognese/version.rb

@@ -1,3 +1,3 @@
 module Bolognese
-  VERSION = "0.9.89"
+  VERSION = "0.9.91"
 end

data/lib/bolognese/writers/bibtex_writer.rb

@@ -8,7 +8,7 @@ module Bolognese
           bibtex_type: bibtex_type.presence || "misc",
           bibtex_key: identifier,
           doi: doi,
-          url: url,
+          url: b_url,
           author: authors_as_string(author),
           keywords: Array.wrap(parse_attributes(keywords, content: "text")).join(", "),
           language: language,

data/lib/bolognese/writers/citeproc_writer.rb

@@ -18,8 +18,8 @@ module Bolognese
           "page" => [first_page, last_page].compact.join("-").presence,
           "publisher" => publisher,
           "title" => parse_attributes(title, content: "text", first: true),
-          "URL" => url,
-          "version" => version,
+          "URL" => b_url,
+          "version" => b_version,
           "volume" => volume
         }.compact
         JSON.pretty_generate hsh.presence

data/lib/bolognese/writers/codemeta_writer.rb

@@ -9,11 +9,11 @@ module Bolognese
           "@type" => type,
           "@id" => identifier,
           "identifier" => identifier,
-          "codeRepository" => url,
+          "codeRepository" => b_url,
           "title" => title,
           "agents" => author,
           "description" => description.present? ? description["text"] : nil,
-          "version" => version,
+          "version" => b_version,
           "tags" => keywords.to_s.split(", ").presence,
           "dateCreated" => date_created,
           "datePublished" => date_published,

data/lib/bolognese/writers/crosscite_writer.rb

@@ -5,7 +5,7 @@ module Bolognese
         hsh = {
           "id" => identifier,
           "doi" => doi,
-          "url" => url,
+          "url" => b_url,
           "type" => type,
           "additional_type" => additional_type,
           "citeproc_type" => citeproc_type,
@@ -32,7 +32,7 @@ module Bolognese
           "language" => language,
           "alternate_name" => alternate_name,
           "content_size" => content_size,
-          "version" => version,
+          "version" => b_version,
           "license" => license,
           "description" => description,
           "volume" => volume,

data/lib/bolognese/writers/datacite_json_writer.rb

@@ -5,7 +5,7 @@ module Bolognese
         hsh = {
           "id" => identifier,
           "doi" => doi,
-          "url" => url,
+          "url" => b_url,
           "creator" => author,
           "title" => title,
           "publisher" => publisher,
@@ -32,7 +32,7 @@ module Bolognese
           "is_part_of" => is_part_of,
           "has_part" => has_part,
           "size" => content_size,
-          "version" => version,
+          "version" => b_version,
           "rights" => license,
           "description" => description,
           "geo-location" => spatial_coverage,

data/lib/bolognese/writers/jats_writer.rb

@@ -20,7 +20,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 b_version.present?
         insert_pub_id(xml)
       end
 
@@ -110,7 +110,7 @@ module Bolognese
       end
 
       def insert_version(xml)
-        xml.version(version)
+        xml.version(b_version)
       end
 
       def insert_pub_id(xml)

data/lib/bolognese/writers/ris_writer.rb

@@ -8,7 +8,7 @@ module Bolognese
           "T2" => container_title,
           "AU" => to_ris(author),
           "DO" => doi,
-          "UR" => url,
+          "UR" => b_url,
           "AB" => parse_attributes(description, content: "text", first: true),
           "KW" => parse_attributes(keywords, content: "text").presence,
           "PY" => publication_year,

data/lib/bolognese/writers/schema_org_writer.rb

@@ -6,7 +6,7 @@ module Bolognese
           "@type" => type,
           "@id" => identifier,
           "identifier" => identifier,
-          "url" => url,
+          "url" => b_url,
           "additionalType" => additional_type,
           "name" => parse_attributes(title, content: "text", first: true),
           "alternateName" => parse_attributes(alternate_name, content: "name", first: true),
@@ -14,7 +14,7 @@ module Bolognese
           "editor" => to_schema_org(editor),
           "description" => parse_attributes(description, content: "text", first: true),
           "license" => Array.wrap(license).map { |l| l["id"] }.compact.unwrap,
-          "version" => version,
+          "version" => b_version,
           "keywords" => Array.wrap(keywords).join(", ").presence,
           "inLanguage" => language,
           "contentSize" => content_size,

data/spec/readers/bibtex_reader_spec.rb

@@ -28,7 +28,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.valid?).to be true
       expect(subject.id).to eq("https://doi.org/10.7554/elife.01567")
       expect(subject.type).to eq("ScholarlyArticle")
-      expect(subject.url).to eq("http://elifesciences.org/lookup/doi/10.7554/eLife.01567")
+      expect(subject.b_url).to eq("http://elifesciences.org/lookup/doi/10.7554/eLife.01567")
       expect(subject.resource_type_general).to eq("Text")
       expect(subject.author.length).to eq(5)
       expect(subject.author.first).to eq("type"=>"Person", "name"=>"Martial Sankar", "givenName"=>"Martial", "familyName"=>"Sankar")

data/spec/readers/citeproc_reader_spec.rb

@@ -15,7 +15,7 @@ describe Bolognese::Metadata, vcr: true do
     it "BlogPosting" do
       expect(subject.valid?).to be true
       expect(subject.id).to eq("https://doi.org/10.5438/4k3m-nyvg")
-      expect(subject.url).to eq("https://blog.datacite.org/eating-your-own-dog-food")
+      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")
       expect(subject.author).to eq("type"=>"Person", "name"=>"Martin Fenner", "givenName"=>"Martin", "familyName"=>"Fenner")

data/spec/readers/codemeta_reader_spec.rb

@@ -17,7 +17,7 @@ describe Bolognese::Metadata, vcr: true do
     it "maremma" do
       expect(subject.valid?).to be true
       expect(subject.id).to eq("https://doi.org/10.5438/qeg0-3gm3")
-      expect(subject.url).to eq("https://github.com/datacite/maremma")
+      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")
       expect(subject.title).to eq("Maremma: a Ruby library for simplified network calls")
@@ -49,7 +49,7 @@ describe Bolognese::Metadata, vcr: true 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.url).to eq("https://github.com/DataONEorg/rdataone")
+      expect(subject.b_url).to eq("https://github.com/DataONEorg/rdataone")
       expect(subject.type).to eq("SoftwareSourceCode")
       expect(subject.author).to eq( [{"type"=>"Person",
                                       "id"=>"http://orcid.org/0000-0003-0077-4738",
@@ -65,7 +65,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.title).to eq("R Interface to the DataONE REST API")
       expect(subject.description["text"]).to start_with("Provides read and write access to data and metadata")
       expect(subject.keywords).to eq(["data sharing", "data repository", "DataONE"])
-      expect(subject.version).to eq("2.0.0")
+      expect(subject.b_version).to eq("2.0.0")
       expect(subject.date_created).to eq("2016-05-27")
       expect(subject.date_published).to eq("2016-05-27")
       expect(subject.date_modified).to eq("2016-05-27")
@@ -77,7 +77,7 @@ describe Bolognese::Metadata, vcr: true do
       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.url).to eq("https://github.com/datacite/maremma")
+      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")
       expect(subject.title).to eq("Maremma: a Ruby library for simplified network calls")

data/spec/readers/crossref_reader_spec.rb

@@ -18,7 +18,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.valid?).to be true
       expect(subject.id).to eq("https://doi.org/10.7554/elife.01567")
       expect(subject.type).to eq("ScholarlyArticle")
-      expect(subject.url).to eq("https://elifesciences.org/articles/01567")
+      expect(subject.b_url).to eq("https://elifesciences.org/articles/01567")
       expect(subject.additional_type).to eq("JournalArticle")
       expect(subject.resource_type_general).to eq("Text")
       expect(subject.author.length).to eq(5)
@@ -50,7 +50,7 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
       expect(subject.id).to eq(input)
-      expect(subject.url).to eq("http://dx.plos.org/10.1371/journal.pone.0000030")
+      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")
       expect(subject.resource_type_general).to eq("Text")
@@ -73,7 +73,7 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
       expect(subject.id).to eq(input)
-      expect(subject.url).to eq("http://biorxiv.org/lookup/doi/10.1101/097196")
+      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")
       expect(subject.resource_type_general).to eq("Text")
@@ -94,7 +94,7 @@ describe Bolognese::Metadata, vcr: true do
       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.url).to eq("http://doi.wiley.com/10.1890/0012-9658(2006)87[2832:TIOPMA]2.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")
       expect(subject.resource_type_general).to eq("Text")
@@ -115,7 +115,7 @@ describe Bolognese::Metadata, vcr: true do
       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.url).to eq("http://www.hindawi.com/journals/pm/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")
       expect(subject.resource_type_general).to eq("Text")
@@ -137,7 +137,7 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
       expect(subject.id).to eq(input)
-      expect(subject.url).to eq("http://linkinghub.elsevier.com/retrieve/pii/S0014299915002332")
+      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")
       expect(subject.resource_type_general).to eq("Text")
@@ -156,7 +156,7 @@ describe Bolognese::Metadata, vcr: true do
       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.url).to eq("ftp://ftp.wwpdb.org/pub/pdb/data/structures/divided/pdb/hh/pdb4hhb.ent.gz")
+      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")
       expect(subject.resource_type_general).to eq("Text")
@@ -176,7 +176,7 @@ describe Bolognese::Metadata, vcr: true do
       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.url).to eq("http://link.springer.com/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")
       expect(subject.resource_type_general).to eq("Text")
@@ -194,7 +194,7 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input)
       expect(subject.valid?).to be true
       expect(subject.id).to eq(input)
-      expect(subject.url).to eq("http://doi.wiley.com/10.1111/nph.14619")
+      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")
       expect(subject.resource_type_general).to eq("Text")

data/spec/readers/datacite_reader_spec.rb

@@ -17,7 +17,7 @@ describe Bolognese::Metadata, vcr: true do
     it "Dataset" do
       expect(subject.valid?).to be true
       expect(subject.id).to eq("https://doi.org/10.5061/dryad.8515")
-      expect(subject.url).to eq("http://datadryad.org/resource/doi: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")
       expect(subject.resource_type_general).to eq("Dataset")
@@ -313,7 +313,7 @@ describe Bolognese::Metadata, vcr: true do
                                      "givenName"=>"Henk",
                                      "familyName"=>"Eskes"}])
       expect(subject.title).to eq("Multi-Sensor Reanalysis (MSR) of total ozone, version 2")
-      expect(subject.version).to eq("2")
+      expect(subject.b_version).to eq("2")
       expect(subject.date_published).to eq("2015")
       expect(subject.publisher).to eq("Royal Netherlands Meteorological Institute (KNMI)")
       expect(subject.service_provider).to eq("DataCite")
@@ -378,7 +378,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.valid?).to be true
       expect(subject.id).to eq("https://doi.org/10.5061/8515")
       expect(subject.doi).to eq("10.5061/8515")
-      expect(subject.url).to eq("http://datadryad.org/resource/doi: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")
     end
 
@@ -387,7 +387,7 @@ describe Bolognese::Metadata, vcr: true do
       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.url).to eq("http://datadryad.org/resource/doi: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.title).to eq("A new malaria agent in African hominids.")
     end
@@ -397,7 +397,7 @@ describe Bolognese::Metadata, vcr: true do
       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.url).to eq("http://datadryad.org/resource/doi: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.title).to eq("Data from: A new malaria agent in African hominids.")
       expect(subject.state).to eq("registered")

data/spec/readers/ris_reader_spec.rb

@@ -28,7 +28,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.valid?).to be true
       expect(subject.id).to eq("https://doi.org/10.7554/elife.01567")
       expect(subject.type).to eq("ScholarlyArticle")
-      expect(subject.url).to eq("http://elifesciences.org/lookup/doi/10.7554/eLife.01567")
+      expect(subject.b_url).to eq("http://elifesciences.org/lookup/doi/10.7554/eLife.01567")
       expect(subject.resource_type_general).to eq("Text")
       expect(subject.author.length).to eq(5)
       expect(subject.author.first).to eq("type"=>"Person",

data/spec/readers/schema_org_reader_spec.rb

@@ -18,7 +18,7 @@ describe Bolognese::Metadata, vcr: true do
     it "BlogPosting" do
       expect(subject.valid?).to be true
       expect(subject.id).to eq("https://doi.org/10.5438/4k3m-nyvg")
-      expect(subject.url).to eq("https://blog.datacite.org/eating-your-own-dog-food")
+      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")
       expect(subject.title).to eq("Eating your own Dog Food")
@@ -38,7 +38,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.valid?).to be true
       expect(subject.id).to eq("https://doi.org/10.5438/0000-00ss")
       expect(subject.doi).to eq("10.5438/0000-00ss")
-      expect(subject.url).to eq("https://blog.datacite.org/eating-your-own-dog-food")
+      expect(subject.b_url).to eq("https://blog.datacite.org/eating-your-own-dog-food")
       expect(subject.type).to eq("BlogPosting")
     end
 
@@ -57,7 +57,7 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input)
 
       expect(subject.id).to eq("https://doi.org/10.5438/4k3m-nyvg")
-      expect(subject.url).to eq("https://blog.datacite.org/eating-your-own-dog-food")
+      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")
       expect(subject.title).to eq("Eating your own Dog Food")

metadata

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