csvlint 1.2.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b539755c5a3e55301ec58027cdfe2df880109aeee0e4c130bdab1e40e1dd38f
-  data.tar.gz: f2d6f801c28e86b75de094302fce55054232f7b3ffd85a8278faab1a6f2fdaba
+  metadata.gz: 0d15e75580e44bba3f1f8965b348f0ccfe088c6fb60e881b9f997c99fc05a7cc
+  data.tar.gz: 0bdf3cbec5a855f68abec7c2dccaa4f90db70955459044f7cfc67cbec963f9b8
 SHA512:
-  metadata.gz: 66ac4e79de88c7a7aa58106ae2e4c030e63e94e5cc1609cd3ac1b5ec72c2f2dc64755f05172da23cfd306fa60c4254bd90a9fa60280ea7e15c08379a76ca489c
-  data.tar.gz: 42fcb514ba728eaf7c957033e08dbc9ce1e9c9bfc92c94229ac158b22dd8267cf47c911dde294325c5f51ac314d359d8dcd97932966a4ac324ae6e932e7a234c
+  metadata.gz: 0c86225f94173f87c44bd337975b3716c9b1ec629aa6d784e4b309724655d2af5eaa118fda1d1f139f0d6a432cfeb1536e7076603a2a4b0e94fe18278d28dcb9
+  data.tar.gz: 4986940f1b2d928d85ae65b01a8c2c3eede4f352218a5ad18aa761a153fcd0a1530189e418a1e38aa4c0544c998f19944a8de290ef924d6f539d959fa2dcca8f

data/.github/workflows/push.yml

@@ -5,14 +5,34 @@ on:
   pull_request:
     branches: [ main ]
 jobs:
-  test:
+  appraisal:
+    name: Ruby ${{ matrix.ruby-version }} / Rails ${{ matrix.activesupport-version }}
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.5', '2.6', '2.7', '3.0', '3.1', '3.2']
+        ruby-version: ['2.5', '2.6', '2.7', '3.0', '3.1', '3.2', '3.3']
+        activesupport-version:
+          - activesupport_5.2
+          - activesupport_6.0
+          - activesupport_6.1
+          - activesupport_7.0
+          - activesupport_7.1
+        exclude:
+          - ruby-version: '2.5'
+            activesupport-version: activesupport_7.0
+          - ruby-version: '2.6'
+            activesupport-version: activesupport_7.0
+          - ruby-version: '2.5'
+            activesupport-version: activesupport_7.1
+          - ruby-version: '2.6'
+            activesupport-version: activesupport_7.1
       fail-fast: false
+
+    env:
+      BUNDLE_GEMFILE: gemfiles/${{ matrix.activesupport-version }}.gemfile
+
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
@@ -21,14 +41,15 @@ jobs:
         run: bundle install
       - name: Run the tests
         run: bundle exec rake
+
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
-          ruby-version: "3.2"
+          ruby-version: "3.3"
       - name: Install dependencies
         run: bundle install
       - name: Run the tests

data/.gitignore

@@ -27,3 +27,5 @@ bin/run-csvw-tests
 
 csvlint-earl.ttl
 .byebug_history
