bolognese 1.3.4 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff8339fd984151e1cae1fa22b009bd1dff2ba462f00d674476e5d109d5f2d86a
-  data.tar.gz: e9b5011acb8ce5d8bdc8bdf81112d5822e8504a3917a72854f34d264864b9423
+  metadata.gz: 431ba38e69fd1bf6e51774f06fbec06b5925c39a2998fdb2f143cd52df21ba48
+  data.tar.gz: 210b52a7ed81088878a9037623951c2579c4dcc55b97f28a58076acfb66a892b
 SHA512:
-  metadata.gz: 911b928f395eb2d28ffdeefc41ca4b66f502c059ca000ee0f32b925661afcc0840e630216205cec5ec1661fb8cdaedd6a6ed53012bc31dc7ab94c7cd28c6dcbe
-  data.tar.gz: 2321353a40ad748ce1f96466dab9ffcd0ccd08930e4ae67502507e9f6431a50872fad1cf424ca81fc41c037f2852a54a6781b1301910a340b4338155646abdf7
+  metadata.gz: 41382afb9f019c898fa49c9efa705ba218f072f4ac125b3c037708341eb903c9965f48ec6398f8fd024f9d493e4bef64c5019a7248879598ad9272591837cb85
+  data.tar.gz: 7081089408bb99805de9200110c036d29a65ed22bc96e9042950b53ced349ef8cf19c8f9be38bd1c2d39085a0ec42338c81887f871a4d67d662fba16eea215d3

data/Gemfile.lock

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

data/lib/bolognese/version.rb

@@ -1,3 +1,3 @@
 module Bolognese
-  VERSION = "1.3.4"
+  VERSION = "1.3.5"
 end

data/resources/kernel-4.3/metadata.xsd

@@ -12,7 +12,7 @@
   2018-09-08 v4.1.1 Make schema 4.1 backwards compatible to 4.0 by allowing geolocation elements in any order
   2019-02-14 v4.2: Addition of dateType value "Withdrawn", relationType values "Obsoletes", "isObsoletedBy", addition of new subproperties for Rights: rightsIdentifier, rightsIdentifierScheme, schemeURI, addition of the XML language attribute to the properties Creator, Contributor and Publisher for organizational names, don't check format of DOI
   2019-07-13 v4.3: Addition of new subproperties for Affiliation: "affiliationIdentifier", "affiliationIdentifierScheme", "schemeURI", addition of new sub-property for funderIdentifier: "schemeURI", addition of new funderIdentifierScheme: "ROR", added documentation for nameIdentifier -->
-<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" xml:lang="EN">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://datacite.org/schema/kernel-4" targetNamespace="http://datacite.org/schema/kernel-4" elementFormDefault="qualified" xml:lang="EN">
   <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="include/xml.xsd"/>
   <xs:include schemaLocation="include/datacite-titleType-v4.xsd"/>
   <xs:include schemaLocation="include/datacite-contributorType-v4.xsd"/>
@@ -68,8 +68,8 @@
                     </xs:element>
                     <xs:element name="givenName" minOccurs="0"/>
                     <xs:element name="familyName" minOccurs="0"/>
-                    <xs:element name="nameIdentifier" type="nameIdentifier" minOccurs="0" maxOccurs="unbounded"/>
-                    <xs:element name="affiliation" type="affiliation" minOccurs="0" maxOccurs="unbounded"/>
+                    <xs:element name="nameIdentifier" xsi:type="nameIdentifier" minOccurs="0" maxOccurs="unbounded"/>
+                    <xs:element name="affiliation" xsi:type="affiliation" minOccurs="0" maxOccurs="unbounded"/>
                   </xs:sequence>
                 </xs:complexType>
               </xs:element>
@@ -175,8 +175,8 @@
                   </xs:element>
                   <xs:element name="givenName" minOccurs="0"/>
                   <xs:element name="familyName" minOccurs="0"/>
-                  <xs:element name="nameIdentifier" type="nameIdentifier" minOccurs="0" maxOccurs="unbounded"/>
-                  <xs:element name="affiliation" type="affiliation" minOccurs="0" maxOccurs="unbounded"/>
+                  <xs:element name="nameIdentifier" xsi:type="nameIdentifier" minOccurs="0" maxOccurs="unbounded"/>
+                  <xs:element name="affiliation" xsi:type="affiliation" minOccurs="0" maxOccurs="unbounded"/>
                 </xs:sequence>
                 <xs:attribute name="contributorType" type="contributorType" use="required"/>
               </xs:complexType>
@@ -430,7 +430,7 @@ Use the complete title of a license and include version information if applicabl
     </xs:annotation>
     <xs:simpleContent>
       <xs:extension base="nonemptycontentStringType">
-        <xs:attribute name="nameIdentifierScheme" use="required"/>
+        <xs:attribute name="nameIdentifierScheme" type="xs:string" use="required"/>
         <xs:attribute name="schemeURI" type="xs:anyURI" use="optional"/>
       </xs:extension>
     </xs:simpleContent>
@@ -442,8 +442,8 @@ Use the complete title of a license and include version information if applicabl
     </xs:annotation>
     <xs:simpleContent>
       <xs:extension base="nonemptycontentStringType">
