datacite-mapping 0.3.0 → 0.4.0

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

@@ -1,4 +1,3 @@
-
 # frozen_string_literal: true
 
 require 'spec_helper'
@@ -174,32 +173,31 @@ module Datacite
             expect { Resource.new(args) }.to raise_error(ArgumentError)
           end
           it 'requires a non-blank publisher' do
-            args[:publisher] = "\n  \n"
-            expect { Resource.new(args) }.to raise_error(ArgumentError)
+            expect { Publisher.new(value: '   ') }.to raise_error(ArgumentError)
           end
           it 'can be initialized' do
             resource = Resource.new(args)
-            expect(resource.publisher).to eq(publisher)
+            expect(resource.publisher.value).to eq(publisher)
           end
           it 'can be set' do
             new_publisher = 'University of California'
             resource = Resource.new(args)
             resource.publisher = new_publisher
-            expect(resource.publisher).to eq(new_publisher)
+            expect(resource.publisher.value).to eq(new_publisher)
           end
           it 'strips on initialization' do
-            args[:publisher] = '
+            args[:publisher] = Publisher.new(value: '
             University of California
-          '
+             ')
             resource = Resource.new(args)
-            expect(resource.publisher).to eq('University of California')
+            expect(resource.publisher.value).to eq('University of California')
           end
           it 'strips on set' do
             resource = Resource.new(args)
-            resource.publisher = '
+            resource.publisher = Publisher.new(value: '
             University of California
-          '
-            expect(resource.publisher).to eq('University of California')
+              ')
+            expect(resource.publisher.value).to eq('University of California')
           end
         end
 
@@ -922,7 +920,7 @@ module Datacite
         end
 
         def parse_file(xml_text, basename)
-          return Resource.parse_xml(xml_text)
+          Resource.parse_xml(xml_text)
         rescue Exception => e # rubocop:disable Lint/RescueException
           warn "Error parsing #{basename}: #{e}"
           File.open("tmp/#{basename}-xml_text.xml", 'w') { |t| t.write(xml_text) }
@@ -933,7 +931,7 @@ module Datacite
         def write_xml(resource, basename, options)
           # Workaround for Dash 1 datacite.xml with missing DOI
           resource.identifier = Identifier.from_doi('10.5555/12345678') unless resource.identifier
-          return resource.write_xml(options)
+          resource.write_xml(options)
         rescue Exception => e # rubocop:disable Lint/RescueException
           warn "Error writing #{basename}: #{e}"
           raise
@@ -988,11 +986,10 @@ module Datacite
           actual_xml = write_xml(resource, basename, options)
           expected_xml.gsub!(/(<resource[^>]+>)\s+(<creators>)/, "\\1\n  <identifier identifierType=\"DOI\">10.5555/12345678</identifier>\n  \\2") if fix_dash1
           begin
-            # actual_xml = actual_xml.gsub('&apos;', "'")
             expect(actual_xml).to be_xml(expected_xml)
           rescue Exception # rubocop:disable Lint/RescueException
-            File.open("tmp/#{basename}-expected.xml", 'w') { |t| t.write(expected_xml) }
-            File.open("tmp/#{basename}-actual.xml", 'w') { |t| t.write(actual_xml) }
+            File.open("/tmp/#{basename}-expected.xml", 'w') { |t| t.write(expected_xml) }
+            File.open("/tmp/#{basename}-actual.xml", 'w') { |t| t.write(actual_xml) }
             raise
           end
         end
@@ -1155,7 +1152,7 @@ module Datacite
 
       describe '#save_to_file' do
         it 'saves to a file' do
-          xml_text = File.read('spec/data/datacite4/datacite-example-full-v4.0.xml')
+          xml_text = File.read('spec/data/datacite4/datacite-example-full-v4.xml')
           resource = Resource.parse_xml(xml_text)
           Dir.mktmpdir('resource_spec') do |dir|
             path = "#{dir}/resource.xml"

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

@@ -14,9 +14,6 @@ module Datacite
           rights = Rights.new(value: 'CC0 1.0 Universal', uri: URI('http://creativecommons.org/publicdomain/zero/1.0/'))
           expect(rights.uri).to eq(URI('http://creativecommons.org/publicdomain/zero/1.0/'))
         end
-        it 'requires a value' do
-          expect { Rights.new(uri: URI('http://creativecommons.org/publicdomain/zero/1.0/')) }.to raise_error(ArgumentError)
-        end
       end
 
       describe '#value=' do
@@ -25,16 +22,6 @@ module Datacite
           rights.value = 'CC0 1.0 Universal'
           expect(rights.value).to eq('CC0 1.0 Universal')
         end
-        it 'requires a value' do
-          rights = Rights.new(value: 'CC0 1.0 Universal')
-          expect { rights.value = nil }.to raise_error(ArgumentError)
-          expect(rights.value).to eq('CC0 1.0 Universal')
-        end
-        it 'requires a non-empty value' do
-          rights = Rights.new(value: 'CC0 1.0 Universal')
-          expect { rights.value = '' }.to raise_error(ArgumentError)
-          expect(rights.value).to eq('CC0 1.0 Universal')
-        end
       end
 
       describe '#uri=' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datacite-mapping
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - David Moles
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-02 00:00:00.000000000 Z
+date: 2019-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typesafe_enum
@@ -211,9 +211,12 @@ files:
 - examples/reading.rb
 - examples/writing.rb
 - lib/datacite/mapping.rb
+- lib/datacite/mapping/affiliation.rb
 - lib/datacite/mapping/alternate_identifier.rb
 - lib/datacite/mapping/contributor.rb
+- lib/datacite/mapping/contributor_name.rb
 - lib/datacite/mapping/creator.rb
+- lib/datacite/mapping/creator_name.rb
 - lib/datacite/mapping/date.rb
 - lib/datacite/mapping/date_value.rb
 - lib/datacite/mapping/description.rb
@@ -227,7 +230,9 @@ files:
 - lib/datacite/mapping/identifier.rb
 - lib/datacite/mapping/module_info.rb
 - lib/datacite/mapping/name_identifier.rb
+- lib/datacite/mapping/name_type.rb
 - lib/datacite/mapping/namespace_extensions.rb
+- lib/datacite/mapping/publisher.rb
 - lib/datacite/mapping/read_only_nodes.rb
 - lib/datacite/mapping/related_identifier.rb
 - lib/datacite/mapping/resource.rb
@@ -400,18 +405,23 @@ files:
 - spec/data/datacite3/datacite-example-video-v3.0.xml
 - spec/data/datacite3/datacite-example-workflow-v3.0.xml
 - spec/data/datacite3/metadata.xsd
-- spec/data/datacite4/datacite-example-Box_dateCollected_DataCollector-v4.0.xml
-- spec/data/datacite4/datacite-example-GeoLocation-v4.0.xml
-- spec/data/datacite4/datacite-example-HasMetadata-v4.0.xml
-- spec/data/datacite4/datacite-example-ResearchGroup_Methods-v4.0.xml
-- spec/data/datacite4/datacite-example-ResourceTypeGeneral_Collection-v4.0.xml
-- spec/data/datacite4/datacite-example-complicated-v4.0.xml
-- spec/data/datacite4/datacite-example-dataset-v4.0.xml
-- spec/data/datacite4/datacite-example-full-v4.0.xml
-- spec/data/datacite4/datacite-example-fundingReference-v.4.0.xml
-- spec/data/datacite4/datacite-example-relationTypeIsIdenticalTo-v4.0.xml
-- spec/data/datacite4/datacite-example-video-v4.0.xml
-- spec/data/datacite4/datacite-example-workflow-v4.0.xml
+- spec/data/datacite4/datacite-example-Box_dateCollected_DataCollector-v4.xml
+- spec/data/datacite4/datacite-example-GeoLocation-v4.xml
+- spec/data/datacite4/datacite-example-HasMetadata-v4.xml
+- spec/data/datacite4/datacite-example-ResearchGroup_Methods-v4.xml
+- spec/data/datacite4/datacite-example-ResourceTypeGeneral_Collection-v4.xml
+- spec/data/datacite4/datacite-example-affiliation-v4.xml
+- spec/data/datacite4/datacite-example-complicated-v4.xml
+- spec/data/datacite4/datacite-example-datapaper-v4.xml
+- spec/data/datacite4/datacite-example-dataset-v4.xml
+- spec/data/datacite4/datacite-example-full-v4.xml
+- spec/data/datacite4/datacite-example-fundingReference-v4.xml
+- spec/data/datacite4/datacite-example-polygon-advanced-v4.xml
+- spec/data/datacite4/datacite-example-polygon-v4.xml
+- spec/data/datacite4/datacite-example-relationTypeIsIdenticalTo-v4.xml
+- spec/data/datacite4/datacite-example-software-v4.xml
+- spec/data/datacite4/datacite-example-video-v4.xml
+- spec/data/datacite4/datacite-example-workflow-v4.xml
 - spec/data/datacite4/metadata.xsd
 - spec/rspec_custom_matchers.rb
 - spec/spec_helper.rb
@@ -452,8 +462,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Parses and generates Datacite XML documents
@@ -623,18 +632,23 @@ test_files:
 - spec/data/datacite3/datacite-example-video-v3.0.xml
 - spec/data/datacite3/datacite-example-workflow-v3.0.xml
 - spec/data/datacite3/metadata.xsd
-- spec/data/datacite4/datacite-example-Box_dateCollected_DataCollector-v4.0.xml
-- spec/data/datacite4/datacite-example-GeoLocation-v4.0.xml
-- spec/data/datacite4/datacite-example-HasMetadata-v4.0.xml
-- spec/data/datacite4/datacite-example-ResearchGroup_Methods-v4.0.xml
-- spec/data/datacite4/datacite-example-ResourceTypeGeneral_Collection-v4.0.xml
-- spec/data/datacite4/datacite-example-complicated-v4.0.xml
-- spec/data/datacite4/datacite-example-dataset-v4.0.xml
-- spec/data/datacite4/datacite-example-full-v4.0.xml
-- spec/data/datacite4/datacite-example-fundingReference-v.4.0.xml
-- spec/data/datacite4/datacite-example-relationTypeIsIdenticalTo-v4.0.xml
-- spec/data/datacite4/datacite-example-video-v4.0.xml
-- spec/data/datacite4/datacite-example-workflow-v4.0.xml
+- spec/data/datacite4/datacite-example-Box_dateCollected_DataCollector-v4.xml
+- spec/data/datacite4/datacite-example-GeoLocation-v4.xml
+- spec/data/datacite4/datacite-example-HasMetadata-v4.xml
+- spec/data/datacite4/datacite-example-ResearchGroup_Methods-v4.xml
+- spec/data/datacite4/datacite-example-ResourceTypeGeneral_Collection-v4.xml
+- spec/data/datacite4/datacite-example-affiliation-v4.xml
+- spec/data/datacite4/datacite-example-complicated-v4.xml
+- spec/data/datacite4/datacite-example-datapaper-v4.xml
+- spec/data/datacite4/datacite-example-dataset-v4.xml
+- spec/data/datacite4/datacite-example-full-v4.xml
+- spec/data/datacite4/datacite-example-fundingReference-v4.xml
+- spec/data/datacite4/datacite-example-polygon-advanced-v4.xml
+- spec/data/datacite4/datacite-example-polygon-v4.xml
+- spec/data/datacite4/datacite-example-relationTypeIsIdenticalTo-v4.xml
+- spec/data/datacite4/datacite-example-software-v4.xml
+- spec/data/datacite4/datacite-example-video-v4.xml
+- spec/data/datacite4/datacite-example-workflow-v4.xml
 - spec/data/datacite4/metadata.xsd
 - spec/rspec_custom_matchers.rb
 - spec/spec_helper.rb

data/spec/data/datacite4/datacite-example-full-v4.0.xml

@@ -1,71 +0,0 @@
-<?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/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>
-  <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>
-  </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>
-    </geoLocation>
-  </geoLocations>
-</resource>