bolognese 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 101b83ceef5cc504cac6e51becd5840d9c27e78a7247033d61183ce7958d5e08
-  data.tar.gz: 9409014f1925750a0795f8cc90607b8fdef63a23d9a8b4ce23fd7c16c7ea19a3
+  metadata.gz: ba8f7ba69c381c964db85cd05abe07d5a1cbd75eb183a3b620bc374430b7dd5b
+  data.tar.gz: 97d81da9e70f8942c66d577ab47e77f310244c37a7cccffa961bb1aefb46b974
 SHA512:
-  metadata.gz: b88362a0aa9c1661fcef16b3886964ec4c214a468310f8df40e9ae50be18657a4f7aae999674a1c3109d65f9f503c3f3830bc5c77597817d0a57d0cec73f45c3
-  data.tar.gz: 250e6261325c0b745d783b865d53d7b9c9d0726fec30b5cc02afeaa1961453f8d5f3afcf1ace249f26b60d9eb1f40d20e041fb10d9fbbbacbdf806012090f81e
+  metadata.gz: d0ae170b389bc7a005935f3da908c4a1754674462011eff2e425b796641a5c5f675e6dff6d2bf4de4354cb452309fc467bdb8064a626391e050d736ea035d0f4
+  data.tar.gz: 51bb1e44e863de1670cd31ebcdb53cd6193f925d83d8d4a675dece1d0246fe88cb54ae829098e6f9b71af291753a4810d772fb10af0a1269f4c46d61659d4592

data/Gemfile.lock

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

data/lib/bolognese/readers/datacite_reader.rb

@@ -117,8 +117,8 @@ module Bolognese
           }
         end
         dates << { "date" => meta.fetch("publicationYear", nil), "date_type" => "Issued" } if meta.fetch("publicationYear", nil).present? && get_date(dates, "Issued").blank?
-        sizes = Array.wrap(meta.dig("sizes", "size")).unwrap
-        formats = Array.wrap(meta.dig("formats", "format")).unwrap
+        sizes = Array.wrap(meta.dig("sizes", "size"))
+        formats = Array.wrap(meta.dig("formats", "format"))
         funding_references = Array.wrap(meta.dig("fundingReferences", "fundingReference")).compact.map do |fr|
           {
             "funder_name" => fr["funderName"],

data/lib/bolognese/readers/schema_org_reader.rb

@@ -131,9 +131,9 @@ module Bolognese
           "identifier" => identifier,
           "alternate_identifiers" => alternate_identifiers,
           "url" => normalize_id(meta.fetch("url", nil)),
-          "content_url" => Array.wrap(meta.fetch("contentUrl", nil)).unwrap,
-          "size" => meta.fetch("contenSize", nil),
-          "formats" => Array.wrap(meta.fetch("encodingFormat", nil) || meta.fetch("fileFormat", nil)).unwrap,
+          "content_url" => Array.wrap(meta.fetch("contentUrl", nil)),
+          "size" => Array.wrap(meta.fetch("contenSize", nil)).presence,
+          "formats" => Array.wrap(meta.fetch("encodingFormat", nil) || meta.fetch("fileFormat", nil)),
           "title" => meta.fetch("name", nil).present? ? [{ "text" => meta.fetch("name", nil) }] : nil,
           "creator" => author,
           "contributor" => contributor,

data/lib/bolognese/version.rb

@@ -1,3 +1,3 @@
 module Bolognese
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
 end

data/lib/bolognese/writers/schema_org_writer.rb

@@ -18,8 +18,8 @@ module Bolognese
           "version" => version,
           "keywords" => keywords.present? ? Array.wrap(keywords).map { |k| parse_attributes(k, content: "text", first: true) }.join(", ") : nil,
           "inLanguage" => language,
-          "contentSize" => size,
-          "encodingFormat" => formats,
+          "contentSize" => Array.wrap(size).unwrap,
+          "encodingFormat" => Array.wrap(formats).unwrap,
           "dateCreated" => get_date(dates, "Created"),
           "datePublished" => get_date(dates, "Issued"),
           "dateModified" => get_date(dates, "Updated"),
@@ -33,7 +33,7 @@ module Bolognese
           "successor_of" => to_schema_org_relation(related_identifiers: related_identifiers, relation_type: "IsNewVersionOf"),
           "citation" => to_schema_org_relation(related_identifiers: related_identifiers, relation_type: "References"),
           "@reverse" => reverse.presence,
-          "contentUrl" => content_url,
+          "contentUrl" => Array.wrap(content_url).unwrap,
           "schemaVersion" => schema_version,
           "periodical" => (types["type"] != "Dataset") && periodical ? to_schema_org(periodical) : nil,
           "includedInDataCatalog" => (types["type"] == "Dataset") && periodical ? to_schema_org(periodical) : nil,

data/spec/readers/datacite_reader_spec.rb

@@ -446,8 +446,8 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.alternate_identifiers).to eq("type"=>"ISBN", "name"=>"937-0-4523-12357-6")
       expect(subject.dates).to eq([{"date"=>"2012-12-13", "date_type"=>"Other"}, {"date"=>"2010", "date_type"=>"Issued"}])
       expect(subject.publication_year).to eq("2010")