-        <xs:attribute name="affiliationIdentifier" use="optional"/>
-        <xs:attribute name="affiliationIdentifierScheme" use="optional"/>
+        <xs:attribute name="affiliationIdentifier" type="xs:string" use="optional"/>
+        <xs:attribute name="affiliationIdentifierScheme" type="xs:string" use="optional"/>
         <xs:attribute name="schemeURI" type="xs:anyURI" use="optional"/>
       </xs:extension>
     </xs:simpleContent>

data/resources/kernel-4/metadata.xsd

@@ -12,7 +12,7 @@
   2018-09-08 v4.1.1 Make schema 4.1 backwards compatible to 4.0 by allowing geolocation elements in any order
   2019-02-14 v4.2: Addition of dateType value "Withdrawn", relationType values "Obsoletes", "isObsoletedBy", addition of new subproperties for Rights: rightsIdentifier, rightsIdentifierScheme, schemeURI, addition of the XML language attribute to the properties Creator, Contributor and Publisher for organizational names, don't check format of DOI
   2019-07-13 v4.3: Addition of new subproperties for Affiliation: "affiliationIdentifier", "affiliationIdentifierScheme", "schemeURI", addition of new sub-property for funderIdentifier: "schemeURI", addition of new funderIdentifierScheme: "ROR", added documentation for nameIdentifier -->
-<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" xml:lang="EN">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://datacite.org/schema/kernel-4" targetNamespace="http://datacite.org/schema/kernel-4" elementFormDefault="qualified" xml:lang="EN">
   <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="include/xml.xsd"/>
   <xs:include schemaLocation="include/datacite-titleType-v4.xsd"/>
   <xs:include schemaLocation="include/datacite-contributorType-v4.xsd"/>
@@ -68,33 +68,8 @@
                     </xs:element>
                     <xs:element name="givenName" minOccurs="0"/>
                     <xs:element name="familyName" minOccurs="0"/>
-                    <xs:element name="nameIdentifier" minOccurs="0" maxOccurs="unbounded">
-                      <xs:complexType>
-                        <xs:annotation>
-                          <xs:documentation>Uniquely identifies a creator or contributor, according to various identifier schemes.</xs:documentation>
-                        </xs:annotation>
-                        <xs:simpleContent>
-                          <xs:extension base="nonemptycontentStringType">
-                            <xs:attribute name="nameIdentifierScheme" use="required"/>
-                            <xs:attribute name="schemeURI" type="xs:anyURI" use="optional"/>
-                          </xs:extension>
-                        </xs:simpleContent>
-                      </xs:complexType>
-                    </xs:element>
-                    <xs:element name="affiliation" minOccurs="0" maxOccurs="unbounded">
-                      <xs:complexType>
-                        <xs:annotation>
-                          <xs:documentation>Uniquely identifies an affiliation, according to various identifier schemes.</xs:documentation>
-                        </xs:annotation>
-                        <xs:simpleContent>
-                          <xs:extension base="nonemptycontentStringType">
-                            <xs:attribute name="affiliationIdentifier" use="optional"/>
-                            <xs:attribute name="affiliationIdentifierScheme" use="optional"/>
-                            <xs:attribute name="schemeURI" type="xs:anyURI" use="optional"/>
-                          </xs:extension>
-                        </xs:simpleContent>
-                      </xs:complexType>
-                    </xs:element>
+                    <xs:element name="nameIdentifier" xsi:type="nameIdentifier" minOccurs="0" maxOccurs="unbounded"/>
+                    <xs:element name="affiliation" xsi:type="affiliation" minOccurs="0" maxOccurs="unbounded"/>
                   </xs:sequence>
                 </xs:complexType>
               </xs:element>
@@ -200,33 +175,8 @@
                   </xs:element>
                   <xs:element name="givenName" minOccurs="0"/>
                   <xs:element name="familyName" minOccurs="0"/>
-                  <xs:element name="nameIdentifier" minOccurs="0" maxOccurs="unbounded">
-                    <xs:complexType>
-                      <xs:annotation>
-                        <xs:documentation>Uniquely identifies a creator or contributor, according to various identifier schemes.</xs:documentation>
-                      </xs:annotation>
-                      <xs:simpleContent>
-                        <xs:extension base="nonemptycontentStringType">
-                          <xs:attribute name="nameIdentifierScheme" use="required"/>
-                          <xs:attribute name="schemeURI" type="xs:anyURI" use="optional"/>
-                        </xs:extension>
-                      </xs:simpleContent>
-                    </xs:complexType>
-                  </xs:element>
-                  <xs:element name="affiliation" minOccurs="0" maxOccurs="unbounded">
-                    <xs:complexType>
-                      <xs:annotation>
-                        <xs:documentation>Uniquely identifies an affiliation, according to various identifier schemes.</xs:documentation>
-                      </xs:annotation>
-                      <xs:simpleContent>
-                        <xs:extension base="nonemptycontentStringType">
-                          <xs:attribute name="affiliationIdentifier" use="optional"/>
-                          <xs:attribute name="affiliationIdentifierScheme" use="optional"/>
-                          <xs:attribute name="schemeURI" type="xs:anyURI" use="optional"/>
-                        </xs:extension>
-                      </xs:simpleContent>
-                    </xs:complexType>
-                  </xs:element>
+                  <xs:element name="nameIdentifier" xsi:type="nameIdentifier" minOccurs="0" maxOccurs="unbounded"/>
+                  <xs:element name="affiliation" xsi:type="affiliation" minOccurs="0" maxOccurs="unbounded"/>
                 </xs:sequence>
                 <xs:attribute name="contributorType" type="contributorType" use="required"/>
               </xs:complexType>
