datacite-mapping 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8775fcefefd2e9b7d31347a04a0495018109f239f1710c45a909c0c6a00f3a7d
-  data.tar.gz: 2d2ff543b99b85846be3c8d322f41967038cb836b83e2d8db6dba3ff7bafb4d8
+  metadata.gz: 5a6ecd59de223d63f3cbdba50679fd649e3b90b5faf54ac5c5d441cfc32c8a6f
+  data.tar.gz: ea434e0efa6850179bd6147a95e21ce0f682d6494d950bd7184dcb5eea929cdf
 SHA512:
-  metadata.gz: 54c5fc88e7ec891b088feff0022dcf89b8cbe8408e1fe6e2de6de76695e5c074397061210378a22c51d1db6653eccd07fe01076fea6807e49d199b8b73c98f90
-  data.tar.gz: 419006f6182826184d8a009552aac66aa59355422e679c43c56ce6b6f399fe21507b2c170800ddc5633135f49171cba54734c3f6fe9d70fc3a741d598594afd4
+  metadata.gz: a2e1ffe1f08383143bea79f9dd4d48404e60ecde812e6c2b089fec7a4ea6ff385b4f6a0e95e1cfda9baee9c6f99a85790c17f7abd0b94b980c44a0e0bebc5464
+  data.tar.gz: 5ee1fecb57d8eb8a7ca6a94ea3c2ecc02cf7872896350328ab42a2f292b6f51e599c0c427d5b444daa189f6db645a4ee7bd585dd96989e4b557fa967c0810240

data/.rubocop.yml

@@ -42,3 +42,9 @@ Style/ClassAndModuleChildren:
 Style/MixinUsage:
   Exclude:
     - 'examples/*'
+
+Style/OptionalBooleanParameter:
+  Enabled: false
+
+Naming/VariableNumber:
+  Enabled: false

data/.ruby-version

@@ -1 +1 @@
-2.6.6
+3.0.4

data/CHANGES.md

@@ -1,4 +1,8 @@
-## 0.4.0 (12 November 2019
+## 0.5.0 (12 November 2019)
+- Update to Ruby 3.0.4
+- Update to Rubocop 0.93
+
+## 0.4.0 (12 November 2019)
 
 - Datacite 4.3 support:
   - Added the new elements and attributes introduced in DataCite 4.1, 4.2, and 4.3.

data/datacite-mapping.gemspec

@@ -16,9 +16,11 @@ Gem::Specification.new do |spec|
   spec.license       = 'MIT'
 
   origin = `git config --get remote.origin.url`.chomp
-  origin_uri = origin.start_with?('http') ? URI(origin) : URI(origin.gsub(%r{git@([^:]+)(.com|.org)[^\/]+}, 'http://\1\2'))
+  origin_uri = origin.start_with?('http') ? URI(origin) : URI(origin.gsub(%r{git@([^:]+)(.com|.org)[^/]+}, 'http://\1\2'))
   spec.homepage = URI::HTTP.build(host: origin_uri.host, path: origin_uri.path.chomp('.git')).to_s
 
+  spec.required_ruby_version = '>= 3.0.0'
+
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
 

data/lib/datacite/mapping/affiliation.rb

@@ -8,7 +8,7 @@ module Datacite
     class Affiliation
       include XML::Mapping
 
-      def initialize(identifier: nil, identifier_scheme: nil, scheme_uri: nil, value:)
+      def initialize(value:, identifier: nil, identifier_scheme: nil, scheme_uri: nil)
         self.identifier = identifier
         self.identifier_scheme = identifier_scheme
         self.scheme_uri = scheme_uri

data/lib/datacite/mapping/contributor.rb

@@ -87,7 +87,7 @@ module Datacite
       # @param identifier [NameIdentifier, nil] an identifier for the contributor. Optional.
       # @param affiliations [Array<Affiliation>] the contributor's affiliations. Defaults to an empty list.
       # @param type [ContributorType] the contributor type. Cannot be nil.
-      def initialize(name:, identifier: nil, affiliations: nil, type:)
+      def initialize(name:, type:, identifier: nil, affiliations: nil)
         self.name = name
         self.identifier = identifier
         self.affiliations = affiliations || []

data/lib/datacite/mapping/contributor_name.rb

@@ -9,7 +9,7 @@ module Datacite
   module Mapping
     class ContributorName
       include XML::Mapping
-      def initialize(type: nil, language: nil, value:)
+      def initialize(value:, type: nil, language: nil)
         self.type = type
         self.language = language
         self.value = value

data/lib/datacite/mapping/creator_name.rb

@@ -9,7 +9,7 @@ module Datacite
   module Mapping
     class CreatorName
       include XML::Mapping
-      def initialize(type: nil, language: nil, value:)
+      def initialize(value:, type: nil, language: nil)
         self.type = type
         self.language = language
         self.value = value

data/lib/datacite/mapping/date.rb

@@ -60,9 +60,7 @@ module Datacite
       include Comparable
       include XML::Mapping
 
-      attr_reader :date_value
-      attr_reader :range_start
-      attr_reader :range_end
+      attr_reader :date_value, :range_start, :range_end
 
       # Initializes a new `Date`
       #
@@ -80,12 +78,15 @@ module Datacite
         @type = val
       end
 
+      # rubocop:disable Metrics/MethodLength
+
       def value=(val) # rubocop:disable Metrics/AbcSize
         parts = val.to_s.split('/', -1) # negative limit so we don't drop trailing empty string
         @date_value, @range_start, @range_end = nil
-        if parts.size == 1
+        case parts.size
+        when 1
           @date_value = DateValue.new(val)
-        elsif parts.size == 2
+        when 2
           @range_start, @range_end = parts.map(&:strip).map { |part| DateValue.new(part) unless part == '' }
           # puts "#{val} -> [#{range_start}, #{range_end}]"
         else
