datacite-mapping 0.1.17.2 → 0.2.0

data/lib/datacite/mapping/rights.rb

@@ -28,6 +28,8 @@ module Datacite
       # @!attribute [rw] value
       #   @return [String] the rights statement. Cannot be empty or nil.
       text_node :value, 'text()'
+
+      fallback_mapping :datacite_3, :_default
     end
 
     class Rights

data/lib/datacite/mapping/subject.rb

@@ -10,22 +10,23 @@ module Datacite
       # Initializes a new {Subject}
       # @param scheme [String, nil] the subject scheme or classification code or authority if one is used. Optional.
       # @param scheme_uri [URI, nil] the URI of the subject scheme or classification code or authority if one is used. Optional.
-      # @param language [String] an IETF BCP 47, ISO 639-1 language code identifying the language.
-      #   It's unclear from the spec whether language is required; to play it safe, if it's missing, we default to 'en'.
+      # @param language [String, nil] an IETF BCP 47, ISO 639-1 language code identifying the language.
       # @param value [String] the subject itself.
-      def initialize(scheme: nil, scheme_uri: nil, language: 'en', value:)
+      def initialize(scheme: nil, scheme_uri: nil, language: nil, value:)
         self.scheme = scheme
         self.scheme_uri = scheme_uri
         self.language = language
         self.value = value
       end
 
-      def language
-        @language || 'en'
+      def language=(value)
+        @language = value && value.strip
       end
 
-      def language=(value)
-        @language = value.strip if value
+      def value=(v)
+        new_value = v && v.strip
+        fail ArgumentError, 'Value cannot be empty or nil' unless new_value && !new_value.empty?
+        @value = new_value
       end
 
       # @!attribute [rw] scheme
@@ -37,14 +38,14 @@ module Datacite
       uri_node :scheme_uri, '@schemeURI', default_value: nil
 
       # @!attribute [rw] language
-      #   @return [String] an IETF BCP 47, ISO 639-1 language code identifying the language.
-      #     It's unclear from the spec whether language is required; to play it safe, if it's missing, we default to 'en'.
+      #   @return [String, nil] an IETF BCP 47, ISO 639-1 language code identifying the language.
       text_node :language, '@xml:lang', default_value: nil
 
       # @!attribute [rw] value
       #   @return [String] the subject itself.
       text_node :value, 'text()'
 
+      fallback_mapping :datacite_3, :_default
     end
   end
 end

data/lib/datacite/mapping/title.rb

@@ -21,32 +21,27 @@ module Datacite
       include XML::Mapping
 
       # Initializes a new {Title}.
-      # @param language [String] an IETF BCP 47, ISO 639-1 language code identifying the language.
-      #   It's unclear from the spec whether language is required; to play it safe, if it's missing, we default to 'en'.
+      # @param language [String, nil] an IETF BCP 47, ISO 639-1 language code identifying the language.
       # @param value [String] the title itself.
       # @param type [TitleType, nil] the title type. Optional.
-      def initialize(language: 'en', value:, type: nil)
+      def initialize(language: nil, value:, type: nil)
         self.language = language
         self.type = type
         self.value = value
       end
 
-      def language
-        @language || 'en'
-      end
-
       def language=(value)
-        @language = value.strip if value
+        @language = value && value.strip
       end
 
       def value=(v)
-        fail ArgumentError, 'Value cannot be empty or nil' unless v && !v.empty?
-        @value = v.strip
+        new_value = v && v.strip
+        fail ArgumentError, 'Value cannot be empty or nil' unless new_value && !new_value.empty?
+        @value = new_value.strip
       end
 
       # @!attribute [rw] language
       #   @return [String] an IETF BCP 47, ISO 639-1 language code identifying the language.
-      #     It's unclear from the spec whether language is required; to play it safe, if it's missing, we default to 'en'.
       text_node :language, '@xml:lang', default_value: nil
 
       # @!attribute [rw] type
@@ -57,6 +52,7 @@ module Datacite
       #   @return [String] the title itself.
       text_node :value, 'text()'
 
+      fallback_mapping :datacite_3, :_default
     end
   end
 end

data/spec/data/datacite-4-synthetic.xml

