csvlint 1.0.0 → 1.1.0

data/lib/csvlint/csvw/date_format.rb

@@ -1,10 +1,9 @@
 module Csvlint
   module Csvw
     class DateFormat
-
       attr_reader :pattern
 
-      def initialize(pattern, datatype=nil)
+      def initialize(pattern, datatype = nil)
         @pattern = pattern
 
         if @pattern.nil?
@@ -13,16 +12,16 @@ module Csvlint
         else
           test_pattern = pattern.clone
           test_pattern.gsub!(/S+/, "")
-          FIELDS.keys.sort_by{|f| -f.length}.each do |field|
+          FIELDS.keys.sort_by { |f| -f.length }.each do |field|
             test_pattern.gsub!(field, "")
           end
-          raise Csvw::DateFormatError, "unrecognised date field symbols in date format" if test_pattern =~ /[GyYuUrQqMLlwWdDFgEecahHKkjJmsSAzZOvVXx]/
+          raise Csvw::DateFormatError, "unrecognised date field symbols in date format" if /[GyYuUrQqMLlwWdDFgEecahHKkjJmsSAzZOvVXx]/.match?(test_pattern)
 
           @regexp = DATE_PATTERN_REGEXP[@pattern]
           @type = @regexp.nil? ? "http://www.w3.org/2001/XMLSchema#time" : "http://www.w3.org/2001/XMLSchema#date"
-          @regexp = @regexp || TIME_PATTERN_REGEXP[@pattern]
+          @regexp ||= TIME_PATTERN_REGEXP[@pattern]
           @type = @regexp.nil? ? "http://www.w3.org/2001/XMLSchema#dateTime" : @type
-          @regexp = @regexp || DATE_TIME_PATTERN_REGEXP[@pattern]
+          @regexp ||= DATE_TIME_PATTERN_REGEXP[@pattern]
 
           if @regexp.nil?
             regexp = @pattern
@@ -33,19 +32,19 @@ module Csvlint
 
             regexp = regexp.sub("HH", FIELDS["HH"].to_s)
             regexp = regexp.sub("mm", FIELDS["mm"].to_s)
-            if @pattern =~ /ss\.S+/
+            if /ss\.S+/.match?(@pattern)
               max_fractional_seconds = @pattern.split(".")[-1].length
-              regexp = regexp.sub(/ss\.S+$/, "(?<second>#{FIELDS["ss"]}(\.[0-9]{1,#{max_fractional_seconds}})?)")
+              regexp = regexp.sub(/ss\.S+$/, "(?<second>#{FIELDS["ss"]}(.[0-9]{1,#{max_fractional_seconds}})?)")
             else
               regexp = regexp.sub("ss", "(?<second>#{FIELDS["ss"]})")
             end
 
-            if regexp =~ /yyyy/
+            if /yyyy/.match?(regexp)
               regexp = regexp.sub("yyyy", FIELDS["yyyy"].to_s)
               regexp = regexp.sub("MM", FIELDS["MM"].to_s)
               regexp = regexp.sub("M", FIELDS["M"].to_s)
               regexp = regexp.sub("dd", FIELDS["dd"].to_s)
-              regexp = regexp.sub(/d(?=[-T \/\.])/, FIELDS["d"].to_s)
+              regexp = regexp.sub(/d(?=[-T \/.])/, FIELDS["d"].to_s)
             end
 
             regexp = regexp.sub("XXX", FIELDS["XXX"].to_s)
@@ -61,7 +60,7 @@ module Csvlint
       end
 
       def match(value)
-        value =~ @regexp ? true : false
+        value&.match?(@regexp) ? true : false
       end
 
       def parse(value)
@@ -76,9 +75,9 @@ module Csvlint
             case field
             when "timezone"
               tz = match["timezone"]
-              tz = "+00:00" if tz == 'Z'
-              tz += ':00' if tz.length == 3
-              tz = "#{tz[0..2]}:#{tz[3..4]}" unless tz =~ /:/
+              tz = "+00:00" if tz == "Z"
+              tz += ":00" if tz.length == 3
+              tz = "#{tz[0..2]}:#{tz[3..4]}" unless /:/.match?(tz)
               value[:timezone] = tz
             when "second"
               value[:second] = match["second"].to_f