@@ -93,9 +94,10 @@ module Datacite
         end
         @value = date_value ? date_value.to_s : "#{range_start}/#{range_end}"
       end
+      # rubocop:enable Metrics/MethodLength
 
       def <=>(other)
-        return nil unless other.class == self.class
+        return nil unless other.instance_of?(self.class)
 
         %i[date_value range_start range_end type].each do |v|
           order = send(v) <=> other.send(v)

data/lib/datacite/mapping/date_value.rb

@@ -25,16 +25,7 @@ module Datacite
     class DateValue
       include Comparable
 
-      attr_reader :year
-      attr_reader :month
-      attr_reader :day
-      attr_reader :hour
-      attr_reader :minute
-      attr_reader :sec
-      attr_reader :nsec
-      attr_reader :date
-      attr_reader :zone
-      attr_reader :iso_value
+      attr_reader :year, :month, :day, :hour, :minute, :sec, :nsec, :date, :zone, :iso_value
 
       # Creates a new {DateValue}.
       #
@@ -58,7 +49,7 @@ module Datacite
       end
 
       def <=>(other)
-        return nil unless other.class == self.class
+        return nil unless other.instance_of?(self.class)
 
         %i[year month day hour minute sec nsec].each do |v|
           order = send(v) <=> other.send(v)

data/lib/datacite/mapping/description.rb

@@ -86,7 +86,7 @@ module Datacite
       # @param type [DescriptionType] the description type.
       # @param value [String] the description itself. See {Description} for notes on special
       #     handling of `<br/>` tags.
-      def initialize(language: nil, type:, value:)
+      def initialize(type:, value:, language: nil)
         self.language = language
         self.type = type
         self.value = value

data/lib/datacite/mapping/funding_reference.rb

@@ -27,7 +27,7 @@ module Datacite
 
       # @param type [FunderIdentifierType] the identifier type. Cannot be nil.
       # @param value [String] the identifier value. Cannot be nil.
-      def initialize(type:, scheme_uri: nil, value:)
+      def initialize(type:, value:, scheme_uri: nil)
         self.type = type
         self.scheme_uri = scheme_uri
         self.value = value
@@ -65,7 +65,7 @@ module Datacite
     class AwardNumber
       include XML::Mapping
 
-      def initialize(uri: nil, value:)
+      def initialize(value:, uri: nil)
         self.uri = uri
         self.value = value
       end

data/lib/datacite/mapping/geo_location_box.rb

@@ -19,10 +19,7 @@ module Datacite
     class GeoLocationBox
       include Comparable
 
-      attr_reader :south_latitude
-      attr_reader :west_longitude
-      attr_reader :north_latitude
-      attr_reader :east_longitude
+      attr_reader :south_latitude, :west_longitude, :north_latitude, :east_longitude
 
       # Initializes a new {GeoLocationBox}. The arguments can be provided
       # either as a named-parameter hash, or as a list of four coordinates
@@ -51,7 +48,10 @@ module Datacite
       def initialize(*args)
         case args.length
         when 1
-          init_from_hash(args[0])
+          raise ArgumentError, "Can't construct GeoLocationBox from arguments: #{args}" unless args[0].respond_to?(:keys)
+
+          init_from_hash(**args[0])
+
         when 4
           init_from_array(args)
         else
@@ -99,7 +99,7 @@ module Datacite
       # @return [Fixnum, nil] the sort order (-1, 0, or 1), or nil if `other` is not a
       #   {GeoLocationBox}
       def <=>(other)
-        return nil unless other.class == self.class
+        return nil unless other.instance_of?(self.class)
 
         %i[south_latitude west_longitude north_latitude east_longitude].each do |c|
           order = send(c) <=> other.send(c)

data/lib/datacite/mapping/geo_location_node.rb

@@ -7,8 +7,7 @@ module Datacite
     # Abstract superclass of GeoLocation parsing nodes
     class GeoLocationNode < XML::Mapping::SingleAttributeNode
 
-      attr_reader :geom_class
-      attr_reader :coord_elements
+      attr_reader :geom_class, :coord_elements
 
       def initialize(*args)
         raise 'No geometry class provided' unless @geom_class
@@ -30,7 +29,7 @@ module Datacite
       end
 
       def set_attr_value(xml, value)
-        raise "Invalid value: expected #{geom_class} instance, was #{value || 'nil'}" unless value&.is_a?(geom_class)
+        raise "Invalid value: expected #{geom_class} instance, was #{value || 'nil'}" unless value.is_a?(geom_class)
 
         element = @path.first(xml, ensure_created: true)
 

data/lib/datacite/mapping/geo_location_point.rb

@@ -15,8 +15,7 @@ module Datacite
     class GeoLocationPoint
       include Comparable
 
-      attr_reader :latitude
-      attr_reader :longitude
+      attr_reader :latitude, :longitude
 
       # Initializes a new {GeoLocationPoint}. The arguments can be provided
       # either as a named-parameter hash, or as a pair of coordinates in the
@@ -31,7 +30,10 @@ module Datacite
       def initialize(*args)
         case args.length
         when 1
-          init_from_hash(args[0])
+          raise ArgumentError, "Can't construct GeoLocationPoint from arguments: #{args}" unless args[0].respond_to?(:keys)
+
+          init_from_hash(**args[0])
+
         when 2
           init_from_array(args)
         else
@@ -65,7 +67,7 @@ module Datacite
       # @return [Fixnum, nil] the sort order (-1, 0, or 1), or nil if `other` is not a
       #   {GeoLocationPoint}
       def <=>(other)
-        return nil unless other.class == self.class
+        return nil unless other.instance_of?(self.class)
 
         %i[latitude longitude].each do |c|
           order = send(c) <=> other.send(c)

