datacite-mapping 0.1.17.1 → 0.1.17.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 398b5a165b8e4c39af2c0e7b18939bacbc6da51d
-  data.tar.gz: e3d8833bff3e5cc8b2ec11e7120d3660fe3bead8
+  metadata.gz: 206495b36be88be8111bbb81c4634ea5e558134e
+  data.tar.gz: 87f325106c27c2c500e97885ff5422c445ec806f
 SHA512:
-  metadata.gz: d248552035446c7c80dd7704246e3203d0e92ff90f4322280b7f6309ecd0b572527eeadd96deb3aa81dee7f6a9c87c8be30beab639359462b8197e12b922b88d
-  data.tar.gz: f0431676af52cc968d6f3f22d5dd7332dccb563aa7ab71fab6c16ae6d9dd414eb825aebaf8b8bf27943f22b15e72b8c4ddbb6b514a71d931c5d83ec7523ef869
+  metadata.gz: 646bbce9bea6dd89c1a8608ce1647cc9727ba022dca531d6f11b2478707813afec72b7c6681fcb5ea784bb02409f4caff55aa4c0911e3776b848cf696038bf82
+  data.tar.gz: d522fcb20188b4d41f0fb076120a00741926987ac1142703a3f1592b98693e058ea6f06438ead7f84e2b89e369760e6bff8725aeda14247206d59d6e67e10291

data/CHANGES.md

@@ -1,3 +1,7 @@
+## 0.1.17.2 (19 August 2016)
+
+- Filter out `<subject/>` tags without values
+
 ## 0.1.17.1 (5 August 2016)
 
 - In `Rights::CC_BY`, use "Creative Commons Attribution 4.0 International (CC BY 4.0)" 

data/lib/datacite/mapping/module_info.rb

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

data/lib/datacite/mapping/nonvalidating/identifier.rb

@@ -9,7 +9,7 @@ module Datacite
       # @!attribute [r] identifier_type
       #   @return [String] the identifier type (always 'DOI')
       # @!attribute [rw] value
-      #   @return [String] the identifier value. Must be a valid DOI value (`10.`_registrant code_`/`_suffix_)
+      #   @return [String, nil] the identifier value. Should be a valid DOI value (`10.`_registrant code_`/`_suffix_)
       class Identifier
         include XML::Mapping
 
@@ -23,8 +23,8 @@ module Datacite
         fallback_mapping(:_default, :nonvalidating)
 
         # Initializes a new {Identifier}
-        # @param value [String]
-        #   the identifier value. Must be a valid DOI value (`10.`_registrant code_`/`_suffix_)
+        # @param value [String, nil]
+        #   the identifier value. Should be a valid DOI value (`10.`_registrant code_`/`_suffix_)
         def initialize(value:)
           self.identifier_type = DOI
           self.value = value

data/lib/datacite/mapping/resource.rb

@@ -20,7 +20,7 @@ module Datacite
     # 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
+    class Resource # rubocop:disable Metrics/ClassLength
       include XML::MappingExtensions::Namespaced
 
       namespace DATACITE_3_NAMESPACE
@@ -110,10 +110,14 @@ module Datacite
         @publication_year = value.to_i
       end
 
-      def subject
+      def subjects
         (@subjects ||= []).select(&:value)
       end
 
+      def subjects=(value)
+        @subjects = (value || []).select(&:value)
+      end
+
       # @!attribute [rw] identifier
       #   @return [Identifier] a persistent identifier that identifies a resource.
       object_node :identifier, 'identifier', class: Identifier

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

@@ -2,6 +2,23 @@ require 'spec_helper'
 
 module Datacite
   module Mapping
+
+    describe FunderIdentifier do
+      describe '#new' do
+        it 'requires a non-nil type' do
+          expect do
+            FunderIdentifier.new(type: nil, value: 'http://doi.org/10.13039/501100000780')
+          end.to raise_error(ArgumentError)
+        end
+
+        it 'requires a non-nil value' do
+          expect do
+            FunderIdentifier.new(type: FunderIdentifierType::CROSSREF_FUNDER_ID, value: nil)
+          end.to raise_error(ArgumentError)
+        end
+      end
+    end
+
     describe FundingReference do
 
       describe '#initialize' do

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

@@ -11,6 +11,10 @@ module Datacite
           expect(id.value).to eq(value)
         end
 