@@ -96,120 +95,119 @@ module Csvlint
           end
         when "http://www.w3.org/2001/XMLSchema#dateTime"
           begin
-            value[:dateTime] = DateTime.new(match["year"].to_i, match["month"].to_i, match["day"].to_i, match["hour"].to_i, match["minute"].to_i, (match.names.include?("second") ? match["second"].to_f : 0), match.names.include?("timezone") && match["timezone"] ? match["timezone"] : '')
+            value[:dateTime] = DateTime.new(match["year"].to_i, match["month"].to_i, match["day"].to_i, match["hour"].to_i, match["minute"].to_i, (match.names.include?("second") ? match["second"].to_f : 0), (match.names.include?("timezone") && match["timezone"]) ? match["timezone"] : "")
           rescue ArgumentError
             return nil
           end
         else
           value[:dateTime] = DateTime.new(value[:year] || 0, value[:month] || 1, value[:day] || 1, value[:hour] || 0, value[:minute] || 0, value[:second] || 0, value[:timezone] || "+00:00")
         end
-        if value[:year]
+        value[:string] = if value[:year]
           if value[:month]
             if value[:day]
               if value[:hour]
                 # dateTime
-                value[:string] = "#{format('%04d', value[:year])}-#{format('%02d', value[:month])}-#{format('%02d', value[:day])}T#{format('%02d', value[:hour])}:#{format('%02d', value[:minute] || 0)}:#{format('%02g', value[:second] || 0)}#{value[:timezone] ? value[:timezone].sub("+00:00", "Z") : ''}"
+                "#{format("%04d", value[:year])}-#{format("%02d", value[:month])}-#{format("%02d", value[:day])}T#{format("%02d", value[:hour])}:#{format("%02d", value[:minute] || 0)}:#{format("%02g", value[:second] || 0)}#{value[:timezone] ? value[:timezone].sub("+00:00", "Z") : ""}"
               else
                 # date
-                value[:string] = "#{format('%04d', value[:year])}-#{format('%02d', value[:month])}-#{format('%02d', value[:day])}#{value[:timezone] ? value[:timezone].sub("+00:00", "Z") : ''}"
+                "#{format("%04d", value[:year])}-#{format("%02d", value[:month])}-#{format("%02d", value[:day])}#{value[:timezone] ? value[:timezone].sub("+00:00", "Z") : ""}"
               end
             else
               # gYearMonth
-              value[:string] = "#{format('%04d', value[:year])}-#{format('%02d', value[:month])}#{value[:timezone] ? value[:timezone].sub("+00:00", "Z") : ''}"
+              "#{format("%04d", value[:year])}-#{format("%02d", value[:month])}#{value[:timezone] ? value[:timezone].sub("+00:00", "Z") : ""}"
             end
           else
             # gYear
-            value[:string] = "#{format('%04d', value[:year])}#{value[:timezone] ? value[:timezone].sub("+00:00", "Z") : ''}"
+            "#{format("%04d", value[:year])}#{value[:timezone] ? value[:timezone].sub("+00:00", "Z") : ""}"
           end
         elsif value[:month]
           if value[:day]
             # gMonthDay
-            value[:string] = "--#{format('%02d', value[:month])}-#{format('%02d', value[:day])}#{value[:timezone] ? value[:timezone].sub("+00:00", "Z") : ''}"
+            "--#{format("%02d", value[:month])}-#{format("%02d", value[:day])}#{value[:timezone] ? value[:timezone].sub("+00:00", "Z") : ""}"
           else
             # gMonth
-            value[:string] = "--#{format('%02d', value[:month])}#{value[:timezone] ? value[:timezone].sub("+00:00", "Z") : ''}"
+            "--#{format("%02d", value[:month])}#{value[:timezone] ? value[:timezone].sub("+00:00", "Z") : ""}"
           end
         elsif value[:day]
           # gDay
-          value[:string] = "---#{format('%02d', value[:day])}#{value[:timezone] ? value[:timezone].sub("+00:00", "Z") : ''}"
+          "---#{format("%02d", value[:day])}#{value[:timezone] ? value[:timezone].sub("+00:00", "Z") : ""}"
         else
