datacite-mapping 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8d570ed19b36949ccbd477c42b99eb16decca70
-  data.tar.gz: 3f9608fb7b9520b69bfc5a4f802d36d3cfeba96b
+  metadata.gz: 44bc8fb40c07e1508f27ec6da5fefe71e8c28406
+  data.tar.gz: 3ec5ac8144c71ea213111a9b711c61d801cf76d1
 SHA512:
-  metadata.gz: 1a4d62507b31e9a3c3086ae9a4f2721c7e8539d0e08d49ccff037e85eaca7a2b740d3055791ba81f8df5589e01ca0ab04d90beec3881c979039a58f874a06a4a
-  data.tar.gz: 56f0d8270aca2b12cca28998fca293490d8cb30ff89f4af1274fbb571bb81bd1a99d50f978cf42b6e1532ec4e573ebdecaf8e5b067978d5bc5dfb1b6b839cfeb
+  metadata.gz: 94be7b6dffca5c5ce26796e9c9149fc0fb3baa8211fd4420f32bc9a8898b931c05df37fe48b2c9fa4a234cf05949500376434511cd54a6c69b70022ab8cc2588
+  data.tar.gz: 0eb19b29c6e37d1c11c3ab9539e22faacbdc8427314a88837600400c22d8d3e7984379f20a0b3f2537da4f6c6e8639209eb8b2e5ce5e0efc8acc8fe734c6c138

data/.ruby-version

@@ -1 +1 @@
-2.2.3
+2.2.5

data/CHANGES.md

@@ -1,3 +1,8 @@
+## 0.2.5 (10 January 2017)
+
+- Update to Ruby 2.2.5
+- Treat blank or empty award number as nil when constructing a `FundingReference`.
+
 ## 0.2.4 (8 November 2016)
 
 - Fix issue where writing a resource in Datacite 3 would cause the Datacite 3 namespace

data/LICENSE.md

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 The Regents of the University of California
+Copyright (c) 2017 The Regents of the University of California
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/datacite/mapping/funding_reference.rb

@@ -89,11 +89,7 @@ module Datacite
       end
 
       def award_number=(value)
-        @award_number = if value.nil? || value.is_a?(AwardNumber)
-                          value
-                        else
-                          AwardNumber.new(value: value.to_s)
-                        end
+        @award_number = award_number_or_nil(value)
       end
 
       def to_s
@@ -107,6 +103,16 @@ module Datacite
       text_node :award_title, 'awardTitle', default_value: nil
 
       fallback_mapping :datacite_3, :_default
+
+      private
+
+      def award_number_or_nil(value)
+        return nil unless value
+        return value if value.is_a?(AwardNumber)
+        new_value = value.to_s.strip
+        return nil if new_value.empty?
+        AwardNumber.new(value: new_value)
+      end
     end
   end
 end

data/lib/datacite/mapping/module_info.rb

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

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

@@ -34,6 +34,16 @@ module Datacite
           expect(award_number).to be_an(AwardNumber)
           expect(award_number.value).to eq('9 3/4')
         end
+
+        it 'treats an empty award number as nil' do
+          fref = FundingReference.new(name: 'Ministry of Magic', award_number: '')
+          expect(fref.award_number).to be_nil
+        end
+
+        it 'treats a blank award number as nil' do
+          fref = FundingReference.new(name: 'Ministry of Magic', award_number: ' ')
+          expect(fref.award_number).to be_nil
+        end
       end
 
       describe '#parse_xml' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datacite-mapping
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - David Moles
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-08 00:00:00.000000000 Z
+date: 2017-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typesafe_enum
@@ -453,7 +453,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Parses and generates Datacite XML documents