data/lib/datacite/mapping/geo_location_polygon.rb

@@ -25,7 +25,7 @@ module Datacite
       end
 
       def <=>(other)
-        return nil unless other.class == self.class
+        return nil unless other.instance_of?(self.class)
 
         points <=> other.points
       end

data/lib/datacite/mapping/identifier.rb

@@ -5,7 +5,7 @@ require 'datacite/mapping/empty_filtering_nodes'
 
 module Datacite
   module Mapping
-    DOI_PATTERN = %r{10\.\S+/\S+}.freeze
+    DOI_PATTERN = %r{10\.\S+/\S+}
 
     # The persistent identifier that identifies the resource.
     #

data/lib/datacite/mapping/module_info.rb

@@ -6,7 +6,7 @@ module Datacite
     NAME = 'datacite-mapping'
 
     # The version of this gem
-    VERSION = '0.4.1'
+    VERSION = '0.5.0'
 
     # The copyright notice for this gem
     COPYRIGHT = 'Copyright (c) 2022 The Regents of the University of California'

data/lib/datacite/mapping/name_identifier.rb

@@ -12,7 +12,7 @@ module Datacite
       # @param scheme [Scheme] the name identifier scheme. Cannot be nil.
       # @param scheme_uri [URI, nil] the URI of the identifier scheme. Optional.
       # @param value [String] the identifier value. Cannot be nil.
-      def initialize(scheme:, scheme_uri: nil, value:)
+      def initialize(scheme:, value:, scheme_uri: nil)
         self.scheme = scheme
         self.scheme_uri = scheme_uri
         self.value = value

data/lib/datacite/mapping/publisher.rb

@@ -12,7 +12,7 @@ module Datacite
       # Initializes a new {Publisher}
       # @param language [String, nil] an IETF BCP 47, ISO 639-1 language code identifying the language.
       # @param value [String] name of the publisher
-      def initialize(language: nil, value:)
+      def initialize(value:, language: nil)
         self.language = language
         self.value = value
       end

data/lib/datacite/mapping/read_only_nodes.rb

@@ -39,10 +39,13 @@ module Datacite
         ReadOnlyNodes.warn(warning)
       end
 
+      # rubocop:disable Lint/UselessMethodDefinition
       # public to allow testing
       def self.warn(warning)
         super
       end
+
+      # rubocop:enable Lint/UselessMethodDefinition
     end
 
     class ReadOnlyTextNode < XML::Mapping::TextNode

data/lib/datacite/mapping/resource.rb

@@ -129,7 +129,7 @@ module Datacite
       end
 
       def subjects=(value)
-        @subjects = (value&.select(&:value)) || []
+        @subjects = value&.select(&:value) || []
       end
 
       def contributors=(value)
@@ -170,11 +170,11 @@ module Datacite
       end
 
       def descriptions=(value)
-        @descriptions = (value&.select(&:value)) || []
+        @descriptions = value&.select(&:value) || []
       end
 
       def geo_locations=(value)
-        @geo_locations = (value&.select(&:location?)) || []
+        @geo_locations = value&.select(&:location?) || []
       end
 
       # @!attribute [rw] identifier

data/lib/datacite/mapping/subject.rb

@@ -14,7 +14,7 @@ module Datacite
       # @param scheme_uri [URI, nil] the URI of the subject scheme or classification code or authority if one is used. Optional.
       # @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: nil, value:)
+      def initialize(value:, scheme: nil, scheme_uri: nil, language: nil)
         self.scheme = scheme
         self.scheme_uri = scheme_uri
         self.language = language

data/lib/datacite/mapping/title.rb

@@ -26,7 +26,7 @@ module Datacite
       # @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: nil, value:, type: nil)
+      def initialize(value:, language: nil, type: nil)
         self.language = language
         self.type = type
         self.value = value

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

@@ -20,7 +20,7 @@ module Datacite
           iso8601_secs: '1914-08-04T11:01:06+01:00',
           iso8601_frac: '1914-08-04T11:01:06.0123+01:00'
         }
-        @dates = values.map { |format, v| [format, DateValue.new(v)] }.to_h
+        @dates = values.transform_values { |v| DateValue.new(v) }
       end
 
       describe '#initialize' do

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

@@ -53,22 +53,22 @@ module Datacite
         describe '#identifier' do
           it 'requires an identifier' do
             args.delete(:identifier)
-            expect { Resource.new(args) }.to raise_error(ArgumentError)
+            expect { Resource.new(**args) }.to raise_error(ArgumentError)
           end
 
           it 'requires a non-nil identifier' do
             args[:identifier] = nil
-            expect { Resource.new(args) }.to raise_error(ArgumentError)
+            expect { Resource.new(**args) }.to raise_error(ArgumentError)
           end
 
           it 'can be initialized' do
-            resource = Resource.new(args)
+            resource = Resource.new(**args)
             expect(resource.identifier).to eq(identifier)
           end
 
           it 'can be set' do
             new_id = Identifier.new(value: '10.1594/WDCC/CCSRNIES_SRES_B2')
-            resource = Resource.new(args)
+            resource = Resource.new(**args)
             resource.identifier = new_id
             expect(resource.identifier).to eq(new_id)
           end
@@ -78,21 +78,21 @@ module Datacite
 
           it 'requires a creator list' do
             args.delete(:creators)
-            expect { Resource.new(args) }.to raise_error(ArgumentError)
+            expect { Resource.new(**args) }.to raise_error(ArgumentError)
           end
 
           it 'requires a non-nil creator list' do
             args[:creators] = nil
-            expect { Resource.new(args) }.to raise_error(ArgumentError)
+            expect { Resource.new(**args) }.to raise_error(ArgumentError)
           end
 
           it 'requires a non-empty creator list' do
             args[:creators] = []