-          value[:string] = "#{format('%02d', value[:hour])}:#{format('%02d', value[:minute])}:#{format('%02g', value[:second] || 0)}#{value[:timezone] ? value[:timezone].sub("+00:00", "Z") : ''}"
+          "#{format("%02d", value[:hour])}:#{format("%02d", value[:minute])}:#{format("%02g", value[:second] || 0)}#{value[:timezone] ? value[:timezone].sub("+00:00", "Z") : ""}"
         end
-        return value
+        value
       end
 
       private
-        FIELDS = {
-          "yyyy" => /(?<year>-?([1-9][0-9]{3,}|0[0-9]{3}))/,
-          "MM" => /(?<month>0[1-9]|1[0-2])/,
-          "M" => /(?<month>[1-9]|1[0-2])/,
-          "dd" => /(?<day>0[1-9]|[12][0-9]|3[01])/,
-          "d" => /(?<day>[1-9]|[12][0-9]|3[01])/,
-          "HH" => /(?<hour>[01][0-9]|2[0-3])/,
-          "mm" => /(?<minute>[0-5][0-9])/,
-          "ss" => /([0-6][0-9])/,
-          "X" => /(?<timezone>Z|[-+]((0[0-9]|1[0-3])([0-5][0-9])?|14(00)?))/,
-          "XX" => /(?<timezone>Z|[-+]((0[0-9]|1[0-3])[0-5][0-9]|1400))/,
-          "XXX" => /(?<timezone>Z|[-+]((0[0-9]|1[0-3]):[0-5][0-9]|14:00))/,
-          "x" => /(?<timezone>[-+]((0[0-9]|1[0-3])([0-5][0-9])?|14(00)?))/,
-          "xx" => /(?<timezone>[-+]((0[0-9]|1[0-3])[0-5][0-9]|1400))/,
-          "xxx" => /(?<timezone>[-+]((0[0-9]|1[0-3]):[0-5][0-9]|14:00))/,
-        }
-
-        DATE_PATTERN_REGEXP = {
-          "yyyy-MM-dd" => Regexp.new("^#{FIELDS["yyyy"]}-#{FIELDS["MM"]}-#{FIELDS["dd"]}$"),
-          "yyyyMMdd" => Regexp.new("^#{FIELDS["yyyy"]}#{FIELDS["MM"]}#{FIELDS["dd"]}$"),
-          "dd-MM-yyyy" => Regexp.new("^#{FIELDS["dd"]}-#{FIELDS["MM"]}-#{FIELDS["yyyy"]}$"),
-          "d-M-yyyy" => Regexp.new("^#{FIELDS["d"]}-#{FIELDS["M"]}-#{FIELDS["yyyy"]}$"),
-          "MM-dd-yyyy" => Regexp.new("^#{FIELDS["MM"]}-#{FIELDS["dd"]}-#{FIELDS["yyyy"]}$"),
-          "M-d-yyyy" => Regexp.new("^#{FIELDS["M"]}-#{FIELDS["d"]}-#{FIELDS["yyyy"]}$"),
-          "dd/MM/yyyy" => Regexp.new("^#{FIELDS["dd"]}/#{FIELDS["MM"]}/#{FIELDS["yyyy"]}$"),
-          "d/M/yyyy" => Regexp.new("^#{FIELDS["d"]}/#{FIELDS["M"]}/#{FIELDS["yyyy"]}$"),
-          "MM/dd/yyyy" => Regexp.new("^#{FIELDS["MM"]}/#{FIELDS["dd"]}/#{FIELDS["yyyy"]}$"),
-          "M/d/yyyy" => Regexp.new("^#{FIELDS["M"]}/#{FIELDS["d"]}/#{FIELDS["yyyy"]}$"),
-          "dd.MM.yyyy" => Regexp.new("^#{FIELDS["dd"]}.#{FIELDS["MM"]}.#{FIELDS["yyyy"]}$"),
-          "d.M.yyyy" => Regexp.new("^#{FIELDS["d"]}.#{FIELDS["M"]}.#{FIELDS["yyyy"]}$"),
-          "MM.dd.yyyy" => Regexp.new("^#{FIELDS["MM"]}.#{FIELDS["dd"]}.#{FIELDS["yyyy"]}$"),
-          "M.d.yyyy" => Regexp.new("^#{FIELDS["M"]}.#{FIELDS["d"]}.#{FIELDS["yyyy"]}$")
-        }
-
-        TIME_PATTERN_REGEXP = {
-          "HH:mm:ss" => Regexp.new("^#{FIELDS["HH"]}:#{FIELDS["mm"]}:(?<second>#{FIELDS["ss"]})$"),
-          "HHmmss" => Regexp.new("^#{FIELDS["HH"]}#{FIELDS["mm"]}(?<second>#{FIELDS["ss"]})$"),
-          "HH:mm" => Regexp.new("^#{FIELDS["HH"]}:#{FIELDS["mm"]}$"),
-          "HHmm" => Regexp.new("^#{FIELDS["HH"]}#{FIELDS["mm"]}$")
-        }
-
-        DATE_TIME_PATTERN_REGEXP = {
-          "yyyy-MM-ddTHH:mm:ss" => Regexp.new("^#{FIELDS["yyyy"]}-#{FIELDS["MM"]}-#{FIELDS["dd"]}T#{FIELDS["HH"]}:#{FIELDS["mm"]}:(?<second>#{FIELDS["ss"]})$"),
-          "yyyy-MM-ddTHH:mm" => Regexp.new("^#{FIELDS["yyyy"]}-#{FIELDS["MM"]}-#{FIELDS["dd"]}T#{FIELDS["HH"]}:#{FIELDS["mm"]}$")
-        }
-
-        DEFAULT_REGEXP = {
-          "http://www.w3.org/2001/XMLSchema#date" =>
-            Regexp.new("^#{FIELDS["yyyy"]}-#{FIELDS["MM"]}-#{FIELDS["dd"]}#{FIELDS["XXX"]}?$"),
-          "http://www.w3.org/2001/XMLSchema#dateTime" =>
-            Regexp.new("^#{FIELDS["yyyy"]}-#{FIELDS["MM"]}-#{FIELDS["dd"]}T#{FIELDS["HH"]}:#{FIELDS["mm"]}:(?<second>#{FIELDS["ss"]}(\.[0-9]+)?)#{FIELDS["XXX"]}?$"),
-          "http://www.w3.org/2001/XMLSchema#dateTimeStamp" =>
-            Regexp.new("^#{FIELDS["yyyy"]}-#{FIELDS["MM"]}-#{FIELDS["dd"]}T#{FIELDS["HH"]}:#{FIELDS["mm"]}:(?<second>#{FIELDS["ss"]}(\.[0-9]+)?)#{FIELDS["XXX"]}$"),
-          "http://www.w3.org/2001/XMLSchema#gDay" =>
-            Regexp.new("^---#{FIELDS["dd"]}#{FIELDS["XXX"]}?$"),
-          "http://www.w3.org/2001/XMLSchema#gMonth" =>
-            Regexp.new("^--#{FIELDS["MM"]}#{FIELDS["XXX"]}?$"),
-          "http://www.w3.org/2001/XMLSchema#gMonthDay" =>
-            Regexp.new("^--#{FIELDS["MM"]}-#{FIELDS["dd"]}#{FIELDS["XXX"]}?$"),
-          "http://www.w3.org/2001/XMLSchema#gYear" =>
-            Regexp.new("^#{FIELDS["yyyy"]}#{FIELDS["XXX"]}?$"),
-          "http://www.w3.org/2001/XMLSchema#gYearMonth" =>
-            Regexp.new("^#{FIELDS["yyyy"]}-#{FIELDS["MM"]}#{FIELDS["XXX"]}?$"),
-          "http://www.w3.org/2001/XMLSchema#time" =>
-            Regexp.new("^#{FIELDS["HH"]}:#{FIELDS["mm"]}:(?<second>#{FIELDS["ss"]}(\.[0-9]+)?)#{FIELDS["XXX"]}?$")
-        }
 
