bolognese 1.0.31 → 1.0.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db57de7769dfb3d60d3650db32bb4da33cb688437605edd09f342c2dc8c4eea0
-  data.tar.gz: 289506a053d20125d2e2da026b29d2a70b6407fcc5f236d09391a58ddbf4d92d
+  metadata.gz: 586317f27774c61bb3e76f1ce1f7eb29ed20d9b723b74acb588b955d3a41f00a
+  data.tar.gz: b5fb12de049828f2d8423030d0979d1f22a68b7c7f387459f698afd98cd05740
 SHA512:
-  metadata.gz: d96bd487af44a8aaf7e2a7a4a02ab4a33a9facc7f3624f9e9bc63b3a7bda882c0e6b4fe196e87ad8d05238564e01fc4983e658b5c8359193f51ef81cea8449d4
-  data.tar.gz: 53d8ce4bff425a7d550b1c2c7700700a1bdbd1f87c4061588194779f01fc0f4c3eaf2cfaa1ceb8d1e796ff9ce0f472bf4454bfcc713ef0b25630c88d12df62f0
+  metadata.gz: 13efb91c0d652dda3596b018bbac50d3d4676930bdbeffbcd831c49560be3330bcb7ec4e1f8a18c93de4e6189a70c0d608e47cb4830aa72e9b2550983c14235e
+  data.tar.gz: 285804b9d1bc9cf4359c52fceb0c627bbf523455d0238e6cfb9e9ef19c4409894aa4d40e9270036430011009da12e129c17af1d8f1dc6269195068f2fc9cb0dd

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bolognese (1.0.31)
+    bolognese (1.0.32)
       activesupport (>= 4.2.5, < 6)
       benchmark_methods (~> 0.7)
       bibtex-ruby (~> 4.1)
@@ -78,7 +78,7 @@ GEM
       concurrent-ruby (~> 1.0)
     hashdiff (0.3.7)
     htmlentities (4.3.4)
-    i18n (1.1.1)
+    i18n (1.2.0)
       concurrent-ruby (~> 1.0)
     iso8601 (0.9.1)
     json (2.1.0)

data/lib/bolognese/readers/bibtex_reader.rb

@@ -60,8 +60,8 @@ module Bolognese
         end
 
         container = if meta.try(:journal).present?