-            expect { Resource.new(args) }.to raise_error(ArgumentError)
+            expect { Resource.new(**args) }.to raise_error(ArgumentError)
           end
 
           it 'can be initialized' do
-            resource = Resource.new(args)
+            resource = Resource.new(**args)
             expect(resource.creators).to eq(creators)
           end
 
@@ -102,7 +102,7 @@ module Datacite
               identifier: NameIdentifier.new(scheme: 'ISNI', scheme_uri: URI('http://isni.org/'), value: '0000 0001 1678 4522'),
               affiliations: ['Disney–ABC Television Group']
             )]
-            resource = Resource.new(args)
+            resource = Resource.new(**args)
             resource.creators = new_creators
             expect(resource.creators).to eq(new_creators)
           end
@@ -110,7 +110,7 @@ module Datacite
           describe 'creator convenience methods' do
             describe '#creator_names' do
               it 'extracts the creator names' do
-                resource = Resource.new(args)
+                resource = Resource.new(**args)
                 expect(resource.creator_names)
                   .to eq(['Hedy Lamarr', 'Herschlag, Natalie'])
               end
@@ -118,7 +118,7 @@ module Datacite
 
             describe '#creator_affiliations' do
               it 'extracts the creator affiliations' do
-                resource = Resource.new(args)
+                resource = Resource.new(**args)
                 expect(resource.creator_affiliations)
                   .to eq([
                            ['United Artists', 'Metro-Goldwyn-Mayer'],
@@ -132,21 +132,21 @@ module Datacite
         describe '#titles' do
           it 'requires a title list' do
             args.delete(:titles)
-            expect { Resource.new(args) }.to raise_error(ArgumentError)
+            expect { Resource.new(**args) }.to raise_error(ArgumentError)
           end
 
           it 'requires a non-nil title list' do
             args[:titles] = nil
-            expect { Resource.new(args) }.to raise_error(ArgumentError)
+            expect { Resource.new(**args) }.to raise_error(ArgumentError)
           end
 
           it 'requires a non-empty title list' do
             args[:titles] = []
-            expect { Resource.new(args) }.to raise_error(ArgumentError)
+            expect { Resource.new(**args) }.to raise_error(ArgumentError)
           end
 
           it 'can be initialized' do
-            resource = Resource.new(args)
+            resource = Resource.new(**args)
             expect(resource.titles).to eq(titles)
           end
 
@@ -156,7 +156,7 @@ module Datacite
               type: TitleType::SUBTITLE,
               value: 'Together with an Appendix of the Same, Containing an Answer to Some Objections, Made by Severall Persons against That Hypothesis'
             )]
-            resource = Resource.new(args)
+            resource = Resource.new(**args)
             resource.titles = new_titles
             expect(resource.titles).to eq(new_titles)
           end
@@ -166,22 +166,22 @@ module Datacite
         describe '#publisher' do
           it 'requires a publisher' do
             args.delete(:publisher)
-            expect { Resource.new(args) }.to raise_error(ArgumentError)
+            expect { Resource.new(**args) }.to raise_error(ArgumentError)
           end
           it 'requires a non-nil publisher' do
             args[:publisher] = nil
-            expect { Resource.new(args) }.to raise_error(ArgumentError)
+            expect { Resource.new(**args) }.to raise_error(ArgumentError)
           end
           it 'requires a non-blank publisher' do
             expect { Publisher.new(value: '   ') }.to raise_error(ArgumentError)
           end
           it 'can be initialized' do
-            resource = Resource.new(args)
+            resource = Resource.new(**args)
             expect(resource.publisher.value).to eq(publisher)
           end
           it 'can be set' do
             new_publisher = 'University of California'
-            resource = Resource.new(args)
+            resource = Resource.new(**args)
             resource.publisher = new_publisher
             expect(resource.publisher.value).to eq(new_publisher)
           end
@@ -189,11 +189,11 @@ module Datacite
             args[:publisher] = Publisher.new(value: '
             University of California
              ')
-            resource = Resource.new(args)
+            resource = Resource.new(**args)
             expect(resource.publisher.value).to eq('University of California')
           end
           it 'strips on set' do
-            resource = Resource.new(args)
+            resource = Resource.new(**args)
             resource.publisher = Publisher.new(value: '
             University of California
               ')
@@ -204,31 +204,31 @@ module Datacite
         describe '#publication_year' do
           it 'requires a publication_year' do
             args.delete(:publication_year)
-            expect { Resource.new(args) }.to raise_error(ArgumentError)
+            expect { Resource.new(**args) }.to raise_error(ArgumentError)
           end
           it 'requires a non-nil publication_year' do
             args[:publication_year] = nil
-            expect { Resource.new(args) }.to raise_error(ArgumentError)
+            expect { Resource.new(**args) }.to raise_error(ArgumentError)
           end
           it 'requires a four-digit publication_year' do
             args[:publication_year] = 999
-            expect { Resource.new(args) }.to raise_error(ArgumentError)
+            expect { Resource.new(**args) }.to raise_error(ArgumentError)
             args[:publication_year] = 10_000
-            expect { Resource.new(args) }.to raise_error(ArgumentError)
+            expect { Resource.new(**args) }.to raise_error(ArgumentError)
           end
           it 'can be initialized' do
-            resource = Resource.new(args)
+            resource = Resource.new(**args)
             expect(resource.publication_year).to eq(publication_year)
           end
           it 'can be set' do
             new_pub_year = 1963
-            resource = Resource.new(args)
+            resource = Resource.new(**args)
             resource.publication_year = new_pub_year
             expect(resource.publication_year).to eq(new_pub_year)
           end
           it 'converts strings to integers' do
             new_pub_year = 1963
-            resource = Resource.new(args)
+            resource = Resource.new(**args)
             resource.publication_year = new_pub_year.to_s
             expect(resource.publication_year).to eq(new_pub_year)
           end
@@ -236,7 +236,7 @@ module Datacite
 
         describe '#subjects' do
           it 'defaults to empty' do
-            resource = Resource.new(args)
+            resource = Resource.new(**args)
             expect(resource.subjects).to eq([])
           end
 
@@ -257,12 +257,12 @@ module Datacite
                 )
               ]
               args[:subjects] = subjects