+        it 'requires a non-nil value' do
+          expect { Identifier.new(value: nil) }.to raise_error(ArgumentError)
+        end
+
         it 'sets the type' do
           id = Identifier.new(value: '10.14749/1407399495')
           expect(id.identifier_type).to eq('DOI')

data/spec/unit/datacite/mapping/nonvalidating/identifier_spec.rb

@@ -4,6 +4,20 @@ module Datacite
   module Mapping
     module Nonvalidating
       describe Identifier do
+
+        describe '#new' do
+          it 'accepts a nil value' do
+            id = Identifier.new(value: nil)
+            expect(id.identifier_type).to eq('DOI')
+          end
+
+          it 'accepts an invalid value' do
+            id = Identifier.new(value: 'elvis')
+            expect(id.value).to eq('elvis')
+          end
+
+        end
+
         describe '#load_from_xml' do
           it 'parses a valid identifier' do
             xml_text = "<identifier identifierType='DOI'>10.14749/1407399498</identifier>"

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

@@ -587,6 +587,60 @@ module Datacite
       describe 'subjects' do
         it 'returns the subject list'
         it 'returns an editable list'
+
+        describe 'nonvalidating mode' do
+          it 'filters out empty subjects' do
+            xml_text = "<resource xsi:schemaLocation='http://datacite.org/schema/kernel-3 http://schema.datacite.org/meta/kernel-3/metadata.xsd' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns='http://datacite.org/schema/kernel-3'>
+                        <identifier identifierType='DOI'>10.14749/1407399495</identifier>
+                        <creators>
+                          <creator>
+                            <creatorName>Hedy Lamarr</creatorName>
+                          </creator>
+                          <creator>
+                            <creatorName>Herschlag, Natalie</creatorName>
+                          </creator>
+                        </creators>
+                        <titles>
+                          <title>An Account of a Very Odd Monstrous Calf</title>
+                        </titles>
+                        <publisher>California Digital Library</publisher>
+                        <publicationYear>2015</publicationYear>
+                        <subjects>
+                          <subject subjectScheme='LCSH' schemeURI='http://id.loc.gov/authorities/subjects' xml:lang='en-us'>Mammals--Embryology</subject>
+                          <subject/>
+                          <subject subjectScheme='dewey' schemeURI='http://dewey.info/' xml:lang='fr'>571.8 Croissance, développement, reproduction biologique (fécondation, sexualité)</subject>
+                          <subject subjectScheme='dewey' schemeURI='http://dewey.info/'></subject>
+                        </subjects>
+                       <language>en</language>
+                      </resource>"
+            resource = Resource.parse_xml(xml_text, mapping: :nonvalidating)
+
+            expected = [
+              Subject.new(
+                language: 'en-us',
+                scheme: 'LCSH',
+                scheme_uri: URI('http://id.loc.gov/authorities/subjects'),
+                value: 'Mammals--Embryology'
+              ),
+              Subject.new(
+                language: 'fr',
+                scheme: 'dewey',
+                scheme_uri: URI('http://dewey.info/'),
+                value: '571.8 Croissance, développement, reproduction biologique (fécondation, sexualité)'
+              )
+            ]
+
+            subjects = resource.subjects
+            expect(subjects.size).to eq(expected.size)
+            expected.each_with_index do |ex, i|
+              expect(subjects[i].language).to eq(ex.language)
+              expect(subjects[i].scheme).to eq(ex.scheme)
+              expect(subjects[i].scheme_uri).to eq(ex.scheme_uri)
+              expect(subjects[i].value).to eq(ex.value)
+            end
+          end
+        end
+
       end
 
       describe 'subjects=' do
@@ -745,6 +799,7 @@ module Datacite
                               .gsub(Regexp.new('<subjects>\p{space}</subjects>', Regexp::MULTILINE), '')
                               .gsub("'", '&apos;')
                               .gsub('"', "'")
+                              .gsub("<subject schemeURI='http://www.nlm.nih.gov/mesh/' subjectScheme='MeSH'/>", '')
 
               begin
                 expect(actual_tidy).to be_xml(expected_tidy)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datacite-mapping
 version: !ruby/object:Gem::Version
-  version: 0.1.17.1
+  version: 0.1.17.2
 platform: ruby
 authors:
 - David Moles
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-05 00:00:00.000000000 Z
+date: 2016-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typesafe_enum