+      FIELDS = {
+        "yyyy" => /(?<year>-?([1-9][0-9]{3,}|0[0-9]{3}))/,
+        "MM" => /(?<month>0[1-9]|1[0-2])/,
+        "M" => /(?<month>[1-9]|1[0-2])/,
+        "dd" => /(?<day>0[1-9]|[12][0-9]|3[01])/,
+        "d" => /(?<day>[1-9]|[12][0-9]|3[01])/,
+        "HH" => /(?<hour>[01][0-9]|2[0-3])/,
+        "mm" => /(?<minute>[0-5][0-9])/,
+        "ss" => /([0-6][0-9])/,
+        "X" => /(?<timezone>Z|[-+]((0[0-9]|1[0-3])([0-5][0-9])?|14(00)?))/,
+        "XX" => /(?<timezone>Z|[-+]((0[0-9]|1[0-3])[0-5][0-9]|1400))/,
+        "XXX" => /(?<timezone>Z|[-+]((0[0-9]|1[0-3]):[0-5][0-9]|14:00))/,
+        "x" => /(?<timezone>[-+]((0[0-9]|1[0-3])([0-5][0-9])?|14(00)?))/,
+        "xx" => /(?<timezone>[-+]((0[0-9]|1[0-3])[0-5][0-9]|1400))/,
+        "xxx" => /(?<timezone>[-+]((0[0-9]|1[0-3]):[0-5][0-9]|14:00))/
+      }
+
+      DATE_PATTERN_REGEXP = {
+        "yyyy-MM-dd" => Regexp.new("^#{FIELDS["yyyy"]}-#{FIELDS["MM"]}-#{FIELDS["dd"]}$"),
+        "yyyyMMdd" => Regexp.new("^#{FIELDS["yyyy"]}#{FIELDS["MM"]}#{FIELDS["dd"]}$"),
+        "dd-MM-yyyy" => Regexp.new("^#{FIELDS["dd"]}-#{FIELDS["MM"]}-#{FIELDS["yyyy"]}$"),
+        "d-M-yyyy" => Regexp.new("^#{FIELDS["d"]}-#{FIELDS["M"]}-#{FIELDS["yyyy"]}$"),
+        "MM-dd-yyyy" => Regexp.new("^#{FIELDS["MM"]}-#{FIELDS["dd"]}-#{FIELDS["yyyy"]}$"),
+        "M-d-yyyy" => Regexp.new("^#{FIELDS["M"]}-#{FIELDS["d"]}-#{FIELDS["yyyy"]}$"),
+        "dd/MM/yyyy" => Regexp.new("^#{FIELDS["dd"]}/#{FIELDS["MM"]}/#{FIELDS["yyyy"]}$"),
+        "d/M/yyyy" => Regexp.new("^#{FIELDS["d"]}/#{FIELDS["M"]}/#{FIELDS["yyyy"]}$"),
+        "MM/dd/yyyy" => Regexp.new("^#{FIELDS["MM"]}/#{FIELDS["dd"]}/#{FIELDS["yyyy"]}$"),
+        "M/d/yyyy" => Regexp.new("^#{FIELDS["M"]}/#{FIELDS["d"]}/#{FIELDS["yyyy"]}$"),
+        "dd.MM.yyyy" => Regexp.new("^#{FIELDS["dd"]}.#{FIELDS["MM"]}.#{FIELDS["yyyy"]}$"),
+        "d.M.yyyy" => Regexp.new("^#{FIELDS["d"]}.#{FIELDS["M"]}.#{FIELDS["yyyy"]}$"),
+        "MM.dd.yyyy" => Regexp.new("^#{FIELDS["MM"]}.#{FIELDS["dd"]}.#{FIELDS["yyyy"]}$"),
+        "M.d.yyyy" => Regexp.new("^#{FIELDS["M"]}.#{FIELDS["d"]}.#{FIELDS["yyyy"]}$")
+      }
+
+      TIME_PATTERN_REGEXP = {
+        "HH:mm:ss" => Regexp.new("^#{FIELDS["HH"]}:#{FIELDS["mm"]}:(?<second>#{FIELDS["ss"]})$"),
+        "HHmmss" => Regexp.new("^#{FIELDS["HH"]}#{FIELDS["mm"]}(?<second>#{FIELDS["ss"]})$"),
+        "HH:mm" => Regexp.new("^#{FIELDS["HH"]}:#{FIELDS["mm"]}$"),
+        "HHmm" => Regexp.new("^#{FIELDS["HH"]}#{FIELDS["mm"]}$")
+      }
+
+      DATE_TIME_PATTERN_REGEXP = {
+        "yyyy-MM-ddTHH:mm:ss" => Regexp.new("^#{FIELDS["yyyy"]}-#{FIELDS["MM"]}-#{FIELDS["dd"]}T#{FIELDS["HH"]}:#{FIELDS["mm"]}:(?<second>#{FIELDS["ss"]})$"),
+        "yyyy-MM-ddTHH:mm" => Regexp.new("^#{FIELDS["yyyy"]}-#{FIELDS["MM"]}-#{FIELDS["dd"]}T#{FIELDS["HH"]}:#{FIELDS["mm"]}$")
+      }
+
+      DEFAULT_REGEXP = {
+        "http://www.w3.org/2001/XMLSchema#date" =>
+          Regexp.new("^#{FIELDS["yyyy"]}-#{FIELDS["MM"]}-#{FIELDS["dd"]}#{FIELDS["XXX"]}?$"),
+        "http://www.w3.org/2001/XMLSchema#dateTime" =>
+          Regexp.new("^#{FIELDS["yyyy"]}-#{FIELDS["MM"]}-#{FIELDS["dd"]}T#{FIELDS["HH"]}:#{FIELDS["mm"]}:(?<second>#{FIELDS["ss"]}(.[0-9]+)?)#{FIELDS["XXX"]}?$"),
+        "http://www.w3.org/2001/XMLSchema#dateTimeStamp" =>
+          Regexp.new("^#{FIELDS["yyyy"]}-#{FIELDS["MM"]}-#{FIELDS["dd"]}T#{FIELDS["HH"]}:#{FIELDS["mm"]}:(?<second>#{FIELDS["ss"]}(.[0-9]+)?)#{FIELDS["XXX"]}$"),
+        "http://www.w3.org/2001/XMLSchema#gDay" =>
+          Regexp.new("^---#{FIELDS["dd"]}#{FIELDS["XXX"]}?$"),
+        "http://www.w3.org/2001/XMLSchema#gMonth" =>
+          Regexp.new("^--#{FIELDS["MM"]}#{FIELDS["XXX"]}?$"),
+        "http://www.w3.org/2001/XMLSchema#gMonthDay" =>
+          Regexp.new("^--#{FIELDS["MM"]}-#{FIELDS["dd"]}#{FIELDS["XXX"]}?$"),
+        "http://www.w3.org/2001/XMLSchema#gYear" =>
+          Regexp.new("^#{FIELDS["yyyy"]}#{FIELDS["XXX"]}?$"),
+        "http://www.w3.org/2001/XMLSchema#gYearMonth" =>
+          Regexp.new("^#{FIELDS["yyyy"]}-#{FIELDS["MM"]}#{FIELDS["XXX"]}?$"),
+        "http://www.w3.org/2001/XMLSchema#time" =>
+          Regexp.new("^#{FIELDS["HH"]}:#{FIELDS["mm"]}:(?<second>#{FIELDS["ss"]}(.[0-9]+)?)#{FIELDS["XXX"]}?$")
+      }
     end
 
     class DateFormatError < StandardError