-              resource = Resource.new(args)
+              resource = Resource.new(**args)
               expect(resource.subjects).to eq(subjects)
             end
             it 'can\'t be initialized to nil' do
               args[:subjects] = nil
-              resource = Resource.new(args)
+              resource = Resource.new(**args)
               expect(resource.subjects).to eq([])
             end
 
@@ -273,7 +273,7 @@ module Datacite
                 Subject.allocate
               ]
               args[:subjects] = subjects
-              resource = Resource.new(args)
+              resource = Resource.new(**args)
               expect(resource.subjects).to eq([subjects[1]])
             end
           end
@@ -294,12 +294,12 @@ module Datacite
                   value: '571.8 Croissance, développement, reproduction biologique (fécondation, sexualité)'
                 )
               ]
-              resource = Resource.new(args)
+              resource = Resource.new(**args)
               resource.subjects = subjects
               expect(resource.subjects).to eq(subjects)
             end
             it 'can\'t be set to nil' do
-              resource = Resource.new(args)
+              resource = Resource.new(**args)
               resource.subjects = nil
               expect(resource.subjects).to eq([])
             end
@@ -309,7 +309,7 @@ module Datacite
                 Subject.new(value: 'Mammals--Embryology'),
                 Subject.allocate
               ]
-              resource = Resource.new(args)
+              resource = Resource.new(**args)
               resource.subjects = subjects
               expect(resource.subjects).to eq([subjects[1]])
             end
@@ -318,7 +318,7 @@ module Datacite
 
         describe '#funding_references' do
           it 'defaults to empty' do
-            resource = Resource.new(args)
+            resource = Resource.new(**args)
             expect(resource.funding_references).to eq([])
           end
 
@@ -329,19 +329,19 @@ module Datacite
                 FundingReference.new(name: 'НИИЧАВО', award_number: '164070')
               ]
               args[:funding_references] = funding_references
-              resource = Resource.new(args)
+              resource = Resource.new(**args)
               expect(resource.funding_references).to eq(funding_references)
             end
             it 'can\'t be initialized to nil' do
               args[:funding_references] = nil
-              resource = Resource.new(args)
+              resource = Resource.new(**args)
               expect(resource.funding_references).to eq([])
             end
           end
 
           describe '#funding_references=' do
             it 'can be set' do
-              resource = Resource.new(args)
+              resource = Resource.new(**args)
               funding_references = [
                 FundingReference.new(name: 'Ministry of Magic', award_number: '9¾'),
                 FundingReference.new(name: 'НИИЧАВО', award_number: '164070')
@@ -350,7 +350,7 @@ module Datacite
               expect(resource.funding_references).to eq(funding_references)
             end
             it 'can\'t be set to nil' do
-              resource = Resource.new(args)
+              resource = Resource.new(**args)
               resource.funding_references = nil
               expect(resource.funding_references).to eq([])
             end
@@ -359,18 +359,18 @@ module Datacite
 
         describe '#language' do
           it 'defaults to nil' do
-            resource = Resource.new(args)
+            resource = Resource.new(**args)
             expect(resource.language).to be_nil
           end
 
           it 'can be initialized' do
             args[:language] = 'en-emodeng'
-            resource = Resource.new(args)
+            resource = Resource.new(**args)
             expect(resource.language).to eq('en-emodeng')
           end
 
           it 'can be set' do
-            resource = Resource.new(args)
+            resource = Resource.new(**args)
             resource.language = 'en-emodeng'
             expect(resource.language).to eq('en-emodeng')
           end
@@ -379,7 +379,7 @@ module Datacite
         describe '#contributors' do
 
           it 'defaults to empty' do
-            resource = Resource.new(args)
+            resource = Resource.new(**args)
             expect(resource.funding_references).to eq([])
           end
 
@@ -390,19 +390,19 @@ module Datacite
                 Contributor.new(name: 'Hedy Lamarr', type: ContributorType::RESEARCHER)
               ]
               args[:contributors] = contributors
-              resource = Resource.new(args)
+              resource = Resource.new(**args)
               expect(resource.contributors).to eq(contributors)
             end
             it 'can\'t be initialized to nil' do
               args[:contributors] = nil
-              resource = Resource.new(args)
+              resource = Resource.new(**args)
               expect(resource.contributors).to eq([])
             end
           end
 
           describe '#contributors=' do
             it 'can be set' do
