csvlint 1.3.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 193f51b0a401784dbd7b5ee452dd7fffd7d7f6ced9ce9b26adce88a3f6f3f9a8
-  data.tar.gz: a2035c66cd7dae7f02716fee65ba08ff061e18afbda28c580f43c7a0722e2745
+  metadata.gz: ad0e814a8366671d93eb767885e657827a84456f6c141a02e7dbe5ba5bcb1892
+  data.tar.gz: 90abebb42e77c1a49e61eb151459f5ea0b98539b0f0415b87e924b63e226aaa0
 SHA512:
-  metadata.gz: c33ab4a38325228df9e4e8d6f05ca7a264d4b15ddbe9ebe924062a0697695862d870170863f972699ee382c1577a759dc8fdebe64f449f43d8ca5b243dab853e
-  data.tar.gz: 0dd17429279ab82528edaabe469295df051c54a752dc2d30b17956a394a169459fb9c6808d9003c4cb1830e51e4e469f479272356862e28bbcfd86d94ebd7e71
+  metadata.gz: 9d8d5462bc0c4306c308dde03264adad8c820bd1fe3d559e970210cdd809806d11a4fc5bea1830e5582774776edb3758f5d78fd4e7fe4c636872afaa4c00a236
+  data.tar.gz: 654659368878f232e0cbc6fa036343a39ac99a141c260ee552e90316f1a8d4a6e18c4ebba43200e7315dd71452602375d76b28cc5da934db6224e0c5239bceda

data/.github/workflows/push.yml

@@ -5,12 +5,41 @@ 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', '3.3']
+        ruby-version: ['2.5', '2.6', '2.7', '3.0', '3.1', '3.2', '3.3', '3.4']
+        activesupport-version:
+          - activesupport_5.2
+          - activesupport_6.0
+          - activesupport_6.1
+          - activesupport_7.0
+          - activesupport_7.1
+          - activesupport_7.2
+        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
+          - ruby-version: '2.5'
+            activesupport-version: activesupport_7.2
+          - ruby-version: '2.6'
+            activesupport-version: activesupport_7.2
+          - ruby-version: '2.7'
+            activesupport-version: activesupport_7.2
+          - ruby-version: '3.0'
+            activesupport-version: activesupport_7.2
       fail-fast: false
+
+    env:
+      BUNDLE_GEMFILE: gemfiles/${{ matrix.activesupport-version }}.gemfile
+
     steps:
       - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
@@ -21,6 +50,7 @@ jobs:
         run: bundle install
       - name: Run the tests
         run: bundle exec rake
+
   lint:
     runs-on: ubuntu-latest
     steps:
@@ -28,7 +58,7 @@ jobs:
       - uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
-          ruby-version: "3.3"
+          ruby-version: "3.4"
       - 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.3.0
+3.4.1

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:
@@ -19,7 +13,6 @@ ignore:
   - Style/IdenticalConditionalBranches
 - lib/csvlint/csvw/property_checker.rb:
   - Performance/InefficientHashSearch
-  - Lint/UselessAssignment
   - Naming/VariableName
   - Style/SlicingWithRange
   - Security/Open
@@ -30,18 +23,16 @@ ignore:
   - Naming/VariableName
 - lib/csvlint/schema.rb:
   - Security/Open
-  - Lint/UselessAssignment
   - Style/SlicingWithRange
 - lib/csvlint/validate.rb:
-  - Lint/UselessAssignment
   - Performance/Count
   - Lint/BooleanSymbol
   - Naming/VariableName
   - Security/Open
   - Lint/NonLocalExitFromIterator
-- spec/validator_spec.rb:
-  - Lint/UselessAssignment
 - lib/csvlint/schema.rb:
   - Lint/UselessRescue
 - lib/csvlint/validate.rb:
   -  Lint/UselessRescue
+- lib/csvlint/cli.rb:
+  - Style/SafeNavigation

data/Appraisals

@@ -0,0 +1,26 @@
+# 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
+
+appraise "activesupport_7.2" do
+  gem "activesupport", "~> 7.2.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.3`
+`ruby version 3.4`
 
 ### Tests
 

data/csvlint.gemspec

