datacite-mapping 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c35c9f94314bc0e78dda05e9beda10bfc951bce4
-  data.tar.gz: 18be63217a380ad07d52f595a879666c8e91e82f
+  metadata.gz: d4b979eb3cad19e98ca359c9512763ac9e866704
+  data.tar.gz: f9e8694c3d5377cea0e737cab6be8160637e8fa2
 SHA512:
-  metadata.gz: 8e9e340a00e87133162816aad8e9bd7da0449cc5028ed39e13e0c98e1b23b92b5042574e774ee734abd0cf5b79f873257556e5b7df3ed6fb01fef770b79135a0
-  data.tar.gz: 319ffcbfb5c3f1c850e87c2d461452c176166e3232ee95bd5b024ecc50dab1dc85941f004d165703dd4a8a763474bbd78ec2d0edc0f4497013221581b74445ed
+  metadata.gz: adec25ce6902203ae62f11ba7ac85f046128b0c4cf49f5d4fd55678a45759267e45b1c42a30b4f5bceb598ea02990e36f8936893d2b9e465198b991505ed791d
+  data.tar.gz: 5c30c3c926e0779bfb9f5fdb4acb31f8e6e2ab5e695959c64d6ad068bccfab035fb2a837aa76f5e702138035a02a9996c05c1c661c62bc2498ab030af4a2f6dd

data/CHANGES.md