-              resource = Resource.new(args)
+              resource = Resource.new(**args)
               contributors = [
                 Contributor.new(name: 'Hershlag, Natalie', type: ContributorType::PROJECT_MEMBER),
                 Contributor.new(name: 'Hedy Lamarr', type: ContributorType::RESEARCHER)
@@ -411,7 +411,7 @@ module Datacite
               expect(resource.contributors).to eq(contributors)
             end
             it 'can\'t be set to nil' do
-              resource = Resource.new(args)
+              resource = Resource.new(**args)
               resource.contributors = nil
               expect(resource.contributors).to eq([])
             end
@@ -419,7 +419,7 @@ module Datacite
 
           describe 'contributor convenience methods' do
             before(:each) do
-              @resource = Resource.new(args)
+              @resource = Resource.new(**args)
               @funder = Contributor.new(
                 name: 'The Ministry of Magic',
                 identifier: NameIdentifier.new(
@@ -460,7 +460,7 @@ module Datacite
 
         describe '#dates' do
           it 'defaults to empty' do
-            resource = Resource.new(args)
+            resource = Resource.new(**args)
             expect(resource.funding_references).to eq([])
           end
 
@@ -471,19 +471,19 @@ module Datacite
                 Date.new(value: '1914-08-04T11:01:06.0123+01:00', type: DateType::AVAILABLE)
               ]
               args[:dates] = dates
-              resource = Resource.new(args)
+              resource = Resource.new(**args)
               expect(resource.dates).to eq(dates)
             end
             it 'can\'t be initialized to nil' do
               args[:dates] = nil
-              resource = Resource.new(args)
+              resource = Resource.new(**args)
               expect(resource.dates).to eq([])
             end
           end
 
           describe '#dates=' do
             it 'can be set' do
-              resource = Resource.new(args)
+              resource = Resource.new(**args)
               dates = [
                 Date.new(value: DateTime.new(1914, 8, 4, 11, 0o1, 6.0123, '+1'), type: DateType::AVAILABLE),
                 Date.new(value: '1914-08-04T11:01:06.0123+01:00', type: DateType::AVAILABLE)
@@ -492,7 +492,7 @@ module Datacite
               expect(resource.dates).to eq(dates)
             end
             it 'can\'t be set to nil' do
-              resource = Resource.new(args)
+              resource = Resource.new(**args)
               resource.dates = nil
               expect(resource.dates).to eq([])
             end
@@ -503,13 +503,13 @@ module Datacite
           it 'can be initialized' do
             resource_type = ResourceType.new(resource_type_general: ResourceTypeGeneral::DATASET, value: 'Dataset')
             args[:resource_type] = resource_type
-            resource = Resource.new(args)
+            resource = Resource.new(**args)
             expect(resource.resource_type).to eq(resource_type)
           end
 
           it 'can be set' do
             resource_type = ResourceType.new(resource_type_general: ResourceTypeGeneral::DATASET, value: 'Dataset')
-            resource = Resource.new(args)
+            resource = Resource.new(**args)
             resource.resource_type = resource_type
             expect(resource.resource_type).to eq(resource_type)
           end
@@ -517,7 +517,7 @@ module Datacite
 
         describe '#alternate_identifiers' do
           it 'defaults to empty' do
-            resource = Resource.new(args)
+            resource = Resource.new(**args)
             expect(resource.alternate_identifiers).to eq([])
           end
 
@@ -528,19 +528,19 @@ module Datacite
                 AlternateIdentifier.new(type: 'URL', value: 'http://example.com')
               ]
               args[:alternate_identifiers] = alternate_identifiers
-              resource = Resource.new(args)
+              resource = Resource.new(**args)
               expect(resource.alternate_identifiers).to eq(alternate_identifiers)
             end
             it 'can\'t be initialized to nil' do
               args[:alternate_identifiers] = nil
-              resource = Resource.new(args)
+              resource = Resource.new(**args)
               expect(resource.alternate_identifiers).to eq([])
             end
           end
 
           describe '#alternate_identifiers=' do
             it 'can be set' do
-              resource = Resource.new(args)
+              resource = Resource.new(**args)
               alternate_identifiers = [
                 AlternateIdentifier.new(type: 'URL', value: 'http://example.org'),
                 AlternateIdentifier.new(type: 'URL', value: 'http://example.com')
@@ -549,7 +549,7 @@ module Datacite
               expect(resource.alternate_identifiers).to eq(alternate_identifiers)
             end
             it 'can\'t be set to nil' do
-              resource = Resource.new(args)
+              resource = Resource.new(**args)
               resource.alternate_identifiers = nil
               expect(resource.alternate_identifiers).to eq([])
             end
@@ -558,7 +558,7 @@ module Datacite
 
         describe '#related_identifiers' do
           it 'defaults to empty' do
-            resource = Resource.new(args)
+            resource = Resource.new(**args)
             expect(resource.related_identifiers).to eq([])
           end
 
@@ -580,19 +580,19 @@ module Datacite
                 )
               ]
               args[:related_identifiers] = related_identifiers
-              resource = Resource.new(args)
+              resource = Resource.new(**args)
               expect(resource.related_identifiers).to eq(related_identifiers)
             end
             it 'can\'t be initialized to nil' do
               args[:related_identifiers] = nil
-              resource = Resource.new(args)
+              resource = Resource.new(**args)
               expect(resource.related_identifiers).to eq([])
             end
           end
 
           describe '#related_identifiers=' do
             it 'can be set' do
-              resource = Resource.new(args)
+              resource = Resource.new(**args)
               related_identifiers = [
                 RelatedIdentifier.new(
                   identifier_type: RelatedIdentifierType::URL,
@@ -612,7 +612,7 @@ module Datacite
               expect(resource.related_identifiers).to eq(related_identifiers)
             end
             it 'can\'t be set to nil' do
-              resource = Resource.new(args)
+              resource = Resource.new(**args)
               resource.related_identifiers = nil
               expect(resource.related_identifiers).to eq([])
             end
@@ -621,7 +621,7 @@ module Datacite
 
         describe '#sizes' do
           it 'defaults to empty' do
-            resource = Resource.new(args)
+            resource = Resource.new(**args)
             expect(resource.sizes).to eq([])
           end
 
@@ -629,12 +629,12 @@ module Datacite
             it 'can be initialized' do
               sizes = %w[48K 128K]
               args[:sizes] = sizes
-              resource = Resource.new(args)
+              resource = Resource.new(**args)
               expect(resource.sizes).to eq(sizes)
             end
             it 'can\'t be initialized to nil' do
               args[:sizes] = nil
-              resource = Resource.new(args)
+              resource = Resource.new(**args)
               expect(resource.sizes).to eq([])
             end
           end
@@ -642,12 +642,12 @@ module Datacite
           describe '#sizes=' do
             it 'can be set' do
               sizes = %w[48K 128K]
-              resource = Resource.new(args)
+              resource = Resource.new(**args)
               resource.sizes = sizes
               expect(resource.sizes).to eq(sizes)
             end
             it 'can\'t be set to nil' do
-              resource = Resource.new(args)
+              resource = Resource.new(**args)
               resource.sizes = nil
               expect(resource.sizes).to eq([])
             end
@@ -656,7 +656,7 @@ module Datacite
 
         describe '#formats' do
           it 'defaults to empty' do
-            resource = Resource.new(args)
+            resource = Resource.new(**args)
             expect(resource.formats).to eq([])
           end
 
@@ -664,12 +664,12 @@ module Datacite
             it 'can be initialized' do
               formats = %w[D64 DSK]
               args[:formats] = formats
-              resource = Resource.new(args)
+              resource = Resource.new(**args)
               expect(resource.formats).to eq(formats)
             end
             it 'can\'t be initialized to nil' do
               args[:formats] = nil
-              resource = Resource.new(args)
+              resource = Resource.new(**args)
               expect(resource.formats).to eq([])
             end
           end
@@ -677,12 +677,12 @@ module Datacite
           describe '#formats=' do
             it 'can be set' do
               formats = %w[D64 DSK]
-              resource = Resource.new(args)
+              resource = Resource.new(**args)
               resource.formats = formats
               expect(resource.formats).to eq(formats)
             end
             it 'can\'t be set to nil' do
-              resource = Resource.new(args)
+              resource = Resource.new(**args)
               resource.formats = nil
               expect(resource.formats).to eq([])
             end
@@ -691,17 +691,17 @@ module Datacite
 
         describe '#version' do
           it 'defaults to nil' do
-            resource = Resource.new(args)
+            resource = Resource.new(**args)
             expect(resource.version).to be_nil
           end
           it 'can be initialized' do
             args[:version] = '9.2.2'
-            resource = Resource.new(args)
+            resource = Resource.new(**args)
             expect(resource.version).to eq('9.2.2')
           end
           it 'can be set' do
             new_version = '9.2.2'
-            resource = Resource.new(args)
+            resource = Resource.new(**args)
             resource.version = new_version
             expect(resource.version).to eq(new_version)
           end
@@ -709,34 +709,34 @@ module Datacite
             args[:version] = '
             9.2.2
           '
-            resource = Resource.new(args)
+            resource = Resource.new(**args)
             expect(resource.version).to eq('9.2.2')
           end
           it 'strips on set' do
-            resource = Resource.new(args)
+            resource = Resource.new(**args)
             resource.version = '
             9.2.2
           '
             expect(resource.version).to eq('9.2.2')
           end
           it 'accepts a float' do
-            resource = Resource.new(args)
+            resource = Resource.new(**args)
             resource.version = 9.2
             expect(resource.version).to eq('9.2')
           end
           it 'accepts an integer' do
-            resource = Resource.new(args)
+            resource = Resource.new(**args)
             resource.version = 9
             expect(resource.version).to eq('9')
           end
           it 'can be initialized' do
             args[:version] = '9.2.2'
-            resource = Resource.new(args)
+            resource = Resource.new(**args)
             expect(resource.version).to eq('9.2.2')
           end
           it 'can be set to nil' do
             args[:version] = '9.2.2'
-            resource = Resource.new(args)
+            resource = Resource.new(**args)
             resource.version = nil
             expect(resource.version).to be_nil
           end
@@ -744,7 +744,7 @@ module Datacite
 
         describe '#rights_list' do
           it 'defaults to empty' do
-            resource = Resource.new(args)
+            resource = Resource.new(**args)
             expect(resource.rights_list).to eq([])
           end
 
@@ -755,19 +755,19 @@ module Datacite
                 Rights.new(value: 'This work is free of known copyright restrictions.', uri: URI('http://creativecommons.org/publicdomain/mark/1.0/'))
               ]
               args[:rights_list] = rights_list
-              resource = Resource.new(args)
+              resource = Resource.new(**args)
               expect(resource.rights_list).to eq(rights_list)
             end
             it 'can\'t be initialized to nil' do
               args[:rights_list] = nil
-              resource = Resource.new(args)
+              resource = Resource.new(**args)
               expect(resource.rights_list).to eq([])
             end
           end
 
           describe '#rights_list=' do
             it 'can be set' do
-              resource = Resource.new(args)
+              resource = Resource.new(**args)
               rights_list = [
                 Rights.new(value: 'CC0 1.0 Universal', uri: URI('http://creativecommons.org/publicdomain/zero/1.0/')),
                 Rights.new(value: 'This work is free of known copyright restrictions.', uri: URI('http://creativecommons.org/publicdomain/mark/1.0/'))
@@ -777,7 +777,7 @@ module Datacite
             end
 
             it 'can\'t be set to nil' do
-              resource = Resource.new(args)
+              resource = Resource.new(**args)
               resource.rights_list = nil
               expect(resource.rights_list).to eq([])
             end
@@ -787,7 +787,7 @@ module Datacite
 
         describe '#descriptions' do
           it 'defaults to empty' do
-            resource = Resource.new(args)
+            resource = Resource.new(**args)
             expect(resource.descriptions).to eq([])
           end
 
@@ -798,12 +798,12 @@ module Datacite
                 Description.new(language: 'en-us', type: DescriptionType::METHODS, value: 'unsound')
               ]
               args[:descriptions] = descriptions
-              resource = Resource.new(args)
+              resource = Resource.new(**args)
               expect(resource.descriptions).to eq(descriptions)
             end
             it 'can\'t be initialized to nil' do
               args[:descriptions] = nil
-              resource = Resource.new(args)
+              resource = Resource.new(**args)
               expect(resource.descriptions).to eq([])
             end
 
@@ -814,7 +814,7 @@ module Datacite
                 Description.allocate
               ]
               args[:descriptions] = descriptions
-              resource = Resource.new(args)
+              resource = Resource.new(**args)
               expect(resource.descriptions).to eq([descriptions[1]])
             end
           end
@@ -825,12 +825,12 @@ module Datacite
                 Description.new(language: 'en-us', type: DescriptionType::ABSTRACT, value: 'Exterminate all the brutes!'),
                 Description.new(language: 'en-us', type: DescriptionType::METHODS, value: 'unsound')
               ]
