datacite-mapping 0.2.5 → 0.3.0

data/lib/datacite/mapping/geo_location_node.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'xml/mapping_extensions'
 
 module Datacite
@@ -9,11 +11,11 @@ module Datacite
       attr_reader :coord_elements
 
       def initialize(*args)
-        fail 'No geometry class provided' unless @geom_class
-        fail 'No coordinate elements provided' unless @coord_elements
-        path, *args = super(*args)
+        raise 'No geometry class provided' unless @geom_class
+        raise 'No coordinate elements provided' unless @coord_elements
+        path, *myargs = super(*args)
         @path = ::XML::XXPath.new(path)
-        args
+        myargs # rubocop:disable Lint/Void
       end
 
       def datacite_3?
@@ -22,12 +24,12 @@ module Datacite
 
       def extract_attr_value(xml)
         return from_text(xml) || from_children(xml)
-      rescue => e
+      rescue StandardError => e
         raise e, "#{@owner}.#{@attrname}: Can't extract #{self.class} from #{xml}: #{e.message}"
       end
 
-      def set_attr_value(xml, value) # rubocop:disable Metrics/AbcSize
-        fail "Invalid value: expected #{geom_class} instance, was #{value || 'nil'}" unless value && value.is_a?(geom_class)
+      def set_attr_value(xml, value)
+        raise "Invalid value: expected #{geom_class} instance, was #{value || 'nil'}" unless value && value.is_a?(geom_class)
         element = @path.first(xml, ensure_created: true)
 
         if datacite_3?

data/lib/datacite/mapping/geo_location_point.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'xml/mapping'
 require 'datacite/mapping/geo_location_node'
 
@@ -33,19 +35,19 @@ module Datacite
         when 2
           init_from_array(args)
         else
-          fail ArgumentError, "Can't construct GeoLocationPoint from arguments: #{args}"
+          raise ArgumentError, "Can't construct GeoLocationPoint from arguments: #{args}"
         end
       end
 
       def latitude=(value)
-        fail ArgumentError, 'Latitude cannot be nil' unless value
-        fail ArgumentError, "#{value} is not a valid latitude" unless value >= -90 && value <= 90
+        raise ArgumentError, 'Latitude cannot be nil' unless value
+        raise ArgumentError, "#{value} is not a valid latitude" unless value >= -90 && value <= 90
         @latitude = value
       end
 
       def longitude=(value)
-        fail ArgumentError, 'Longitude cannot be nil' unless value
-        fail ArgumentError, "#{value} is not a valid longitude" unless value >= -180 && value <= 180
+        raise ArgumentError, 'Longitude cannot be nil' unless value
+        raise ArgumentError, "#{value} is not a valid longitude" unless value >= -180 && value <= 180
         @longitude = value
       end
 
@@ -62,7 +64,7 @@ module Datacite
       #   {GeoLocationPoint}
       def <=>(other)
         return nil unless other.class == self.class
-        [:latitude, :longitude].each do |c|
+        %i[latitude longitude].each do |c|
           order = send(c) <=> other.send(c)
           return order if order.nonzero?
         end

data/lib/datacite/mapping/geo_location_polygon.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'xml/mapping'
 
 module Datacite
@@ -14,7 +16,7 @@ module Datacite
       def initialize(points:) # TODO: allow simple array of point args, array of hashes
         self.points = points
         warn "Polygon should contain at least 4 points, but has #{points.size}" if points.size < 4
-        warn "Polygon is not closed; last and first point should be identical, but were: [#{points[0]}], [#{points[-1]}]" if points.size > 1 unless points[0] == points[-1]
+        warn "Polygon is not closed; last and first point should be identical, but were: [#{points[0]}], [#{points[-1]}]" unless points[0] == points[-1] || points.size <= 1
       end
 
       def points=(value)

data/lib/datacite/mapping/identifier.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'xml/mapping'
 require 'datacite/mapping/empty_filtering_nodes'
 
@@ -14,7 +16,7 @@ module Datacite
     class Identifier
       include XML::Mapping
 
