bolognese 1.1 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c62a598e109f6caf9fe34a1b9237eb1360f6cc3992a25c46cf56afe36d6bc7c9
-  data.tar.gz: f96ed6464ded442d7d87f1eb6e660b9c22435f89c78bfa7690e4573f53f2a409
+  metadata.gz: 3ff0be2c3f93e115b37c7fb40e472979f997660034fe611caa145f94eda6f00d
+  data.tar.gz: ec082c7b6ddd9f0f8abf2f5c08897b3ca73a48ad9a391a3e4de570a9556bf2ee
 SHA512:
-  metadata.gz: 39cc52b608b54aea3cf0e6716b718d7523a7648c28cb20ae04875286e25103f3cc0961a7f32ab4a9668fa79769b164aff5fb02b5c68af230003df5582d0bae20
-  data.tar.gz: e3279dc77b34a8978eda30de20f9ef9348833b866fe8241b36d8233e64c4f19bc8011047a7deb2388548067cdf0c0f9b0f96ffa8d9b4fde9060a3c0fb7ac5ea4
+  metadata.gz: 23f5743255d698fa71e7297e67335883abe7fd093c7a38b1a25ffe1d26d6462e36034f591cc00fdf3baafd649426393e8d3e25938744da2de91b102c155d37aa
+  data.tar.gz: ad05fdb0f221944bb4a2dbc0b06fb69e14244b819762585bb293acf06697dba0815bee2eea5c7a77b4606b4ffbdc8e7b8f692f248117f6afedc933779462e4df

data/Gemfile.lock

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

data/lib/bolognese/metadata.rb

@@ -13,7 +13,7 @@ module Bolognese
                 :subjects, :contributor, :descriptions, :language, :sizes,
                 :formats, :schema_version, :meta, :container, :agency,
                 :format, :funding_references, :state, :geo_locations,
-                :types, :content_url, :related_identifiers, :style, :locale
+                :types, :content_url, :related_identifiers, :style, :locale, :date_registered
 
     def initialize(input: nil, from: nil, **options)
       id = normalize_id(input, options)
@@ -215,6 +215,10 @@ module Bolognese
       @state ||= meta.fetch("state", nil)
     end
 
+    def date_registered
+      @date_registered ||= meta.fetch("date_registered", nil)
+    end
+
     def types
       @types ||= meta.fetch("types", nil)
     end

data/lib/bolognese/utils.rb

@@ -833,6 +833,12 @@ module Bolognese
       { 'date-parts' => [[year.to_i, month.to_i, day.to_i].reject { |part| part == 0 }] }
     end
 
+    def get_iso8601_date(iso8601_time)
+      return nil if iso8601_time.nil?
+      
+      iso8601_time[0..9]
+    end
+
     def get_year_month(iso8601_time)
       return [] if iso8601_time.nil?
 

data/lib/bolognese/version.rb

@@ -1,3 +1,3 @@
 module Bolognese
-  VERSION = "1.1"
+  VERSION = "1.1.1"
 end

data/lib/bolognese/writers/csv_writer.rb

@@ -2,7 +2,7 @@ module Bolognese
   module Writers
     module CsvWriter
       require "csv"
-      
+
       def csv
         return nil unless valid?
 
@@ -12,6 +12,9 @@ module Bolognese
           doi: doi,
           url: url,
           year: publication_year,
+          registered: get_iso8601_date(date_registered),
+          state: state,
+          resource_type_general: types["resourceTypeGeneral"],
           bibtex_type: types["bibtex"].presence || "misc",
           title: parse_attributes(titles, content: "title", first: true),
           author: authors_as_string(creators),
@@ -19,9 +22,7 @@ module Bolognese
           journal: container && container["title"],
           volume: container.to_h["volume"],
           issue: container.to_h["issue"],
-          pages: pages,
-          language: language,
-          keywords: subjects.present? ? Array.wrap(subjects).map { |k| parse_attributes(k, content: "subject", first: true) }.join(", ") : nil
+          pages: pages
         }.values
 
         CSV.generate { |csv| csv << bib }

data/spec/writers/csv_writer_spec.rb

@@ -12,11 +12,14 @@ describe Bolognese::Metadata, vcr: true do
       expect(csv[0]).to eq("10.7554/elife.01567")
       expect(csv[1]).to eq("https://elifesciences.org/articles/01567")
       expect(csv[2]).to eq("2014")
-      expect(csv[3]).to eq("article")
-      expect(csv[4]).to eq("Automated quantitative histology reveals vascular morphodynamics during Arabidopsis hypocotyl secondary growth")
-      expect(csv[5]).to eq("Sankar, Martial and Nieminen, Kaisa and Ragni, Laura and Xenarios, Ioannis and Hardtke, Christian S")
-      expect(csv[6]).to eq("(:unav)")
-      expect(csv[7]).to eq("eLife")
+      expect(csv[3]).to be_nil
+      expect(csv[4]).to eq("findable")
+      expect(csv[5]).to eq("Text")
+      expect(csv[6]).to eq("article")
+      expect(csv[7]).to eq("Automated quantitative histology reveals vascular morphodynamics during Arabidopsis hypocotyl secondary growth")
+      expect(csv[8]).to eq("Sankar, Martial and Nieminen, Kaisa and Ragni, Laura and Xenarios, Ioannis and Hardtke, Christian S")
+      expect(csv[9]).to eq("(:unav)")
+      expect(csv[10]).to eq("eLife")
     end
 
     it "with pages" do
