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.

Sign up for GitHub

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

Jump to bottom

Either short_name or long_name required #25

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Either short_name or long_name required #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions lib/gtfs/route.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ module GTFS
class Route
include GTFS::Model

has_required_attrs :id, :short_name, :long_name, :type
has_optional_attrs :agency_id, :desc, :url, :color, :text_color
has_required_attrs :id, :type
has_optional_attrs :agency_id, :desc, :url, :color, :text_color, :short_name, :long_name
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should clear the merge conflict.

Suggested change
has_optional_attrs :agency_id, :desc, :url, :color, :text_color, :short_name, :long_name
has_optional_attrs :agency_id, :desc, :url, :color, :text_color, :sort_order, :short_name, :long_name

attr_accessor *attrs

column_prefix :route_
Expand All @@ -15,5 +15,9 @@ class Route
def self.parse_routes(data, options={})
return parse_models(data, options)
end

def valid?
super && ! (short_name || long_name).nil?
end
end
end
21 changes: 21 additions & 0 deletions spec/gtfs/route_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,26 @@
subject {GTFS::Route.parse_routes(source_text, opts)}

include_examples 'models'

context '#valid' do
let(:opts) {{}}
let(:source_text) {header_line + valid_line}

context 'routes with only short name' do
let(:valid_line) {"4679,1,001,,,3,,0000FF,FFFFFF\n"}

it "are valid" do
subject.first.valid?.should == true
end
end

context 'routes with only long name' do
let(:valid_line) {"4679,1,,SINAI - FORT McHENRY,,3,,0000FF,FFFFFF\n"}

it "are valid" do
subject.first.valid?.should == true
end
end
end
end
end