-      DOI = 'DOI'.freeze
+      DOI = 'DOI'
 
       # Initializes a new {Identifier}
       # @param value [String]
@@ -25,9 +27,9 @@ module Datacite
       end
 
       def value=(v)
-        new_value = v && v.strip
-        fail ArgumentError, 'Identifier must have a non-nil value' unless new_value
-        fail ArgumentError, "Identifier value '#{new_value}' is not a valid DOI" unless new_value.match(DOI_PATTERN)
+        new_value = v&.strip
+        raise ArgumentError, 'Identifier must have a non-nil value' unless new_value
+        raise ArgumentError, "Identifier value '#{new_value}' is not a valid DOI" unless new_value.match?(DOI_PATTERN)
         @value = new_value
       end
 
@@ -35,7 +37,7 @@ module Datacite
       # @param v [String]
       #   the identifier type (always 'DOI')
       def identifier_type=(v)
-        fail ArgumentError, "Identifier type '#{v}' must be 'DOI'" unless DOI == v
+        raise ArgumentError, "Identifier type '#{v}' must be 'DOI'" unless DOI == v
         @identifier_type = v
       end
 
@@ -48,7 +50,7 @@ module Datacite
       # @param doi_string [String]
       def self.from_doi(doi_string)
         match = doi_string.match(DOI_PATTERN)
-        fail ArgumentError, "'#{doi_string}' does not appear to contain a valid DOI" unless match
+        raise ArgumentError, "'#{doi_string}' does not appear to contain a valid DOI" unless match
         Identifier.new(value: match[0])
       end
 
@@ -69,7 +71,7 @@ module Datacite
 
       private
 
-      def has_element?(xml) # rubocop:disable Style/PredicateName
+      def has_element?(xml) # rubocop:disable Naming/PredicateName
         @path.first(xml)
       rescue XML::XXPathError
         false

data/lib/datacite/mapping/module_info.rb

@@ -1,12 +1,14 @@
+# frozen_string_literal: true
+
 module Datacite
   module Mapping
     # The name of this gem
-    NAME = 'datacite-mapping'.freeze
+    NAME = 'datacite-mapping'
 
     # The version of this gem
-    VERSION = '0.2.5'.freeze
+    VERSION = '0.3.0'
 
     # The copyright notice for this gem
-    COPYRIGHT = 'Copyright (c) 2016 The Regents of the University of California'.freeze
+    COPYRIGHT = 'Copyright (c) 2016 The Regents of the University of California'
   end
 end

data/lib/datacite/mapping/name_identifier.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'xml/mapping_extensions'
 
 module Datacite
@@ -17,12 +19,12 @@ module Datacite
       end
 
       def scheme=(v)
-        fail ArgumentError, 'Scheme cannot be empty or nil' unless v && !v.empty?
+        raise ArgumentError, 'Scheme cannot be empty or nil' unless v && !v.empty?
         @scheme = v
       end
 
       def value=(v)
-        fail ArgumentError, 'Value cannot be empty or nil' unless v && !v.empty?
+        raise ArgumentError, 'Value cannot be empty or nil' unless v && !v.empty?
         @value = v
       end
 

data/lib/datacite/mapping/namespace_extensions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'xml/mapping_extensions'
 
 # TODO: port this to xml-mapping_extensions

data/lib/datacite/mapping/read_only_nodes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'xml/mapping'
 
 module XML
@@ -31,7 +33,7 @@ module Datacite
 
       def warn_ignored(val)
         warning = "ignoring #{@attrname} #{value_str(val)}"
-        warning.prepend("#{warn_reason}; ") if warn_reason
+        warning = "#{warn_reason}; #{warning}" if warn_reason
         ReadOnlyNodes.warn(warning)
       end
 
@@ -43,7 +45,7 @@ module Datacite
 
     class ReadOnlyTextNode < XML::Mapping::TextNode
       def warn_ignored(val)
-        fail ArgumentError, "Expected string, got #{val}" unless val.respond_to?(:strip)
+        raise ArgumentError, "Expected string, got #{val}" unless val.respond_to?(:strip)
         return if val.strip.empty?
         super
       end
