gtfs_reader 1.2.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fe6f021960f77592a1591bc5d0316b076a0fc7d
-  data.tar.gz: 8131ca59794a510f7389a97fe698c234977fb637
+  metadata.gz: e25dd494cd1cfa6d1e2fef48744b1016644362c6
+  data.tar.gz: b147c7f108b84ac047b68e50a704bb1aa3d4f6ff
 SHA512:
-  metadata.gz: 207c432f6e4a68729a82767391fd993cc76bebff2279523c63f3c9151352b07750f4bce8e883b849381b1a80e5185582f83b31eb46f0c3fa3cbffc288b871098
-  data.tar.gz: 5685d855743749512b346f364b1db975317d04b75bf7519bf2292bf7f86e569a0fadb946c1c37173437e0fd88b9d5ec86c7ec622925c963a9681ca1e15018706
+  metadata.gz: d9dc292265e217230dac89bf9f92ac5c7bcec17e19e77ef62c9dd34e79660ebf77f1732d96627925d01ced21bace26479b6c4dddff59fcbd43d43ff43a42ecfd
+  data.tar.gz: dfd918d96505e679e61ac204441df6c7d4976601d7ea5d413ceeb47f4dc7941dd56d04e1492e2afad935c8ebcf19c3b74ce44aff8119ca4af03595e26be0242e

data/README.md

