bolognese 1.1.6 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02ec698005af34046845045a8a78bd47ed1b70579678768b6117e242194c641e
-  data.tar.gz: ad2fbbd3bac845ce7c10f9c07f2a439b258a90cfe7020633adaa69568c92531d
+  metadata.gz: 71f4d74385d924fbaabb7f004be5d932cc1b3ada31b9004ed23e96971d7aa9bd
+  data.tar.gz: 9ed032df2411626a7a492985696b2516fc1ac1f066cfa73c2d5cf081ac6573bb
 SHA512:
-  metadata.gz: 50ca5d8a322de56b3d416c52e18080a6024e2d8ef706a268a8488d03f25ab6ec9f616943d6c6db4e6779459aa1d1191841613064a8d1b8892746554d5444cc42
-  data.tar.gz: 2c12554875e95489534c0a7fda479985f3b75e3fd5b24358f6bf63576e4a19f483bf9a3ea21dde316be5c808a3177f1c65734f6287d856deeb4c0a159e16c173
+  metadata.gz: 2ea430692c764eae6076a3124269d312c7c13f6b92123b5575edb65fd7f7ff319c9ce828307615578adf6a0fc0bad1a02d1b1fdb11b14783cdfc64c339a5aa52
+  data.tar.gz: 02e289d34a7ad6de259ff96ef5241fab11090b3b2bab3253aad2b658c6e4b1c1b7ee42f35839e0ca482a4bda3e2c635b9f0ac72e21d7a5c06d6b0707fa3cd596

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bolognese (1.1.6)
+    bolognese (1.1.7)
       activesupport (>= 4.2.5, < 6)
       benchmark_methods (~> 0.7)
       bibtex-ruby (~> 4.1)
@@ -78,10 +78,10 @@ GEM
       concurrent-ruby (~> 1.0)
     hashdiff (0.3.8)
     htmlentities (4.3.4)
-    i18n (1.5.3)
+    i18n (1.6.0)
       concurrent-ruby (~> 1.0)
     iso8601 (0.9.1)
-    json (2.1.0)
+    json (2.2.0)
     json-ld (2.2.1)
       multi_json (~> 1.12)
       rdf (>= 2.2.8, < 4.0)
@@ -158,15 +158,15 @@ GEM
     rspec-xsd (0.1.0)
       nokogiri (~> 1.6)
       rspec (~> 3)
-    safe_yaml (1.0.4)
+    safe_yaml (1.0.5)
     simplecov (0.13.0)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    sxp (1.0.1)
-      rdf (>= 2.2, < 4.0)
-    temple (0.8.0)
+    sxp (1.0.2)
+      rdf (~> 3.0)
+    temple (0.8.1)
     thor (0.20.3)
     thread_safe (0.3.6)
     tilt (2.0.9)

data/lib/bolognese/datacite_utils.rb

@@ -68,13 +68,13 @@ module Bolognese
     def insert_person(xml, person, type)
       person_name = person["familyName"].present? ? [person["familyName"], person["givenName"]].compact.join(", ") : person["name"]
       attributes = { "nameType" => person["nameType"] }.compact
-
       xml.send(type + "Name", person_name, attributes)
       xml.givenName(person["givenName"]) if person["givenName"].present?
       xml.familyName(person["familyName"]) if person["familyName"].present?
       Array.wrap(person["nameIdentifiers"]).each do |ni|
         xml.nameIdentifier(ni["nameIdentifier"], 'nameIdentifierScheme' => ni["nameIdentifierScheme"])
       end
+      xml.affiliation(person["affiliation"]) if person["affiliation"].present?
     end
 
     def insert_titles(xml)

data/lib/bolognese/version.rb

@@ -1,3 +1,3 @@
 module Bolognese
-  VERSION = "1.1.6"
+  VERSION = "1.1.7"
 end

data/spec/readers/schema_org_reader_spec.rb

@@ -47,7 +47,7 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input, from: "schema_org")
       expect(subject.valid?).to be false
       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.errors.first).to eq("49: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.identifiers).to eq([{"identifier"=>"https://doi.org/10.5281/zenodo.1196821", "identifierType"=>"DOI"}])
       expect(subject.doi).to eq("10.5281/zenodo.1196821")
       expect(subject.url).to eq("https://zenodo.org/record/1196821")

data/spec/writers/datacite_writer_spec.rb

@@ -71,13 +71,13 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.valid?).to be true
       datacite = Maremma.from_xml(subject.datacite).fetch("resource", {})
       expect(datacite.dig("titles", "title")).to eq("R Interface to the DataONE REST API")
