csvlint 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 193f51b0a401784dbd7b5ee452dd7fffd7d7f6ced9ce9b26adce88a3f6f3f9a8
-  data.tar.gz: a2035c66cd7dae7f02716fee65ba08ff061e18afbda28c580f43c7a0722e2745
+  metadata.gz: 0d15e75580e44bba3f1f8965b348f0ccfe088c6fb60e881b9f997c99fc05a7cc
+  data.tar.gz: 0bdf3cbec5a855f68abec7c2dccaa4f90db70955459044f7cfc67cbec963f9b8
 SHA512:
-  metadata.gz: c33ab4a38325228df9e4e8d6f05ca7a264d4b15ddbe9ebe924062a0697695862d870170863f972699ee382c1577a759dc8fdebe64f449f43d8ca5b243dab853e
-  data.tar.gz: 0dd17429279ab82528edaabe469295df051c54a752dc2d30b17956a394a169459fb9c6808d9003c4cb1830e51e4e469f479272356862e28bbcfd86d94ebd7e71
+  metadata.gz: 0c86225f94173f87c44bd337975b3716c9b1ec629aa6d784e4b309724655d2af5eaa118fda1d1f139f0d6a432cfeb1536e7076603a2a4b0e94fe18278d28dcb9
+  data.tar.gz: 4986940f1b2d928d85ae65b01a8c2c3eede4f352218a5ad18aa761a153fcd0a1530189e418a1e38aa4c0544c998f19944a8de290ef924d6f539d959fa2dcca8f

data/.github/workflows/push.yml

@@ -5,12 +5,32 @@ 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']
+        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@v4
       - uses: ruby/setup-ruby@v1
@@ -21,6 +41,7 @@ jobs:
         run: bundle install
       - name: Run the tests
         run: bundle exec rake
+
   lint:
     runs-on: ubuntu-latest
     steps:

data/.gitignore

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

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:

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/csvlint.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   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"
@@ -48,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/version.rb

@@ -1,3 +1,3 @@
 module Csvlint
-  VERSION = "1.3.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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: csvlint
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - pezholio
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-10 00:00:00.000000000 Z
+date: 2024-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: csv
@@ -56,16 +56,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
@@ -416,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
@@ -435,6 +449,7 @@ files:
 - ".pre-commit-hooks.yaml"
 - ".ruby-version"
 - ".standard_todo.yml"
+- Appraisals
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
@@ -488,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