+
+gemfiles/*.lock

data/.ruby-version

@@ -1 +1 @@
-3.2.0
+3.3.0

data/.standard_todo.yml

@@ -2,14 +2,8 @@
 # Remove from this list as you refactor files.
 ---
 ignore:
-- features/step_definitions/validation_errors_steps.rb:
-  - Lint/Void
 - features/support/load_tests.rb:
-  - Style/For
   - Security/Open
-  - Lint/UselessAssignment
-- lib/csvlint/cli.rb:
-  - Style/NonNilCheck
 - lib/csvlint/csvw/column.rb:
   - Style/TernaryParentheses
 - lib/csvlint/csvw/date_format.rb:
@@ -41,3 +35,7 @@ ignore:
   - Lint/NonLocalExitFromIterator
 - spec/validator_spec.rb:
   - Lint/UselessAssignment
+- lib/csvlint/schema.rb:
+  - Lint/UselessRescue
+- lib/csvlint/validate.rb:
+  -  Lint/UselessRescue

data/Appraisals

@@ -0,0 +1,22 @@
+# After a new entry: `bundle exec appraisal install`
+# Add an entry in `.github/workflows/push.yml`'s file
+
+appraise "activesupport_5.2" do
+  gem "activesupport", "~> 5.2.0"
+end
+
+appraise "activesupport_6.0" do
+  gem "activesupport", "~> 6.0.0"
+end
+
+appraise "activesupport_6.1" do
+  gem "activesupport", "~> 6.1.0"
+end
+
+appraise "activesupport_7.0" do
+  gem "activesupport", "~> 7.0.0"
+end
+
+appraise "activesupport_7.1" do
+  gem "activesupport", "~> 7.1.0"
+end

data/README.md

@@ -17,7 +17,7 @@ A ruby gem to support validating CSV files to check their syntax and contents. Y
 
 ## Development
 
-`ruby version 3.2`
+`ruby version 3.3`
 
 ### Tests
 

data/csvlint.gemspec

@@ -16,8 +16,9 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = [">= 2.5", "< 3.3"]
+  spec.required_ruby_version = [">= 2.5", "< 3.4"]
 
+  spec.add_dependency "csv"
   spec.add_dependency "rainbow"
   spec.add_dependency "open_uri_redirections"
   spec.add_dependency "activesupport"
@@ -47,4 +48,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rdf-turtle"
   spec.add_development_dependency "henry"
   spec.add_development_dependency "standardrb"
+  spec.add_development_dependency "appraisal"
 end

data/features/support/load_tests.rb

@@ -16,7 +16,7 @@ def cache_file(filename)
   unless File.exist?(file)
     if filename.include? "/"
       levels = filename.split("/")[0..-2]
-      for i in 0..levels.length
+      (0..levels.length).each do |i|
         dir = File.join(BASE_PATH, levels[0..i].join("/"))
         Dir.mkdir(dir) unless Dir.exist?(dir)
       end
@@ -26,7 +26,7 @@ def cache_file(filename)
       f.puts URI.open(uri, "rb").read
     end
   end
-  [uri, file]
+  uri
 end
 
 unless File.exist? SCRIPT_FILE_PATH
@@ -66,7 +66,7 @@ unless File.exist? VALIDATION_FEATURE_FILE_PATH
     file.puts ""
 
     manifest["entries"].each do |entry|
-      action_uri, action_file = cache_file(entry["action"])
+      action_uri = cache_file(entry["action"])
       metadata = nil
       provided_files = []
       missing_files = []
@@ -98,7 +98,7 @@ unless File.exist? VALIDATION_FEATURE_FILE_PATH
         missing_files << URI.join(action_uri, "csv-metadata.json").to_s
       end
       entry["implicit"]&.each do |implicit|
-        implicit_uri, implicit_file = cache_file(implicit)
+        implicit_uri = cache_file(implicit)
         provided_files << implicit_uri.to_s
         unless implicit_uri == metadata
           file.puts "\t\tAnd I have a file called \"csvw/#{implicit}\" at the url \"#{implicit_uri}\""

data/gemfiles/activesupport_5.2.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 5.2.0"
+
+gemspec path: "../"

data/gemfiles/activesupport_6.0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 6.0.0"
+
+gemspec path: "../"

data/gemfiles/activesupport_6.1.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 6.1.0"
+
+gemspec path: "../"

data/gemfiles/activesupport_7.0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 7.0.0"
+
+gemspec path: "../"

data/gemfiles/activesupport_7.1.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 7.1.0"
+
+gemspec path: "../"

data/lib/csvlint/cli.rb

@@ -105,7 +105,7 @@ module Csvlint
       end
       output_string = "#{index + 1}. "
       if error.column && @schema && @schema.instance_of?(Csvlint::Schema)
-        if @schema.fields[error.column - 1] != nil
+        unless @schema.fields[error.column - 1].nil?
           output_string += "#{@schema.fields[error.column - 1].name}: "
         end
       end
@@ -176,7 +176,7 @@ module Csvlint
         col: error.column
       }
 
-      if error.column && @schema && @schema.instance_of?(Csvlint::Schema) && @schema.fields[error.column - 1] != nil
+      if error.column && @schema && @schema.instance_of?(Csvlint::Schema) && !@schema.fields[error.column - 1].nil?
         field = @schema.fields[error.column - 1]
         h[:header] = field.name
         h[:constraints] = field.constraints.map { |k, v| [k.underscore, v] }.to_h

data/lib/csvlint/csvw/column.rb

@@ -126,14 +126,14 @@ module Csvlint
             format = Csvlint::Csvw::DateFormat.new(nil, type) if format.nil?
             v = format.parse(value)
             return nil, warning if v.nil?
-            return v, nil
+            [v, nil]
           }
         end
 
         def create_regexp_based_parser(regexp, warning)
           lambda { |value, format|
             return nil, warning unless value&.match?(regexp)
-            return value, nil
+            [value, nil]
           }
         end
 
@@ -256,14 +256,14 @@ module Csvlint
         "http://www.w3.org/2001/XMLSchema#time" => NO_ADDITIONAL_VALIDATION
       }
 
-      TRIM_VALUE = lambda { |value, format| return value.strip, nil }
-      ALL_VALUES_VALID = lambda { |value, format| return value, nil }
+      TRIM_VALUE = lambda { |value, format| [value.strip, nil] }
+      ALL_VALUES_VALID = lambda { |value, format| [value, nil] }
 
       NUMERIC_PARSER = lambda { |value, format, integer = false|
         format = Csvlint::Csvw::NumberFormat.new(nil, nil, ".", integer) if format.nil?
         v = format.parse(value)
         return nil, :invalid_number if v.nil?
-        return v, nil
+        [v, nil]
       }
 
       DATATYPE_PARSER = {
@@ -281,7 +281,7 @@ module Csvlint
             return true, nil if value == format[0]
             return false, nil if value == format[1]
           end
-          return value, :invalid_boolean
+          [value, :invalid_boolean]
         },
         "http://www.w3.org/2001/XMLSchema#date" =>
           create_date_parser("http://www.w3.org/2001/XMLSchema#date", :invalid_date),
@@ -291,85 +291,85 @@ module Csvlint
           create_date_parser("http://www.w3.org/2001/XMLSchema#dateTimeStamp", :invalid_date_time_stamp),
         "http://www.w3.org/2001/XMLSchema#decimal" => lambda { |value, format|
           return nil, :invalid_decimal if /(E|e|^(NaN|INF|-INF)$)/.match?(value)
-          return NUMERIC_PARSER.call(value, format)
+          NUMERIC_PARSER.call(value, format)
         },
         "http://www.w3.org/2001/XMLSchema#integer" => lambda { |value, format|
           v, w = NUMERIC_PARSER.call(value, format, true)
           return v, :invalid_integer unless w.nil?
           return nil, :invalid_integer unless v.is_a? Integer
-          return v, w
+          [v, w]
         },
         "http://www.w3.org/2001/XMLSchema#long" => lambda { |value, format|
           v, w = DATATYPE_PARSER["http://www.w3.org/2001/XMLSchema#integer"].call(value, format)
           return v, :invalid_long unless w.nil?
           return nil, :invalid_long unless v <= 9223372036854775807 && v >= -9223372036854775808
-          return v, w
+          [v, w]
         },
         "http://www.w3.org/2001/XMLSchema#int" => lambda { |value, format|
           v, w = DATATYPE_PARSER["http://www.w3.org/2001/XMLSchema#integer"].call(value, format)
           return v, :invalid_int unless w.nil?
           return nil, :invalid_int unless v <= 2147483647 && v >= -2147483648
-          return v, w
+          [v, w]
         },
         "http://www.w3.org/2001/XMLSchema#short" => lambda { |value, format|
           v, w = DATATYPE_PARSER["http://www.w3.org/2001/XMLSchema#integer"].call(value, format)
           return v, :invalid_short unless w.nil?
           return nil, :invalid_short unless v <= 32767 && v >= -32768
-          return v, w
+          [v, w]
         },
         "http://www.w3.org/2001/XMLSchema#byte" => lambda { |value, format|
           v, w = DATATYPE_PARSER["http://www.w3.org/2001/XMLSchema#integer"].call(value, format)
           return v, :invalid_byte unless w.nil?
           return nil, :invalid_byte unless v <= 127 && v >= -128
-          return v, w
+          [v, w]
         },
         "http://www.w3.org/2001/XMLSchema#nonNegativeInteger" => lambda { |value, format|
           v, w = DATATYPE_PARSER["http://www.w3.org/2001/XMLSchema#integer"].call(value, format)
           return v, :invalid_nonNegativeInteger unless w.nil?
           return nil, :invalid_nonNegativeInteger unless v >= 0
-          return v, w
+          [v, w]
         },
         "http://www.w3.org/2001/XMLSchema#positiveInteger" => lambda { |value, format|
           v, w = DATATYPE_PARSER["http://www.w3.org/2001/XMLSchema#integer"].call(value, format)
           return v, :invalid_positiveInteger unless w.nil?
           return nil, :invalid_positiveInteger unless v > 0
-          return v, w
+          [v, w]
         },
         "http://www.w3.org/2001/XMLSchema#unsignedLong" => lambda { |value, format|
           v, w = DATATYPE_PARSER["http://www.w3.org/2001/XMLSchema#nonNegativeInteger"].call(value, format)
           return v, :invalid_unsignedLong unless w.nil?
           return nil, :invalid_unsignedLong unless v <= 18446744073709551615
-          return v, w
+          [v, w]
         },
         "http://www.w3.org/2001/XMLSchema#unsignedInt" => lambda { |value, format|
           v, w = DATATYPE_PARSER["http://www.w3.org/2001/XMLSchema#nonNegativeInteger"].call(value, format)
           return v, :invalid_unsignedInt unless w.nil?
           return nil, :invalid_unsignedInt unless v <= 4294967295
-          return v, w
+          [v, w]
         },
         "http://www.w3.org/2001/XMLSchema#unsignedShort" => lambda { |value, format|
           v, w = DATATYPE_PARSER["http://www.w3.org/2001/XMLSchema#nonNegativeInteger"].call(value, format)
           return v, :invalid_unsignedShort unless w.nil?
           return nil, :invalid_unsignedShort unless v <= 65535
-          return v, w
+          [v, w]
         },
         "http://www.w3.org/2001/XMLSchema#unsignedByte" => lambda { |value, format|
           v, w = DATATYPE_PARSER["http://www.w3.org/2001/XMLSchema#nonNegativeInteger"].call(value, format)
           return v, :invalid_unsignedByte unless w.nil?
           return nil, :invalid_unsignedByte unless v <= 255
-          return v, w
+          [v, w]
         },
         "http://www.w3.org/2001/XMLSchema#nonPositiveInteger" => lambda { |value, format|
           v, w = DATATYPE_PARSER["http://www.w3.org/2001/XMLSchema#integer"].call(value, format)
           return v, :invalid_nonPositiveInteger unless w.nil?
           return nil, :invalid_nonPositiveInteger unless v <= 0
-          return v, w
+          [v, w]
         },
         "http://www.w3.org/2001/XMLSchema#negativeInteger" => lambda { |value, format|
           v, w = DATATYPE_PARSER["http://www.w3.org/2001/XMLSchema#integer"].call(value, format)
           return v, :invalid_negativeInteger unless w.nil?
           return nil, :invalid_negativeInteger unless v < 0
-          return v, w
+          [v, w]
         },
         "http://www.w3.org/2001/XMLSchema#double" => NUMERIC_PARSER,
         # regular expressions here taken from XML Schema datatypes spec

data/lib/csvlint/csvw/property_checker.rb

@@ -60,7 +60,7 @@ module Csvlint
                 raise Csvlint::Csvw::MetadataError.new, "common property with @value has properties other than @language or @type" unless value.except("@type").except("@language").except("@value").empty?
               when "@language"
                 raise Csvlint::Csvw::MetadataError.new, "common property with @language lacks a @value" unless value["@value"]
-                raise Csvlint::Csvw::MetadataError.new, "common property has invalid @language (#{v})" unless ((v.is_a? String) && (v =~ BCP47_LANGUAGE_REGEXP)) || v.nil?
+                raise Csvlint::Csvw::MetadataError.new, "common property has invalid @language (#{v})" if !((v.is_a? String) && (v =~ BCP47_LANGUAGE_REGEXP)) || !v.nil?
               else
                 if p[0] == "@"
                   raise Csvlint::Csvw::MetadataError.new, "common property has property other than @id, @type, @value or @language beginning with @ (#{p})"
@@ -99,7 +99,7 @@ module Csvlint
               v = format.parse(value[property])
               if v.nil?
                 value.delete(property)
-                return [":invalid_#{property}".to_sym]
+                return [:":invalid_#{property}"]
               else
                 value[property] = v
                 return []
@@ -116,35 +116,35 @@ module Csvlint
         def array_property(type)
           lambda { |value, base_url, lang|
             return value, nil, type if value.instance_of? Array
-            return false, :invalid_value, type
+            [false, :invalid_value, type]
           }
         end
 
         def boolean_property(type)
           lambda { |value, base_url, lang|
             return value, nil, type if value == true || value == false
-            return false, :invalid_value, type
+            [false, :invalid_value, type]
           }
         end
 
         def string_property(type)
           lambda { |value, base_url, lang|
             return value, nil, type if value.instance_of? String
-            return "", :invalid_value, type
+            ["", :invalid_value, type]
           }
         end
 
         def uri_template_property(type)
           lambda { |value, base_url, lang|
             return URITemplate.new(value), nil, type if value.instance_of? String
-            return URITemplate.new(""), :invalid_value, type
+            [URITemplate.new(""), :invalid_value, type]
           }
         end
 
         def numeric_property(type)
           lambda { |value, base_url, lang|
             return value, nil, type if value.is_a?(Integer) && value >= 0
-            return nil, :invalid_value, type
+            [nil, :invalid_value, type]
           }
         end
 
@@ -152,14 +152,14 @@ module Csvlint
           lambda { |value, base_url, lang|
             raise Csvlint::Csvw::MetadataError.new, "URL #{value} starts with _:" if /^_:/.match?(value.to_s)
             return (base_url.nil? ? URI(value) : URI.join(base_url, value)), nil, type if value.instance_of? String
-            return base_url, :invalid_value, type
+            [base_url, :invalid_value, type]
           }
         end
 
         def language_property(type)
           lambda { |value, base_url, lang|
             return value, nil, type if BCP47_REGEXP.match?(value)
-            return nil, :invalid_value, type
+            [nil, :invalid_value, type]
           }
         end
 
@@ -167,7 +167,7 @@ module Csvlint
           lambda { |value, base_url, lang|
             warnings = []
             if value.instance_of? String
-              return {lang => [value]}, nil, type
+              [{lang => [value]}, nil, type]
             elsif value.instance_of? Array
               valid_titles = []
               value.each do |title|
@@ -177,7 +177,7 @@ module Csvlint
                   warnings << :invalid_value
                 end
               end
-              return {lang => valid_titles}, warnings, type
+              [{lang => valid_titles}, warnings, type]
             elsif value.instance_of? Hash
               value = value.clone
               value.each do |l, v|
@@ -197,16 +197,16 @@ module Csvlint
                 end
               end
               warnings << :invalid_value if value.empty?
-              return value, warnings, type
+              [value, warnings, type]
             else
-              return {}, :invalid_value, type
+              [{}, :invalid_value, type]
             end
           }
         end
 
         def column_reference_property(type)
           lambda { |value, base_url, lang|
-            return Array(value), nil, type
+            [Array(value), nil, type]
           }
         end
       end
@@ -226,7 +226,7 @@ module Csvlint
             values << v
             warnings += w
           end
-          return values, warnings, :common
+          [values, warnings, :common]
         },
         "suppressOutput" => boolean_property(:common),
         "dialect" => lambda { |value, base_url, lang|
@@ -249,16 +249,16 @@ module Csvlint
                 end
               end
             end
-            return value, warnings, :common
+            [value, warnings, :common]
           else
-            return {}, :invalid_value, :common
+            [{}, :invalid_value, :common]
           end
         },
         # inherited properties
         "null" => lambda { |value, base_url, lang|
           case value
           when String
-            return [value], nil, :inherited
+            [[value], nil, :inherited]
           when Array
             values = []
             warnings = []
@@ -269,15 +269,15 @@ module Csvlint
                 warnings << :invalid_value
               end
             end
-            return values, warnings, :inherited
+            [values, warnings, :inherited]
           else
-            return [""], :invalid_value, :inherited
+            [[""], :invalid_value, :inherited]
           end
         },
         "default" => string_property(:inherited),
         "separator" => lambda { |value, base_url, lang|
           return value, nil, :inherited if value.instance_of?(String) || value.nil?
-          return nil, :invalid_value, :inherited
+          [nil, :invalid_value, :inherited]
         },
         "lang" => language_property(:inherited),
         "datatype" => lambda { |value, base_url, lang|
@@ -387,7 +387,7 @@ module Csvlint
               end
             end
           end
-          return value, warnings, :inherited
+          [value, warnings, :inherited]
         },
         "required" => boolean_property(:inherited),
         "ordered" => boolean_property(:inherited),
@@ -397,14 +397,14 @@ module Csvlint
         "textDirection" => lambda { |value, base_url, lang|
           value = value.to_sym
           return value, nil, :inherited if [:ltr, :rtl, :auto, :inherit].include? value
-          return :inherit, :invalid_value, :inherited
+          [:inherit, :invalid_value, :inherited]
         },
         # column level properties
         "virtual" => boolean_property(:column),
         "titles" => natural_language_property(:column),
         "name" => lambda { |value, base_url, lang|
           return value, nil, :column if value.instance_of?(String) && value =~ NAME_REGEXP
-          return nil, :invalid_value, :column
+          [nil, :invalid_value, :column]
         },
         # table level properties
         "transformations" => lambda { |value, base_url, lang|
@@ -423,7 +423,7 @@ module Csvlint
                   elsif p == "titles"
                   else
                     v, warning, type = check_property(p, v, base_url, lang)
-                    unless type == :transformation && (warning.nil? || warning.empty?)
+                    if type != :transformation && !(warning.nil? || warning.empty?)
                       value.delete(p)
                       warnings << :invalid_property unless type == :transformation
                       warnings += Array(warning)
@@ -438,12 +438,12 @@ module Csvlint
           else
             warnings << :invalid_value
           end
-          return transformations, warnings, :table
+          [transformations, warnings, :table]
         },
         "tableDirection" => lambda { |value, base_url, lang|
           value = value.to_sym
           return value, nil, :table if [:ltr, :rtl, :auto].include? value
-          return :auto, :invalid_value, :table
+          [:auto, :invalid_value, :table]
         },
         "tableSchema" => lambda { |value, base_url, lang|
           schema_base_url = base_url
@@ -483,7 +483,7 @@ module Csvlint
               end
             end
           end
-          return schema, warnings, :table
+          [schema, warnings, :table]
         },
         "url" => link_property(:table),
         # dialect properties
@@ -492,7 +492,7 @@ module Csvlint
         "doubleQuote" => boolean_property(:dialect),
         "encoding" => lambda { |value, base_url, lang|
           return value, nil, :dialect if VALID_ENCODINGS.include? value
-          return nil, :invalid_value, :dialect
+          [nil, :invalid_value, :dialect]
         },
         "header" => boolean_property(:dialect),
         "headerRowCount" => numeric_property(:dialect),
@@ -508,10 +508,10 @@ module Csvlint
           value = :start if value == "start"
           value = :end if value == "end"
           return value, nil, :dialect if [:true, :false, :start, :end].include? value
-          return true, :invalid_value, :dialect
+          [true, :invalid_value, :dialect]
         },
         # schema properties
-        "columns" => lambda { |value, base_url, lang| return value, nil, :schema },
+        "columns" => lambda { |value, base_url, lang| [value, nil, :schema] },
         "primaryKey" => column_reference_property(:schema),
         "foreignKeys" => lambda { |value, base_url, lang|
           foreign_keys = []
@@ -540,13 +540,13 @@ module Csvlint
           else
             warnings << :invalid_value
           end
-          return foreign_keys, warnings, :schema
+          [foreign_keys, warnings, :schema]
         },
         "rowTitles" => column_reference_property(:schema),
         # transformation properties
-        "targetFormat" => lambda { |value, base_url, lang| return value, nil, :transformation },
-        "scriptFormat" => lambda { |value, base_url, lang| return value, nil, :transformation },
-        "source" => lambda { |value, base_url, lang| return value, nil, :transformation },
+        "targetFormat" => lambda { |value, base_url, lang| [value, nil, :transformation] },
+        "scriptFormat" => lambda { |value, base_url, lang| [value, nil, :transformation] },
+        "source" => lambda { |value, base_url, lang| [value, nil, :transformation] },
         # foreignKey properties
         "columnReference" => column_reference_property(:foreign_key),
         "reference" => lambda { |value, base_url, lang|
@@ -572,15 +572,15 @@ module Csvlint
             raise Csvlint::Csvw::MetadataError.new("foreignKey.reference.columnReference"), "foreignKey reference columnReference is missing" unless value["columnReference"]
             raise Csvlint::Csvw::MetadataError.new("foreignKey.reference"), "foreignKey reference does not have either resource or schemaReference" unless value["resource"] || value["schemaReference"]
             raise Csvlint::Csvw::MetadataError.new("foreignKey.reference"), "foreignKey reference has both resource and schemaReference" if value["resource"] && value["schemaReference"]
-            return value, warnings, :foreign_key
+            [value, warnings, :foreign_key]
           else
             raise Csvlint::Csvw::MetadataError.new("foreignKey.reference"), "foreignKey reference is not an object"
           end
         },
         # foreignKey reference properties
-        "resource" => lambda { |value, base_url, lang| return value, nil, :foreign_key_reference },
+        "resource" => lambda { |value, base_url, lang| [value, nil, :foreign_key_reference] },
         "schemaReference" => lambda { |value, base_url, lang|
-          return URI.join(base_url, value).to_s, nil, :foreign_key_reference
+          [URI.join(base_url, value).to_s, nil, :foreign_key_reference]
         }
       }
 

data/lib/csvlint/field.rb

@@ -16,7 +16,7 @@ module Csvlint
 
     def validate_column(value, row = nil, column = nil, all_errors = [])
       reset
-      unless all_errors.any? { |error| ((error.type == :invalid_regex) && (error.column == column)) }
+      unless all_errors.any? { |error| (error.type == :invalid_regex) && (error.column == column) }
         validate_regex(value, row, column, all_errors)
       end
       validate_length(value, row, column)

data/lib/csvlint/validate.rb

@@ -590,14 +590,14 @@ module Csvlint
       numeric: /\A[-+]?\d*\.?\d+(?:[eE][-+]?\d+)?\z/,
       uri: /\Ahttps?:/,
       date_db: /\A\d{4,}-\d\d-\d\d\z/, # "12345-01-01"
-      date_long: /\A(?:#{Date::MONTHNAMES.join('|')}) [ \d]\d, \d{4,}\z/, # "January  1, 12345"
-      date_rfc822: /\A[ \d]\d (?:#{Date::ABBR_MONTHNAMES.join('|')}) \d{4,}\z/, # " 1 Jan 12345"
-      date_short: /\A[ \d]\d (?:#{Date::ABBR_MONTHNAMES.join('|')})\z/, # "1 Jan"
+      date_long: /\A(?:#{Date::MONTHNAMES.join("|")}) [ \d]\d, \d{4,}\z/, # "January  1, 12345"
+      date_rfc822: /\A[ \d]\d (?:#{Date::ABBR_MONTHNAMES.join("|")}) \d{4,}\z/, # " 1 Jan 12345"
+      date_short: /\A[ \d]\d (?:#{Date::ABBR_MONTHNAMES.join("|")})\z/, # "1 Jan"
       dateTime_db: /\A\d{4,}-\d\d-\d\d \d\d:\d\d:\d\d\z/, # "12345-01-01 00:00:00"
       dateTime_hms: /\A\d\d:\d\d:\d\d\z/, # "00:00:00"
       dateTime_iso8601: /\A\d{4,}-\d\d-\d\dT\d\d:\d\d:\d\dZ\z/, # "12345-01-01T00:00:00Z"
-      dateTime_long: /\A(?:#{Date::MONTHNAMES.join('|')}) \d\d, \d{4,} \d\d:\d\d\z/, # "January 01, 12345 00:00"
-      dateTime_short: /\A\d\d (?:#{Date::ABBR_MONTHNAMES.join('|')}) \d\d:\d\d\z/, # "01 Jan 00:00"
+      dateTime_long: /\A(?:#{Date::MONTHNAMES.join("|")}) \d\d, \d{4,} \d\d:\d\d\z/, # "January 01, 12345 00:00"
+      dateTime_short: /\A\d\d (?:#{Date::ABBR_MONTHNAMES.join("|")}) \d\d:\d\d\z/, # "01 Jan 00:00"
       dateTime_time: /\A\d\d:\d\d\z/ # "00:00"
     }.freeze
 

data/lib/csvlint/version.rb

@@ -1,3 +1,3 @@
 module Csvlint
-  VERSION = "1.2.0"
+  VERSION = "1.4.0"
 end

data/lib/csvlint.rb

@@ -4,9 +4,7 @@ require "open-uri"
 require "tempfile"
 require "typhoeus"
 
-require "active_support/core_ext/date/conversions"
-require "active_support/core_ext/time/conversions"
-require "active_support/core_ext/object"
+require "active_support"
 require "open_uri_redirections"
 require "uri_template"
 

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: csvlint
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.4.0
 platform: ruby
 authors:
 - pezholio
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-27 00:00:00.000000000 Z
+date: 2024-04-13 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: csv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
@@ -402,6 +416,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: CSV Validator
 email:
 - pezholio@gmail.com
@@ -421,6 +449,7 @@ files:
 - ".pre-commit-hooks.yaml"
 - ".ruby-version"
 - ".standard_todo.yml"
+- Appraisals
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
@@ -474,6 +503,11 @@ files:
 - features/validation_errors.feature
 - features/validation_info.feature
 - features/validation_warnings.feature
+- gemfiles/activesupport_5.2.gemfile
+- gemfiles/activesupport_6.0.gemfile
+- gemfiles/activesupport_6.1.gemfile
+- gemfiles/activesupport_7.0.gemfile
+- gemfiles/activesupport_7.1.gemfile
 - lib/csvlint.rb
 - lib/csvlint/cli.rb
 - lib/csvlint/csvw/column.rb
@@ -513,14 +547,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.5'
   - - "<"
     - !ruby/object:Gem::Version
-      version: '3.3'
+      version: '3.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: CSV Validator