csvlint 0.4.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5d5ee384ce684c04b09f786edab7aaba1598f651
-  data.tar.gz: 7e473e918dea5c6578c5f8d5870633c006ee7c80
+SHA256:
+  metadata.gz: 7f9c598fca283466c50e65c4b436166fccb0e9e0340d3d370fb3f4e814cf1f3e
+  data.tar.gz: 321481d47fca1f6ef1df7963e5d705ce05685a9861e48d954397eb288f46541a
 SHA512:
-  metadata.gz: e2dbc5910aca216330618cf5095950a8b227b412ccc7f6b997fa401b2e02d19895c4c18b0a4d2b01cb76c0415089a4793429f10c09a1c7eb4273d4dfa5cff0db
-  data.tar.gz: dd5bc5ff3d8b31b52a342bbba7d9b8984dca267cfa618b514c1c3995139190e275e5c8ee6f5ac0b965910458a49891a13bf60fd46d4c329a99e4fc51d75d28ed
+  metadata.gz: 1e9f755b174f3c1b3052f43621e8c15cf3a3b947a5a611f370b42f309492797664a622886520a7d209d109f271a2d101aaa24017529900c82d76a71b8cb46173
+  data.tar.gz: 73da87ddbbc71a1e62f90ffaebca3947833921f546dcb01524bd464c7fbf1a3dbf086757443838e6ec401bac86e5cacf26a9e3b397904ba9ee32a0688c4271a0

data/.github/dependabot.yml

@@ -0,0 +1,11 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10
+- package-ecosystem: github-actions
+  directory: "/"
+  schedule:
+    interval: weekly

data/.github/workflows/push.yml

@@ -0,0 +1,35 @@
+name: CI
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['2.5', '2.6', '2.7', '3.0', '3.1', '3.2']
+      fail-fast: false
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+          ruby-version: ${{ matrix.ruby-version }}
+      - name: Install dependencies
+        run: bundle install
+      - name: Run the tests
+        run: bundle exec rake
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+          ruby-version: "3.2"
+      - name: Install dependencies
+        run: bundle install
+      - name: Run the tests
+        run: bundle exec standardrb

data/.gitignore

@@ -26,3 +26,4 @@ features/fixtures/csvw
 bin/run-csvw-tests
 
 csvlint-earl.ttl
+.byebug_history

data/.ruby-version

@@ -1 +1 @@
-2.4.1
+3.2.0

data/.standard_todo.yml

@@ -0,0 +1,43 @@
+# Auto generated files with errors to ignore.
+# 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:
+  - Lint/MixedRegexpCaptureTypes
+- lib/csvlint/csvw/number_format.rb:
+  - Style/SlicingWithRange
+  - Style/IdenticalConditionalBranches
+- lib/csvlint/csvw/property_checker.rb:
+  - Performance/InefficientHashSearch
+  - Lint/UselessAssignment
+  - Naming/VariableName
+  - Style/SlicingWithRange
+  - Security/Open
+  - Lint/BooleanSymbol
+- lib/csvlint/csvw/table_group.rb:
+  - Style/OptionalArguments
+- lib/csvlint/field.rb:
+  - 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

data/CHANGELOG.md

@@ -1,5 +1,43 @@
 # Change Log
 
