bolognese 0.9.48 → 0.9.50

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 903902cc9d9d2073110c35825e464acd2b4e52ee
-  data.tar.gz: 5f33ff35922d87ee31bf9b85868a78f24ee8065b
+  metadata.gz: bd2837b30a082d4677ebee66a96d451b13cf7fdd
+  data.tar.gz: 3a8974f65f8e03246e481e8d582414bcb9685bea
 SHA512:
-  metadata.gz: 62a1627fd5ae1098c14c6d11375118c2e9466962302c28b664691f9a15ad6ece68a782a1ea9b2ec014fb21c6339cf3f90354d3dcb1116adaca4ec0e87418d530
-  data.tar.gz: c5034a49640bfb65975fd4186c3ec1eff9b342dcd127ae1e3ba17816f36592371a862536e0e772f3d39d77c3af6f56a3ced7a7f81b3d4abe0771d9bcb82349ea
+  metadata.gz: 7b6d279ec212fa429603a38f550c3266b86196c0ddf52c34f456a95b383c64a4149692c6bfadc630a111e31fed1ae1c8b58e60a10b093ce73f692db8776d2ced
+  data.tar.gz: 9611c1db3887c80637fd3ac8fdd558b3d01f9c40250223f14a8bf879c325de873c87a6956275bc931f182601d338f49402ee6009ea32415d17cd9b765be8c55b

data/Gemfile.lock

