Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,8 @@ Session.vim
coverage
.rvmrc
*.gem
Gemfile.lock
spec/fixtures/cassettes

.DS_Store
.ruby-version
71 changes: 0 additions & 71 deletions Gemfile.lock

This file was deleted.

3 changes: 2 additions & 1 deletion gtfs.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ Gem::Specification.new do |gem|
gem.add_dependency 'rake'
gem.add_dependency 'multi_json'
gem.add_dependency 'rubyzip', ['~> 2.3']

gem.add_dependency 'csv'

gem.add_development_dependency 'rspec', ['>= 2.0.0']
gem.add_development_dependency 'simplecov'
gem.add_development_dependency 'byebug'
Expand Down
19 changes: 17 additions & 2 deletions lib/gtfs/url_source.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,26 @@
module GTFS
class URLSource < Source

MAXIMUM_REDIRECTS = 5

def load_archive(source_url)
original_source_url = source_url.dup
Dir.mktmpdir do |tmp|
n = 0
while n < MAXIMUM_REDIRECTS
uri = URI.parse(source_url)
response = Net::HTTP.get_response(uri)
if response.is_a?(Net::HTTPRedirection)
n += 1
source_url = response['location']
else
break
end
end
if n >= MAXIMUM_REDIRECTS
raise InvalidSourceException.new("Too many redirects for #{original_source_url}")
end
file_name = File.join(tmp, "/gtfs_temp_#{Time.now.strftime('%Y%jT%H%M%S%z')}.zip")
uri = URI.parse(source_url)
response = Net::HTTP.get_response(uri)
open(file_name, 'wb') do |file|
file.write response.body
end
Expand Down
63 changes: 0 additions & 63 deletions spec/fixtures/cassettes/invalid_gtfs_uri.yml

This file was deleted.

60 changes: 0 additions & 60 deletions spec/fixtures/cassettes/valid_gtfs_uri.yml

This file was deleted.

9 changes: 9 additions & 0 deletions spec/gtfs/url_source_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,15 @@
end
end

context 'with a URI causing redirects' do
let(:source_path) {'https://api.gtfs-data.jp/v2/organizations/asatetu/feeds/asakaigantetsudo/files/feed.zip'} # 302 Found
it 'should create a new source successfully' do
VCR.use_cassette('redirect_gtfs_uri') do
lambda {GTFS::URLSource.new(source_path, {})}.should_not raise_error(GTFS::InvalidSourceException)
end
end
end

context 'with a non-existent URI' do
let(:source_path) {'https://example.org/gtfs.zip'}
it 'should raise an exception' do
Expand Down