Skip to content

Commit

Permalink
Merge pull request #4 from af83/10739-upgrade-ruby-version
Browse files Browse the repository at this point in the history
Fixes #10739 Upgrade ruby version and add liberal_parsing option to CSV.parse
  • Loading branch information
ldonnet authored Apr 15, 2019
2 parents f8dab88 + d676aba commit 131e18a
Show file tree
Hide file tree
Showing 10 changed files with 171 additions and 153 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
Session.vim
coverage
.ruby-version
.rvmrc
*.gem
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ gem 'rspec'
gem 'multi_json', '1.0.4'
gem 'simplecov', :require => false
gem 'rubyzip', '~> 1.1'
gem 'vcr'
gem 'fakeweb'
gem 'vcr', '~> 3.0.3'
gem 'webmock', '~> 3.5.1'
21 changes: 17 additions & 4 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
GEM
remote: https://rubygems.org/
specs:
addressable (2.6.0)
public_suffix (>= 2.0.2, < 4.0)
crack (0.4.3)
safe_yaml (~> 1.0.0)
diff-lcs (1.1.3)
fakeweb (1.3.0)
hashdiff (0.3.8)
multi_json (1.0.4)
public_suffix (3.0.3)
rake (0.9.2.2)
rspec (2.8.0)
rspec-core (~> 2.8.0)
Expand All @@ -14,20 +19,28 @@ GEM
diff-lcs (~> 1.1.2)
rspec-mocks (2.8.0)
rubyzip (1.1.6)
safe_yaml (1.0.5)
simplecov (0.6.1)
multi_json (~> 1.0)
simplecov-html (~> 0.5.3)
simplecov-html (0.5.3)
vcr (1.11.3)
vcr (3.0.3)
webmock (3.5.1)
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff

PLATFORMS
ruby

DEPENDENCIES
fakeweb
multi_json (= 1.0.4)
rake
rspec
rubyzip (~> 1.1)
simplecov
vcr
vcr (~> 3.0.3)
webmock (~> 3.5.1)

BUNDLED WITH
2.0.1
6 changes: 3 additions & 3 deletions gtfs.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
gem.email = ['[email protected]']
gem.homepage = 'https://github.com/nerdEd/gtfs'

gem.required_ruby_version = '>= 1.9.2'
gem.required_ruby_version = '>= 2.4.0'

gem.add_dependency 'rake'
gem.add_dependency 'multi_json'
Expand All @@ -25,8 +25,8 @@ Gem::Specification.new do |gem|
gem.add_development_dependency 'rspec', ['>= 2.0.0']
gem.add_development_dependency 'simplecov'
gem.add_development_dependency 'ruby-debug19'
gem.add_development_dependency 'vcr'
gem.add_development_dependency 'fakeweb'
gem.add_development_dependency 'vcr', ['~> 3.0.3']
gem.add_development_dependency 'webmock', ['~> 3.5.0']

gem.files = `git ls-files`.split("\n")
gem.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
Expand Down
2 changes: 1 addition & 1 deletion lib/gtfs/model/class_methods.rb
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ def parse_models(data, options={})
return [] if data.nil? || data.empty?

models = []
CSV.parse(data, :headers => true) do |row|
CSV.parse(data, headers: true, liberal_parsing: true) do |row|
model = parse_model(row.to_hash, options)
models << model if options[:strict] == false || model.valid?
end
Expand Down
2 changes: 1 addition & 1 deletion lib/gtfs/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module GTFS
VERSION = '0.2.7'
VERSION = '0.3.0'
end
44 changes: 24 additions & 20 deletions spec/fixtures/cassettes/invalid_gtfs_uri.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 131e18a

Please sign in to comment.