datacite-mapping 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 735d8cc7ab80f9534cba40b1b46b38b15dc8124f4e0cd53bb1963c5b31b2a9c2
-  data.tar.gz: f052e557983ea3af4ea3c025db12daa93ad5e60253f3e427c0cfe1ee39277bf1
+  metadata.gz: 5a6ecd59de223d63f3cbdba50679fd649e3b90b5faf54ac5c5d441cfc32c8a6f
+  data.tar.gz: ea434e0efa6850179bd6147a95e21ce0f682d6494d950bd7184dcb5eea929cdf
 SHA512:
-  metadata.gz: 21645ef65182b9800dd3657188d31dc38a2ce148a910853d667eacaebf20dd334bdcd2ee34c32b85dd5bfa8b681b47a9380b0ab600367af5750a39c80c4ddf35
-  data.tar.gz: 33c2ff60458e0c835c086b2eff99e5198b26e0783ef483444418cd74e98f715ff4f149534e979fa5f124044924f5ad781088021ca56ad867a0af5ae89fe8c286
+  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.4.1
+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) }
 
@@ -28,10 +30,10 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'typesafe_enum', '~> 0.1', '>= 0.1.7'
   spec.add_dependency 'xml-mapping_extensions', '~> 0.4', '>= 0.4.7'
 
-  spec.add_development_dependency 'bundler', '~> 1.7'
+  spec.add_development_dependency 'bundler', '>= 2.2.33'
   spec.add_development_dependency 'equivalent-xml', '~> 0.6.0'
   spec.add_development_dependency 'github-markup', '~> 1.4'
-  spec.add_development_dependency 'rake', '~> 10.4'
+  spec.add_development_dependency 'rake', '>= 12.3.3'
   spec.add_development_dependency 'redcarpet', '~> 3.3'
   spec.add_development_dependency 'rspec', '~> 3.2'
   spec.add_development_dependency 'rubocop', '~> 0.52'

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,9 +6,9 @@ module Datacite
     NAME = 'datacite-mapping'
 
     # The version of this gem
-    VERSION = '0.4.0'
+    VERSION = '0.5.0'
 
     # The copyright notice for this gem
-    COPYRIGHT = 'Copyright (c) 2019 The Regents of the University of California'
+    COPYRIGHT = 'Copyright (c) 2022 The Regents of the University of California'
   end
 end

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