-
     end
   end
 end

data/lib/csvlint/csvw/metadata_error.rb

@@ -1,13 +1,11 @@
 module Csvlint
   module Csvw
     class MetadataError < StandardError
-
       attr_reader :path
 
-      def initialize(path=nil)
+      def initialize(path = nil)
         @path = path
       end
-
     end
   end
 end

data/lib/csvlint/csvw/number_format.rb

@@ -1,26 +1,25 @@
 module Csvlint
   module Csvw
     class NumberFormat
-
       attr_reader :integer, :pattern, :prefix, :numeric_part, :suffix, :grouping_separator, :decimal_separator, :primary_grouping_size, :secondary_grouping_size, :fractional_grouping_size
 
-      def initialize(pattern=nil, grouping_separator=nil, decimal_separator=".", integer=nil)
+      def initialize(pattern = nil, grouping_separator = nil, decimal_separator = ".", integer = nil)
         @pattern = pattern
         @integer = integer
         if @integer.nil?
-          if @pattern.nil?
-            @integer = nil
+          @integer = if @pattern.nil?
+            nil
           else
-            @integer = !@pattern.include?(decimal_separator)
+            !@pattern.include?(decimal_separator)
           end
         end
         @grouping_separator = grouping_separator || (@pattern.nil? ? nil : ",")
         @decimal_separator = decimal_separator || "."
         if pattern.nil?
