gtfs-realtime 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fdb5edf2bf700f13409ea826f59a78ebdd045ec
-  data.tar.gz: fe85177c932f143c406a0dab22619d4d91fdeadc
+  metadata.gz: 93c88ec86fdf9817120942d1a1d303a3713a96d9
+  data.tar.gz: 37da22bb5fb75d046689dcd1154f15b062e53f8b
 SHA512:
-  metadata.gz: 4266033628d5877f08e56b930a6856d000ae748724d42ec775dd95fef2c8375517e3ddf0639354ff08c898ab858dc5996a5afba68b96826b77d8e6d1894c3217
-  data.tar.gz: 52c2d5ec317e55cf9d496c2944277e860b6638d09e2f937a147142266c0ef73876f2c32ebc918ed2d910cff20f9ffb266ceee9080d7b1eecc5553d76e0d72ad8
+  metadata.gz: 390cab27e23ef7f3adbf72be6dc1d73fd22008ca324e13b13275d5c976bb4a6ae7c57207faa6928e4ceb43b51c5816a9bd9dee684893bd5d0f6c827c7a928dcc
+  data.tar.gz: 5620d60d1f92ec842935d7e310e2ca6d9a42f4bba2ddf5e8867b3a254c76badb2333026d5dde52a6f2a4d53c74023f841c0905e289e864167930aa57b0118413

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+TODO

data/README.md

@@ -26,17 +26,19 @@ Basic functionality currently works like this:
 require 'gtfs-realtime'
 
 GTFS::Realtime.configure do |config|
-  config.static_feed = "http://www.ripta.com/googledata/current/google_transit.zip"
+  config.static_feed = "http://www.ripta.com/googledata/current/google_transit.zip"   # File path or URL
   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"    # leave unset to use an in-memory database
 end
 
 # After calling 'configure', the gem loads all relevant GTFS info into a database.
 # This may take some time (up to a minute) depending on the size of the input data.
 # By default, gtfs-realtime uses an in-memory database, which requires reloading all
 # data from scratch on each launch. If you'd like to use a persistent database instead,
-# set the 'GTFS_DATABASE_PATH' environment variable, and a SQLite DB will be generated.
+# set 'config.database_path' above, and include a scheme/protocol path for the DB type
+# that you would like to use. gtfs-realtime will generate the relevant tables.
 
 @nearby = GTFS::Realtime::Stop.nearby(41.834521, -71.396906)
 stop = @nearby.first

data/lib/gtfs/realtime.rb

@@ -4,12 +4,13 @@ require "sequel"
 require "sqlite3"
 
 # we must load our Sequel DB schema first
-require "gtfs/realtime/db_schema"
+require "gtfs/realtime/database"
 
 require "gtfs/gtfs_gem_patch"
 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"
@@ -53,6 +54,18 @@ module GTFS
             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|
@@ -90,8 +103,6 @@ module GTFS
               }
             end
           )
-
-          # TODO: load shapes
         end
       end
 

data/lib/gtfs/realtime/configuration.rb

@@ -1,7 +1,14 @@
 module GTFS
   class Realtime
     class Configuration
-      attr_accessor :static_feed, :trip_updates_feed, :vehicle_positions_feed, :service_alerts_feed
+      attr_accessor :static_feed, :trip_updates_feed, :vehicle_positions_feed, :service_alerts_feed, :database_path
+
+      def database_path=(new_path)
+        @database_path = new_path
+
+        # reinitialize the database with the new path
+        GTFS::Realtime::Database.path = database_path
+      end
     end
   end
 end

data/lib/gtfs/realtime/database.rb