-      expect(subject.size).to eq("256 pages")
-      expect(subject.formats).to eq("pdf")
+      expect(subject.size).to eq(["256 pages"])
+      expect(subject.formats).to eq(["pdf"])
       expect(subject.content_url).to eq("https://example.org/report.pdf")
       expect(subject.publication_year).to eq("2010")
       expect(subject.related_identifiers.length).to eq(1)
@@ -746,8 +746,8 @@ describe Bolognese::Metadata, vcr: true do
     expect(subject.publication_year).to eq("2017")
     expect(subject.related_identifiers.length).to eq(4)
     expect(subject.related_identifiers.last).to eq("id"=>"https://www.ebi.ac.uk/miriam/main/datatypes/MIR:00000663", "related_identifier_type"=>"URL", "relation_type"=>"IsPartOf")
-    expect(subject.formats).to eq("application/tar")
-    expect(subject.size).to eq("15.7M")
+    expect(subject.formats).to eq(["application/tar"])
+    expect(subject.size).to eq(["15.7M"])
     expect(subject.periodical).to eq("id"=>"https://www.ebi.ac.uk/miriam/main/datatypes/MIR:00000663", "title"=>"GTEx", "type"=>"DataCatalog")
     expect(subject.publisher).to eq("GTEx")
     expect(subject.funding_references.count).to eq(7)

data/spec/readers/schema_org_reader_spec.rb

@@ -137,7 +137,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.identifier).to eq("https://doi.org/10.25491/d50j-3083")
       expect(subject.alternate_identifiers).to eq("name"=>"687610993", "type"=>"md5")
       expect(subject.url).to eq("https://ors.datacite.org/doi:/10.25491/d50j-3083")
-      expect(subject.content_url).to eq("https://storage.googleapis.com/gtex_analysis_v7/single_tissue_eqtl_data/GTEx_Analysis_v7_eQTL_expression_matrices.tar.gz")
+      expect(subject.content_url).to eq(["https://storage.googleapis.com/gtex_analysis_v7/single_tissue_eqtl_data/GTEx_Analysis_v7_eQTL_expression_matrices.tar.gz"])
       expect(subject.types).to eq("bibtex"=>"misc", "citeproc"=>"dataset", "resource_type"=>"Gene expression matrices", "resource_type_general"=>"Dataset", "ris"=>"DATA", "type"=>"Dataset")
       expect(subject.creator).to eq("name"=>"The GTEx Consortium", "type"=>"Organization")
       expect(subject.title).to eq([{"text"=>"Fully processed, filtered and normalized gene expression matrices (in BED format) for each tissue, which were used as input into FastQTL for eQTL discovery"}])

data/spec/writers/schema_org_writer_spec.rb

@@ -155,7 +155,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(json["author"]).to eq("@type"=>"Organization", "name"=>"The GTEx Consortium")
       expect(json["includedInDataCatalog"]).to eq("@type"=>"DataCatalog", "name"=>"GTEx")
       expect(json["identifier"]).to eq([{"@type"=>"PropertyValue", "propertyID"=>"doi", "value"=>"https://doi.org/10.25491/8kmc-g314"},{"@type"=>"PropertyValue", "propertyID"=>"md5", "value"=>"c7c89fe7366d50cd75448aa603c9de58"}])
-      expect(json["contentUrl"]).to eq(["https://storage.googleapis.com/gtex_analysis_v7/single_tissue_eqtl_data/GTEx_Analysis_v7_eQTL_covariates.tar.gz"])
+      expect(json["contentUrl"]).to eq("https://storage.googleapis.com/gtex_analysis_v7/single_tissue_eqtl_data/GTEx_Analysis_v7_eQTL_covariates.tar.gz")
     end
 
     it "alternate identifiers" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bolognese
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Martin Fenner