gtfs-realtime 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e44b358f36ed58f6afb79e1ac3bcb293c94328c2
-  data.tar.gz: b4e95727479c1c8a9d75c497a82e53eed77ef44b
+  metadata.gz: 05148a6c6a4925c9072942c4ab6a57c1d8ddda4b
+  data.tar.gz: 072e0487c28f7f7ff2483bdeac72f006dc507f8a
 SHA512:
-  metadata.gz: 651b28031192650142b967199e5b10f8065fde6dcf36391296bc3c10e1d1e6cdc37f91974152c91ca46ff8a953773fa5a87ad7f4cb938d6b8e40890edc07af32
-  data.tar.gz: f9e588907904be93a52d4ba7825818633af9d95c3d9cb367cfc8fd9f9bda0cb712e450950a342ec42e01097a9298b941a6d29756cec6f5e9d6327e28e4b338e4
+  metadata.gz: c2bd4c6f34c66db13ddc5eb56f27aa7238c1dc68208ce8a7ba027fb542b1b907539ebef06fccc7b042450361a2ae15e486f64183e4eca6caabf900711ca7b7e2
+  data.tar.gz: 29ec92ae65ecbef01d633610eea3594669a32510985089f8e7675f9b82acdf37dd7b2953f3e11cfe9683eed5bf1b944df55f0ca0247e1171fb707b6ca64e80a0

data/bin/console

@@ -2,13 +2,22 @@
 
 require "bundler/setup"
 require "gtfs/realtime"