@@ -0,0 +1,135 @@
+module GTFS
+  class Realtime
+    class Database
+      class << self
+        attr_writer :database_path
+
+        def path=(new_path)
+          @path = new_path
+
+          # This script sets up an in-memory DB so that it can be used by this gem.
+          # It also extends Sequel::Model so that Sequel may be used independently by
+          # the parent project if desired.
+          db = Sequel.connect(new_path || "sqlite://")
+
+          # Set up all database tables
+          db.create_table? :gtfs_realtime_routes do
+            String :id, primary_key: true
+            String :short_name
+            String :long_name
+            String :url
+
+            index :id
+          end
+
+          db.create_table? :gtfs_realtime_shapes do
+            String :id
+            Integer :sequence
+            Double :latitude
+            Double :longitude
+
+            index :id
+          end
+
+          db.create_table? :gtfs_realtime_stops do
+            String :id, primary_key: true
+            String :name
+            Double :latitude
+            Double :longitude
+
+            index :id
+          end
+
+          db.create_table? :gtfs_realtime_stop_times do
+            String :trip_id
+            String :stop_id
+            String :arrival_time
+            String :departure_time
+            Integer :stop_sequence
+
+            index :trip_id
+            index :stop_id
+          end
+
+          db.create_table? :gtfs_realtime_trips do
+            String :id, primary_key: true
+            String :headsign
+            String :route_id
+            String :service_id
+            String :shape_id
+
+            index :id
+            index :route_id
+          end
+
+          db.create_table? :gtfs_realtime_trip_updates do
+            String :id, primary_key: true
+            String :trip_id
+            String :route_id
+
+            index :id
+          end
+
+          db.create_table? :gtfs_realtime_stop_time_updates do
+            String :trip_update_id
+            String :stop_id
+            Integer :arrival_delay
+            Time :arrival_time
+            Integer :departure_delay
+            Time :departure_time
+
+            index :trip_update_id
+            index :stop_id
+          end
+
+          db.create_table? :gtfs_realtime_vehicle_positions do
+            String :trip_id
+            String :stop_id
+            Double :latitude
+            Double :longitude
+            Double :bearing
+            Time :timestamp
+
+            index :trip_id
+            index :stop_id
+          end
+
+          db.create_table? :gtfs_realtime_service_alerts do
+            String :stop_id
+            String :header_text
+            Text :description_text
+            Time :start_time
+            Time :end_time
+
+            index :stop_id
+          end
+
+          # Set up all gtfs-realtime models to use this database
+          model_classes.each do |model_class|
+            model_class.db = db
+          end
+        end
+
+        def model_classes
+          ObjectSpace.each_object(::Class).select{|klass| klass <= GTFS::Realtime::Model}
+        end
+      end
+    end
+  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 !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
+      "gtfs_realtime_#{super}".to_sym
+    end
+  end
+end

data/lib/gtfs/realtime/shape.rb

@@ -0,0 +1,14 @@
+module GTFS
+  class Realtime
+    class Shape < GTFS::Realtime::Model
+      dataset_module do
+        def ordered_by_sequence
+          order(:sequence)
+        end
+      end
+
+      # order results by sequence by default
+      set_dataset(self.ordered_by_sequence)
+    end
+  end
+end

data/lib/gtfs/realtime/version.rb

@@ -1,5 +1,5 @@
 module GTFS
   class Realtime
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gtfs-realtime
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Ryan Laughlin
@@ -130,10 +130,11 @@ files:
 - lib/gtfs/gtfs_gem_patch.rb
 - lib/gtfs/realtime.rb
 - lib/gtfs/realtime/configuration.rb
-- lib/gtfs/realtime/db_schema.rb
+- lib/gtfs/realtime/database.rb
 - lib/gtfs/realtime/nearby.rb
 - lib/gtfs/realtime/route.rb
 - lib/gtfs/realtime/service_alert.rb
+- lib/gtfs/realtime/shape.rb
 - lib/gtfs/realtime/stop.rb
 - lib/gtfs/realtime/stop_time.rb
 - lib/gtfs/realtime/stop_time_update.rb

data/lib/gtfs/realtime/db_schema.rb

@@ -1,92 +0,0 @@
-# This script sets up an in-memory DB so that it can be used by this gem.
-# It also extends Sequel::Model so that Sequel may be used independently by
-# the parent project if desired.
-db = Sequel.sqlite(ENV["GTFS_DATABASE_PATH"])
-
-# Set up all database tables
-db.create_table? :routes do
-  String :id, primary_key: true
-  String :short_name
-  String :long_name
-  String :url
-
-  index :id
-end
-
-db.create_table? :stops do
-  String :id, primary_key: true
-  String :name
-  Double :latitude
-  Double :longitude
-
-  index :id
-end
-
-db.create_table? :stop_times do
-  String :trip_id
-  String :stop_id
-  String :arrival_time
-  String :departure_time
-  Integer :stop_sequence
-
-  index :trip_id
-  index :stop_id
-end
-
-db.create_table? :trips do
-  String :id, primary_key: true
-  String :headsign
-  String :route_id
-  String :service_id
-  String :shape_id
-
-  index :id
-  index :route_id
-end
-
-db.create_table? :trip_updates do
-  String :id, primary_key: true
-  String :trip_id
-  String :route_id
-
-  index :id
-end
-
-db.create_table? :stop_time_updates do
-  String :trip_update_id
-  String :stop_id
-  Integer :arrival_delay
-  Time :arrival_time
-  Integer :departure_delay
-  Time :departure_time
-
-  index :trip_update_id
-  index :stop_id
-end
-
-db.create_table? :vehicle_positions do
-  String :trip_id
-  String :stop_id
-  Double :latitude
-  Double :longitude
-  Double :bearing
-  Time :timestamp
-
-  index :trip_id
-  index :stop_id
-end
-
-db.create_table? :service_alerts do
-  String :stop_id
-  String :header_text
-  Text :description_text
-  Time :start_time
-  Time :end_time
-
-  index :stop_id
-end
-
-# Set up all gtfs-realtime models to use this database
-GTFS::Realtime::Model = Class.new(Sequel::Model)
-GTFS::Realtime::Model.db = db
-GTFS::Realtime::Model.plugin :many_through_many