@@ -27,12 +30,17 @@ describe Bolognese::Metadata, vcr: true do
       expect(csv[0]).to eq("10.1155/2012/291294")
       expect(csv[1]).to eq("http://www.hindawi.com/journals/pm/2012/291294/")
       expect(csv[2]).to eq("2012")
-      expect(csv[3]).to eq("article")
-      expect(csv[4]).to eq("Delineating a Retesting Zone Using Receiver Operating Characteristic Analysis on Serial QuantiFERON Tuberculosis Test Results in US Healthcare Workers")
-      expect(csv[5]).to eq("Thanassi, Wendy and Noda, Art and Hernandez, Beatriz and Newell, Jeffery and Terpeluk, Paul and Marder, David and Yesavage, Jerome A.")
-      expect(csv[6]).to eq("(:unav)")
-      expect(csv[7]).to eq("Pulmonary Medicine")
-      expect(csv[10]).to eq("1-7")
+      expect(csv[3]).to be_nil
+      expect(csv[4]).to eq("findable")
+      expect(csv[5]).to eq("Text")
+      expect(csv[6]).to eq("article")
+      expect(csv[7]).to eq("Delineating a Retesting Zone Using Receiver Operating Characteristic Analysis on Serial QuantiFERON Tuberculosis Test Results in US Healthcare Workers")
+      expect(csv[8]).to eq("Thanassi, Wendy and Noda, Art and Hernandez, Beatriz and Newell, Jeffery and Terpeluk, Paul and Marder, David and Yesavage, Jerome A.")
+      expect(csv[9]).to eq("(:unav)")
+      expect(csv[10]).to eq("Pulmonary Medicine")
+      expect(csv[11]).to eq("2012")
+      expect(csv[12]).to be_nil
+      expect(csv[13]).to eq("1-7")
     end
 
     it "text" do
@@ -44,10 +52,14 @@ describe Bolognese::Metadata, vcr: true do
       expect(csv[0]).to eq("10.17173/pretest8")
       expect(csv[1]).to eq("http://pretest.gesis.org/Pretest/DoiId/10.17173/pretest8")
       expect(csv[2]).to eq("2014")
-      expect(csv[3]).to eq("article")
-      expect(csv[4]).to eq("PIAAC-Longitudinal (PIAAC-L) 2015")
-      expect(csv[5]).to eq("Lenzner, T. and Neuert, C. and Otto, W. and Landrock, U. and Menold, N.")
-      expect(csv[6]).to eq("GESIS – Pretest Lab")
+      expect(csv[3]).to eq("2016-06-01")
+      expect(csv[4]).to eq("findable")
+      expect(csv[5]).to eq("Text")
+      expect(csv[6]).to eq("article")
+      expect(csv[7]).to eq("PIAAC-Longitudinal (PIAAC-L) 2015")
+      expect(csv[8]).to eq("Lenzner, T. and Neuert, C. and Otto, W. and Landrock, U. and Menold, N.")
+      expect(csv[9]).to eq("GESIS – Pretest Lab")
+      expect(csv[10]).to eq("GESIS Projektbericht")
     end
 
     it "climate data" do
@@ -59,10 +71,13 @@ describe Bolognese::Metadata, vcr: true do
       expect(csv[0]).to eq("10.5067/altcy-tj122")
       expect(csv[1]).to eq("http://podaac.jpl.nasa.gov/dataset/MERGED_TP_J1_OSTM_OST_CYCLES_V2")
       expect(csv[2]).to eq("2012")
-      expect(csv[3]).to eq("misc")
-      expect(csv[4]).to eq("Integrated Multi-Mission Ocean Altimeter Data for Climate Research Version 2")
-      expect(csv[5]).to eq("{GSFC}")
-      expect(csv[6]).to eq("NASA Physical Oceanography DAAC")
+      expect(csv[3]).to eq("2014-01-15")
+      expect(csv[4]).to eq("findable")
+      expect(csv[5]).to eq("Dataset")
+      expect(csv[6]).to eq("misc")
+      expect(csv[7]).to eq("Integrated Multi-Mission Ocean Altimeter Data for Climate Research Version 2")
+      expect(csv[8]).to eq("{GSFC}")
+      expect(csv[9]).to eq("NASA Physical Oceanography DAAC")
     end
     
     it "maremma" do
@@ -73,11 +88,13 @@ describe Bolognese::Metadata, vcr: true do
       expect(csv[0]).to eq("10.5438/qeg0-3gm3")
       expect(csv[1]).to eq("https://github.com/datacite/maremma")
       expect(csv[2]).to eq("2017")
-      expect(csv[3]).to eq("misc")
-      expect(csv[4]).to eq("Maremma: a Ruby library for simplified network calls")
-      expect(csv[5]).to eq("Fenner, Martin")
-      expect(csv[6]).to eq("DataCite")
-      expect(csv[12]).to eq("faraday, excon, net/http")
+      expect(csv[3]).to be_nil
+      expect(csv[4]).to eq("findable")
+      expect(csv[5]).to eq("Software")
+      expect(csv[6]).to eq("misc")
+      expect(csv[7]).to eq("Maremma: a Ruby library for simplified network calls")
+      expect(csv[8]).to eq("Fenner, Martin")
+      expect(csv[9]).to eq("DataCite")
     end
   end
 end

metadata

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