+## [v1.0.0](https://github.com/Data-Liberation-Front/csvlint.rb/tree/v1.0.0) (2022-07-13)
+[Full Changelog](https://github.com/theodi/csvlint.rb/compare/0.4.0...v1.0.0)
+
+Support Ruby 3.x, and DROPPED support for Ruby 2.4 - that's why the major version bump. That and this has been around long enough that it really shouldn't be on a zero version any more :)
+
+## What's Changed
+* Don't patch CSV#init_converters for ruby 2.5 compatibility by @rbmrclo in https://github.com/Data-Liberation-Front/csvlint.rb/pull/217
+* correct typos in README by @erikj in https://github.com/Data-Liberation-Front/csvlint.rb/pull/216
+* add info about your PATH by @ftrotter in https://github.com/Data-Liberation-Front/csvlint.rb/pull/222
+* Remove tests on deprecated ruby versions < 2.3 by @Floppy in https://github.com/Data-Liberation-Front/csvlint.rb/pull/234
+* Drop mime-types gem dependency by @ohbarye in https://github.com/Data-Liberation-Front/csvlint.rb/pull/221
+* remove specific version of net-http-persistent in gemspec by @kotaro0522 in https://github.com/Data-Liberation-Front/csvlint.rb/pull/219
+* Replace colorize with rainbow to make licensing consistent. by @cobbr2 in https://github.com/Data-Liberation-Front/csvlint.rb/pull/215
+* Update rdf requirement from < 2.0 to < 4.0 by @dependabot-preview in https://github.com/Data-Liberation-Front/csvlint.rb/pull/231
+* Test on Ruby 2.5 and 2.6 by @Domon in https://github.com/Data-Liberation-Front/csvlint.rb/pull/223
+* Fix load_from_json deprecation warnings. by @jezhiggins in https://github.com/Data-Liberation-Front/csvlint.rb/pull/237
+* Fix csvw tests by @Floppy in https://github.com/Data-Liberation-Front/csvlint.rb/pull/239
+* Test on Ruby 2.6 and 2.7 by @Floppy in https://github.com/Data-Liberation-Front/csvlint.rb/pull/240
+* Create Dependabot config file by @dependabot-preview in https://github.com/Data-Liberation-Front/csvlint.rb/pull/245
+* Include active_support/object to ensure this works in ruby 2.6 by @mseverini in https://github.com/Data-Liberation-Front/csvlint.rb/pull/246
+* add CI workflow for github actions by @Floppy in https://github.com/Data-Liberation-Front/csvlint.rb/pull/255
+* Enable and fix tests for Ruby 2.5 by @Floppy in https://github.com/Data-Liberation-Front/csvlint.rb/pull/259
+* Support Ruby 2.6 by @Floppy in https://github.com/Data-Liberation-Front/csvlint.rb/pull/262
+* Ruby 2.7 support by @Floppy in https://github.com/Data-Liberation-Front/csvlint.rb/pull/263
+* Drop support for Ruby 2.4 by @Floppy in https://github.com/Data-Liberation-Front/csvlint.rb/pull/265
+* Ruby 3.0 by @Floppy in https://github.com/Data-Liberation-Front/csvlint.rb/pull/264
+
+## New Contributors
+* @rbmrclo made their first contribution in https://github.com/Data-Liberation-Front/csvlint.rb/pull/217
+* @erikj made their first contribution in https://github.com/Data-Liberation-Front/csvlint.rb/pull/216
+* @ftrotter made their first contribution in https://github.com/Data-Liberation-Front/csvlint.rb/pull/222
+* @ohbarye made their first contribution in https://github.com/Data-Liberation-Front/csvlint.rb/pull/221
+* @kotaro0522 made their first contribution in https://github.com/Data-Liberation-Front/csvlint.rb/pull/219
+* @cobbr2 made their first contribution in https://github.com/Data-Liberation-Front/csvlint.rb/pull/215
+* @dependabot-preview made their first contribution in https://github.com/Data-Liberation-Front/csvlint.rb/pull/231
+* @Domon made their first contribution in https://github.com/Data-Liberation-Front/csvlint.rb/pull/223
+* @mseverini made their first contribution in https://github.com/Data-Liberation-Front/csvlint.rb/pull/246
+
 ## [0.4.0](https://github.com/theodi/csvlint.rb/tree/0.4.0) (2017-xx-xx)
 [Full Changelog](https://github.com/theodi/csvlint.rb/compare/0.3.3...0.4.0)
 

data/Dockerfile

@@ -0,0 +1,16 @@
+FROM ruby:2.5.8-buster
+
+# throw errors if Gemfile has been modified since Gemfile.lock
+RUN bundle config --global frozen 1
+
+WORKDIR /usr/src/app
+
+ENV LANG C.UTF-8
+
+COPY ./lib/csvlint/version.rb ./lib/csvlint/
+COPY csvlint.gemspec Gemfile Gemfile.lock ./
+RUN bundle install
+
+COPY ./ ./
+
+CMD ["./bin/csvlint"]

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in csvlint.rb.gemspec
-gemspec
+gemspec

data/README.md

@@ -1,23 +1,23 @@
-[![Build Status](http://img.shields.io/travis/theodi/csvlint.rb.svg)](https://travis-ci.org/theodi/csvlint.rb)
-[![Dependency Status](http://img.shields.io/gemnasium/theodi/csvlint.rb.svg)](https://gemnasium.com/theodi/csvlint.rb)
-[![Coverage Status](http://img.shields.io/coveralls/theodi/csvlint.rb.svg)](https://coveralls.io/r/theodi/csvlint.rb)
+[![Build Status](https://img.shields.io/github/workflow/status/Data-Liberation-Front/csvlint.rb/CI/main)](https://travis-ci.org/theodi/csvlint.rb)
+[![Dependency Status](https://img.shields.io/librariesio/github/Data-Liberation-Front/csvlint.rb)](https://libraries.io/github/Data-Liberation-Front/csvlint.rb)
+[![Coverage Status](http://img.shields.io/coveralls/Data-Liberation-Front/csvlint.rb.svg)](https://coveralls.io/r/Data-Liberation-Front/csvlint.rb)
 [![License](http://img.shields.io/:license-mit-blue.svg)](http://theodi.mit-license.org)
 [![Badges](http://img.shields.io/:badges-5/5-ff6799.svg)](https://github.com/pikesley/badger)
 
 # CSV Lint
 
-A ruby gem to support validating CSV files to check their syntax and contents. You can either use this gem within your own Ruby code, or as a standolone command line application
+A ruby gem to support validating CSV files to check their syntax and contents. You can either use this gem within your own Ruby code, or as a standalone command line application
 
 ## Summary of features
 
-* Validation that checks the structural formatting of a CSV file  
+* Validation that checks the structural formatting of a CSV file
 * Validation of a delimiter-separated values (dsv) file accesible via URL, File, or an IO-style object (e.g. StringIO)
-* Validation against [CSV dialects](http://dataprotocols.org/csv-dialect/)  
-* Validation against multiple schema standards; [JSON Table Schema](https://github.com/theodi/csvlint.rb/blob/master/README.md#json-table-schema-support) and [CSV on the Web](https://github.com/theodi/csvlint.rb/blob/master/README.md#csv-on-the-web-validation-support) 
+* Validation against [CSV dialects](http://dataprotocols.org/csv-dialect/)
+* Validation against multiple schema standards; [JSON Table Schema](https://github.com/theodi/csvlint.rb/blob/master/README.md#json-table-schema-support) and [CSV on the Web](https://github.com/theodi/csvlint.rb/blob/master/README.md#csv-on-the-web-validation-support)
 
 ## Development
 
-`ruby version 2.1.4`
+`ruby version 3.2`
 
 ### Tests
 
@@ -63,7 +63,7 @@ Or install it yourself as:
 
 ## Usage
 
-You can either use this gem within your own Ruby code, or as a standolone command line application
+You can either use this gem within your own Ruby code, or as a standalone command line application
 
 ## On the command line
 
@@ -71,6 +71,9 @@ After installing the gem, you can validate a CSV on the command line like so:
 
 	csvlint myfile.csv
 
+You may need to add the gem exectuable directory to your path, by adding '/usr/local/lib/ruby/gems/2.6.0/bin'
+or whatever your version is, to your .bash_profile PATH entry. [like so](https://stackoverflow.com/questions/2392293/ruby-gems-returns-command-not-found)
+
 You will then see the validation result, together with any warnings or errors e.g.
 
 ```
@@ -210,7 +213,7 @@ An example JSON Table Schema schema file is:
 				"name": "price",
 				"constraints": {
 					"required": true,
-					"minLength": 1 
+					"minLength": 1
 				}
 			},
 			{

data/Rakefile

@@ -1,12 +1,12 @@
 require "bundler/gem_tasks"
 
-$:.unshift File.join( File.dirname(__FILE__), "lib")
+$:.unshift File.join(File.dirname(__FILE__), "lib")
 
-require 'rubygems'
-require 'cucumber'
-require 'cucumber/rake/task'
-require 'coveralls/rake/task'
-require 'rspec/core/rake_task'
+require "rubygems"
+require "cucumber"
+require "cucumber/rake/task"
+require "coveralls/rake/task"
+require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 Coveralls::RakeTask.new
@@ -14,4 +14,4 @@ Cucumber::Rake::Task.new(:features) do |t|
   t.cucumber_opts = "features --format pretty"
 end
 
-task :default => [:spec, :features, 'coveralls:push']
+task default: [:spec, :features, "coveralls:push"]

data/bin/create_schema

@@ -5,7 +5,7 @@ require 'csvlint'
 
 begin
   puts ARGV[0]
-	csv = CSV.new( open(ARGV[0]) )
+  csv = CSV.new( URI.open(ARGV[0]) )
 	headers = csv.shift
 	
 	name = File.basename( ARGV[0] )
@@ -29,4 +29,4 @@ rescue => e
   puts e
   puts e.backtrace
 	puts "Unable to parse CSV file"
-end
+end

data/csvlint.gemspec

@@ -1,27 +1,24 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'csvlint/version'
+require "csvlint/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = "csvlint"
-  spec.version       = Csvlint::VERSION
-  spec.authors       = ["pezholio"]
-  spec.email         = ["pezholio@gmail.com"]
-  spec.description   = %q{CSV Validator}
-  spec.summary       = %q{CSV Validator}
-  spec.homepage      = "https://github.com/theodi/csvlint.rb"
-  spec.license       = "MIT"
+  spec.name = "csvlint"
+  spec.version = Csvlint::VERSION
+  spec.authors = ["pezholio"]
+  spec.email = ["pezholio@gmail.com"]
+  spec.description = "CSV Validator"
+  spec.summary = "CSV Validator"
+  spec.homepage = "https://github.com/theodi/csvlint.rb"
+  spec.license = "MIT"
 
-  spec.files         = `git ls-files`.split($/)
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.files = `git ls-files`.split($/)
+  spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = ['~> 2.0']
+  spec.required_ruby_version = [">= 2.5", "< 3.3"]
 
-  spec.add_dependency "mime-types"
-  spec.add_dependency "colorize"
+  spec.add_dependency "rainbow"
   spec.add_dependency "open_uri_redirections"
   spec.add_dependency "activesupport"
   spec.add_dependency "addressable"
@@ -30,9 +27,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency "uri_template"
   spec.add_dependency "thor"
   spec.add_dependency "rack"
-  spec.add_dependency "net-http-persistent", "< 3.0"
+  spec.add_dependency "net-http-persistent"
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler", ">= 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "cucumber"
   spec.add_development_dependency "simplecov"
@@ -43,11 +40,11 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec-pride"
   spec.add_development_dependency "rspec-expectations"
   spec.add_development_dependency "coveralls"
-  spec.add_development_dependency "pry"
+  spec.add_development_dependency "byebug"
   spec.add_development_dependency "github_changelog_generator"
   spec.add_development_dependency "aruba"
-  spec.add_development_dependency "rdf", "< 2.0"
+  spec.add_development_dependency "rdf", "< 4.0"
   spec.add_development_dependency "rdf-turtle"
   spec.add_development_dependency "henry"
-
+  spec.add_development_dependency "standardrb"
 end

data/docker_notes_for_windows.txt

@@ -0,0 +1,20 @@
+# Note that these commands are specific for a docker environment on MS Windows.
+
+# to generate Gemfile.lock file
+docker run --rm -v %CD%:/usr/src/app -w /usr/src/app ruby:2.5 bundle install
+
+# to build docker image from source (the ending dot is significant)
+docker build -t csvlint .
+
+# to run tests
+docker run -it --rm csvlint rake
+
+# to run csvlint command line with a CSV file.
+# cd to the directory with the CSV file then
+docker run -it --rm -v %CD%:/tmp csvlint ./bin/csvlint --dump-errors /tmp/file-to-lint.csv
+
+# to enter the linux container
+docker run -it --rm -v %CD%:/tmp csvlint bash
+
+# to enter the ruby REPL
+docker run -it --rm -v %CD%:/tmp csvlint irb

data/features/step_definitions/cli_steps.rb

@@ -1,37 +1,37 @@
-Given(/^I have stubbed stdin to contain "(.*?)"$/) do |file|
-  expect(STDIN).to receive(:read).and_return(File.read(file))
+Given(/^I have stubbed $stdin to contain "(.*?)"$/) do |file|
+  expect($stdin).to receive(:read).and_return(File.read(file))
 end
 
-Given(/^I have stubbed stdin to contain nothing$/) do
-  expect(STDIN).to receive(:read).and_return(nil)
+Given(/^I have stubbed $stdin to contain nothing$/) do
+  expect($stdin).to receive(:read).and_return(nil)
 end
 
 Then(/^nothing should be outputted to STDERR$/) do
-  expect(STDERR).to_not receive(:puts)
+  expect($stderr).to_not receive(:puts)
 end
 
 Then(/^the output should contain JSON$/) do
   @json = JSON.parse(all_stdout)
-  expect(@json['validation']).to be_present
+  expect(@json["validation"]).to be_present
 end
 
 Then(/^the JSON should have a state of "(.*?)"$/) do |state|
-  expect(@json['validation']['state']).to eq(state)
+  expect(@json["validation"]["state"]).to eq(state)
 end
 
 Then(/^the JSON should have (\d+) errors?$/) do |count|
   @index = count.to_i - 1
-  expect(@json['validation']['errors'].count).to eq(count.to_i)
+  expect(@json["validation"]["errors"].count).to eq(count.to_i)
 end
 
 Then(/^that error should have the "(.*?)" "(.*?)"$/) do |k, v|
-  expect(@json['validation']['errors'][@index][k].to_s).to eq(v)
+  expect(@json["validation"]["errors"][@index][k].to_s).to eq(v)
 end
 
 Then(/^error (\d+) should have the "(.*?)" "(.*?)"$/) do |index, k, v|
-  expect(@json['validation']['errors'][index.to_i - 1][k].to_s).to eq(v)
+  expect(@json["validation"]["errors"][index.to_i - 1][k].to_s).to eq(v)
 end
 
 Then(/^error (\d+) should have the constraint "(.*?)" "(.*?)"$/) do |index, k, v|
-  expect(@json['validation']['errors'][index.to_i - 1]['constraints'][k].to_s).to eq(v)
+  expect(@json["validation"]["errors"][index.to_i - 1]["constraints"][k].to_s).to eq(v)
 end

data/features/step_definitions/information_steps.rb

@@ -3,11 +3,11 @@ Given(/^the content type is "(.*?)"$/) do |arg1|
 end
 
 Then(/^the "(.*?)" should be "(.*?)"$/) do |type, encoding|
-  validator = Csvlint::Validator.new( @url, default_csv_options ) 
-  expect( validator.send(type.to_sym) ).to eq( encoding )
+  validator = Csvlint::Validator.new(@url, default_csv_options)
+  expect(validator.send(type.to_sym)).to eq(encoding)
 end
 
 Then(/^the metadata content type should be "(.*?)"$/) do |content_type|
-  validator = Csvlint::Validator.new( @url, default_csv_options ) 
-  expect( validator.headers['content-type'] ).to eq( content_type )
+  validator = Csvlint::Validator.new(@url, default_csv_options)
+  expect(validator.headers["content-type"]).to eq(content_type)
 end

data/features/step_definitions/parse_csv_steps.rb

@@ -12,31 +12,31 @@ Given(/^it is stored at the url "(.*?)"$/) do |url|
   charset = @encoding || "UTF-8"
   headers = {"Content-Type" => "#{content_type}; charset=#{charset}"}
   headers["Link"] = @link if @link
-  stub_request(:get, url).to_return(:status => 200, :body => @csv, :headers => headers)
-  stub_request(:get, URI.join(url, '/.well-known/csvm')).to_return(:status => 404)
-  stub_request(:get, url + '-metadata.json').to_return(:status => 404)
-  stub_request(:get, URI.join(url, 'csv-metadata.json')).to_return(:status => 404)
+  stub_request(:get, url).to_return(status: 200, body: @csv, headers: headers)
+  stub_request(:get, URI.join(url, "/.well-known/csvm")).to_return(status: 404)
+  stub_request(:get, url + "-metadata.json").to_return(status: 404)
+  stub_request(:get, URI.join(url, "csv-metadata.json")).to_return(status: 404)
 end
 
 Given(/^it is stored at the url "(.*?)" with no character set$/) do |url|
   @url = url
   content_type = @content_type || "text/csv"
-  stub_request(:get, url).to_return(:status => 200, :body => @csv, :headers => {"Content-Type" => "#{content_type}"})
-  stub_request(:get, URI.join(url, '/.well-known/csvm')).to_return(:status => 404)
-  stub_request(:get, url + '-metadata.json').to_return(:status => 404)
-  stub_request(:get, URI.join(url, 'csv-metadata.json')).to_return(:status => 404)
+  stub_request(:get, url).to_return(status: 200, body: @csv, headers: {"Content-Type" => content_type.to_s})
+  stub_request(:get, URI.join(url, "/.well-known/csvm")).to_return(status: 404)
+  stub_request(:get, url + "-metadata.json").to_return(status: 404)
+  stub_request(:get, URI.join(url, "csv-metadata.json")).to_return(status: 404)
 end
 
 When(/^I ask if the CSV is valid$/) do
   @csv_options ||= default_csv_options
-  @validator = Csvlint::Validator.new( @url, @csv_options )
+  @validator = Csvlint::Validator.new(@url, @csv_options)
   @valid = @validator.valid?
 end
 
 Then(/^I should get the value of true$/) do
-  expect( @valid ).to be(true)
+  expect(@valid).to be(true)
 end
 
 Then(/^I should get the value of false$/) do
-  expect( @valid ).to be(false)
+  expect(@valid).to be(false)
 end

data/features/step_definitions/schema_validation_steps.rb

@@ -10,24 +10,24 @@ end
 
 Given(/^I have a metadata file called "([^"]*)"$/) do |filename|
   @schema_type = :csvw_metadata
-  @schema_json = File.read( File.join( File.dirname(__FILE__), "..", "fixtures", filename ) )
+  @schema_json = File.read(File.join(File.dirname(__FILE__), "..", "fixtures", filename))
 end
 
-Given(/^the (schema|metadata) is stored at the url "(.*?)"$/) do |schema_type,schema_url|
+Given(/^the (schema|metadata) is stored at the url "(.*?)"$/) do |schema_type, schema_url|
   @schema_url = schema_url
-  stub_request(:get, @schema_url).to_return(:status => 200, :body => @schema_json.to_str)
+  stub_request(:get, @schema_url).to_return(status: 200, body: @schema_json.to_str)
 end
 
 Given(/^there is a file at "(.*?)" with the content:$/) do |url, content|
-  stub_request(:get, url).to_return(:status => 200, :body => content.to_str)
+  stub_request(:get, url).to_return(status: 200, body: content.to_str)
 end
 
-Given(/^I have a file called "(.*?)" at the url "(.*?)"$/) do |filename,url|
-  content = File.read( File.join( File.dirname(__FILE__), "..", "fixtures", filename ) )
-  content_type = filename =~ /.csv$/ ? "text/csv" : "application/csvm+json"
-  stub_request(:get, url).to_return(:status => 200, :body => content, :headers => {"Content-Type" => "#{content_type}; charset=UTF-8"})
+Given(/^I have a file called "(.*?)" at the url "(.*?)"$/) do |filename, url|
+  content = File.read(File.join(File.dirname(__FILE__), "..", "fixtures", filename))
+  content_type = /.csv$/.match?(filename) ? "text/csv" : "application/csvm+json"
+  stub_request(:get, url).to_return(status: 200, body: content, headers: {"Content-Type" => "#{content_type}; charset=UTF-8"})
 end
 
 Given(/^there is no file at the url "(.*?)"$/) do |url|
-  stub_request(:get, url).to_return(:status => 404)
-end
+  stub_request(:get, url).to_return(status: 404)
+end

data/features/step_definitions/sources_steps.rb

@@ -3,5 +3,5 @@ Given(/^it is parsed as a StringIO$/) do
 end
 
 Given(/^I parse a file called "(.*?)"$/) do |filename|
-  @url = File.new( File.join( File.dirname(__FILE__), "..", "fixtures", filename ) )
+  @url = File.new(File.join(File.dirname(__FILE__), "..", "fixtures", filename))
 end

data/features/step_definitions/validation_errors_steps.rb

@@ -2,14 +2,14 @@ When(/^I ask if there are errors$/) do
   @csv_options ||= default_csv_options
 
   if @schema_json
-    if @schema_type == :json_table
-      @schema = Csvlint::Schema.from_json_table( @schema_url || "http://example.org ", JSON.parse(@schema_json) )
+    @schema = if @schema_type == :json_table
+      Csvlint::Schema.from_json_table(@schema_url || "http://example.org ", JSON.parse(@schema_json))
     else
-      @schema = Csvlint::Schema.from_csvw_metadata( @schema_url || "http://example.org ", JSON.parse(@schema_json) )
+      Csvlint::Schema.from_csvw_metadata(@schema_url || "http://example.org ", JSON.parse(@schema_json))
     end
   end
 
-  @validator = Csvlint::Validator.new( @url, @csv_options, @schema )
+  @validator = Csvlint::Validator.new(@url, @csv_options, @schema)
   @errors = @validator.errors
 end
 
@@ -19,10 +19,10 @@ When(/^I carry out CSVW validation$/) do
   begin
     if @schema_json
       json = JSON.parse(@schema_json)
-      if @schema_type == :json_table
-        @schema = Csvlint::Schema.from_json_table( @schema_url || "http://example.org ", json )
+      @schema = if @schema_type == :json_table
+        Csvlint::Schema.from_json_table(@schema_url || "http://example.org ", json)
       else
-        @schema = Csvlint::Schema.from_csvw_metadata( @schema_url || "http://example.org ", json )
+        Csvlint::Schema.from_csvw_metadata(@schema_url || "http://example.org ", json)
       end
     end
 
@@ -30,12 +30,12 @@ When(/^I carry out CSVW validation$/) do
       @errors = []
       @warnings = []
       @schema.tables.keys.each do |table_url|
-        validator = Csvlint::Validator.new( table_url, @csv_options, @schema )
+        validator = Csvlint::Validator.new(table_url, @csv_options, @schema)
         @errors += validator.errors
         @warnings += validator.warnings
       end
     else
-      validator = Csvlint::Validator.new( @url, @csv_options, @schema )
+      validator = Csvlint::Validator.new(@url, @csv_options, @schema)
       @errors = validator.errors
       @warnings = validator.warnings
     end
@@ -49,42 +49,42 @@ end
 Then(/^there should be errors$/) do
   # this test is only used for CSVW testing; :invalid_encoding & :line_breaks mask lack of real errors
   @errors.delete_if { |e| e.instance_of?(Csvlint::ErrorMessage) && [:invalid_encoding, :line_breaks].include?(e.type) }
-  expect( @errors.count ).to be > 0
+  expect(@errors.count).to be > 0
 end
 
 Then(/^there should not be errors$/) do
-  expect( @errors.count ).to eq(0)
+  expect(@errors.count).to eq(0)
 end
 
 Then(/^there should be (\d+) error$/) do |count|
-  expect( @errors.count ).to eq( count.to_i )
+  expect(@errors.count).to eq(count.to_i)
 end
 
 Then(/^that error should have the type "(.*?)"$/) do |type|
-  expect( @errors.first.type ).to eq( type.to_sym )
+  expect(@errors.first.type).to eq(type.to_sym)
 end
 
 Then(/^that error should have the row "(.*?)"$/) do |row|
-  expect( @errors.first.row ).to eq( row.to_i )
+  expect(@errors.first.row).to eq(row.to_i)
 end
 
 Then(/^that error should have the column "(.*?)"$/) do |column|
-  expect( @errors.first.column ).to eq( column.to_i )
+  expect(@errors.first.column).to eq(column.to_i)
 end
 
 Then(/^that error should have the content "(.*)"$/) do |content|
-  expect( @errors.first.content.chomp ).to eq( content.chomp )
+  expect(@errors.first.content.chomp).to eq(content.chomp)
 end
 
 Then(/^that error should have no content$/) do
-  expect( @errors.first.content ).to eq( nil )
+  expect(@errors.first.content).to eq(nil)
 end
 
 Given(/^I have a CSV that doesn't exist$/) do
   @url = "http//www.example.com/fake-csv.csv"
-  stub_request(:get, @url).to_return(:status => 404)
+  stub_request(:get, @url).to_return(status: 404)
 end
 
 Then(/^there should be no "(.*?)" errors$/) do |type|
-  @errors.each do |error| error.type.should_not == type.to_sym end
+  @errors.each { |error| error.type.should_not == type.to_sym }
 end