@@ -53,7 +55,7 @@ module Datacite
 
     class ReadOnlyArrayNode < XML::Mapping::ArrayNode
       def warn_ignored(val)
-        fail ArgumentError, "Expected array, got #{val}" unless val.respond_to?(:empty?)
+        raise ArgumentError, "Expected array, got #{val}" unless val.respond_to?(:empty?)
         return if val.empty?
         super
       end

data/lib/datacite/mapping/related_identifier.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'xml/mapping_extensions'
 
 module Datacite
@@ -181,17 +183,17 @@ module Datacite
       end
 
       def value=(value)
-        fail ArgumentError, 'Value cannot be empty or nil' unless value && !value.empty?
+        raise ArgumentError, 'Value cannot be empty or nil' unless value && !value.empty?
         @value = value
       end
 
       def identifier_type=(value)
-        fail ArgumentError, 'Identifier type cannot be empty or nil' unless value
+        raise ArgumentError, 'Identifier type cannot be empty or nil' unless value
         @identifier_type = value
       end
 
       def relation_type=(value)
-        fail ArgumentError, 'Relation type cannot be nil' unless value
+        raise ArgumentError, 'Relation type cannot be nil' unless value
         @relation_type = value
       end
 

data/lib/datacite/mapping/resource.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'xml/mapping_extensions'
 
 require 'datacite/mapping/identifier'
@@ -91,33 +93,33 @@ module Datacite
       end
 
       def identifier=(value)
-        fail ArgumentError, 'Resource must have an identifier' unless value
+        raise ArgumentError, 'Resource must have an identifier' unless value
         @identifier = value
       end
 
       def creators=(value)
-        fail ArgumentError, 'Resource must have at least one creator' unless value && !value.empty?
+        raise ArgumentError, 'Resource must have at least one creator' unless value && !value.empty?
         @creators = value
       end
 
       def titles=(value)
-        fail ArgumentError, 'Resource must have at least one title' unless value && !value.empty?
+        raise ArgumentError, 'Resource must have at least one title' unless value && !value.empty?
         @titles = value
       end
 
       def publisher=(value)
-        new_value = value && value.strip
-        fail ArgumentError, 'Resource must have a publisher' unless new_value && !new_value.empty?
+        new_value = value&.strip
+        raise ArgumentError, 'Resource must have a publisher' unless new_value && !new_value.empty?
         @publisher = new_value.strip
       end
 
       def publication_year=(value)
-        fail ArgumentError, 'Resource must have a four-digit publication year' unless value && value.to_i.between?(1000, 9999)
+        raise ArgumentError, 'Resource must have a four-digit publication year' unless value && value.to_i.between?(1000, 9999)
         @publication_year = value.to_i
       end
 
       def subjects=(value)
-        @subjects = (value && value.select(&:value)) || []
+        @subjects = (value&.select(&:value)) || []
       end
 
       def contributors=(value)
@@ -150,7 +152,7 @@ module Datacite
 
       def version=(value)
         new_value = value && value.to_s
-        @version = new_value && new_value.strip
+        @version = new_value&.strip
       end
 
       def rights_list=(value)
@@ -158,11 +160,11 @@ module Datacite
       end
 
       def descriptions=(value)
-        @descriptions = (value && value.select(&:value)) || []
+        @descriptions = (value&.select(&:value)) || []
       end
 
       def geo_locations=(value)
-        @geo_locations = (value && value.select(&:location?)) || []
+        @geo_locations = (value&.select(&:location?)) || []
       end
 
       # @!attribute [rw] identifier
@@ -264,19 +266,19 @@ module Datacite
       # @deprecated contributor type 'funder' is deprecated. Use {FundingReference} instead.
       # @return [String, nil] the name of the funding contributor, if any.
       def funder_name
-        funder_contrib.name if funder_contrib
+        funder_contrib&.name
       end
 
       # Convenience method to get the funding contributor identifier.
       # @return [NameIdentifier, nil] the identifier of the funding contributor, if any.
       def funder_id