@@ -1,3 +1,10 @@
+## 0.1.17 (5 August 2016)
+
+- Added experimental support for Datacite 4.0 `<fundingReference/>` tag
+- Added convenience constants `Rights::CC_ZERO` and `Rights::CC_BY` for the
+  [CC0](https://creativecommons.org/publicdomain/zero/1.0/legalcode) public domain declaration
+  and [CC-BY](https://creativecommons.org/licenses/by/4.0/) Creative Commons Attribution License
+
 ## 0.1.16 (14 July 2016)
 
 - Add new `:nonvalidating` mapping for less strict parsing of problem files.

data/lib/datacite/mapping/funding_reference.rb

@@ -0,0 +1,97 @@
+require 'xml/mapping_extensions'
+
+module Datacite
+  module Mapping
+
+    class FunderIdentifierType < TypesafeEnum::Base
+      # @!parse ISNI = ISNI
+      new :ISNI, 'ISNI'
+
+      # @!parse GRID = GRID
+      new :GRID, 'GRID'
+
+      # @!parse CROSSREF_FUNDER = 'Crossref Funder ID'
+      new :CROSSREF_FUNDER_ID, 'Crossref Funder ID'
+
+      # @!parse OTHER = Other
+      new :OTHER, 'Other'
+    end
+
+    class FunderIdentifier
+      include XML::Mapping
+
+      # @param type [FunderIdentifierType] the identifier type. Cannot be nil.
+      # @param value [String] the identifier value. Cannot be nil.
+      def initialize(type:, value:)
+        self.type = type
+        self.value = value
+      end
+
+      def value=(value)
+        fail ArgumentError, 'Value cannot be empty or nil' unless value && !value.empty?
+        @value = value
+      end
+
+      def type=(value)
+        fail ArgumentError, 'Type cannot be nil' unless value
+        @type = value
+      end
+
+      # @!attribute [rw] type
+      #   @return [FunderIdentifierType] the identifier type. Cannot be nil.
+      typesafe_enum_node :type, '@funderIdentifierType', class: FunderIdentifierType
+
+      # @!attribute [rw] value
+      #   @return [String] the identifier value. Cannot be nil.
+      text_node :value, 'text()'
+    end
+
+    class AwardNumber
+      include XML::Mapping
+
+      def initialize(uri: nil, value:)
+        self.uri = uri
+        self.value = value
+      end
+
+      def value=(value)
+        fail ArgumentError, 'Value cannot be empty or nil' unless value && !value.empty?
+        @value = value
+      end
+
+      # @!attribute [rw] uri
+      #  @return [URI, nil] The URI leading to a page provided by the funder for more information about the award
+      uri_node :uri, '@awardURI', default_value: nil
+
+      # @!attribute [rw] value
+      #   @return [String] the award number. Cannot be nil.
+      text_node :value, 'text()'
+    end
+
+    class FundingReference
+      include XML::Mapping
+
+      root_element_name 'fundingReference'
+
+      def initialize(name:, identifier: nil, award_number: nil, award_title: nil)
+        self.name = name
+        self.identifier = identifier
+        self.award_number = award_number
+        self.award_title = award_title
+      end
+
+      def award_number=(value)
+        if value.nil? || value.is_a?(AwardNumber)
+          @award_number = value
+        else
+          @award_number = AwardNumber.new(value: value.to_s)
+        end
+      end
+
+      text_node :name, 'funderName'
+      object_node :identifier, 'funderIdentifier', class: FunderIdentifier, default_value: nil
+      object_node :award_number, 'awardNumber', class: AwardNumber, default_value: nil
+      text_node :award_title, 'awardTitle', default_value: nil
+    end
+  end
+end

data/lib/datacite/mapping/module_info.rb

@@ -4,7 +4,7 @@ module Datacite
     NAME = 'datacite-mapping'
 
     # The version of this gem
-    VERSION = '0.1.16'
+    VERSION = '0.1.17'
 
     # The copyright notice for this gem
     COPYRIGHT = 'Copyright (c) 2016 The Regents of the University of California'

data/lib/datacite/mapping/resource.rb

@@ -12,16 +12,18 @@ require 'datacite/mapping/title'
 module Datacite
   module Mapping
 
+    DATACITE_3_NAMESPACE = XML::MappingExtensions::Namespace.new(
+      uri: 'http://datacite.org/schema/kernel-3',
+      schema_location: 'http://schema.datacite.org/meta/kernel-3/metadata.xsd'
+    )
+
     # A collection of metadata properties chosen for the accurate and consistent identification
     # of a resource for citation and retrieval purposes, along with recommended use instructions.
     # The resource that is being identified can be of any kind, but it is typically a dataset.
     class Resource
       include XML::MappingExtensions::Namespaced
 
-      namespace XML::MappingExtensions::Namespace.new(
-        uri: 'http://datacite.org/schema/kernel-3',
-        schema_location: 'http://schema.datacite.org/meta/kernel-3/metadata.xsd'
-      )
+      namespace DATACITE_3_NAMESPACE
 
       # Initialies a new {Resource}
       #
@@ -31,6 +33,7 @@ module Datacite
       # @param publisher [String] the name of the entity that holds, archives, publishes prints, distributes, releases, issues, or produces the resource.
       # @param publication_year [Integer] year when the resource is made publicly available.
       # @param subjects [Array<Subject>] subjects, keywords, classification codes, or key phrases describing the resource.
+      # @param funding_references [Array<FundingReference>] information about financial support (funding) for the resource being registered.
       # @param contributors [Array<Contributor>] institutions or persons responsible for collecting, creating, or otherwise contributing to the developement of the dataset.
       # @param dates [Array<Date>] different dates relevant to the work.
       # @param language [String] Primary language of the resource: an IETF BCP 47, ISO 639-1 language code.
@@ -44,13 +47,14 @@ module Datacite
       # @param rights_list [Array<Rights>] rights information for this resource.
       # @param descriptions [Array<Description>] all additional information that does not fit in any of the other categories.
       # @param geo_locations [Array<GeoLocations>] spatial region or named place where the data was gathered or about which the data is focused.
-      def initialize(identifier:, creators:, titles:, publisher:, publication_year:, subjects: [], contributors: [], dates: [], language: 'en', resource_type: nil, alternate_identifiers: [], related_identifiers: [], sizes: [], formats: [], version: nil, rights_list: [], descriptions: [], geo_locations: []) # rubocop:disable Metrics/MethodLength, Metrics/ParameterLists, Metrics/AbcSize
+      def initialize(identifier:, creators:, titles:, publisher:, publication_year:, subjects: [], funding_references: [], contributors: [], dates: [], language: 'en', resource_type: nil, alternate_identifiers: [], related_identifiers: [], sizes: [], formats: [], version: nil, rights_list: [], descriptions: [], geo_locations: []) # rubocop:disable Metrics/MethodLength, Metrics/ParameterLists, Metrics/AbcSize
         self.identifier = identifier
         self.creators = creators
         self.titles = titles
         self.publisher = publisher
         self.publication_year = publication_year
         self.subjects = subjects
+        self.funding_references = funding_references
         self.contributors = contributors
         self.dates = dates
         self.language = language
@@ -134,6 +138,10 @@ module Datacite
       #   @return [Array<Subject>] subjects, keywords, classification codes, or key phrases describing the resource.
       array_node :subjects, 'subjects', 'subject', class: Subject, default_value: []
 
+      # @!attribute [rw] fundingReferences
+      #   @return [Array<FundingReference>] information about financial support (funding) for the resource being registered.
+      array_node :funding_references, 'fundingReferences', 'fundingReference', class: FundingReference, default_value: []
+
       # @!attribute [rw] contributors
       #   @return [Array<Contributor>] institutions or persons responsible for collecting, creating, or otherwise contributing to the developement of the dataset.
       array_node :contributors, 'contributors', 'contributor', class: Contributor, default_value: []

data/lib/datacite/mapping/rights.rb

@@ -29,5 +29,33 @@ module Datacite
       #   @return [String] the rights statement. Cannot be empty or nil.
       text_node :value, 'text()'
     end
+
+    class Rights
+      CC_ZERO = Rights.new(
+        uri: URI('https://creativecommons.org/publicdomain/zero/1.0/'),
+        value: 'CC0 1.0 Universal (CC0 1.0) Public Domain Dedication'
+      )
+
+      CC_BY = Rights.new(
+        uri: URI('https://creativecommons.org/licenses/by/4.0/'),
+        value: 'Creative Commons Attribution 4.0 International (CC-BY)'
+      )
+    end
+
   end
+
+  # class License
+  #   # Convenience instance for the [CC-BY](https://creativecommons.org/licenses/by/4.0/legalcode) license
+  #   CC_BY = License.new(
+  #       name: 'Creative Commons Attribution 4.0 International (CC-BY)',
+  #       uri: URI('https://creativecommons.org/licenses/by/4.0/')
+  #   )
+  #
+  #   # Convenience instance for the [CC0](https://creativecommons.org/publicdomain/zero/1.0/legalcode)
+  #   # public domain declaration
+  #   CC_ZERO = License.new(
+  #       name: 'CC0 1.0 Universal (CC0 1.0) Public Domain Dedication',
+  #       uri: URI('https://creativecommons.org/publicdomain/zero/1.0/')
+  #   )
+  # end
 end

data/spec/data/kernel-4.0/datacite-example-fundingReference-v.4.0.xml

@@ -0,0 +1,59 @@
+<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.5281/zenodo.47394</identifier>
+  <creators>
+    <creator>
+      <creatorName>Dedeurwaerdere Tom</creatorName>
+      <affiliation>Université catholique de Louvain</affiliation>
+    </creator>
+  </creators>
+  <titles>
+    <title>Combining internal and external motivations in multi-actor governance arrangements for biodiversity and ecosystem services</title>
+  </titles>
+  <publisher>Zenodo</publisher>
+  <publicationYear>2016</publicationYear>
+  <subjects>
+    <subject>Internal motivations</subject>
+    <subject>Biodiversity</subject>
+    <subject>Multi-actor governance</subject>
+    <subject>Payment for ecosystem services</subject>
+    <subject>Crowding out</subject>
+  </subjects>
+  <fundingReferences>
+    <fundingReference>
+      <funderName>European Commission</funderName>
+      <funderIdentifier funderIdentifierType="Crossref Funder ID">http://doi.org/10.13039/501100000780</funderIdentifier>
+      <awardNumber awardURI="http://cordis.europa.eu/project/rcn/100180_en.html">282625</awardNumber>
+      <awardTitle>MOTivational strength of ecosystem services and alternative ways to express the value of BIOdiversity</awardTitle>
+    </fundingReference>
+    <fundingReference>
+      <funderName>European Commission</funderName>
+      <funderIdentifier funderIdentifierType="Crossref Funder ID">http://doi.org/10.13039/501100000780</funderIdentifier>
+      <awardNumber awardURI="http://cordis.europa.eu/project/rcn/100603_en.html">284382</awardNumber>
+      <awardTitle>Institutionalizing global genetic-resource commons. Global Strategies for accessingand using essential public knowledge assets in the life science</awardTitle>
+    </fundingReference>
+  </fundingReferences>
+  <dates>
+    <date dateType="Issued">2016-03-11</date>
+  </dates>
+  <resourceType resourceTypeGeneral="Dataset"/>
+  <alternateIdentifiers>
+    <alternateIdentifier alternateIdentifierType="URL">http://zenodo.org/record/47394</alternateIdentifier>
+  </alternateIdentifiers>
+  <relatedIdentifiers>
+    <relatedIdentifier relatedIdentifierType="URL" relationType="HasPart">https://zenodo.org/record/47394/files/Data_All_Internal_motivations.pdf</relatedIdentifier>
+    <relatedIdentifier relatedIdentifierType="URL" relationType="HasPart">https://zenodo.org/record/47394/files/survey_questionnaire_internal_motivations.pdf</relatedIdentifier>
+  </relatedIdentifiers>
+  <rightsList>
+    <rights rightsURI="info:eu-repo/semantics/openAccess">Open Access</rights>
+    <rights rightsURI="http://creativecommons.org/publicdomain/zero/1.0/">Creative Commons Zero 1.0 Universal</rights>
+  </rightsList>
+  <descriptions>
+    <description descriptionType="Abstract">&lt;p&gt;These files provide the original survey data of the paper on motivations for biodiversity conservation in Europe. This paper analyses the possibility of building a mutually supportive dynamics between
+      internally and&lt;br /&gt; externally motivated behaviour for biodiversity conservation and ecosystem services provision. To this&lt;br /&gt; purpose a face to face survey amongst 169 key actors of 34 highly successful and prominent
+      biodiversity&lt;br /&gt; arrangements in seven EU countries was conducted. The main&lt;br /&gt; finding of the paper is the feasibility of&lt;br /&gt; combining inherently intrinsically motivated behaviours (providing enjoyment, pleasure from&lt;br
+      /&gt; experimentation and learning, aesthetic satisfaction) and internalized extrinsic motivations (related&lt;br /&gt; to the identification with the collective goals of conservation policy) through a common set of governance&lt;br /&gt; features.
+      Successful initiatives that combine internal and external motivations share the following&lt;br /&gt; features: inclusive decision making processes, a broad monitoring by &amp;ldquo;peers&amp;rdquo; beyond the core staff of the&lt;br /&gt;
+      initiatives, and a context that is supportive for the building of autonomous actor competences. These&lt;br /&gt; findings are in line with the psycho-sociological theory of motivation, which shows the importance of a&lt;br /&gt; psycho-social
+      context leading to a subjective perception of autonomy and a sense of competence of the&lt;br /&gt; actors.&lt;/p&gt;</description>
+  </descriptions>
+</resource>

data/spec/data/kernel-4.0/metadata.xsd

@@ -0,0 +1,470 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Revision history
+  2010-08-26 Complete revision according to new common specification by the metadata work group after review. AJH, DTIC
+  2010-11-17 Revised to current state of kernel review, FZ, TIB
+  2011-01-17 Complete revsion after community review. FZ, TIB
+  2011-03-17 Release of v2.1: added a namespace; mandatory properties got minLength; changes in the definitions of relationTypes IsDocumentedBy/Documents and isCompiledBy/Compiles; changes type of property "Date" from xs:date to xs:string. FZ, TIB
+  2011-06-27 v2.2: namespace: kernel-2.2, additions to controlled lists "resourceType", "contributorType", "relatedIdentifierType", and "descriptionType". Removal of intermediate include-files.
+  2013-07-24 v3.0: namespace: kernel-3.0; delete LastMetadataUpdate & MetadateVersionNumber; additions to controlled lists "contributorType", "dateType", "descriptionType", "relationType", "relatedIdentifierType" & "resourceType"; deletion of "StartDate" & "EndDate" from list "dateType" and "Film" from "resourceType";  allow arbitrary order of elements; allow optional wrapper elements to be empty; include xml:lang attribute for title, subject & description; include attribute schemeURI for nameIdentifier of creator, contributor & subject; added new attributes "relatedMetadataScheme", "schemeURI" & "schemeType" to relatedIdentifier; included new property "geoLocation"
+  2014-08-20 v3.1: additions to controlled lists "relationType", contributorType" and "relatedIdentifierType"; introduction of new child element "affiliation" to "creator" and "contributor"
+  2016-05-14 v4.0: namespace: kernel-4.0; makes "resourceType" required field, added optional "givenName" and "familyName" to creator and contributor, added "funderReference", added "valueURI" for subject, added "geoLocationPolygon" -->
+<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: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-relatedIdentifierType-v4.xsd"/>
+  <xs:include schemaLocation="include/datacite-funderIdentifierType-v4.xsd"/>
+  <xs:include schemaLocation="include/datacite-descriptionType-v4.xsd"/>
+  <xs:element name="resource">
+    <xs:annotation>
+      <xs:documentation>
+        Root element of a single record. This wrapper element is for XML implementation only and is not defined in the DataCite DOI standard.
+        Note: This is the case for all wrapper elements within this schema.</xs:documentation>
+      <xs:documentation>No content in this wrapper element.</xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:all>
+        <!--REQUIRED FIELDS-->
+        <xs:element name="identifier">
+          <xs:annotation>
+            <xs:documentation>A persistent identifier that identifies a resource.</xs:documentation>
+            <xs:documentation>Currently, only DOI is allowed.</xs:documentation>
+          </xs:annotation>
+          <xs:complexType>
+            <xs:simpleContent>
+              <xs:extension base="doiType">
+                <xs:attribute name="identifierType" use="required" fixed="DOI"/>
+              </xs:extension>
+            </xs:simpleContent>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="creators">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="creator" maxOccurs="unbounded">
+                <xs:annotation>
+                  <xs:documentation>The main researchers involved working on the data, or the authors of the publication in priority order. May be a corporate/institutional or personal name.</xs:documentation>
+                  <xs:documentation>Format: Family, Given.</xs:documentation>
+                  <xs:documentation>Personal names can be further specified using givenName and familyName.</xs:documentation>
+                </xs:annotation>
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:element name="creatorName">
+                      <xs:simpleType>
+                        <xs:restriction base="nonemptycontentStringType"/>
+                      </xs:simpleType>
+                    </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: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:sequence>
+                </xs:complexType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="titles">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="title" maxOccurs="unbounded">
+                <xs:annotation>
+                  <xs:documentation>A name or title by which a resource is known.</xs:documentation>
+                </xs:annotation>
+                <xs:complexType>
+                  <xs:simpleContent>
+                    <xs:extension base="nonemptycontentStringType">
+                      <xs:attribute name="titleType" type="titleType" use="optional"/>
+                      <xs:attribute ref="xml:lang"/>
+                    </xs:extension>
+                  </xs:simpleContent>
+                </xs:complexType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="publisher">
+          <xs:annotation>
+            <xs:documentation>The name of the entity that holds, archives, publishes prints, distributes, releases, issues, or produces the resource. This property will be used to formulate the citation, so consider the prominence of the role.</xs:documentation>
+            <xs:documentation>In the case of datasets, "publish" is understood to mean making the data available to the community of researchers.</xs:documentation>
+          </xs:annotation>
+          <xs:simpleType>
+            <xs:restriction base="nonemptycontentStringType"/>
+          </xs:simpleType>
+        </xs:element>
+        <xs:element name="publicationYear">
+          <xs:annotation>
+            <xs:documentation>Year when the data is made publicly available. If an embargo period has been in effect, use the date when the embargo period ends.</xs:documentation>
+            <xs:documentation>In the case of datasets, "publish" is understood to mean making the data available on a specific date to the community of researchers. If there is no standard publication year value, use the date that would be preferred from a citation perspective.</xs:documentation>
+            <xs:documentation>YYYY</xs:documentation>
+          </xs:annotation>
+          <xs:simpleType>
+            <xs:restriction base="yearType"/>
+          </xs:simpleType>
+        </xs:element>
+        <xs:element name="resourceType">
+          <xs:annotation>
+            <xs:documentation>The type of a resource. You may enter an additional free text description.</xs:documentation>
+            <xs:documentation>The format is open, but the preferred format is a single term of some detail so that a pair can be formed with the sub-property.</xs:documentation>
+          </xs:annotation>
+          <xs:complexType>
+            <xs:simpleContent>
+              <xs:extension base="xs:string">
+                <xs:attribute name="resourceTypeGeneral" type="resourceType" use="required"/>
+              </xs:extension>
+            </xs:simpleContent>
+          </xs:complexType>
+        </xs:element>
+        <!--OPTIONAL FIELDS-->
+        <xs:element name="subjects" minOccurs="0">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="subject" minOccurs="0" maxOccurs="unbounded">
+              <xs:annotation>
+                <xs:documentation>Subject, keywords, classification codes, or key phrases describing the resource.</xs:documentation>
+              </xs:annotation>
+              <xs:complexType>
+                <xs:simpleContent>
+                  <xs:extension base="xs:string">
+                    <xs:attribute name="subjectScheme" use="optional"/>
+                    <xs:attribute name="schemeURI" type="xs:anyURI" use="optional"/>
+                    <xs:attribute name="valueURI" type="xs:anyURI" use="optional"/>
+                    <xs:attribute ref="xml:lang"/>
+                  </xs:extension>
+                </xs:simpleContent>
+              </xs:complexType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="contributors" minOccurs="0">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="contributor" minOccurs="0" maxOccurs="unbounded">
+              <xs:annotation>
+                <xs:documentation>The institution or person responsible for collecting, creating, or otherwise contributing to the developement of the dataset.</xs:documentation>
+                <xs:documentation>The personal name format should be: Family, Given.</xs:documentation>
+              </xs:annotation>
+              <xs:complexType>
+                <xs:sequence>
+                  <xs:element name="contributorName">
+                    <xs:simpleType>
+                      <xs:restriction base="xs:string">
+                        <xs:minLength value="1"/>
+                      </xs:restriction>
+                    </xs:simpleType>
+                  </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:simpleContent>
+                        <xs:extension base="xs:string">
+                          <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:sequence>
+                <xs:attribute name="contributorType" type="contributorType" use="required"/>
+              </xs:complexType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="dates" minOccurs="0">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="date" minOccurs="0" maxOccurs="unbounded">
+                <xs:annotation>
+                  <xs:documentation>Different dates relevant to the work.</xs:documentation>
+                  <xs:documentation>YYYY,YYYY-MM-DD, YYYY-MM-DDThh:mm:ssTZD or any other format or level of granularity described in W3CDTF. Use RKMS-ISO8601 standard for depicting date ranges.</xs:documentation>
+                </xs:annotation>
+                <xs:complexType>
+                  <xs:simpleContent>
+                    <xs:extension base="xs:string">
+                      <xs:attribute name="dateType" type="dateType" use="required"/>
+                    </xs:extension>
+                  </xs:simpleContent>
+                </xs:complexType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="language" type="xs:language" minOccurs="0">
+          <xs:annotation>
+            <xs:documentation>Primary language of the resource. Allowed values are taken from  IETF BCP 47, ISO 639-1 language codes.</xs:documentation>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="alternateIdentifiers" minOccurs="0">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="alternateIdentifier" minOccurs="0" maxOccurs="unbounded">
+                <xs:annotation>
+                  <xs:documentation>An identifier or identifiers other than the primary Identifier applied to the resource being registered. This may be any alphanumeric string which is unique within its domain of issue. May be used for local identifiers. AlternateIdentifier should be used for another identifier of the same instance (same location, same file).</xs:documentation>
+                </xs:annotation>
+                <xs:complexType>
+                  <xs:simpleContent>
+                    <xs:extension base="xs:string">
+                      <xs:attribute name="alternateIdentifierType" use="required"/>
+                    </xs:extension>
+                  </xs:simpleContent>
+                </xs:complexType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="relatedIdentifiers" minOccurs="0">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="relatedIdentifier" minOccurs="0" maxOccurs="unbounded">
+                <xs:annotation>
+                  <xs:documentation>Identifiers of related resources. Use this property to indicate subsets of properties, as appropriate.</xs:documentation>
+                </xs:annotation>
+                <xs:complexType>
+                  <xs:simpleContent>
+                    <xs:extension base="xs:string">
+                      <xs:attribute name="relatedIdentifierType" type="relatedIdentifierType" use="required"/>
+                      <xs:attribute name="relationType" type="relationType" use="required"/>
+                      <xs:attribute name="relatedMetadataScheme" use="optional"/>
+                      <xs:attribute name="schemeURI" type="xs:anyURI" use="optional"/>
+                      <xs:attribute name="schemeType" use="optional"/>
+                    </xs:extension>
+                  </xs:simpleContent>
+                </xs:complexType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="sizes" minOccurs="0">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="size" type="xs:string" minOccurs="0" maxOccurs="unbounded">
+                <xs:annotation>
+                  <xs:documentation>Unstructures size information about the resource.</xs:documentation>
+                </xs:annotation>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="formats" minOccurs="0">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="format" type="xs:string" minOccurs="0" maxOccurs="unbounded">
+                <xs:annotation>
+                  <xs:documentation>Technical format of the resource.</xs:documentation>
+                  <xs:documentation>Use file extension or MIME type where possible.</xs:documentation>
+                </xs:annotation>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="version" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:documentation>Version number of the resource. If the primary resource has changed the version number increases.</xs:documentation>
+            <xs:documentation>Register a new identifier for a major version change. Individual stewards need to determine which are major vs. minor versions. May be used in conjunction with properties 11 and 12 (AlternateIdentifier and RelatedIdentifier) to indicate various information updates. May be used in conjunction with property 17 (Description) to indicate the nature and file/record range of version.</xs:documentation>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="rightsList" minOccurs="0">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="rights" minOccurs="0" maxOccurs="unbounded">
+                <xs:annotation>
+                  <xs:documentation>Any rights information for this resource. Provide a rights management statement for the resource or reference a service providing such information. Include embargo information if applicable.
+Use the complete title of a license and include version information if applicable.</xs:documentation>
+                </xs:annotation>
+                <xs:complexType>
+                  <xs:simpleContent>
+                    <xs:extension base="xs:string">
+                      <xs:attribute name="rightsURI" type="xs:anyURI" use="optional"/>
+                    </xs:extension>
+                  </xs:simpleContent>
+                </xs:complexType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="descriptions" minOccurs="0">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="description" minOccurs="0" maxOccurs="unbounded">
+                <xs:annotation>
+                  <xs:documentation>All additional information that does not fit in any of the other categories. May be used for technical information. It is a best practice to supply a description.</xs:documentation>
+                </xs:annotation>
+                <xs:complexType mixed="true">
+                  <xs:choice>
+                    <xs:element name="br" minOccurs="0" maxOccurs="unbounded">
+                      <xs:simpleType>
+                        <xs:restriction base="xs:string">
+                          <xs:length value="0"/>
+                        </xs:restriction>
+                      </xs:simpleType>
+                    </xs:element>
+                  </xs:choice>
+                  <xs:attribute name="descriptionType" type="descriptionType" use="required"/>
+                  <xs:attribute ref="xml:lang"/>
+                </xs:complexType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="geoLocations" minOccurs="0">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="geoLocation" minOccurs="0" maxOccurs="unbounded">
+                <xs:complexType>
+                  <xs:all>
+                    <xs:element name="geoLocationPlace" minOccurs="0">
+                      <xs:annotation>
+                        <xs:documentation>Spatial region or named place where the data was gathered or about which the data is focused.</xs:documentation>
+                      </xs:annotation>
+                    </xs:element>
+                    <xs:element name="geoLocationPoint" type="point" minOccurs="0">
+                      <xs:annotation>
+                        <xs:documentation>A point contains a single latitude-longitude pair, separated by whitespace.</xs:documentation>
+                      </xs:annotation>
+                    </xs:element>
+                    <xs:element name="geoLocationBox" type="box" minOccurs="0">
+                      <xs:annotation>
+                        <xs:documentation>A box contains two white space separated latitude-longitude pairs, with each pair separated by whitespace. The first pair is the lower corner, the second is the upper corner.</xs:documentation>
+                      </xs:annotation>
+                    </xs:element>
+                    <xs:element name="geoLocationPolygon" minOccurs="0">
+                      <xs:annotation>
+                        <xs:documentation>A drawn polygon area, defined by a set of points and lines connecting the points in a closed chain.</xs:documentation>
+                      </xs:annotation>
+                      <xs:complexType>
+                        <xs:sequence>
+                          <xs:element name="polygonPoint" type="point" minOccurs="3" maxOccurs="unbounded"/>
+                        </xs:sequence>
+                      </xs:complexType>
+                    </xs:element>
+                  </xs:all>
+                </xs:complexType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="fundingReferences" minOccurs="0">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="fundingReference" minOccurs="0" maxOccurs="unbounded">
+                <xs:annotation>
+                  <xs:documentation>Information about financial support (funding) for the resource being registered.</xs:documentation>
+                </xs:annotation>
+                <xs:complexType>
+                  <xs:all>
+                    <xs:element name="funderName" minOccurs="1" maxOccurs="1">
+                      <xs:annotation>
+                        <xs:documentation>Name of the funding provider.</xs:documentation>
+                      </xs:annotation>
+                      <xs:simpleType>
+                        <xs:restriction base="nonemptycontentStringType"/>
+                      </xs:simpleType>
+                    </xs:element>
+                    <xs:element name="funderIdentifier" minOccurs="0">
+                      <xs:annotation>
+                        <xs:documentation>Uniquely identifies a funding entity, according to various types.</xs:documentation>
+                      </xs:annotation>
+                      <xs:complexType>
+                        <xs:simpleContent>
+                          <xs:extension base="xs:string">
+                            <xs:attribute name="funderIdentifierType" type="funderIdentifierType" use="required"/>
+                          </xs:extension>
+                        </xs:simpleContent>
+                      </xs:complexType>
+                    </xs:element>
+                    <xs:element name="awardNumber" minOccurs="0">
+                      <xs:annotation>
+                        <xs:documentation>The code assigned by the funder to a sponsored award (grant).</xs:documentation>
+                      </xs:annotation>
+                      <xs:complexType>
+                        <xs:simpleContent>
+                          <xs:extension base="xs:string">
+                            <xs:attribute name="awardURI" type="xs:anyURI" use="optional"/>
+                          </xs:extension>
+                        </xs:simpleContent>
+                      </xs:complexType>
+                    </xs:element>
+                    <xs:element name="awardTitle" minOccurs="0">
+                      <xs:annotation>
+                        <xs:documentation>The human readable title of the award (grant).</xs:documentation>
+                      </xs:annotation>
+                      <xs:simpleType>
+                        <xs:restriction base="nonemptycontentStringType"/>
+                      </xs:simpleType>
+                    </xs:element>
+                  </xs:all>
+                </xs:complexType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+      </xs:all>
+    </xs:complexType>
+  </xs:element>
+  <!-- TYPE DECLARATIONS -->
+  <!-- defines the value for a DOI"  -->
+  <xs:simpleType name="doiType">
+    <xs:restriction base="xs:token">
+      <xs:pattern value="10\..+/.+"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <!-- defines value for mandatory fields -->
+  <xs:simpleType name="nonemptycontentStringType">
+    <xs:restriction base="xs:string">
+      <xs:minLength value="1"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:attributeGroup name="nameId">
+    <xs:attribute name="nameIdentifier" type="xs:string" use="optional"/>
+    <xs:attribute name="nameIdentifierScheme" type="xs:string" use="optional"/>
+  </xs:attributeGroup>
+  <!-- defines the value for a year -->
+  <xs:simpleType name="yearType">
+    <xs:restriction base="xs:token">
+      <xs:pattern value="[\d]{4}"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <!-- definitions for geoLocation -->
+  <xs:complexType name="point">
+    <xs:all>
+      <xs:element name="pointLongitude" type="longitudeType" minOccurs="1"/>
+      <xs:element name="pointLatitude" type="latitudeType" minOccurs="1"/>
+    </xs:all>
+  </xs:complexType>
+  <xs:complexType name="box">
+    <xs:all>
+      <xs:element name="westBoundLongitude" type="longitudeType" minOccurs="1"/>
+      <xs:element name="eastBoundLongitude" type="longitudeType" minOccurs="1"/>
+      <xs:element name="southBoundLatitude" type="latitudeType" minOccurs="1"/>
+      <xs:element name="northBoundLatitude" type="latitudeType" minOccurs="1"/>
+    </xs:all>
+  </xs:complexType>
+  <xs:simpleType name="longitudeType">
+    <xs:restriction base="xs:float">
+      <xs:minInclusive value="-180"/>
+      <xs:maxInclusive value="180"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="latitudeType">
+    <xs:restriction base="xs:float">
+      <xs:minInclusive value="-90"/>
+      <xs:maxInclusive value="90"/>
+    </xs:restriction>
+  </xs:simpleType>
+</xs:schema>

data/spec/unit/datacite/mapping/funding_reference_spec.rb

@@ -0,0 +1,61 @@
+require 'spec_helper'
+
+module Datacite
+  module Mapping
+    describe FundingReference do
+
+      describe '#initialize' do
+        it 'accepts an AwardNumber object' do
+          award_number = AwardNumber.new(value: '9 3/4')
+          fref = FundingReference.new(name: 'Ministry of Magic', award_number: award_number)
+          expect(fref.award_number).to be(award_number)
+        end
+
+        it 'accepts a text award_number' do
+          fref = FundingReference.new(name: 'Ministry of Magic', award_number: '9 3/4')
+          award_number = fref.award_number
+          expect(award_number).to be_an(AwardNumber)
+          expect(award_number.value).to eq('9 3/4')
+        end
+      end
+
+      describe '#parse_xml' do
+        attr_reader :fref_xml
+        attr_reader :fref
+
+        before(:all) do
+          @fref_xml = '<fundingReference>
+                                   <funderName>European Commission</funderName>
+                                   <funderIdentifier funderIdentifierType="Crossref Funder ID">http://doi.org/10.13039/501100000780</funderIdentifier>
+                                   <awardNumber awardURI="http://cordis.europa.eu/project/rcn/100180_en.html">282625</awardNumber>
+                                   <awardTitle>MOTivational strength of ecosystem services and alternative ways to express the value of BIOdiversity</awardTitle>
+                                 </fundingReference>'.freeze
+
+          @fref = FundingReference.parse_xml(fref_xml)
+        end
+
+        it 'parses XML' do
+          expect(fref.name).to eq('European Commission')
+
+          id = fref.identifier
+          expect(id).to be_a(FunderIdentifier)
+          expect(id.type).to eq(FunderIdentifierType::CROSSREF_FUNDER_ID)
+          expect(id.value).to eq('http://doi.org/10.13039/501100000780')
+
+          award_number = fref.award_number
+          expect(award_number).to be_an(AwardNumber)
+          expect(award_number.value).to eq('282625')
+          expect(award_number.uri).to eq(URI('http://cordis.europa.eu/project/rcn/100180_en.html'))
+
+          expect(fref.award_title).to eq('MOTivational strength of ecosystem services and alternative ways to express the value of BIOdiversity')
+        end
+
+        it 'round-trips' do
+          xml = fref.write_xml
+          expect(xml).to be_xml(fref_xml)
+        end
+      end
+
+    end
+  end
+end

data/spec/unit/datacite/mapping/resource_spec.rb

@@ -511,11 +511,28 @@ module Datacite
         end
 
         it 'correctly differentiates required and optional attributes'
+
+        it 'parses a Datacite 4.0 document with FundingReference' do
+          resource = Resource.parse_xml(File.read('spec/data/kernel-4.0/datacite-example-fundingReference-v.4.0.xml'))
+          funding_references = resource.funding_references
+          expect(funding_references.size).to eq(2)
+          funding_references.each do |fref|
+            expect(fref).to be_a(FundingReference)
+          end
+        end
       end
 
       describe '#save_to_xml' do
         it 'sets the namespace to http://datacite.org/schema/kernel-3'
         it "doesn't clobber the namespace on the various xml:lang attributes"
+
+        # TODO: make this work; maybe it's the language that's the issue?
+        xit 'round-trips a Datacite 4.0 document with FundingReference' do
+          xml_text = File.read('spec/data/kernel-4.0/datacite-example-fundingReference-v.4.0.xml')
+          resource = Resource.parse_xml(xml_text)
+          saved_xml = resource.save_to_xml
+          expect(saved_xml).to be_xml(xml_text)
+        end
       end
 
       describe 'identifier' do
@@ -688,7 +705,9 @@ module Datacite
 
         describe '#parse_xml' do
           it 'handles all Dash 1 documents' do
-            Dir.glob('/Users/dmoles/Work/datacite-mapping/spec/data/dash1-datacite-xml/*mrt-datacite.xml') do |f|
+            versions = []
+
+            Dir.glob('spec/data/dash1-datacite-xml/*mrt-datacite.xml') do |f|
               basename = File.basename(f)
               bad_contrib_regex = Regexp.new('<contributor contributorType="([^"]+)">\p{Space}*<contributor>([^<]+)</contributor>\p{Space}*</contributor>', Regexp::MULTILINE)
               good_contrib_replacement = "<contributor contributorType=\"\\1\">\n<contributorName>\\2</contributorName>\n</contributor>"
@@ -704,6 +723,8 @@ module Datacite
               end
               next unless resource
 
+              versions << resource.version if resource.version
+
               actual_xml = nil
               begin
                 actual_xml = resource.write_xml

data/spec/unit/datacite/mapping/rights_spec.rb

@@ -70,6 +70,16 @@ module Datacite
           expected_xml = '<rights rightsURI="http://creativecommons.org/publicdomain/zero/1.0/">CC0 1.0 Universal</rights>'
           expect(rights.save_to_xml).to be_xml(expected_xml)
         end
+        it 'works with convenience constants' do
+          rights = Rights::CC_ZERO
+          expected_xml = '<rights rightsURI="https://creativecommons.org/publicdomain/zero/1.0/">CC0 1.0 Universal (CC0 1.0) Public Domain Dedication</rights>'
+          expect(rights.save_to_xml).to be_xml(expected_xml)
+
+          rights = Rights::CC_BY
+          expected_xml = '<rights rightsURI="https://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International (CC-BY)</rights>'
+          expect(rights.save_to_xml).to be_xml(expected_xml)
+        end
+
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datacite-mapping
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.17
 platform: ruby
 authors:
 - David Moles
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-14 00:00:00.000000000 Z
+date: 2016-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typesafe_enum
@@ -216,6 +216,7 @@ files:
 - lib/datacite/mapping/creator.rb
 - lib/datacite/mapping/date.rb
 - lib/datacite/mapping/description.rb
+- lib/datacite/mapping/funding_reference.rb
 - lib/datacite/mapping/geo_location.rb
 - lib/datacite/mapping/geo_location_box.rb
 - lib/datacite/mapping/geo_location_point.rb
@@ -359,6 +360,8 @@ files:
 - spec/data/dash1-datacite-xml/ucsf-ark+=b7272=q6w66hpn-mrt-datacite.xml
 - spec/data/dash1-datacite-xml/ucsf-ark+=b7272=q6x63jt1-mrt-datacite.xml
 - spec/data/dash1-datacite-xml/ucsf-ark+=b7272=q6z60kzd-mrt-datacite.xml
+- spec/data/kernel-4.0/datacite-example-fundingReference-v.4.0.xml
+- spec/data/kernel-4.0/metadata.xsd
 - spec/data/metadata.xsd
 - spec/data/mrt-datacite.xml
 - spec/data/resource.xml
@@ -369,6 +372,7 @@ files:
 - spec/unit/datacite/mapping/creator_spec.rb
 - spec/unit/datacite/mapping/date_spec.rb
 - spec/unit/datacite/mapping/description_spec.rb
+- spec/unit/datacite/mapping/funding_reference_spec.rb
 - spec/unit/datacite/mapping/geo_location_box_spec.rb
 - spec/unit/datacite/mapping/geo_location_point_spec.rb
 - spec/unit/datacite/mapping/geo_location_spec.rb
@@ -535,6 +539,8 @@ test_files:
 - spec/data/dash1-datacite-xml/ucsf-ark+=b7272=q6w66hpn-mrt-datacite.xml
 - spec/data/dash1-datacite-xml/ucsf-ark+=b7272=q6x63jt1-mrt-datacite.xml
 - spec/data/dash1-datacite-xml/ucsf-ark+=b7272=q6z60kzd-mrt-datacite.xml
+- spec/data/kernel-4.0/datacite-example-fundingReference-v.4.0.xml
+- spec/data/kernel-4.0/metadata.xsd
 - spec/data/metadata.xsd
 - spec/data/mrt-datacite.xml
 - spec/data/resource.xml
@@ -545,6 +551,7 @@ test_files:
 - spec/unit/datacite/mapping/creator_spec.rb
 - spec/unit/datacite/mapping/date_spec.rb
 - spec/unit/datacite/mapping/description_spec.rb
+- spec/unit/datacite/mapping/funding_reference_spec.rb
 - spec/unit/datacite/mapping/geo_location_box_spec.rb
 - spec/unit/datacite/mapping/geo_location_point_spec.rb
 - spec/unit/datacite/mapping/geo_location_spec.rb