-          if integer
-            @regexp = INTEGER_REGEXP
+          @regexp = if integer
+            INTEGER_REGEXP
           else
-            @regexp = Regexp.new("^(([-+]?[0-9]+(\\.[0-9]+)?([Ee][-+]?[0-9]+)?[%‰]?)|NaN|INF|-INF)$")
+            Regexp.new("^(([-+]?[0-9]+(\\.[0-9]+)?([Ee][-+]?[0-9]+)?[%‰]?)|NaN|INF|-INF)$")
           end
         else
           numeric_part_regexp = Regexp.new("(?<numeric_part>[-+]?([0#Ee]|#{Regexp.escape(@grouping_separator)}|#{Regexp.escape(@decimal_separator)})+)")
@@ -47,18 +46,30 @@ module Csvlint
             numeric_part_regexp = "[-+]?"
           end
 
-          min_integer_digits = integer_part.gsub(@grouping_separator, "").gsub("#", "").length
-          min_fraction_digits = fractional_part.gsub(@grouping_separator, "").gsub("#", "").length
+          min_integer_digits = integer_part.gsub(@grouping_separator, "").delete("#").length
+          min_fraction_digits = fractional_part.gsub(@grouping_separator, "").delete("#").length
           max_fraction_digits = fractional_part.gsub(@grouping_separator, "").length