@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  A modified datacite-example-full-v4.0.xml that includes:
+  - fundingReference
+  - IGSN related identifier
+  - geoLocationPolygon
+-->
+<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/example-full</identifier>
+  <creators>
+    <creator>
+      <creatorName>Miller, Elizabeth</creatorName>
+      <givenName>Elizabeth</givenName>
+      <familyName>Miller</familyName>
+      <nameIdentifier schemeURI="http://orcid.org/" nameIdentifierScheme="ORCID">0000-0001-5000-0007</nameIdentifier>
+      <affiliation>DataCite</affiliation>
+    </creator>
+  </creators>
+  <titles>
+    <title xml:lang="en-us">Full DataCite XML Example</title>
+    <title xml:lang="en-us" titleType="Subtitle">Demonstration of DataCite Properties.</title>
+  </titles>
+  <publisher>DataCite</publisher>
+  <publicationYear>2014</publicationYear>
+  <subjects>
+    <subject xml:lang="en-us" schemeURI="http://dewey.info/" subjectScheme="dewey">000 computer science</subject>
+  </subjects>
+  <contributors>
+    <contributor contributorType="ProjectLeader">
+      <contributorName>Starr, Joan</contributorName>
+      <nameIdentifier schemeURI="http://orcid.org/" nameIdentifierScheme="ORCID">0000-0002-7285-027X</nameIdentifier>
+      <affiliation>California Digital Library</affiliation>
+    </contributor>
+  </contributors>
+  <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="Updated">2014-10-17</date>
+  </dates>
+  <language>en-us</language>
+  <resourceType resourceTypeGeneral="Software">XML</resourceType>
+  <alternateIdentifiers>
+    <alternateIdentifier alternateIdentifierType="URL">http://schema.datacite.org/schema/meta/kernel-3.1/example/datacite-example-full-v3.1.xml</alternateIdentifier>
+  </alternateIdentifiers>
+  <relatedIdentifiers>
+    <relatedIdentifier relatedIdentifierType="URL" relationType="HasMetadata" relatedMetadataScheme="citeproc+json" schemeURI="https://github.com/citation-style-language/schema/raw/master/csl-data.json">http://data.datacite.org/application/citeproc+json/10.5072/example-full</relatedIdentifier>
+    <relatedIdentifier relatedIdentifierType="arXiv" relationType="IsReviewedBy">arXiv:0706.0001</relatedIdentifier>
+    <relatedIdentifier relatedIdentifierType="IGSN" relationType="References">IECUR0097</relatedIdentifier>
+  </relatedIdentifiers>
+  <sizes>
+    <size>3KB</size>
+  </sizes>
+  <formats>
+    <format>application/xml</format>
+  </formats>
+  <version>3.1</version>
+  <rightsList>
+    <rights rightsURI="http://creativecommons.org/publicdomain/zero/1.0/">CC0 1.0 Universal</rights>
+  </rightsList>
+  <descriptions>
+    <description xml:lang="en-us" descriptionType="Abstract">
+      XML example of all DataCite Metadata Schema v4.0 properties.
+    </description>
+  </descriptions>
+  <geoLocations>
+    <geoLocation>
+      <geoLocationPlace>Atlantic Ocean</geoLocationPlace>
+      <geoLocationPoint>
+        <pointLongitude>-67.302</pointLongitude>
+        <pointLatitude>31.233</pointLatitude>
+      </geoLocationPoint>
+      <geoLocationBox>
+        <westBoundLongitude>-71.032</westBoundLongitude>
+        <eastBoundLongitude>-68.211</eastBoundLongitude>
+        <southBoundLatitude>41.090</southBoundLatitude>
+        <northBoundLatitude>42.893</northBoundLatitude>
+      </geoLocationBox>
+      <geoLocationPolygon>
+        <polygonPoint>
+          <pointLongitude>-67.302</pointLongitude>
+          <pointLatitude>31.233</pointLatitude>
+        </polygonPoint>
+        <polygonPoint>
+          <pointLongitude>-71.032</pointLongitude>
+          <pointLatitude>-68.211</pointLatitude>
+        </polygonPoint>
+        <polygonPoint>
+          <pointLongitude>41.09</pointLongitude>
+          <pointLatitude>42.893</pointLatitude>
+        </polygonPoint>
+        <polygonPoint>
+          <pointLongitude>-67.302</pointLongitude>
+          <pointLatitude>31.233</pointLatitude>
+        </polygonPoint>
+      </geoLocationPolygon>
+    </geoLocation>
+  </geoLocations>
+</resource>