-      expect(datacite.dig("creators", "creator")).to eq([{"creatorName"=>{"__content__"=>"Jones, Matt", "nameType"=>"Personal"},
+      expect(datacite.dig("creators", "creator")).to eq([{"affiliation"=>"NCEAS", "creatorName"=>{"__content__"=>"Jones, Matt", "nameType"=>"Personal"},
                                                           "givenName"=>"Matt",
                                                           "familyName"=>"Jones",
                                                           "nameIdentifier"=>
                                                          {"nameIdentifierScheme"=>"ORCID",
                                                           "__content__"=>"https://orcid.org/0000-0003-0077-4738"}},
-                                                         {"creatorName"=>{"__content__"=>"Slaughter, Peter", "nameType"=>"Personal"},
+                                                         {"affiliation"=>"NCEAS", "creatorName"=>{"__content__"=>"Slaughter, Peter", "nameType"=>"Personal"},
                                                            "givenName"=>"Peter",
                                                            "familyName"=>"Slaughter",
                                                           "nameIdentifier"=>
@@ -93,13 +93,13 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.valid?).to be true
       datacite = Maremma.from_xml(subject.datacite).fetch("resource", {})
       expect(datacite.dig("titles", "title")).to eq("R Interface to the DataONE REST API")
-      expect(datacite.dig("creators", "creator")).to eq([{"creatorName"=>{"__content__"=>"Jones, Matt", "nameType"=>"Personal"},
+      expect(datacite.dig("creators", "creator")).to eq([{"affiliation"=>"NCEAS", "creatorName"=>{"__content__"=>"Jones, Matt", "nameType"=>"Personal"},
                                                           "givenName"=>"Matt",
                                                           "familyName"=>"Jones",
                                                           "nameIdentifier"=>
                                                          {"nameIdentifierScheme"=>"ORCID",
                                                           "__content__"=>"https://orcid.org/0000-0003-0077-4738"}},
-                                                         {"creatorName"=>{"__content__"=>"Slaughter, Peter", "nameType"=>"Personal"},
+                                                         {"affiliation"=>"NCEAS", "creatorName"=>{"__content__"=>"Slaughter, Peter", "nameType"=>"Personal"},
                                                            "givenName"=>"Peter",
                                                            "familyName"=>"Slaughter",
                                                           "nameIdentifier"=>
@@ -115,7 +115,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.valid?).to be true
       datacite = Maremma.from_xml(subject.datacite).fetch("resource", {})
       expect(datacite.dig("titles", "title")).to eq("Maremma: a Ruby library for simplified network calls")
-      expect(datacite.dig("creators", "creator")).to eq("creatorName"=> {"__content__"=>"Fenner, Martin", "nameType"=>"Personal"}, "givenName"=>"Martin", "familyName"=>"Fenner", "nameIdentifier"=>{"__content__"=>"https://orcid.org/0000-0003-0077-4738", "nameIdentifierScheme"=>"ORCID"})
+      expect(datacite.dig("creators", "creator")).to eq("affiliation"=>"DataCite", "creatorName"=> {"__content__"=>"Fenner, Martin", "nameType"=>"Personal"}, "givenName"=>"Martin", "familyName"=>"Fenner", "nameIdentifier"=>{"__content__"=>"https://orcid.org/0000-0003-0077-4738", "nameIdentifierScheme"=>"ORCID"})
     end
 
     it "Text pass-thru" do
@@ -179,6 +179,28 @@ describe Bolognese::Metadata, vcr: true do
       expect(datacite.fetch("xsi:schemaLocation", "").split(" ").first).to eq("http://datacite.org/schema/kernel-4")
     end
 
+    it "Affiliation" do
+      input = fixture_path + 'datacite-example-geolocation-2.xml'
+      doi = "10.6071/Z7WC73"
+      subject = Bolognese::Metadata.new(input: input, from: "datacite", regenerate: true)
+      expect(subject.valid?).to be true
+      expect(subject.types).to eq("bibtex"=>"misc", "citeproc"=>"dataset", "resourceType"=>"dataset", "resourceTypeGeneral"=>"Dataset", "ris"=>"DATA", "schemaOrg"=>"Dataset")
+      expect(subject.creators.length).to eq(6)
+      expect(subject.creators.first).to eq("affiliation"=>"UC Merced", "familyName"=>"Bales", "givenName"=>"Roger", "name"=>"Bales, Roger", "nameType"=>"Personal")
+      expect(subject.titles).to eq([{"title"=>"Southern Sierra Critical Zone Observatory (SSCZO), Providence Creek\n      meteorological data, soil moisture and temperature, snow depth and air\n      temperature"}])
+      expect(subject.identifiers).to eq([{"identifier"=>"https://doi.org/10.6071/z7wc73", "identifierType"=>"DOI"}])
+      expect(subject.rights_list).to eq([{"rights"=>"Creative Commons Attribution 4.0 International (CC BY 4.0)", "rightsUri"=>"https://creativecommons.org/licenses/by/4.0"}])
+      expect(subject.dates).to eq([{"date"=>"2014-10-17", "dateType"=>"Updated"}, {"date"=>"2016-03-14T17:02:02Z", "dateType"=>"Available"}, {"date"=>"2013", "dateType"=>"Issued"}])
+      expect(subject.publication_year).to eq("2013")
+      expect(subject.publisher).to eq("UC Merced")
+      expect(subject.agency).to eq("DataCite")
+      expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
+
+      datacite = Maremma.from_xml(subject.datacite).fetch("resource", {})
+      expect(datacite.fetch("xsi:schemaLocation", "").split(" ").first).to eq("http://datacite.org/schema/kernel-4")
+      expect(datacite.dig("creators", "creator", 0, "affiliation")).to eq("UC Merced")
+    end
+
     it "with data citation schema.org" do
       input = "https://blog.datacite.org/eating-your-own-dog-food/"
       subject = Bolognese::Metadata.new(input: input, from: "schema_org")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolognese
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
 platform: ruby
 authors:
 - Martin Fenner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-20 00:00:00.000000000 Z
+date: 2019-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: maremma
@@ -1074,7 +1074,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Ruby client library for conversion of DOI Metadata