@@ -15,7 +15,7 @@ Feed](https://developers.google.com/transit/gtfs)":
 > developers to write applications that consume that data in an interoperable
 > way.
 
-Essentially, a GTFS feed is a ZIP file containing 
+Essentially, a GTFS feed is a ZIP file containing
 [CSV-formatted](https://en.wikipedia.org/wiki/Comma-separated_values) .txt
 files which following the specification.
 
@@ -27,26 +27,27 @@ files which following the specification.
 require 'gtfs_reader'
 
 GtfsReader.config do
+  # verbose true # TODO: uncomment for verbose output
   return_hashes true
-  # verbose true #uncomment for verbose output
+
   sources do
     sample do
-      url 'http://localhost/sample-feed.zip' # you can also use a filepath here 
+      url 'http://localhost/sample-feed.zip' # you can also use a filepath here
       before { |etag| puts "Processing source with tag #{etag}..." }
       handlers do
-        agency {|row| puts "Read Agency: #{row[:agency_name]}" }
-        routes {|row| puts "Read Route: #{row[:route_long_name]}" }
+        agency { |row| puts "Read Agency: #{row[:agency_name]}" }
+        routes { |row| puts "Read Route: #{row[:route_long_name]}" }
       end
     end
   end
 end
 
-GtfsReader.update :sample # or GtfsReader.update_all!
+GtfsReader.update(:sample) # or GtfsReader.update_all!
 ```
 
-Assuming that `http://localhost/sample-feed.zip` returns the [Example Feed]
-(https://developers.google.com/transit/gtfs/examples/gtfs-feed), this script
-will print the following:
+Assuming that `http://localhost/sample-feed.zip` returns the
+[Example Feed](https://developers.google.com/transit/gtfs/examples/gtfs-feed),
+this script will print the following:
 
 ```
 Processing source with tag 4d9d3040c284f0581cd5620d5c131109...
@@ -73,25 +74,27 @@ GtfsReader.config do
   sources do
     sample do
       feed_definition do
-        file :drivers, required: true do # for my_file.txt
-          col :licence_number, required: true, unique: true
+        file(:drivers, required: true) do # for my_file.txt
+          col(:licence_number, required: true, unique: true)
 
           # If the sex column contains "1", the symbol :male will be returned,
           # otherwise :female will be returned
-          col :sex, &output_map( :unspecified, female: ?1, male: ?2 )
+          col :sex, &output_map({ female: '1', male: '2' }, :unspecified)
 
           # This will allow you to create a custom parser. Within the given
           # block you can reference other columns in the current row by name.
           col :name do |name|
             case sex
-              when :female then "Ms. #{name}"
-              when :male   then "Mr. #{name}"
-              else              name
+            when :female then "Ms. #{name}"
+            when :male   then "Mr. #{name}"
+            else              name
             end
           end
         end
       end
+
       # ...
+
     end
   end
 end

data/Rakefile

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'rubygems'
 require 'bundler'
 require 'rake'
@@ -11,8 +9,8 @@ require_relative 'lib/gtfs_reader/version'
 begin
   Bundler.setup :default, :development
 rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts 'Run `bundle install` to install missing gems'
+  warn e.message
+  warn 'Run `bundle install` to install missing gems'
   exit e.status_code
 end
 
@@ -20,15 +18,15 @@ Jeweler::Tasks.new do |gem|
   gem.name = 'gtfs_reader'
   gem.version = GtfsReader::Version.to_s
   gem.homepage = 'http://github.com/sangster/gtfs_reader'
-  gem.license = 'GPL 3'
+  gem.license = 'GPL-3.0'
   gem.summary = 'Read General Transit Feed Specification zip files'
-  gem.description = <<-EOF.strip.gsub /\s+/, ' '
+  gem.description = <<-DESC.strip.gsub(/\s+/, ' ')
     Reads and parses zip files conforming to Google's GTFS spec. Such files can
     take up quite a bit of memory when inflated, so this gem prefers to read
     them as a stream of rows.
 
     GTFS Spec: https://developers.google.com/transit/gtfs
-  EOF
+  DESC
   gem.email = 'jon@ertt.ca'
   gem.authors = ['Jon Sangster']
 
@@ -52,6 +50,5 @@ end
 
 # RSpec
 require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new :spec
+RSpec::Core::RakeTask.new(:spec)
 task default: :spec
-

data/lib/gtfs_reader/bulk_feed_handler.rb

@@ -1,23 +1,23 @@
 module GtfsReader
   class BulkFeedHandler
-    def initialize(bulk_size, args=[], &block)
+    def initialize(bulk_size, args = [], &block)
       @bulk_size = bulk_size
       @callbacks = {}
-      BulkFeedHandlerDsl.new(self).instance_exec *args, &block
+      BulkFeedHandlerDsl.new(self).instance_exec(*args, &block)
     end
 
     def handler?(filename)
-      @callbacks.key? filename
+      @callbacks.key?(filename)
     end
 
     def handle_file(filename, reader)
-      unless @callbacks.key? filename
+      unless @callbacks.key?(filename)
         Log.warn { "No handler registered for #{filename.to_s.red}.txt" }
         return
       end
 
-      calls = callbacks filename
-      calls[:before].call if calls.key? :before
+      calls = callbacks(filename)
+      calls[:before].call if calls.key?(:before)
       read_row = calls[:read]
 
       values = []
@@ -27,16 +27,16 @@ module GtfsReader
         values << (read_row ? read_row.call(row) : row)
         bulk_count += 1
 
-        if bulk_count == @bulk_size
-          total += bulk_count
-          calls[:bulk].call values, bulk_count, total, cols
-          bulk_count = 0
-          values = []
-        end
+        next unless bulk_count == @bulk_size
+
+        total += bulk_count
+        calls[:bulk].call values, bulk_count, total, cols
+        bulk_count = 0
+        values = []
       end
 
-      unless bulk_count == 0
-        calls[:bulk].call values, bulk_count, (total + bulk_count), cols
+      unless bulk_count.zero?
+        calls[:bulk].call(values, bulk_count, (total + bulk_count), cols)
       end
       nil
     end
@@ -50,7 +50,7 @@ module GtfsReader
     end
 
     def callback?(kind, filename)
-      @callbacks.key? filename and @callbacks[filename].key? kind
+      @callbacks.key?(filename) && @callbacks[filename].key?(kind)
     end
 
     private
@@ -65,30 +65,34 @@ module GtfsReader
       @feed_handler = feed_handler
     end
 
-    def method_missing(filename, *args, &block)
-      BulkDsl.new(@feed_handler, filename).instance_exec &block
+    def method_missing(filename, *_args, &block)
+      BulkDsl.new(@feed_handler, filename).instance_exec(&block)
 
-      unless @feed_handler.callback? :bulk, filename
-        raise HandlerMissingError, "No bulk block for #{filename}"
-      end
+      return if @feed_handler.callback?(:bulk, filename)
+      raise HandlerMissingError, "No bulk block for #{filename}"
+    end
+
+    def respond_to_missing?(_name, _include_private = false)
+      true
     end
   end
 
   class BulkDsl
     def initialize(feed_handler, filename)
-      @feed_handler, @filename = feed_handler, filename
+      @feed_handler = feed_handler
+      @filename = filename
     end
 
     def before(&block)
-      @feed_handler.create_callback :before, @filename, block
+      @feed_handler.create_callback(:before, @filename, block)
     end
 
     def read(&block)
-      @feed_handler.create_callback :read, @filename, block
+      @feed_handler.create_callback(:read, @filename, block)
     end
 
     def bulk(&block)
-      @feed_handler.create_callback :bulk, @filename, block
+      @feed_handler.create_callback(:bulk, @filename, block)
     end
   end
 end

data/lib/gtfs_reader/config/column.rb

@@ -7,16 +7,16 @@ module GtfsReader
 
       attr_reader :name
 
-      #@param name [String] the name of the column
-      #@option opts [Boolean] :required (false) If this column is required to
-      #  appear in the given file
-      #@option opts [Boolean] :unique (false) if values in this column need to be
-      #  unique among all rows in the file.
-      def initialize(name, opts={}, &parser)
+      # @param name [String] the name of the column
+      # @option opts [Boolean] :required (false) If this column is required to
+      #   appear in the given file
+      # @option opts [Boolean] :unique (false) if values in this column need to
+      #   be unique among all rows in the file.
+      def initialize(name, opts = {}, &parser)
         @name = name
         @parser = block_given? ? parser : IDENTITY_PARSER
 
-        @opts = { required: false, unique: false }.merge ( opts || {} )
+        @opts = { required: false, unique: false }.merge(opts || {})
       end
 
       def parser(&block)
@@ -24,30 +24,30 @@ module GtfsReader
         @parser
       end
 
-      #@return [Boolean] if this column is required to appear in the file
+      # @return [Boolean] if this column is required to appear in the file
       def required?
         @opts[:required]
       end
 
-      #@return [Boolean] if values in this column need to be unique among all rows
-      #  in the file.
+      # @return [Boolean] if values in this column need to be unique among all
+      #   rows in the file.
       def unique?
         @opts[:unique]
       end
 
-      #@return [Boolean]
+      # @return [Boolean]
       def parser?
         parser != IDENTITY_PARSER
       end
 
       def to_s
-        opts = @opts.map do |key,value|
+        opts = @opts.map do |key, value|
           case value
-            when true then key
-            when false,nil then nil
-            else "#{key}=#{value}"
+          when true then key
+          when false, nil then nil
+          else "#{key}=#{value}"
           end
-        end.reject &:nil?
+        end.reject(&:nil?)
 
         opts << 'has_parser' if parser?
 

data/lib/gtfs_reader/config/defaults/gtfs_feed_definition.rb

@@ -15,36 +15,36 @@ module GtfsReader
             col :agency_name,     required: true
             col :agency_url,      required: true
             col :agency_timezone, required: true
-            col :agency_id,                       unique: true
+            col :agency_id, unique: true
             col :agency_lang
             col :agency_phone
             col :agency_fare_url
           end
 
           file :stops, required: true do
-            col :stop_id,       required: true, unique: true
+            col :stop_id, required: true, unique: true
             col :stop_code
-            col :stop_name,     required: true
+            col :stop_name, required: true
             col :stop_desc
             col :stop_lat,      required: true
             col :stop_lon,      required: true
             col :stop_url
             col :stop_timezone
             col :zone_id
-            col :location_type, &output_map( :stop, station: ?1 )
+            col :location_type, &output_map({ station: '1' }, :stop)
             col :parent_station
 
             col :wheelchair_boarding do |val|
               if parent_station
                 case val
-                when ?2 then :no
-                when ?1 then :yes
+                when '2' then :no
+                when '1' then :yes
                 else :inherit
                 end
               else
                 case val
-                when ?2 then :no_vehicles
-                when ?1 then :some_vehicles
+                when '2' then :no_vehicles
+                when '1' then :some_vehicles
                 else :unknown
                 end
               end
@@ -56,16 +56,17 @@ module GtfsReader
             col :route_short_name, required: true
             col :route_long_name,  required: true
             col :route_desc
-            col :route_type,       required: true,
-                &output_map(   :unknown,
-                               tram: ?0,
-                               subway: ?1,
-                               rail: ?2,
-                               bus: ?3,
-                               ferry: ?4,
-                               cable_car: ?5,
-                               gondola: ?6,
-                               funicular: ?7 )
+            col :route_type, required: true,
+                &output_map({
+                              tram: '0',
+                              subway: '1',
+                              rail: '2',
+                              bus: '3',
+                              ferry: '4',
+                              cable_car: '5',
+                              gondola: '6',
+                              funicular: '7'
+                            }, :unknown)
             col :route_url
             col :route_color
             col :route_text_color
@@ -73,17 +74,17 @@ module GtfsReader
           end
 
           file :trips, required: true do
-            col :trip_id,               required: true, unique: true
+            col :trip_id, required: true, unique: true
             col :trip_headsign
             col :trip_short_name
             col :trip_long_name
             col :route_id,              required: true
             col :service_id,            required: true
-            col :direction_id,          &output_map( primary: ?0, opposite: ?1 )
+            col :direction_id,          &output_map(primary: '0', opposite: '1')
             col :block_id
             col :shape_id
-            col :wheelchair_accessible, &output_map( :unknown, yes: ?1, no: ?2 )
-            col :bikes_allowed,         &output_map( :unknown, yes: ?1, no: ?2 )
+            col :wheelchair_accessible, &output_map({ yes: '1', no: '2' }, :unknown)
+            col :bikes_allowed,         &output_map({ yes: '1', no: '2' }, :unknown)
           end
 
           file :stop_times, required: true do
@@ -95,29 +96,31 @@ module GtfsReader
             col :stop_headsign
 
             col :pickup_type,
-              &output_map(    :regular,
-                                  none: ?1,
-                          phone_agency: ?2,
-                coordinate_with_driver: ?3 )
+                &output_map({
+                              none: '1',
+                              phone_agency: '2',
+                              coordinate_with_driver: '3'
+                            }, :regular)
 
             col :drop_off_type,
-              &output_map(    :regular,
-                                  none: ?1,
-                          phone_agency: ?2,
-                coordinate_with_driver: ?3 )
+                &output_map({
+                              none: '1',
+                              phone_agency: '2',
+                              coordinate_with_driver: '3'
+                            }, :regular)
 
             col :shape_dist_traveled
           end
 
           file :calendar, required: true do
             col :service_id, required: true, unique: true
-            col :monday,     required: true, &output_map( yes: ?1, no: ?0 )
-            col :tuesday,    required: true, &output_map( yes: ?1, no: ?0 )
-            col :wednesday,  required: true, &output_map( yes: ?1, no: ?0 )
-            col :thursday,   required: true, &output_map( yes: ?1, no: ?0 )
-            col :friday,     required: true, &output_map( yes: ?1, no: ?0 )
-            col :saturday,   required: true, &output_map( yes: ?1, no: ?0 )
-            col :sunday,     required: true, &output_map( yes: ?1, no: ?0 )
+            col :monday,     required: true, &output_map(yes: '1', no: '0')
+            col :tuesday,    required: true, &output_map(yes: '1', no: '0')
+            col :wednesday,  required: true, &output_map(yes: '1', no: '0')
+            col :thursday,   required: true, &output_map(yes: '1', no: '0')
+            col :friday,     required: true, &output_map(yes: '1', no: '0')
+            col :saturday,   required: true, &output_map(yes: '1', no: '0')
+            col :sunday,     required: true, &output_map(yes: '1', no: '0')
             col :start_date
             col :end_date
           end
@@ -126,7 +129,7 @@ module GtfsReader
             col :service_id,     required: true
             col :date,           required: true
             col :exception_type, required: true,
-              &output_map( added: ?1, removed: ?2 )
+                &output_map(added: '1', removed: '2')
           end
 
           file :fare_attributes do
@@ -134,14 +137,14 @@ module GtfsReader
             col :price,          required: true
             col :currency_type,  required: true
             col :payment_method, required: true,
-              &output_map( on_board: 0, before: 1 )
+                &output_map(on_board: 0, before: 1)
             col :transfers,      required: true,
-              &output_map( :unlimited, none: 0, once: 1, twice: 2 )
+                &output_map({ none: 0, once: 1, twice: 2 }, :unlimited)
             col :transfer_duration
           end
 
           file :fare_rules do
-            col :fare_id,        required: true
+            col :fare_id, required: true
             col :route_id
             col :origin_id
             col :destination_id
@@ -161,17 +164,18 @@ module GtfsReader
             col :start_time,   required: true
             col :end_time,     required: true
             col :headway_secs, required: true
-            col :exact_times,  &output_map( :inexact, exact: 1 )
+            col :exact_times,  &output_map({ exact: 1 }, :inexact)
           end
 
           file :transfers do
             col :from_stop_id,      required: true
             col :to_stop_id,        required: true
             col :transfer_type,     required: true,
-              &output_map( :recommended,
-                         timed_transfer: 1,
-                  minimum_time_required: 2,
-                             impossible: 3 )
+                &output_map({
+                              timed_transfer: 1,
+                              minimum_time_required: 2,
+                              impossible: 3
+                            }, :recommended)
             col :min_transfer_time
           end