Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

do not raise exception when an optional source file is missing #27

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
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
19 changes: 11 additions & 8 deletions lib/gtfs/source.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
require 'tmpdir'
require 'fileutils'
require 'stringio'
require 'zip'

module GTFS
Expand Down Expand Up @@ -57,14 +58,14 @@ def entries
Dir.entries(@tmp_dir)
end

def raise_if_missing_source(filename)
file_missing = !entries.include?(filename)
raise InvalidSourceException.new("Missing required source file: #{filename}") if file_missing
def raise_if_required_source(entity)
raise InvalidSourceException.new("Missing required source file: #{entity.filename}") if entity.required_file?
end

ENTITIES.each do |entity|
define_method entity.name.to_sym do
parse_file entity.filename do |f|
parse_entity entity do |f|
files[entity.filename] ||= f
entity.send("parse_#{entity.name}".to_sym, f.read, options)
end
end
Expand All @@ -78,10 +79,12 @@ def files
@files ||= {}
end

def parse_file(filename)
raise_if_missing_source filename
open File.join(@tmp_dir, '/', filename), 'r:bom|utf-8' do |f|
files[filename] ||= yield f
def parse_entity(entity)
if entries.include?(entity.filename)
yield open(File.join(@tmp_dir, entity.filename), 'r:bom|utf-8')
else
raise_if_required_source entity
yield StringIO.new
end
end
end
Expand Down
Binary file not shown.
17 changes: 16 additions & 1 deletion spec/gtfs/source_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,14 @@
File.expand_path(File.dirname(__FILE__) + '/../fixtures/valid_gtfs.zip')
end

let(:source_missing_required_files) do
let(:source_missing_required_files) do
File.expand_path(File.dirname(__FILE__) + '/../fixtures/missing_files.zip')
end

let (:valid_local_source_missing_optional_files) do
File.expand_path(File.dirname(__FILE__) + '/../fixtures/valid_gtfs_missing_optional_files.zip')
end

describe '#build' do
let(:opts) {{}}
let(:data_source) {valid_local_source}
Expand Down Expand Up @@ -78,4 +82,15 @@

describe '#stop_times' do
end

describe '#transfers' do
subject {source.transfers}

context 'when the source is missing transfers' do
let(:source) { GTFS::Source.build valid_local_source_missing_optional_files }

it {should_not raise_exception GTFS::InvalidSourceException}
it {should be_empty}
end
end
end