@@ -16,12 +16,12 @@ 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.4"]
+  spec.required_ruby_version = [">= 2.5", "< 3.5"]
 
   spec.add_dependency "csv"
   spec.add_dependency "rainbow"
   spec.add_dependency "open_uri_redirections"
-  spec.add_dependency "activesupport", "< 7.1.0"
+  spec.add_dependency "activesupport"
   spec.add_dependency "addressable"
   spec.add_dependency "typhoeus"
   spec.add_dependency "escape_utils"
@@ -29,6 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "thor"
   spec.add_dependency "rack"
   spec.add_dependency "net-http-persistent"
+  spec.add_dependency "mutex_m" # For Ruby 3.4+
 
   spec.add_development_dependency "bundler", ">= 1.3"
   spec.add_development_dependency "rake"
@@ -40,12 +41,12 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "rspec-pride"
   spec.add_development_dependency "rspec-expectations"
-  spec.add_development_dependency "coveralls"
+  spec.add_development_dependency "coveralls_reborn"
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "github_changelog_generator"
   spec.add_development_dependency "aruba"
   spec.add_development_dependency "rdf", "< 4.0"
   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/gemfiles/activesupport_7.2.gemfile

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

data/lib/csvlint/cli.rb

@@ -104,8 +104,8 @@ module Csvlint
         location = "#{error.row ? "Row" : "Column"}: #{location}"
       end
       output_string = "#{index + 1}. "
-      if error.column && @schema && @schema.instance_of?(Csvlint::Schema)
-        if @schema.fields[error.column - 1] != nil
+      if error.column && @schema&.instance_of?(Csvlint::Schema)
+        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&.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/property_checker.rb

@@ -285,8 +285,8 @@ module Csvlint
           warnings = []
           if value.instance_of? Hash
             if value["@id"]
-              raise Csvlint::Csvw::MetadataError.new("datatype.@id"), "datatype @id must not be the id of a built-in datatype (#{value["@id"]})" if BUILT_IN_DATATYPES.values.include?(value["@id"])
-              v, w, t = PROPERTIES["@id"].call(value["@id"], base_url, lang)
+              raise Csvlint::Csvw::MetadataError.new("datatype.@id"), "datatype @id must not be the id of a built-in datatype (#{value["@id"]})" if BUILT_IN_DATATYPES.value?(value["@id"])
+              _, w, _ = PROPERTIES["@id"].call(value["@id"], base_url, lang)
               unless w.nil?
                 warnings << w
                 value.delete("@id")
@@ -422,7 +422,7 @@ module Csvlint
                   elsif p == "url"
                   elsif p == "titles"
                   else
-                    v, warning, type = check_property(p, v, base_url, lang)
+                    _, warning, type = check_property(p, v, base_url, lang)
                     if type != :transformation && !(warning.nil? || warning.empty?)
                       value.delete(p)
                       warnings << :invalid_property unless type == :transformation
@@ -555,7 +555,7 @@ module Csvlint
             warnings = []
             value.each do |p, v|
               if ["resource", "schemaReference", "columnReference"].include? p
-                v, warning, type = check_property(p, v, base_url, lang)
+                v, warning, _ = check_property(p, v, base_url, lang)
                 if warning.nil? || warning.empty?
                   value[p] = v
                 else

data/lib/csvlint/field.rb

@@ -82,6 +82,12 @@ module Csvlint
           @uniques << value
         end
       end
+
+      if constraints["enum"]
+        unless constraints["enum"].include?(value)
+          build_errors(:invalid_enum_value, :schema, row, column, value, {"enum" => constraints["enum"]})
+        end
+      end
     end
 
     def validate_type(value, row, column)

data/lib/csvlint/schema.rb

@@ -48,7 +48,7 @@ module Csvlint
         else
           Schema.from_json_table(uri, json)
         end
-      rescue TypeError => e
+      rescue TypeError
         # NO IDEA what this was even trying to do - SP 20160526
       rescue Csvlint::Csvw::MetadataError => e
         raise e
@@ -88,7 +88,7 @@ module Csvlint
 
       fields.each_with_index do |field, i|
         value = values[i] || ""
-        result = field.validate_column(value, row, i + 1, all_errors)
+        field.validate_column(value, row, i + 1, all_errors)
         @errors += fields[i].errors
         @warnings += fields[i].warnings
       end