-          min_exponent_digits = exponent_part.gsub("#", "").length
+          min_exponent_digits = exponent_part.delete("#").length
           max_exponent_digits = exponent_part.length
 
           integer_parts = integer_part.split(@grouping_separator)[1..-1]
-          @primary_grouping_size = integer_parts[-1].length rescue 0
-          @secondary_grouping_size = integer_parts[-2].length rescue @primary_grouping_size
+          @primary_grouping_size = begin
+            integer_parts[-1].length
+          rescue
+            0
+          end
+          @secondary_grouping_size = begin
+            integer_parts[-2].length
+          rescue
+            @primary_grouping_size
+          end
 
           fractional_parts = fractional_part.split(@grouping_separator)[0..-2]
-          @fractional_grouping_size = fractional_parts[0].length rescue 0
+          @fractional_grouping_size = begin
+            fractional_parts[0].length
+          rescue
+            0
+          end
 
           if @primary_grouping_size == 0
             integer_regexp = "[0-9]*[0-9]{#{min_integer_digits}}"
@@ -67,7 +78,7 @@ module Csvlint
             secondary_groups = "([0-9]{#{@secondary_grouping_size}}#{Regexp.escape(@grouping_separator)})*"
             if min_integer_digits > @primary_grouping_size
               remaining_req_digits = min_integer_digits - @primary_grouping_size
-              req_secondary_groups = remaining_req_digits / @secondary_grouping_size > 0 ? "([0-9]{#{@secondary_grouping_size}}#{Regexp.escape(@grouping_separator)}){#{remaining_req_digits / @secondary_grouping_size}}" : ""
+              req_secondary_groups = (remaining_req_digits / @secondary_grouping_size > 0) ? "([0-9]{#{@secondary_grouping_size}}#{Regexp.escape(@grouping_separator)}){#{remaining_req_digits / @secondary_grouping_size}}" : ""
               if remaining_req_digits % @secondary_grouping_size > 0
                 final_req_digits = "[0-9]{#{@secondary_grouping_size - (remaining_req_digits % @secondary_grouping_size)}}"
                 final_opt_digits = "[0-9]{0,#{@secondary_grouping_size - (remaining_req_digits % @secondary_grouping_size)}}"
