gtfs 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8df8ca58b1e0d2b4855443d0d7825c59f7eabfaf8be6c89fff0da03cd69ce6b0
-  data.tar.gz: e38f08d1959b969400f80353d26ad1ee12965df92fc4c0ebe405ee39d81555ea
+  metadata.gz: dc9d7e6c89a8e5a32b02fa4beeb688871c6f341bc1e019148f3fd4fdc0ba077b
+  data.tar.gz: 2850718a407d7fba536d7d0472e0b886713d4a5c387594d5ad94a52175d0d10a
 SHA512:
-  metadata.gz: 689c542dead3e918da4d02dd6170ae31a134eeea4dfff6ba7bf1591fd71d297bcbd616b935790823a4247d8421aeb7fc9be9f8618ebd67f6a50388df57c27193
-  data.tar.gz: 4b09664e10ccd3c84dbdccbde25b66536395769dc3e789ce371c8f41ad6b77f68a2dbf70466ef88f508e717081eb7bfbf5be197d53a3fb80c6423d70d6495812
+  metadata.gz: f8990b4d336656ef5b02c1cd2acdcf1e1886533f35534cbd9acd5b384b9aee2d386320a671d781a6576e18f746f4b9920f26e3cea88f7c27f3af9af2ebd65053
+  data.tar.gz: 3f2f724cd7d8cf336cd8aabef553d21d036e0c1769053324afca22872d504a2cc792b9144b8eafdd1c96092b6864a055ae89ff36a1143514c566cda6e9366dd0

data/.github/workflows/ci.yml

@@ -0,0 +1,28 @@
+name: Run CI Tasks
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    strategy:
+        matrix:
+          ruby-version: ['2.7', '3.0', '3.1']
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+
+      - name: Run Tests
+        run: |
+          bundle exec rake -t

data/Gemfile

@@ -1,7 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'multi_json', '1.0.4'
-gem 'rubyzip', '~> 1.1'
+gemspec
 
 group :test, :development do
   gem 'simplecov', :require => false

data/Gemfile.lock

@@ -1,39 +1,53 @@
+PATH
+  remote: .
+  specs:
+    gtfs (0.3.0)
+      multi_json
+      rake
+      rubyzip (~> 1.1)
+
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
-    crack (0.4.4)
-    diff-lcs (1.4.4)
-    docile (1.3.2)
+    byebug (11.1.3)
+    crack (0.4.5)
+      rexml
+    diff-lcs (1.5.0)
+    docile (1.4.0)
+    fakeweb (1.3.0)
     hashdiff (1.0.1)
-    multi_json (1.0.4)
-    public_suffix (4.0.6)
-    rake (13.0.1)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.3)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.3)
+    multi_json (1.15.0)
+    public_suffix (4.0.7)
+    rake (13.0.6)
+    rexml (3.2.5)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
+      rspec-support (~> 3.11.0)
     rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.9.1)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.4)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
     rubyzip (1.3.0)
-    simplecov (0.19.0)
+    simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
-    vcr (6.0.0)
-    webmock (3.9.3)
-      addressable (>= 2.3.6)
+    simplecov_json_formatter (0.1.4)
+    vcr (6.1.0)
+    webmock (3.14.0)
+      addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
 
@@ -41,14 +55,15 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  multi_json (= 1.0.4)
+  byebug
+  fakeweb
+  gtfs!
   rake
   rspec
   rspec-its
-  rubyzip (~> 1.1)
   simplecov
   vcr
   webmock
 
 BUNDLED WITH
-   2.1.4
+   2.3.6

data/README.md