@@ -23,13 +23,13 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.1.3)
+    activesupport (5.1.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
     benchmark_methods (0.7)
     bibtex-ruby (4.4.4)
       latex-decode (~> 0.0)
@@ -54,7 +54,7 @@ GEM
       faraday (>= 0.7.4, < 1.0)
     gender_detector (0.1.2)
       unicode_utils (>= 1.3.0)
-    haml (5.0.2)
+    haml (5.0.3)
       temple (>= 0.8.0)
       tilt
     hamster (3.0.0)
@@ -87,7 +87,7 @@ GEM
       oj (>= 2.8.3)
     mini_portile2 (2.1.0)
     minitest (5.10.3)
-    multi_json (1.12.1)
+    multi_json (1.12.2)
     multipart-post (2.0.0)
     namae (0.11.3)
     nokogiri (1.7.2)
@@ -101,8 +101,8 @@ GEM
     rack (2.0.3)
     rack-test (0.7.0)
       rack (>= 1.0, < 3)
-    rake (12.0.0)
-    rdf (2.2.7)
+    rake (12.1.0)
+    rdf (2.2.9)
       hamster (~> 3.0)
       link_header (~> 0.0, >= 0.0.8)
     rdf-aggregate-repo (2.2.0)

data/lib/bolognese/author_utils.rb

@@ -11,8 +11,8 @@ module Bolognese
       name_identifiers = get_name_identifiers(author)
       id = author.fetch("id", nil).presence || name_identifiers.first
       identifier = name_identifiers.length > 1 ? name_identifiers.unwrap : nil
-      name = author.fetch("creatorName", nil) ||
-             author.fetch("contributorName", nil) ||
+      name = parse_attributes(author.fetch("creatorName", nil)) ||
+             parse_attributes(author.fetch("contributorName", nil)) ||
              author.fetch("name", nil)
 
       if name.include?("; ")

data/lib/bolognese/version.rb

@@ -1,3 +1,3 @@
 module Bolognese
-  VERSION = "0.9.48"
+  VERSION = "0.9.50"
 end

data/resources/kernel-4/include/{datacite-dateType-v4.xsd → datacite-dateType-v4.1.xsd}

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Version 1.0 - Created 2011-01-13 - FZ, TIB, Germany
-     2013-05 v3.0: Addition of ID to simpleType element; addition of value "Collected"; deleted "StartDate" & "EndDate"-->
+     2013-05 v3.0: Addition of ID to simpleType element; addition of value "Collected"; deleted "StartDate" & "EndDate"
+     2017-09-14 v4.1: Addition of value "Other"-->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://datacite.org/schema/kernel-4" targetNamespace="http://datacite.org/schema/kernel-4" elementFormDefault="qualified">
   <xs:simpleType name="dateType" id="dateType">
     <xs:annotation>
@@ -13,6 +14,7 @@
       <xs:enumeration value="Copyrighted"/>
       <xs:enumeration value="Created"/>
       <xs:enumeration value="Issued"/>
+      <xs:enumeration value="Other"/>
       <xs:enumeration value="Submitted"/>
       <xs:enumeration value="Updated"/>
       <xs:enumeration value="Valid"/>

data/resources/kernel-4/include/datacite-nameType-v4.1.xsd

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Version 4.1 - Created 2017-9-14 -->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://datacite.org/schema/kernel-4" targetNamespace="http://datacite.org/schema/kernel-4" elementFormDefault="qualified">
+  <xs:simpleType name="nameType" id="nameType">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="Organizational"/>
+      <xs:enumeration value="Personal"/>
+    </xs:restriction>
+  </xs:simpleType>
+</xs:schema>

data/resources/kernel-4/include/{datacite-relationType-v4.xsd → datacite-relationType-v4.1.xsd}

@@ -2,7 +2,8 @@
 <!--
   2011-01-13 v1.0 - FZ, TIB, Germany
   2013-05 v3.0: Addition of ID to simpleType element, addition of values "IsIdenticalTo", "HasMetadata" & "IsMetadataFor"
-  2014-08-20 v3.1: Addition of values "Reviews" & "IsReviewedBy" and "IsDerivedFrom" & "IsSourceOf"-->
+  2014-08-20 v3.1: Addition of values "Reviews" & "IsReviewedBy" and "IsDerivedFrom" & "IsSourceOf"
+  2017-09-14 v.4.1: Addition of values "Describes", "IsDescribedBy", "HasVersion", "IsVersionOf", "Requires", "IsRequiredBy" -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://datacite.org/schema/kernel-4" targetNamespace="http://datacite.org/schema/kernel-4" elementFormDefault="qualified">
   <xs:simpleType name="relationType" id="relationType">
     <xs:annotation>
@@ -34,6 +35,12 @@
       <xs:enumeration value="IsReviewedBy"/>
       <xs:enumeration value="IsDerivedFrom"/>
       <xs:enumeration value="IsSourceOf"/>
+      <xs:enumeration value="Describes"/>
+      <xs:enumeration value="IsDescribedBy"/>
+      <xs:enumeration value="HasVersion"/>
+      <xs:enumeration value="IsVersionof"/>
+      <xs:enumeration value="Requires"/>
+      <xs:enumeration value="IsRequiredBy"/>
     </xs:restriction>
   </xs:simpleType>
 </xs:schema>

data/resources/kernel-4/include/{datacite-resourceType-v4.xsd → datacite-resourceType-v4.1.xsd}

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Version 1.0 - Created 2011-01-13 - FZ, TIB, Germany
-     2013-05 v3.0: Addition of ID to simpleType element; added values "Audiovisual", "Workflow" & "Other"; deleted value "Film" -->
+     2013-05 v3.0: Addition of ID to simpleType element; added values "Audiovisual", "Workflow" & "Other"; deleted value "Film"
+     2017-09-14 v4.1: Addition of value "DataPaper" -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://datacite.org/schema/kernel-4" targetNamespace="http://datacite.org/schema/kernel-4" elementFormDefault="qualified">
   <xs:simpleType name="resourceType" id="resourceType">
     <xs:annotation>
@@ -9,6 +10,7 @@
     <xs:restriction base="xs:string">
       <xs:enumeration value="Audiovisual"/>
       <xs:enumeration value="Collection"/>
+      <xs:enumeration value="DataPaper"/>
       <xs:enumeration value="Dataset"/>
       <xs:enumeration value="Event"/>
       <xs:enumeration value="Image"/>

data/resources/kernel-4/metadata.xsd

@@ -12,12 +12,13 @@
   <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2009/01/xml.xsd"/>
   <xs:include schemaLocation="include/datacite-titleType-v4.xsd"/>
   <xs:include schemaLocation="include/datacite-contributorType-v4.xsd"/>
-  <xs:include schemaLocation="include/datacite-dateType-v4.xsd"/>
-  <xs:include schemaLocation="include/datacite-resourceType-v4.xsd"/>
-  <xs:include schemaLocation="include/datacite-relationType-v4.xsd"/>
+  <xs:include schemaLocation="include/datacite-dateType-v4.1.xsd"/>
+  <xs:include schemaLocation="include/datacite-resourceType-v4.1.xsd"/>
+  <xs:include schemaLocation="include/datacite-relationType-v4.1.xsd"/>
   <xs:include schemaLocation="include/datacite-relatedIdentifierType-v4.xsd"/>
   <xs:include schemaLocation="include/datacite-funderIdentifierType-v4.xsd"/>
   <xs:include schemaLocation="include/datacite-descriptionType-v4.xsd"/>
+  <xs:include schemaLocation="include/datacite-nameType-v4.1.xsd"/>
   <xs:element name="resource">
     <xs:annotation>
       <xs:documentation>
@@ -53,9 +54,13 @@
                 <xs:complexType>
                   <xs:sequence>
                     <xs:element name="creatorName">
-                      <xs:simpleType>
-                        <xs:restriction base="nonemptycontentStringType"/>
-                      </xs:simpleType>
+                      <xs:complexType>
+                        <xs:simpleContent>
+                          <xs:extension base="nonemptycontentStringType">
+                            <xs:attribute name="nameType" type="nameType" use="optional"/>
+                          </xs:extension>
+                        </xs:simpleContent>
+                      </xs:complexType>
                     </xs:element>
                     <xs:element name="givenName" minOccurs="0"/>
                     <xs:element name="familyName" minOccurs="0"/>
@@ -160,11 +165,13 @@
               <xs:complexType>
                 <xs:sequence>
                   <xs:element name="contributorName">
-                    <xs:simpleType>
-                      <xs:restriction base="xs:string">
-                        <xs:minLength value="1"/>
-                      </xs:restriction>
-                    </xs:simpleType>
+                    <xs:complexType>
+                      <xs:simpleContent>
+                        <xs:extension base="nonemptycontentStringType">
+                          <xs:attribute name="nameType" type="nameType" use="optional"/>
+                        </xs:extension>
+                      </xs:simpleContent>
+                    </xs:complexType>
                   </xs:element>
                   <xs:element name="givenName" minOccurs="0"/>
                   <xs:element name="familyName" minOccurs="0"/>
@@ -198,6 +205,7 @@
                   <xs:simpleContent>
                     <xs:extension base="xs:string">
                       <xs:attribute name="dateType" type="dateType" use="required"/>
+                      <xs:attribute name="dateInformation" use="optional"/>
                     </xs:extension>
                   </xs:simpleContent>
                 </xs:complexType>
@@ -238,6 +246,7 @@
                 <xs:complexType>
                   <xs:simpleContent>
                     <xs:extension base="xs:string">
+                      <xs:attribute name="resourceTypeGeneral" type="resourceType" use="optional"/>
                       <xs:attribute name="relatedIdentifierType" type="relatedIdentifierType" use="required"/>
                       <xs:attribute name="relationType" type="relationType" use="required"/>
                       <xs:attribute name="relatedMetadataScheme" use="optional"/>
@@ -291,6 +300,7 @@ Use the complete title of a license and include version information if applicabl
                   <xs:simpleContent>
                     <xs:extension base="xs:string">
                       <xs:attribute name="rightsURI" type="xs:anyURI" use="optional"/>
+                      <xs:attribute ref="xml:lang"/>
                     </xs:extension>
                   </xs:simpleContent>
                 </xs:complexType>

data/spec/fixtures/datacite-example-complicated-v4.1.xml

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://datacite.org/schema/kernel-4" xsi:schemaLocation="http://datacite.org/schema/kernel-4 http://schema.datacite.org/meta/kernel-4/metadata.xsd">
+  <identifier identifierType="DOI">10.5072/testpub</identifier>
+  <creators>
+    <creator>
+      <creatorName nameType="Personal">Smith, John</creatorName>
+    </creator>
+    <creator>
+      <creatorName>つまらないものですが</creatorName>
+      <nameIdentifier nameIdentifierScheme="ISNI" schemeURI="http://isni.org/isni/">0000000134596520</nameIdentifier>
+    </creator>
+  </creators>
+  <titles>
+    <title>Właściwości rzutowań podprzestrzeniowych</title>
+    <title titleType="TranslatedTitle">Translation of Polish titles</title>
+  </titles>
+  <publisher>Springer</publisher>
+  <publicationYear>2010</publicationYear>
+  <subjects>
+    <subject subjectScheme="DDC">830 German &amp; related literatures</subject>
+    <subject>Polish Literature</subject>
+  </subjects>
+  <dates>
+    <date dateType="Other" dateInformation="Correction">2012-12-13</date>
+  </dates>
+  <contributors>
+    <contributor contributorType="DataCollector">
+      <contributorName>Doe, John</contributorName>
+      <nameIdentifier nameIdentifierScheme="ORCID" schemeURI="http://orcid.org/">0000-0001-5393-1421</nameIdentifier>
+    </contributor>
+  </contributors>
+  <language>GER</language>
+  <resourceType resourceTypeGeneral="Text">Monograph</resourceType>
+  <alternateIdentifiers>
+    <alternateIdentifier alternateIdentifierType="ISBN">937-0-4523-12357-6</alternateIdentifier>
+  </alternateIdentifiers>
+  <relatedIdentifiers>
+    <relatedIdentifier resourceTypeGeneral="Text" relatedIdentifierType="DOI" relationType="IsPartOf">10.5272/oldertestpub</relatedIdentifier>
+  </relatedIdentifiers>
+  <sizes>
+    <size>256 pages</size>
+  </sizes>
+  <formats>
+    <format>pdf</format>
+  </formats>
+  <version>2</version>
+  <rightsList>
+    <rights xml:lang="eng" rightsURI="http://creativecommons.org/licenses/by-nd/2.0/">Creative Commons Attribution-NoDerivs 2.0 Generic</rights>
+  </rightsList>
+  <descriptions>
+    <description descriptionType="Abstract">
+      Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea
+      takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores
+      et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
+    </description>
+  </descriptions>
+</resource>

data/spec/readers/datacite_reader_spec.rb

@@ -242,6 +242,24 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.provider).to eq("DataCite")
     end
 