data/lib/csvlint/validate.rb

@@ -157,7 +157,7 @@ module Csvlint
         # If it's not a full line, then prepare to add it to the beginning of the next chunk
         @leading = line
       end
-    rescue ArgumentError => ae
+    rescue ArgumentError
       build_errors(:invalid_encoding, :structure, @current_line, nil, @current_line) unless @reported_invalid_encoding
       @current_line += 1
       @reported_invalid_encoding = true
@@ -165,13 +165,12 @@ module Csvlint
 
     def validate_line(input = nil, index = nil)
       @input = input
-      single_col = false
       line = index.present? ? index : 0
       @encoding = input.encoding.to_s
       report_line_breaks(line)
       parse_contents(input, line)
       @lambda&.call(self)
-    rescue ArgumentError => ae
+    rescue ArgumentError
       build_errors(:invalid_encoding, :structure, @current_line, nil, index) unless @reported_invalid_encoding
       @reported_invalid_encoding = true
     end
@@ -205,7 +204,7 @@ module Csvlint
           if @schema
             @schema.validate_row(row, current_line, all_errors, @source, @validate)
             @errors += @schema.errors
-            all_errors += @schema.errors
+            @schema.errors
             @warnings += @schema.warnings
           elsif !row.empty? && row.size != @expected_columns
             build_errors(:ragged_rows, :structure, current_line, nil, stream.to_s)
@@ -277,7 +276,6 @@ module Csvlint
               if schema.tables[@source_url]
                 @schema = schema
               else
-                warn_if_unsuccessful = true
                 build_warnings(:schema_mismatch, :context, nil, nil, @source_url, schema)
               end
             end

data/lib/csvlint/version.rb

@@ -1,3 +1,3 @@
 module Csvlint
-  VERSION = "1.3.0"
+  VERSION = "1.5.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/all"
 require "open_uri_redirections"
 require "uri_template"
 

data/spec/validator_spec.rb

@@ -573,14 +573,14 @@ describe Csvlint::Validator do
     it "should call a lambda for each line" do
       @count = 0
       mylambda = lambda { |row| @count += 1 }
-      validator = Csvlint::Validator.new(File.new(File.join(File.dirname(__FILE__), "..", "features", "fixtures", "valid.csv")), {}, nil, {lambda: mylambda})
+      Csvlint::Validator.new(File.new(File.join(File.dirname(__FILE__), "..", "features", "fixtures", "valid.csv")), {}, nil, {lambda: mylambda})
       expect(@count).to eq(3)
     end
 
     it "reports back the status of each line" do
       @results = []
       mylambda = lambda { |row| @results << row.current_line }
-      validator = Csvlint::Validator.new(File.new(File.join(File.dirname(__FILE__), "..", "features", "fixtures", "valid.csv")), {}, nil, {lambda: mylambda})
+      Csvlint::Validator.new(File.new(File.join(File.dirname(__FILE__), "..", "features", "fixtures", "valid.csv")), {}, nil, {lambda: mylambda})
       expect(@results.count).to eq(3)
       expect(@results[0]).to eq(1)
       expect(@results[1]).to eq(2)

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: csvlint
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.5.0
 platform: ruby
 authors:
 - pezholio
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-10 00:00:00.000000000 Z
+date: 2025-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: csv
@@ -56,16 +55,16 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +163,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mutex_m
+  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: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -305,7 +318,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: coveralls_reborn
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -389,7 +402,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: henry
+  name: standardrb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -403,7 +416,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: standardrb
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -435,6 +448,7 @@ files:
 - ".pre-commit-hooks.yaml"
 - ".ruby-version"
 - ".standard_todo.yml"
+- Appraisals
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
@@ -488,6 +502,12 @@ 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
+- gemfiles/activesupport_7.2.gemfile
 - lib/csvlint.rb
 - lib/csvlint/cli.rb
 - lib/csvlint/csvw/column.rb
@@ -516,7 +536,6 @@ homepage: https://github.com/theodi/csvlint.rb
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -527,15 +546,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.5'
   - - "<"
     - !ruby/object:Gem::Version
-      version: '3.4'
+      version: '3.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: CSV Validator
 test_files: []