@@ -1,7 +1,7 @@
-[![Build Status](https://travis-ci.org/nerdEd/gtfs.svg?branch=master)](https://travis-ci.org/nerdEd/gtfs)
-
 ### GTFS Ruby
 
+[![Run CI Tasks](https://github.com/nerdEd/gtfs/actions/workflows/ci.yml/badge.svg)](https://github.com/nerdEd/gtfs/actions/workflows/ci.yml)
+
 A Ruby wrapper for the [General Transit Feed Specification](https://developers.google.com/transit/gtfs/)
 
 ### Getting started

data/gtfs.gemspec

@@ -24,7 +24,7 @@ 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 'byebug'
   gem.add_development_dependency 'vcr'
   gem.add_development_dependency 'fakeweb'
 

data/lib/gtfs/attribution.rb

@@ -0,0 +1,20 @@
+module GTFS
+  class Attribution
+    include GTFS::Model
+
+    has_required_attrs :organization_name
+    has_optional_attrs :attribution_id, :agency_id, :route_id, :trip_id, :is_producer,
+    :is_operator, :is_authority, :attribution_url, :attribution_email, :attribution_phone
+
+    attr_accessor *attrs
+
+    collection_name :attributions
+
+    required_file false
+    uses_filename 'attributions.txt'
+
+    def self.parse_attributions(data, options={})
+      return parse_models(data, options)
+    end
+  end
+end

data/lib/gtfs/fare_attribute.rb

@@ -3,7 +3,7 @@ module GTFS
     include GTFS::Model
 
     has_required_attrs :fare_id, :price, :currency_type, :payment_method, :transfers
-    has_optional_attrs :transfer_duration 
+    has_optional_attrs :transfer_duration, :agency_id
     attr_accessor *attrs
 
     collection_name :fare_attributes

data/lib/gtfs/feed_info.rb

@@ -3,7 +3,7 @@ module GTFS
     include GTFS::Model
 
     has_required_attrs :publisher_name, :publisher_url, :lang
-    has_optional_attrs :start_date, :end_date, :version
+    has_optional_attrs :start_date, :end_date, :version, :contact_email, :contact_url, :default_lang
     attr_accessor *attrs
 
     column_prefix :feed_

data/lib/gtfs/level.rb

@@ -0,0 +1,17 @@
+module GTFS
+  class Level
+    include GTFS::Model
+
+    has_required_attrs :level_id, :level_index
+    has_optional_attrs :level_name
+    attr_accessor *attrs
+
+    collection_name :levels
+    required_file false
+    uses_filename 'levels.txt'
+
+    def self.parse_levels(data, options={})
+      return parse_models(data, options)
+    end
+  end
+end

data/lib/gtfs/model.rb

@@ -39,7 +39,7 @@ module GTFS
       end
 
       def attrs
-       required_attrs + optional_attrs
+        required_attrs + optional_attrs
       end
 
       #####################################
@@ -77,8 +77,8 @@ module GTFS
         self.define_singleton_method(:filename) {filename}
       end
 
-      def each(filename)
-        CSV.foreach(filename, :headers => true) do |row|
+      def each(filename, options)
+        CSV.foreach(filename, :headers => true, :encoding => options[:encoding]) do |row|
           yield parse_model(row.to_hash)
         end
       end

data/lib/gtfs/pathway.rb

@@ -0,0 +1,19 @@
+module GTFS
+  class Pathway
+    include GTFS::Model
+
+    has_required_attrs :pathway_id, :from_stop_id, :to_stop_id, :pathway_mode, :is_bidirectional
+    has_optional_attrs :length, :traversal_time, :stair_count, :max_slope, :min_width, :signposted_as,
+                       :reversed_signposted_as
+
+    attr_accessor *attrs
+    collection_name :pathways
+
+    required_file false
+    uses_filename 'pathways.txt'
+
+    def self.parse_pathways(data, options={})
+      return parse_models(data, options)
+    end
+  end
+end

data/lib/gtfs/route.rb

@@ -3,7 +3,7 @@ module GTFS
     include GTFS::Model
 
     has_required_attrs :id, :short_name, :long_name, :type
-    has_optional_attrs :agency_id, :desc, :url, :color, :text_color
+    has_optional_attrs :agency_id, :desc, :url, :color, :text_color, :sort_order
     attr_accessor *attrs
 
     column_prefix :route_

data/lib/gtfs/source.rb

@@ -5,15 +5,15 @@ require 'zip'
 module GTFS
   class Source
 
-    ENTITIES = [GTFS::Agency, GTFS::Stop, GTFS::Route, GTFS::Trip, GTFS::StopTime,
-                GTFS::Calendar, GTFS::CalendarDate, GTFS::Shape, GTFS::FareAttribute,
-                GTFS::FareRule, GTFS::Frequency, GTFS::Transfer, GTFS::FeedInfo]
+    ENTITIES = [GTFS::Agency, GTFS::Stop, GTFS::Route, GTFS::Trip, GTFS::StopTime, GTFS::Calendar, GTFS::CalendarDate,
+                GTFS::Shape, GTFS::FareAttribute, GTFS::FareRule, GTFS::Frequency, GTFS::Transfer, GTFS::FeedInfo,
+                GTFS::Attribution, GTFS::Pathway, GTFS::Translation, GTFS::Level]
 
     REQUIRED_SOURCE_FILES = ENTITIES.select(&:required_file?).map(&:filename)
     OPTIONAL_SOURCE_FILES = ENTITIES.reject(&:required_file?).map(&:filename)
     SOURCE_FILES = ENTITIES.map(&:filename)
 
-    DEFAULT_OPTIONS = {strict: true}
+    DEFAULT_OPTIONS = {strict: true, encoding: "utf-8"}
 
     attr_accessor :source, :archive, :options
 
@@ -64,13 +64,13 @@ module GTFS
 
     ENTITIES.each do |entity|
       define_method entity.name.to_sym do
-        parse_file entity.filename do |f|
+        parse_file entity.filename, options do |f|
           entity.send("parse_#{entity.name}".to_sym, f.read, options)
         end
       end
 
       define_method "each_#{entity.singular_name}".to_sym do |&block|
-        entity.each(File.join(@tmp_dir, entity.filename)) { |model| block.call model }
+        entity.each(File.join(@tmp_dir, entity.filename), options) { |model| block.call model }
       end
     end
 
@@ -78,9 +78,9 @@ module GTFS
       @files ||= {}
     end
 
-    def parse_file(filename)
+    def parse_file(filename, options)
       raise_if_missing_source filename
-      open File.join(@tmp_dir, '/', filename), 'r:bom|utf-8' do |f|
+      open File.join(@tmp_dir, '/', filename), "r:#{options[:encoding]}" do |f|
         files[filename] ||= yield f
       end
     end

data/lib/gtfs/stop.rb

@@ -3,7 +3,8 @@ module GTFS
     include GTFS::Model
     
     has_required_attrs :id, :name, :lat, :lon
-    has_optional_attrs :code, :desc, :zone_id, :url, :location_type, :parent_station, :timezone, :wheelchair_boarding
+    has_optional_attrs :code, :desc, :zone_id, :url, :location_type, :parent_station, :timezone, :wheelchair_boarding,
+                       :level_id, :platform_code
     column_prefix :stop_
     attr_accessor *attrs
 

data/lib/gtfs/translation.rb

@@ -0,0 +1,18 @@
+module GTFS
+  class Translation
+    include GTFS::Model
+
+    has_required_attrs :table_name, :field_name, :language, :translation
+    has_optional_attrs :record_id, :record_sub_id, :field_value
+
+    attr_accessor *attrs
+    collection_name :translations
+
+    required_file false
+    uses_filename 'translations.txt'
+
+    def self.parse_translations(data, options={})
+      return parse_models(data, options)
+    end
+  end
+end

data/lib/gtfs/version.rb

@@ -1,3 +1,3 @@
 module GTFS
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

data/lib/gtfs.rb

@@ -14,6 +14,10 @@ require 'gtfs/fare_attribute'
 require 'gtfs/fare_rule'
 require 'gtfs/frequency'
 require 'gtfs/transfer'
+require 'gtfs/translation'
+require 'gtfs/pathway'
+require 'gtfs/attribution'
+require 'gtfs/level'
 
 require 'gtfs/source'
 require 'gtfs/url_source'

data/spec/gtfs/attribution_spec.rb

@@ -0,0 +1,14 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe GTFS::Attribution do
+  describe 'Attribution.parse_attributions' do
+    let(:header_line) {"organization_name\n"}
+    let(:invalid_header_line) {"\n"}
+    let(:valid_line) {"Transit Feed Solutions Tokyo\n"}
+    let(:invalid_line) {"\n"}
+
+    subject {GTFS::Attribution.parse_attributions(source_text, opts)}
+
+    include_examples 'models'
+  end
+end

data/spec/gtfs/level_spec.rb

@@ -0,0 +1,14 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe GTFS::Level do
+  describe 'Level.parse_levels' do
+    let(:header_line) {"level_id,level_index\n"}
+    let(:invalid_header_line) {",level_index\n"}
+    let(:valid_line) {"L0,0\n"}
+    let(:invalid_line) {",1\n"}
+
+    subject {GTFS::Level.parse_levels(source_text, opts)}
+
+    include_examples 'models'
+  end
+end

data/spec/gtfs/local_source_spec.rb

@@ -2,24 +2,28 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe GTFS::LocalSource do
   describe '#new' do
-    subject {lambda{GTFS::LocalSource.new(source_path)}}
-
     context 'with a local source path that is invalid' do
       let(:source_path) {File.expand_path(File.dirname(__FILE__) + '/../fixtures/not_here.zip')}
 
-      it {should raise_error(GTFS::InvalidSourceException)}
+      it 'throws an exception' do
+        expect { GTFS::LocalSource.new(source_path) }.to raise_error(GTFS::InvalidSourceException)
+      end
     end
 
     context 'with a local source path to a zip w/o required files' do
       let(:source_path) {File.expand_path(File.dirname(__FILE__) + '/../fixtures/missing_files_gtfs.zip')}
 
-      it {should raise_error(GTFS::InvalidSourceException)}
+      it 'throws an exception' do
+        expect { GTFS::LocalSource.new(source_path) }.to raise_error(GTFS::InvalidSourceException)
+      end
     end
 
     context 'with a local source path to a valid source zip' do
       let(:source_path) {File.expand_path(File.dirname(__FILE__) + '/../fixtures/valid_gtfs.zip')}
       
-      it {should_not raise_error(GTFS::InvalidSourceException)}
+      it 'throws an exception' do
+        expect { GTFS::LocalSource.new(source_path) }.to_not raise_error(GTFS::InvalidSourceException)
+      end
     end
   end
 end

data/spec/gtfs/pathway_spec.rb

@@ -0,0 +1,14 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe GTFS::Pathway do
+  describe 'Pathway.parse_pathways' do
+    let(:header_line) {"pathway_id,from_stop_id,to_stop_id,pathway_mode,is_bidirectional\n"}
+    let(:invalid_header_line) {",rom_stop_id,to_stop_id,pathway_mode,is_bidirectional\n"}
+    let(:valid_line) {"E1N1,E1,N1,2,1\n"}
+    let(:invalid_line) {"E1N1,E1,,,1\n"}
+
+    subject {GTFS::Pathway.parse_pathways(source_text, opts)}
+
+    include_examples 'models'
+  end
+end

data/spec/gtfs/source_spec.rb

@@ -45,7 +45,7 @@ describe GTFS::Source do
     context 'with options to disable strict checks' do
       let(:opts) {{strict: false}}
 
-      its(:options) {should == {strict: false}}
+      its(:options) {should == GTFS::Source::DEFAULT_OPTIONS.merge({strict: false})}
     end
   end
 

data/spec/gtfs/translation_spec.rb

@@ -0,0 +1,14 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe GTFS::Translation do
+  describe 'Translation.parse_translations' do
+    let(:header_line) {"table_name,field_name,language,translation\n"}
+    let(:invalid_header_line) {",stop_name,,translation\n"}
+    let(:valid_line) {"stops,stop_name,en,Tokyo Station\n"}
+    let(:invalid_line) {",,,en\n"}
+
+    subject {GTFS::Translation.parse_translations(source_text, opts)}
+
+    include_examples 'models'
+  end
+end

data/spec/spec_helper.rb

@@ -17,6 +17,7 @@ RSpec.configure do |config|
     expectations.syntax = [:should , :expect]
     expectations.on_potential_false_positives = :nothing
   end
+  config.raise_errors_for_deprecations!
 end
 
 VCR.configure do |c|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gtfs
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - nerdEd
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-19 00:00:00.000000000 Z
+date: 2022-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ruby-debug19
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -130,8 +130,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
-- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -140,6 +140,7 @@ files:
 - gtfs.gemspec
 - lib/gtfs.rb
 - lib/gtfs/agency.rb
+- lib/gtfs/attribution.rb
 - lib/gtfs/calendar.rb
 - lib/gtfs/calendar_date.rb
 - lib/gtfs/custom_exceptions.rb
@@ -147,14 +148,17 @@ files:
 - lib/gtfs/fare_rule.rb
 - lib/gtfs/feed_info.rb
 - lib/gtfs/frequency.rb
+- lib/gtfs/level.rb
 - lib/gtfs/local_source.rb
 - lib/gtfs/model.rb
+- lib/gtfs/pathway.rb
 - lib/gtfs/route.rb
 - lib/gtfs/shape.rb
 - lib/gtfs/source.rb
 - lib/gtfs/stop.rb
 - lib/gtfs/stop_time.rb
 - lib/gtfs/transfer.rb
+- lib/gtfs/translation.rb
 - lib/gtfs/trip.rb
 - lib/gtfs/url_source.rb
 - lib/gtfs/version.rb
@@ -163,19 +167,23 @@ files:
 - spec/fixtures/missing_files.zip
 - spec/fixtures/valid_gtfs.zip
 - spec/gtfs/agency_spec.rb
+- spec/gtfs/attribution_spec.rb
 - spec/gtfs/calendar_date_spec.rb
 - spec/gtfs/calendar_spec.rb
 - spec/gtfs/fare_attribute_spec.rb
 - spec/gtfs/fare_rule_spec.rb
 - spec/gtfs/feed_info_spec.rb
 - spec/gtfs/frequency_spec.rb
+- spec/gtfs/level_spec.rb
 - spec/gtfs/local_source_spec.rb
+- spec/gtfs/pathway_spec.rb
 - spec/gtfs/route_spec.rb
 - spec/gtfs/shape_spec.rb
 - spec/gtfs/source_spec.rb
 - spec/gtfs/stop_spec.rb
 - spec/gtfs/stop_time_spec.rb
 - spec/gtfs/transfer_spec.rb
+- spec/gtfs/translation_spec.rb
 - spec/gtfs/trip_spec.rb
 - spec/gtfs/url_source_spec.rb
 - spec/spec_helper.rb
@@ -199,7 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: Load and read GTFS data from zip bundles
@@ -209,19 +217,23 @@ test_files:
 - spec/fixtures/missing_files.zip
 - spec/fixtures/valid_gtfs.zip
 - spec/gtfs/agency_spec.rb
+- spec/gtfs/attribution_spec.rb
 - spec/gtfs/calendar_date_spec.rb
 - spec/gtfs/calendar_spec.rb
 - spec/gtfs/fare_attribute_spec.rb
 - spec/gtfs/fare_rule_spec.rb
 - spec/gtfs/feed_info_spec.rb
 - spec/gtfs/frequency_spec.rb
+- spec/gtfs/level_spec.rb
 - spec/gtfs/local_source_spec.rb
+- spec/gtfs/pathway_spec.rb
 - spec/gtfs/route_spec.rb
 - spec/gtfs/shape_spec.rb
 - spec/gtfs/source_spec.rb
 - spec/gtfs/stop_spec.rb
 - spec/gtfs/stop_time_spec.rb
 - spec/gtfs/transfer_spec.rb
+- spec/gtfs/translation_spec.rb
 - spec/gtfs/trip_spec.rb
 - spec/gtfs/url_source_spec.rb
 - spec/spec_helper.rb

data/.travis.yml

@@ -1,15 +0,0 @@
-os: linux
-dist: bionic
-language: ruby
-rvm:
-  - 2.5.7
-  - 2.6.5
-  - 2.7.0
-
-before_install:
-  - gem install bundler
-
-install: bundle install --retry=3
-
-notifications:
-  email: false