-        funder_contrib.identifier if funder_contrib
+        funder_contrib&.identifier
       end
 
       # Convenience method to get the funding contributor identifier as a string.
       # @return [String, nil] the string value of the funding contributor's identifier, if any.
       def funder_id_value
-        funder_id.value if funder_id
+        funder_id&.value
       end
 
       extend Gem::Deprecate

data/lib/datacite/mapping/resource_type.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'xml/mapping_extensions'
 
 module Datacite
@@ -62,7 +64,7 @@ module Datacite
       end
 
       def resource_type_general=(val)
-        fail ArgumentError, 'General resource type cannot be nil' unless val
+        raise ArgumentError, 'General resource type cannot be nil' unless val
         @resource_type_general = val
       end
 

data/lib/datacite/mapping/rights.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'xml/mapping_extensions'
 
 module Datacite
@@ -17,7 +19,7 @@ module Datacite
       end
 
       def value=(v)
-        fail ArgumentError, 'Value cannot be empty or nil' unless v && !v.empty?
+        raise ArgumentError, 'Value cannot be empty or nil' unless v && !v.empty?
         @value = v.strip
       end
 

data/lib/datacite/mapping/subject.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'xml/mapping'
 
 module Datacite
@@ -20,12 +22,12 @@ module Datacite
       end
 
       def language=(value)
-        @language = value && value.strip
+        @language = value&.strip
       end
 
       def value=(v)
-        new_value = v && v.strip
-        fail ArgumentError, 'Value cannot be empty or nil' unless new_value && !new_value.empty?
+        new_value = v&.strip
+        raise ArgumentError, 'Value cannot be empty or nil' unless new_value && !new_value.empty?
         @value = new_value
       end
 

data/lib/datacite/mapping/title.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'xml/mapping_extensions'
 
 module Datacite
@@ -31,12 +33,12 @@ module Datacite
       end
 
       def language=(value)
-        @language = value && value.strip
+        @language = value&.strip
       end
 
       def value=(v)
-        new_value = v && v.strip
-        fail ArgumentError, 'Value cannot be empty or nil' unless new_value && !new_value.empty?
+        new_value = v&.strip
+        raise ArgumentError, 'Value cannot be empty or nil' unless new_value && !new_value.empty?
         @value = new_value.strip
       end
 

data/spec/.rubocop.yml

@@ -1,5 +1,8 @@
 inherit_from: ../.rubocop.yml
 
+Metrics/BlockLength:
+  Enabled: false
+
 Metrics/MethodLength:
   Enabled: false
 

data/spec/rspec_custom_matchers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rspec/expectations'
 require 'equivalent-xml'
 
@@ -15,7 +17,7 @@ RSpec::Matchers.define :be_xml do |expected|
     when REXML::Element
       to_nokogiri(xml.to_s)
     else
-      fail "be_xml() expected XML, got #{xml.class}"
+      raise "be_xml() expected XML, got #{xml.class}"
     end
   end
 
@@ -28,7 +30,7 @@ RSpec::Matchers.define :be_xml do |expected|
   end
 
   match do |actual|
-    expected_xml = to_nokogiri(expected) || fail("expected value #{expected || 'nil'} does not appear to be XML")
+    expected_xml = to_nokogiri(expected) || raise("expected value #{expected || 'nil'} does not appear to be XML")
     actual_xml = to_nokogiri(actual)
 
     EquivalentXml.equivalent?(expected_xml, actual_xml, element_order: false, normalize_whitespace: true)
@@ -57,12 +59,10 @@ RSpec::Matchers.define :be_time do |expected|
   end
 
   match do |actual|
-    if expected
-      fail "Expected value #{expected} is not a Time" unless expected.is_a?(Time)
-      actual.is_a?(Time) && (to_string(expected) == to_string(actual))
-    else
-      return actual.nil?
-    end
+    return actual.nil? unless expected
+
+    raise "Expected value #{expected} is not a Time" unless expected.is_a?(Time)
+    actual.is_a?(Time) && (to_string(expected) == to_string(actual))
   end
 
   failure_message do |actual|