-              resource = Resource.new(args)
+              resource = Resource.new(**args)
               resource.descriptions = descriptions
               expect(resource.descriptions).to eq(descriptions)
             end
             it 'can\'t be set to nil' do
-              resource = Resource.new(args)
+              resource = Resource.new(**args)
               resource.descriptions = nil
               expect(resource.descriptions).to eq([])
             end
@@ -841,7 +841,7 @@ module Datacite
                 Description.new(language: 'en-us', type: DescriptionType::METHODS, value: 'unsound'),
                 Description.allocate
               ]
-              resource = Resource.new(args)
+              resource = Resource.new(**args)
               resource.descriptions = descriptions
               expect(resource.descriptions).to eq([descriptions[1]])
             end
@@ -850,7 +850,7 @@ module Datacite
 
         describe '#geo_locations' do
           it 'defaults to empty' do
-            resource = Resource.new(args)
+            resource = Resource.new(**args)
             expect(resource.geo_locations).to eq([])
           end
 
@@ -861,12 +861,12 @@ module Datacite
                 GeoLocation.new(box: GeoLocationBox.new(-33.45, -122.33, 47.61, -70.67))
               ]
               args[:geo_locations] = geo_locations
-              resource = Resource.new(args)
+              resource = Resource.new(**args)
               expect(resource.geo_locations).to eq(geo_locations)
             end
             it 'can\'t be initialized to nil' do
               args[:geo_locations] = nil