@@ -473,6 +423,31 @@ Use the complete title of a license and include version information if applicabl
       <xs:minLength value="1"/>
     </xs:restriction>
   </xs:simpleType>
+  <!-- definition for nameIdentifier -->
+  <xs:complexType name="nameIdentifier">
+    <xs:annotation>
+      <xs:documentation>Uniquely identifies a creator or contributor, according to various identifier schemes.</xs:documentation>
+    </xs:annotation>
+    <xs:simpleContent>
+      <xs:extension base="nonemptycontentStringType">
+        <xs:attribute name="nameIdentifierScheme" type="xs:string" use="required"/>
+        <xs:attribute name="schemeURI" type="xs:anyURI" use="optional"/>
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+  <!-- definition for affiliation -->
+  <xs:complexType name="affiliation">
+    <xs:annotation>
+      <xs:documentation>Uniquely identifies an affiliation, according to various identifier schemes.</xs:documentation>
+    </xs:annotation>
+    <xs:simpleContent>
+      <xs:extension base="nonemptycontentStringType">
+        <xs:attribute name="affiliationIdentifier" type="xs:string" use="optional"/>
+        <xs:attribute name="affiliationIdentifierScheme" type="xs:string" use="optional"/>
+        <xs:attribute name="schemeURI" type="xs:anyURI" use="optional"/>
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
   <!-- defines the value for a year -->
   <xs:simpleType name="yearType">
     <xs:restriction base="xs:token">

data/spec/readers/datacite_reader_spec.rb

@@ -134,22 +134,22 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
     end
 
-    # it "xs:string attributes" do
-    #   input = "https://doi.org/10.17630/bb43e6a3-72e0-464c-9fdd-fbe5d3e56a09"
-    #   subject = Bolognese::Metadata.new(input: input)
-    #   expect(subject.valid?).to be true
-    #   expect(subject.types["schemaOrg"]).to eq("Dataset")
-    #   expect(subject.types["resourceType"]).to eq("Dataset")
-    #   expect(subject.types["resourceTypeGeneral"]).to eq("Audiovisual")
-    #   expect(subject.creators.length).to eq(14)
-    #   expect(subject.creators.first).to eq("nameType"=>"Personal", "name"=>"Haywood, Raphaelle Dawn", "givenName"=>"Raphaelle Dawn", "familyName"=>"Haywood", "affiliation" => "School of Physics and Astronomy")
-    #   expect(subject.titles).to eq([{"lang"=>"en", "title"=>"Data underpinning - The Sun as a planet-host star: Proxies from SDO images for HARPS radial-velocity variations"}])
-    #   expect(subject.dates).to eq([{"date"=>"2016-01-20", "dateType"=>"Available"}, {"date"=>"2016", "dateType"=>"Issued"}])
-    #   expect(subject.publication_year).to eq("2016")
-    #   expect(subject.publisher).to eq("University of St Andrews")
-    #   expect(subject.agency).to eq("DataCite")
-    #   expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
-    # end
+    it "xs:string attributes" do
+      input = "https://doi.org/10.17630/bb43e6a3-72e0-464c-9fdd-fbe5d3e56a09"
+      subject = Bolognese::Metadata.new(input: input)
+      expect(subject.valid?).to be true
+      expect(subject.types["schemaOrg"]).to eq("Dataset")
+      expect(subject.types["resourceType"]).to eq("Dataset")
+      expect(subject.types["resourceTypeGeneral"]).to eq("Audiovisual")
+      expect(subject.creators.length).to eq(14)
+      expect(subject.creators.first).to eq("nameType"=>"Personal", "name"=>"Haywood, Raphaelle Dawn", "givenName"=>"Raphaelle Dawn", "familyName"=>"Haywood", "affiliation" => [{"name"=>"School of Physics and Astronomy"}])
+      expect(subject.titles).to eq([{"lang"=>"en", "title"=>"Data underpinning - The Sun as a planet-host star: Proxies from SDO images for HARPS radial-velocity variations"}])
+      expect(subject.dates).to eq([{"date"=>"2016-01-20", "dateType"=>"Available"}, {"date"=>"2016", "dateType"=>"Issued"}])
+      expect(subject.publication_year).to eq("2016")
+      expect(subject.publisher).to eq("University of St Andrews")
+      expect(subject.agency).to eq("DataCite")
+      expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
+    end
 
     it "multiple licenses" do
       input = "https://doi.org/10.5281/ZENODO.48440"

metadata

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