+    it "Schema 4.1 from string" do
+      input = fixture_path + "datacite-example-complicated-v4.1.xml"
+      subject = Bolognese::Metadata.new(input: input)
+      expect(subject.valid?).to be true
+      expect(subject.id).to eq("https://doi.org/10.5072/testpub")
+      expect(subject.type).to eq("ScholarlyArticle")
+      expect(subject.additional_type).to eq("Monograph")
+      expect(subject.resource_type_general).to eq("Text")
+      expect(subject.author).to eq([{"type"=>"Person", "name"=>"John Smith", "givenName"=>"John", "familyName"=>"Smith"}, {"name"=>"つまらないものですが"}])
+      expect(subject.title).to eq(["Właściwości rzutowań podprzestrzeniowych", {"title_type"=>"TranslatedTitle", "text"=>"Translation of Polish titles"}])
+      expect(subject.alternate_name).to eq("type"=>"ISBN", "name"=>"937-0-4523-12357-6")
+      expect(subject.date_published).to eq("2010")
+      expect(subject.is_part_of).to eq("type"=>"CreativeWork", "id"=>"https://doi.org/10.5272/oldertestpub")
+      expect(subject.license).to eq("id"=>"http://creativecommons.org/licenses/by-nd/2.0", "name"=>"Creative Commons Attribution-NoDerivs 2.0 Generic")
+      expect(subject.publisher).to eq("Springer")
+      expect(subject.provider).to eq("DataCite")
+    end
+
     it "empty subject" do
       input = "https://doi.org/10.18169/PAPDEOTTX00502"
       subject = Bolognese::Metadata.new(input: input)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolognese
 version: !ruby/object:Gem::Version