+require "sqlite3"
 
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
+# Load the RIPTA feed as an example, with a sqlite3 database
+GTFS::Realtime.configure do |config|
+  config.static_feed = "http://www.ripta.com/googledata/current/google_transit.zip"
+  config.trip_updates_feed = "http://realtime.ripta.com:81/api/tripupdates"
+  config.vehicle_positions_feed = "http://realtime.ripta.com:81/api/vehiclepositions"
+  config.service_alerts_feed = "http://realtime.ripta.com:81/api/servicealerts"
+  config.database_path = "sqlite://database.db"
+end
 
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
+def reload!
+  files = $LOADED_FEATURES.select { |feat| feat =~ /\/gtfs-realtime\// }
+  files.each { |file| load file }
+  GTFS::Realtime.refresh_realtime_feed!
+end
 
 require "irb"
 IRB.start

data/gtfs-realtime.gemspec

@@ -23,11 +23,11 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.13"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "webmock"
 
   spec.add_dependency "gtfs-realtime-bindings"
   spec.add_dependency "gtfs"
   spec.add_dependency "sequel"
-  spec.add_dependency "sqlite3"
 end

data/lib/gtfs/realtime.rb

@@ -1,24 +1,8 @@
 require "google/transit/gtfs-realtime.pb"
 require "gtfs"
 require "sequel"
-require "sqlite3"
 
-# we must load our Sequel DB schema first
-require "gtfs/realtime/database"
-
-require "gtfs/gtfs_gem_patch"
-require "gtfs/realtime/calendar_date"
 require "gtfs/realtime/configuration"
-require "gtfs/realtime/route"
-require "gtfs/realtime/service_alert"
-require "gtfs/realtime/shape"
-require "gtfs/realtime/stop"
-require "gtfs/realtime/stop_time"
-require "gtfs/realtime/stop_time_update"
-require "gtfs/realtime/trip"
-require "gtfs/realtime/trip_update"
-require "gtfs/realtime/vehicle_position"
-require "gtfs/realtime/version"
 
 module GTFS
   class Realtime
@@ -36,165 +20,6 @@ module GTFS
         load_static_feed!
         refresh_realtime_feed!
       end
-
-      def load_static_feed!(force: false)
-        return if !force && GTFS::Realtime::Route.count > 0
-
-        static_data = GTFS::Source.build(@configuration.static_feed)
-        return unless static_data
-
-        GTFS::Realtime::Model.db.transaction do
-          GTFS::Realtime::CalendarDate.dataset.delete
-          GTFS::Realtime::CalendarDate.multi_insert(
-            static_data.calendar_dates.collect do |calendar_date|
-              {
-                service_id: calendar_date.service_id.strip,
-                date: Date.strptime(calendar_date.date, "%Y%m%d"),
-                exception_type: calendar_date.exception_type
-              }
-            end
-          )
-
-          GTFS::Realtime::Route.dataset.delete
-          GTFS::Realtime::Route.multi_insert(
-            static_data.routes.collect do |route|
-              {
-                id: route.id.strip,
-                short_name: route.short_name,
-                long_name: route.long_name,
-                url: route.url
-              }
-            end
-          )
-
-          GTFS::Realtime::Shape.dataset.delete
-          GTFS::Realtime::Shape.multi_insert(
-            static_data.shapes.collect do |shape|
-              {
-                id: shape.id.strip,
-                sequence: shape.pt_sequence,
-                latitude: shape.pt_lat.to_f,
-                longitude: shape.pt_lon.to_f
-              }
-            end
-          )
-
-          GTFS::Realtime::Stop.dataset.delete
-          GTFS::Realtime::Stop.multi_insert(
-            static_data.stops.collect do |stop|
-              {
-                id: stop.id.strip,
-                name: stop.name,
-                latitude: stop.lat.to_f,
-                longitude: stop.lon.to_f
-              }
-            end
-          )
-
-          GTFS::Realtime::StopTime.dataset.delete
-          GTFS::Realtime::StopTime.multi_insert(
-            static_data.stop_times.collect do |stop_time|
-              {
-                stop_id: stop_time.stop_id.strip,
-                trip_id: stop_time.trip_id.strip,
-                arrival_time: stop_time.arrival_time,
-                departure_time: stop_time.departure_time,
-                stop_sequence: stop_time.stop_sequence.to_i
-              }
-            end
-          )
-
-          GTFS::Realtime::Trip.dataset.delete
-          GTFS::Realtime::Trip.multi_insert(
-            static_data.trips.collect do |trip|
-              {
-                id: trip.id.strip,
-                headsign: trip.headsign.strip,
-                route_id: trip.route_id.strip,
-                service_id: trip.service_id.strip,
-                shape_id: trip.shape_id.strip,
-                direction_id: trip.direction_id
-              }
-            end
-          )
-        end
-      end
-
-      def refresh_realtime_feed!
-        trip_updates = get_entities(@configuration.trip_updates_feed)
-        vehicle_positions = get_entities(@configuration.vehicle_positions_feed)
-        service_alerts = get_entities(@configuration.service_alerts_feed)
-
-        GTFS::Realtime::Model.db.transaction do
-          GTFS::Realtime::TripUpdate.dataset.delete
-          GTFS::Realtime::TripUpdate.multi_insert(
-            trip_updates.collect do |trip_update|
-              {
-                id: trip_update.id.strip,
-                trip_id: trip_update.trip_update.trip.trip_id.strip,
-                route_id: trip_update.trip_update.trip.route_id.strip
-              }
-            end
-          )
-
-          GTFS::Realtime::StopTimeUpdate.dataset.delete
-          GTFS::Realtime::StopTimeUpdate.multi_insert(
-            trip_updates.collect do |trip_update|
-              trip_update.trip_update.stop_time_update.collect do |stop_time_update|
-                {
-                  trip_update_id: trip_update.id.strip,
-                  stop_id: stop_time_update.stop_id.strip,
-                  arrival_delay: stop_time_update.arrival ? stop_time_update.arrival.delay : nil,
-                  arrival_time: stop_time_update.arrival ? stop_time_update.arrival.time : nil,
-                  departure_delay: stop_time_update.departure ? stop_time_update.departure.delay : nil,
-                  departure_time: stop_time_update.departure ? stop_time_update.departure.time : nil,
-                }
-              end
-            end.flatten
-          )
-
-          GTFS::Realtime::VehiclePosition.dataset.delete
-          GTFS::Realtime::VehiclePosition.multi_insert(
-            vehicle_positions.collect do |vehicle|
-              {
-                trip_id: vehicle.vehicle.trip.trip_id.strip,
-                stop_id: vehicle.vehicle.stop_id.strip,
-                latitude: vehicle.vehicle.position.latitude.to_f,
-                longitude: vehicle.vehicle.position.longitude.to_f,
-                bearing: vehicle.vehicle.position.bearing.to_f,
-                timestamp: vehicle.vehicle.timestamp
-              }
-            end
-          )
-
-          GTFS::Realtime::ServiceAlert.dataset.delete
-          GTFS::Realtime::ServiceAlert.multi_insert(
-            service_alerts.collect do |service_alert|
-              {
-                stop_id: service_alert.alert.informed_entity.first.stop_id.strip,
-                header_text: service_alert.alert.header_text.translation.first.text,
-                description_text: service_alert.alert.description_text.translation.first.text,
-                start_time: service_alert.alert.active_period.first.start,
-                end_time: service_alert.alert.active_period.first.end
-              }
-            end
-          )
-        end
-      end
-
-      private
-
-      def get_entities(path)
-        return [] if path.nil?
-
-        if File.exists?(path)
-          data = File.open(path, 'r'){|f| f.read}
-        else
-          data = Net::HTTP.get(URI.parse(path))
-        end
-        feed = Transit_realtime::FeedMessage.decode(data)
-        feed.entity   # array of entities
-      end
     end
   end
 end

data/lib/gtfs/realtime/bootstrap.rb

@@ -0,0 +1,178 @@
+require "gtfs/gtfs_gem_patch"
+require "gtfs/realtime/calendar_date"
+require "gtfs/realtime/route"
+require "gtfs/realtime/service_alert"
+require "gtfs/realtime/shape"
+require "gtfs/realtime/stop"
+require "gtfs/realtime/stop_time"
+require "gtfs/realtime/stop_time_update"
+require "gtfs/realtime/trip"
+require "gtfs/realtime/trip_update"
+require "gtfs/realtime/vehicle_position"
+require "gtfs/realtime/version"
+
+module GTFS
+  class Realtime
+    # This is a singleton object, so everything will be on the class level
+    class << self
+      def load_static_feed!(force: false)
+        return if !force && GTFS::Realtime::Route.count > 0
+
+        static_data = GTFS::Source.build(@configuration.static_feed)
+        return unless static_data
+
+        GTFS::Realtime::Model.db.transaction do
+          GTFS::Realtime::CalendarDate.dataset.delete
+          GTFS::Realtime::CalendarDate.multi_insert(
+            static_data.calendar_dates.collect do |calendar_date|
+              {
+                service_id: calendar_date.service_id.strip,
+                date: Date.strptime(calendar_date.date, "%Y%m%d"),
+                exception_type: calendar_date.exception_type
+              }
+            end
+          )
+
+          GTFS::Realtime::Route.dataset.delete
+          GTFS::Realtime::Route.multi_insert(
+            static_data.routes.collect do |route|
+              {
+                id: route.id.strip,
+                short_name: route.short_name,
+                long_name: route.long_name,
+                url: route.url
+              }
+            end
+          )
+
+          GTFS::Realtime::Shape.dataset.delete
+          GTFS::Realtime::Shape.multi_insert(
+            static_data.shapes.collect do |shape|
+              {
+                id: shape.id.strip,
+                sequence: shape.pt_sequence,
+                latitude: shape.pt_lat.to_f,
+                longitude: shape.pt_lon.to_f
+              }
+            end
+          )
+
+          GTFS::Realtime::Stop.dataset.delete
+          GTFS::Realtime::Stop.multi_insert(
+            static_data.stops.collect do |stop|
+              {
+                id: stop.id.strip,
+                name: stop.name.strip,
+                latitude: stop.lat.to_f,
+                longitude: stop.lon.to_f
+              }
+            end
+          )
+
+          GTFS::Realtime::StopTime.dataset.delete
+          GTFS::Realtime::StopTime.multi_insert(
+            static_data.stop_times.collect do |stop_time|
+              {
+                stop_id: stop_time.stop_id.strip,
+                trip_id: stop_time.trip_id.strip,
+                arrival_time: stop_time.arrival_time,
+                departure_time: stop_time.departure_time,
+                stop_sequence: stop_time.stop_sequence.to_i
+              }
+            end
+          )
+
+          GTFS::Realtime::Trip.dataset.delete
+          GTFS::Realtime::Trip.multi_insert(
+            static_data.trips.collect do |trip|
+              {
+                id: trip.id.strip,
+                headsign: trip.headsign.strip,
+                route_id: trip.route_id.strip,
+                service_id: trip.service_id.strip,
+                shape_id: trip.shape_id.strip,
+                direction_id: trip.direction_id
+              }
+            end
+          )
+        end
+      end
+
+      def refresh_realtime_feed!
+        trip_updates = get_entities(@configuration.trip_updates_feed)
+        vehicle_positions = get_entities(@configuration.vehicle_positions_feed)
+        service_alerts = get_entities(@configuration.service_alerts_feed)
+
+        GTFS::Realtime::Model.db.transaction do
+          GTFS::Realtime::TripUpdate.dataset.delete
+          GTFS::Realtime::TripUpdate.multi_insert(
+            trip_updates.collect do |trip_update|
+              {
+                id: trip_update.id.strip,
+                trip_id: trip_update.trip_update.trip.trip_id.strip,
+                route_id: trip_update.trip_update.trip.route_id.strip
+              }
+            end
+          )
+
+          GTFS::Realtime::StopTimeUpdate.dataset.delete
+          GTFS::Realtime::StopTimeUpdate.multi_insert(
+            trip_updates.collect do |trip_update|
+              trip_update.trip_update.stop_time_update.collect do |stop_time_update|
+                {
+                  trip_update_id: trip_update.id.strip,
+                  stop_id: stop_time_update.stop_id.strip,
+                  arrival_delay: stop_time_update.arrival ? stop_time_update.arrival.delay : nil,
+                  arrival_time: stop_time_update.arrival ? Time.at(stop_time_update.arrival.time) : nil,
+                  departure_delay: stop_time_update.departure ? stop_time_update.departure.delay : nil,
+                  departure_time: stop_time_update.departure ? Time.at(stop_time_update.departure.time) : nil,
+                }
+              end
+            end.flatten
+          )
+
+          GTFS::Realtime::VehiclePosition.dataset.delete
+          GTFS::Realtime::VehiclePosition.multi_insert(
+            vehicle_positions.collect do |vehicle|
+              {
+                trip_id: vehicle.vehicle.trip.trip_id.strip,
+                stop_id: vehicle.vehicle.stop_id.strip,
+                latitude: vehicle.vehicle.position.latitude.to_f,
+                longitude: vehicle.vehicle.position.longitude.to_f,
+                bearing: vehicle.vehicle.position.bearing.to_f,
+                timestamp: Time.at(vehicle.vehicle.timestamp)
+              }
+            end
+          )
+
+          GTFS::Realtime::ServiceAlert.dataset.delete
+          GTFS::Realtime::ServiceAlert.multi_insert(
+            service_alerts.collect do |service_alert|
+              {
+                stop_id: service_alert.alert.informed_entity.first.stop_id.strip,
+                header_text: service_alert.alert.header_text.translation.first.text,
+                description_text: service_alert.alert.description_text.translation.first.text,
+                start_time: Time.at(service_alert.alert.active_period.first.start),
+                end_time: Time.at(service_alert.alert.active_period.first.end)
+              }
+            end
+          )
+        end
+      end
+
+      private
+
+      def get_entities(path)
+        return [] if path.nil?
+
+        if File.exists?(path)
+          data = File.open(path, 'r'){|f| f.read}
+        else
+          data = Net::HTTP.get(URI.parse(path))
+        end
+        feed = Transit_realtime::FeedMessage.decode(data)
+        feed.entity   # array of entities
+      end
+    end
+  end
+end

data/lib/gtfs/realtime/configuration.rb

@@ -6,8 +6,12 @@ module GTFS
       def database_path=(new_path)
         @database_path = new_path
 
-        # reinitialize the database with the new path
+        # now that we know the DB path, we can initialize the database
+        require 'gtfs/realtime/database'
         GTFS::Realtime::Database.path = database_path
+
+        # now that we have a database, initialize all the other models
+        require 'gtfs/realtime/bootstrap'
       end
     end
   end

data/lib/gtfs/realtime/database.rb

@@ -14,12 +14,10 @@ module GTFS
 
           # Set up all database tables
           db.create_table? :gtfs_realtime_calendar_dates do
-            Integer :id, primary_key: true
             String :service_id
             Date :date
             Integer :exception_type
 
-            index :id
             index :service_id
           end
 
@@ -35,8 +33,8 @@ module GTFS
           db.create_table? :gtfs_realtime_shapes do
             String :id
             Integer :sequence
-            Double :latitude
-            Double :longitude
+            Float :latitude
+            Float :longitude
 
             index :id
           end
@@ -44,8 +42,8 @@ module GTFS
           db.create_table? :gtfs_realtime_stops do
             String :id, primary_key: true
             String :name
-            Double :latitude
-            Double :longitude
+            Float :latitude
+            Float :longitude
 
             index :id
           end
@@ -96,9 +94,9 @@ module GTFS
           db.create_table? :gtfs_realtime_vehicle_positions do
             String :trip_id
             String :stop_id
-            Double :latitude
-            Double :longitude
-            Double :bearing
+            Float :latitude
+            Float :longitude
+            Float :bearing
             Time :timestamp
 
             index :trip_id
@@ -129,14 +127,10 @@ module GTFS
   end
 end
 
-# If we have not defined our model parent class yet, initialize it. Before we can
-# load any other model files, we must have some sort of database set up, so we
-# use an in-memory database for now. Later on, we can change this if we wish by
-# setting `database_path` in a `GTFS::Realtime.configure` block.
+# If we have not defined our model parent class yet, initialize it.
 if !defined?(GTFS::Realtime::Model)
   GTFS::Realtime::Model = Class.new(Sequel::Model)
   GTFS::Realtime::Model.plugin :many_through_many
-  GTFS::Realtime::Database.path = nil
 
   class GTFS::Realtime::Model
     def self.implicit_table_name

data/lib/gtfs/realtime/nearby.rb

@@ -1,14 +1,26 @@
 module GTFS
   class Realtime
     module Nearby
-      def nearby(latitude, longitude)
-        # TODO: this math is terrible! It'll fail for various edge cases.
-        # (e.g. close to the poles, overlapping to the prime meridian)
-        # That said, it's an okay approximation within the United States.
+      def self.included(base)
+        base.send :include, InstanceMethods
+        base.extend ClassMethods
+      end
+
+      module InstanceMethods
+        def distance(latitude, longitude)
+          Math::sqrt((latitude - self.latitude)**2 + (longitude - self.longitude)**2)
+        end
+      end
+
+      module ClassMethods
+        def nearby(latitude, longitude)
+          # TODO: this math is terrible! It'll fail for various edge cases.
+          # (e.g. close to the poles, overlapping to the prime meridian)
+          # That said, it's an okay approximation away from the poles/meridian.
 
-        all.select do |stop|
-          (stop.latitude - latitude).abs < 0.01 &&
-            (stop.longitude - longitude).abs < 0.01
+          all.select do |item|
+            item.distance(latitude, longitude) < 0.01
+          end
         end
       end
     end

data/lib/gtfs/realtime/stop.rb

@@ -3,7 +3,7 @@ require "gtfs/realtime/nearby"
 module GTFS
   class Realtime
     class Stop < GTFS::Realtime::Model
-      extend GTFS::Realtime::Nearby
+      include GTFS::Realtime::Nearby
 
       one_to_many :service_alerts
       one_to_many :stop_times

data/lib/gtfs/realtime/vehicle_position.rb

@@ -3,7 +3,7 @@ require "gtfs/realtime/nearby"
 module GTFS
   class Realtime
     class VehiclePosition < GTFS::Realtime::Model
-      extend GTFS::Realtime::Nearby
+      include GTFS::Realtime::Nearby
 
       many_to_one :stop
       many_to_one :trip

data/lib/gtfs/realtime/version.rb

@@ -1,5 +1,5 @@
 module GTFS
   class Realtime
-    VERSION = "0.2.3"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gtfs-realtime
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Ryan Laughlin
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -108,20 +122,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: A gem to interact with realtime transit data presented in the GTFS Realtime
   format (https://developers.google.com/transit/gtfs-realtime/).
 email:
@@ -143,6 +143,7 @@ files:
 - gtfs-realtime.gemspec
 - lib/gtfs/gtfs_gem_patch.rb
 - lib/gtfs/realtime.rb
+- lib/gtfs/realtime/bootstrap.rb
 - lib/gtfs/realtime/calendar_date.rb
 - lib/gtfs/realtime/configuration.rb
 - lib/gtfs/realtime/database.rb