@@ -76,8 +87,8 @@ module Csvlint
                 integer_regexp = "(#{leading_regexp}#{secondary_groups})?#{req_secondary_groups}[0-9]{#{@primary_grouping_size}}"
               end
             else
-              final_req_digits = @primary_grouping_size > min_integer_digits ? "[0-9]{#{@primary_grouping_size - min_integer_digits}}" : ""
-              final_opt_digits = @primary_grouping_size > min_integer_digits ? "[0-9]{0,#{@primary_grouping_size - min_integer_digits}}" : ""
+              final_req_digits = (@primary_grouping_size > min_integer_digits) ? "[0-9]{#{@primary_grouping_size - min_integer_digits}}" : ""
+              final_opt_digits = (@primary_grouping_size > min_integer_digits) ? "[0-9]{0,#{@primary_grouping_size - min_integer_digits}}" : ""
               integer_regexp = "((#{leading_regexp}#{secondary_groups}#{final_req_digits})|#{final_opt_digits})[0-9]{#{min_integer_digits}}"
             end
           end
@@ -101,7 +112,7 @@ module Csvlint
                   fractional_regexp += "[0-9]{#{@fractional_grouping_size}}"
                   # additional groups of required digits - something like "(,[0-9]{3}){1}"
                   fractional_regexp += "(#{Regexp.escape(@grouping_separator)}[0-9]{#{@fractional_grouping_size}}){#{min_fraction_digits / @fractional_grouping_size - 1}}" if min_fraction_digits / @fractional_grouping_size > 1
-                  fractional_regexp += "#{Regexp.escape(@grouping_separator)}" if min_fraction_digits % @fractional_grouping_size > 0
+                  fractional_regexp += Regexp.escape(@grouping_separator).to_s if min_fraction_digits % @fractional_grouping_size > 0
                 end
                 # additional required digits - something like ",[0-9]{1}"
                 fractional_regexp += "[0-9]{#{min_fraction_digits % @fractional_grouping_size}}" if min_fraction_digits % @fractional_grouping_size > 0
@@ -168,7 +179,7 @@ module Csvlint
       end
 
       def match(value)
-        value =~ @regexp ? true : false
+        value&.match?(@regexp) ? true : false
       end
 
       def parse(value)
@@ -176,30 +187,28 @@ module Csvlint
           return nil if !@grouping_separator.nil? && value =~ Regexp.new("((^#{Regexp.escape(@grouping_separator)})|#{Regexp.escape(@grouping_separator)}{2})")
           value.gsub!(@grouping_separator, "") unless @grouping_separator.nil?
           value.gsub!(@decimal_separator, ".") unless @decimal_separator.nil?
-          if value =~ @regexp
+          if value&.match?(@regexp)
             case value
             when "NaN"
-              return Float::NAN
+              Float::NAN
             when "INF"
-              return Float::INFINITY
+              Float::INFINITY
             when "-INF"
-              return -Float::INFINITY
+              -Float::INFINITY
             else
               case value[-1]
               when "%"
-                return value.to_f / 100
+                value.to_f / 100
               when "‰"
-                return value.to_f / 1000
+                value.to_f / 1000
               else
                 if @integer.nil?
-                  return value.include?(".") ? value.to_f : value.to_i
+                  value.include?(".") ? value.to_f : value.to_i
                 else
-                  return @integer ? value.to_i : value.to_f
+                  @integer ? value.to_i : value.to_f
                 end
               end
             end
-          else
-            return nil
           end
         else
           match = @regexp.match(value)
@@ -210,17 +219,16 @@ module Csvlint
           number = @integer ? number.to_i : number.to_f
           number = number.to_f / 100 if match["prefix"].include?("%") || match["suffix"].include?("%")
           number = number.to_f / 1000 if match["prefix"].include?("‰") || match["suffix"].include?("‰")
-          return number
+          number
         end
       end
 
       private
-        INTEGER_REGEXP = /^[-+]?[0-9]+[%‰]?$/
 
+      INTEGER_REGEXP = /^[-+]?[0-9]+[%‰]?$/
     end
 
     class NumberFormatError < StandardError
-
     end
   end
 end