-  version: 0.9.48
+  version: 0.9.50
 platform: ruby
 authors:
 - Martin Fenner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-23 00:00:00.000000000 Z
+date: 2017-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: maremma
@@ -521,12 +521,13 @@ files:
 - resources/kernel-3/include/datacite-titleType-v3.xsd
 - resources/kernel-3/metadata.xsd
 - resources/kernel-4/include/datacite-contributorType-v4.xsd
-- resources/kernel-4/include/datacite-dateType-v4.xsd
+- resources/kernel-4/include/datacite-dateType-v4.1.xsd
 - resources/kernel-4/include/datacite-descriptionType-v4.xsd
 - resources/kernel-4/include/datacite-funderIdentifierType-v4.xsd
+- resources/kernel-4/include/datacite-nameType-v4.1.xsd
 - resources/kernel-4/include/datacite-relatedIdentifierType-v4.xsd
-- resources/kernel-4/include/datacite-relationType-v4.xsd
-- resources/kernel-4/include/datacite-resourceType-v4.xsd
+- resources/kernel-4/include/datacite-relationType-v4.1.xsd
+- resources/kernel-4/include/datacite-resourceType-v4.1.xsd
 - resources/kernel-4/include/datacite-titleType-v4.xsd
 - resources/kernel-4/metadata.xsd
 - resources/schema_org/jsonldcontext.json
@@ -541,6 +542,7 @@ files:
 - spec/fixtures/crossref.bib
 - spec/fixtures/crossref.ris
 - spec/fixtures/crossref.xml
+- spec/fixtures/datacite-example-complicated-v4.1.xml
 - spec/fixtures/datacite.json
 - spec/fixtures/datacite.xml
 - spec/fixtures/datacite_dataset.xml
@@ -859,7 +861,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Ruby client library for conversion of DOI Metadata