-          first_page = meta.try(:pages).present? ? meta.try(:pages).split("-").map(&:strip).first : nil
-          last_page = meta.try(:pages).present? ? meta.try(:pages).split("-").map(&:strip).last : nil
+          first_page = meta.try(:pages).present? ? meta.try(:pages).split("-").map(&:strip)[0] : nil
+          last_page = meta.try(:pages).present? ? meta.try(:pages).split("-").map(&:strip)[1] : nil
           
           { "type" => "Journal",
             "title" => meta.journal.to_s,

data/lib/bolognese/readers/citeproc_reader.rb

@@ -70,8 +70,8 @@ module Bolognese
           nil
         end
         container = if meta.fetch("container-title", nil).present?
-          first_page = meta.fetch("page", nil).present? ? meta.fetch("page").split("-").map(&:strip).first : nil
-          last_page = meta.fetch("page", nil).present? ? meta.fetch("page").split("-").map(&:strip).last : nil
+          first_page = meta.fetch("page", nil).present? ? meta.fetch("page").split("-").map(&:strip)[0] : nil
+          last_page = meta.fetch("page", nil).present? ? meta.fetch("page").split("-").map(&:strip)[1] : nil
 
           { "type" => "Periodical",
             "title" => meta.fetch("container-title", nil),

data/lib/bolognese/readers/datacite_reader.rb

@@ -77,7 +77,9 @@ module Bolognese
         end
 
         identifiers = [{ "identifierType" => "DOI", "identifier" => id }] + Array.wrap(meta.dig("alternateIdentifiers", "alternateIdentifier")).map do |r|
-          { "identifierType" => get_identifier_type(r["alternateIdentifierType"]), "identifier" => r["__content__"].presence }.compact
+          if r["__content__"].present?
+            { "identifierType" => get_identifier_type(r["alternateIdentifierType"]), "identifier" => r["__content__"] }
+          end
         end.compact
 
         doi = Array.wrap(identifiers).find { |r| r["identifierType"] == "DOI" }.to_h.fetch("identifier", nil)

data/lib/bolognese/utils.rb

@@ -876,6 +876,8 @@ module Bolognese
     end
 
     def get_identifier_type(identifier_type)
+      return nil unless identifier_type.present?
+
       identifierTypes = {
         "ark" => "ARK",
         "arxiv" => "arXiv",
@@ -913,8 +915,8 @@ module Bolognese
       volume = volume_issue.present? ? volume_issue[0].presence || volume_issue[2].presence : nil
       issue = volume_issue.present? ? volume_issue[1][1...-1].presence : nil
       pages = str.length > 1 ? str.last : nil
-      first_page = pages.present? ? pages.split("-").map(&:strip).first : nil
-      last_page = pages.present? ? pages.split("-").map(&:strip).last : nil
+      first_page = pages.present? ? pages.split("-").map(&:strip)[0] : nil
+      last_page = pages.present? ? pages.split("-").map(&:strip)[1] : nil
 
       { 
         "title" => title,

data/lib/bolognese/version.rb

@@ -1,3 +1,3 @@
 module Bolognese
-  VERSION = "1.0.31"
+  VERSION = "1.0.32"
 end

data/spec/fixtures/nist.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resource xmlns="http://datacite.org/schema/kernel-3" 
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://datacite.org/schema/kernel-3 http://schema.datacite.org/meta/kernel-3/metadata.xsd">
+  <identifier identifierType="DOI">https://doi.org/10.5072/M32163</identifier>
+  <creators>
+    <creator>
+      <creatorName nameType="personal">William Turner</creatorName>
+      <givenName>William</givenName>
+      <familyName>Turner</familyName>
+      <affiliation>National Institute of Standards and Technology</affiliation>
+    </creator>
+  </creators>
+  <titles>
+    <title>Peter Auto Dataset 501</title>
+  </titles>
+  <publisher>National Institute of Standards and Technology</publisher>
+  <publicationYear>2018</publicationYear>
+  <subjects>
+    <subject>Einstein</subject>
+  </subjects>
+  <dates>
+    <date dateType="Updated">2018-10-30</date>
+  </dates>
+  <language>en</language>
+  <resourceType resourceTypeGeneral="Dataset">Dataset</resourceType>
+  <rightsList>
+    <rights rightsURI="https://www.nist.gov/director/licensing">NIST Licensing</rights>
+  </rightsList>
+  <descriptions>
+    <description descriptionType="Abstract">This is to overturn Einstein's Relativity Theory.</description>
+  </descriptions>
+  <alternateIdentifiers alternateIdentifierType="text">
+    <alternateIdentifier>7CE9D6400C0A30C9E053B357068182C92163</alternateIdentifier>
+  </alternateIdentifiers>
+</resource>

data/spec/readers/datacite_reader_spec.rb

@@ -246,6 +246,17 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.geo_locations).to eq([{"geoLocationBox"=>{"eastBoundLongitude"=>"70.0", "northBoundLatitude"=>"70.0", "southBoundLatitude"=>"-70.0", "westBoundLongitude"=>"-70.0"}}, {"geoLocationPlace"=>"Regional"}])
     end
 
+    it "wrong attributes" do
+      input = fixture_path + 'nist.xml'
+      subject = Bolognese::Metadata.new(input: input)
+      expect(subject.identifiers).to eq([{"identifier"=>"https://doi.org/10.5072/m32163", "identifierType"=>"DOI"}])
+      expect(subject.titles).to eq([{"title"=>"Peter Auto Dataset 501"}])
+      expect(subject.descriptions).to eq([{"description"=>"This is to overturn Einstein's Relativity Theory.", "descriptionType"=>"Abstract"}])
+      expect(subject.valid?).to be false
+      expect(subject.errors.length).to eq(4)
+      expect(subject.errors.last).to eq("32:0: ERROR: Element '{http://datacite.org/schema/kernel-3}alternateIdentifier': The attribute 'alternateIdentifierType' is required but missing.")
+    end
+
     it "schema 4.0" do
       input = fixture_path + 'schema_4.0.xml'
       subject = Bolognese::Metadata.new(input: input)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolognese
 version: !ruby/object:Gem::Version
-  version: 1.0.31
+  version: 1.0.32
 platform: ruby
 authors:
 - Martin Fenner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-10 00:00:00.000000000 Z
+date: 2018-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: maremma
@@ -691,6 +691,7 @@ files:
 - spec/fixtures/funding_reference.xml
 - spec/fixtures/gtex.xml
 - spec/fixtures/maremma/codemeta.json
+- spec/fixtures/nist.xml
 - spec/fixtures/ns0.xml
 - spec/fixtures/pure.bib
 - spec/fixtures/pure.ris