-              resource = Resource.new(args)
+              resource = Resource.new(**args)
               expect(resource.geo_locations).to eq([])
             end
             it 'ignores empty locations' do
@@ -876,14 +876,14 @@ module Datacite
                 GeoLocation.new
               ]
               args[:geo_locations] = geo_locations
-              resource = Resource.new(args)
+              resource = Resource.new(**args)
               expect(resource.geo_locations).to eq([geo_locations[1]])
             end
           end
 
           describe '#geo_locations=' do
             it 'can be set' do
-              resource = Resource.new(args)
+              resource = Resource.new(**args)
               geo_locations = [
                 GeoLocation.new(point: GeoLocationPoint.new(47.61, -122.33)),
                 GeoLocation.new(box: GeoLocationBox.new(-33.45, -122.33, 47.61, -70.67))
@@ -892,12 +892,12 @@ module Datacite
               expect(resource.geo_locations).to eq(geo_locations)
             end
             it 'can\'t be set to nil' do
-              resource = Resource.new(args)
+              resource = Resource.new(**args)
               resource.geo_locations = nil
               expect(resource.geo_locations).to eq([])
             end
             it 'ignores empty locations' do
-              resource = Resource.new(args)
+              resource = Resource.new(**args)
               geo_locations = [
                 GeoLocation.new,
                 GeoLocation.new(point: GeoLocationPoint.new(47.61, -122.33)),
@@ -945,14 +945,13 @@ module Datacite
           r3 = r2.gsub(/<resource (xmlns:xsi="[^"]+")\s+(xsi:schemaLocation="[^"]+")>/, '<resource \\2 \\1 xmlns="http://datacite.org/schema/kernel-3">') # fix missing namespace
           r4 = r3.gsub(%r{(<identifier[^>]+>)\s*([^ ]+)\s*(</identifier>)}, '\\1\\2\\3') # trim identifiers
           r5 = r4.gsub(%r{<([^>]+tude)>([0-9.-]+?)(0?)0+</\1>}, '<\\1>\\2\\3</\\1>') # strip trailing coordinate zeroes
-          r6 = r5.gsub(%r{<(geoLocation[^>]+)>[^<]+</\1>}) { |loc| loc.gsub(/([0-9\-]+\.[0-9]+?)0+([^0-9])/, '\\1\\2') } # strip trailing coordinate zeroes
+          r6 = r5.gsub(%r{<(geoLocation[^>]+)>[^<]+</\1>}) { |loc| loc.gsub(/([0-9-]+\.[0-9]+?)0+([^0-9])/, '\\1\\2') } # strip trailing coordinate zeroes
           r7 = r6.gsub(%r{<([A-Za-z]*)[^>]*>\s*</\1>}, '') # remove empty tag pairs
-          r8 = to_pretty(r7)
+          to_pretty(r7)
           # if r8.include?('&lt;br')
           #   trace = [r0, r1, r2, r3, r4, r5, r6, r7, r8].map { |r| r.include?('&lt;br') }
           #   puts trace
           # end
-          r8
         end
 
         def to_pretty(xml_text)
@@ -977,7 +976,7 @@ module Datacite
           r3.gsub(%r{(<contributor[^>/]+>\s*)<contributor>([^<]+)</contributor>(\s*</contributor>)}, '\\1<contributorName>\\2</contributorName>\\3') # fix broken contributors
         end
 
-        def it_round_trips(file:, mapping: :_default, fix_dash1: false) # rubocop:disable Metrics/AbcSize
+        def it_round_trips(file:, mapping: :_default, fix_dash1: false)
           options = { mapping: mapping }
           basename = File.basename(file)
           xml_text = xml_text_from(file, fix_dash1)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datacite-mapping
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - David Moles
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-26 00:00:00.000000000 Z
+date: 2023-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typesafe_enum
@@ -455,14 +455,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Parses and generates Datacite XML documents