gtfs_engine 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 146717ee9ac8cc7dc0455271478b5d37986f8d81
-  data.tar.gz: 67be5776653dad9d7d4038f30fe49606f4843199
+  metadata.gz: 3c96cba6580a01ef821cde544853c5660563e0fe
+  data.tar.gz: bcf29b2b98379dfdcf3066261e90368ece72adb1
 SHA512:
-  metadata.gz: 9cb0dd5b1904e1c456fc83635c9ae94c9d8483956967dbb603f0822a3317921151853360d016e95e961c70170d2f7cb2a9f2d46f393d8871fbc06c25e5ddff0a
-  data.tar.gz: c965696b02274443d77454c6c75aceff13d6d478fed0f0afe8e28900f5872bc992b91c410b3d45a1d7614ada5e6419229700b0e41436dcb2cd89303c559214a0
+  metadata.gz: b06887b3f22f3356dba09e22df4a5c29320beb1cd611613507849dd95f1bb28871f19b97163da11adadb0b48e7ecc232279a5b3968a3a22ffc50d3efb94491c5
+  data.tar.gz: a8e710faee5f1626b37a97c3123fda618b4ef17ac73be6da5f42c5053803299a5f1800bff140a89b40c33d10981237cf1c782223eba8e9aa8dae75c4690549ff

data/app/models/gtfs_engine/calendar.rb

@@ -16,8 +16,10 @@ module GtfsEngine
   class Calendar < ActiveRecord::Base
     belongs_to :data_set, inverse_of: :calendars
 
-    has_many :calendar_dates, inverse_of: :calendar, shared_key: :service_id
-    has_many :trips,          inverse_of: :calendar, shared_key: :service_id
+    has_many :calendar_dates, inverse_of: :calendar,
+             foreign_key: :service_id, primary_key: :service_id
+    has_many :trips,          inverse_of: :calendar,
+             foreign_key: :service_id, primary_key: :service_id
 
     has_many :routes, through: :trips
     has_many :shapes, through: :trips

data/app/models/gtfs_engine/calendar_date.rb

@@ -15,6 +15,7 @@
 module GtfsEngine
   class CalendarDate < ActiveRecord::Base
     belongs_to :data_set, inverse_of: :calendar_dates
-    belongs_to :calendar, inverse_of: :calendar_dates, shared_key: :service_id
+    belongs_to :calendar, inverse_of: :calendar_dates,
+               foreign_key: :service_id, primary_key: :service_id
   end
 end

data/app/models/gtfs_engine/fare_rule.rb

@@ -15,8 +15,10 @@
 module GtfsEngine
   class FareRule < ActiveRecord::Base
     belongs_to :data_set, inverse_of: :trips
-    belongs_to :fare_attribute, inverse_of: :fare_rules,   shared_key: :fare_id
-    belongs_to :route,          inverse_of: :fare_rules,   shared_key: :route_id
+    belongs_to :fare_attribute, inverse_of: :fare_rules,
+               foreign_key: :fare_id, primary_key: :fare_id
+    belongs_to :route,          inverse_of: :fare_rules,
+               foreign_key: :route_id, primary_key: :route_id
 
     with_options class_name: 'Stop', primary_key: :zone_id do |rule|
       rule.belongs_to :origin,      inverse_of: :origin_rules,

data/app/models/gtfs_engine/frequency.rb

@@ -15,6 +15,7 @@
 module GtfsEngine
   class Frequency < ActiveRecord::Base
     belongs_to :data_set, inverse_of: :frequencies
-    belongs_to :trip,     inverse_of: :frequencies, shared_key: :trip_id
+    belongs_to :trip,     inverse_of: :frequencies,
+               foreign_key: :trip_id, primary_key: :trip_id
   end
 end

data/app/models/gtfs_engine/route.rb

@@ -16,7 +16,8 @@ module GtfsEngine
   class Route < ActiveRecord::Base
     belongs_to :data_set, inverse_of: :routes
 
-    has_many :trips, inverse_of: :route, shared_key: :route_id
+    has_many :trips, inverse_of: :route,
+             foreign_key: :route_id, primary_key: :route_id
 
     has_many :calendars, through: :trips
     has_many :shapes,    through: :trips

data/app/models/gtfs_engine/shape.rb

@@ -15,6 +15,7 @@
 module GtfsEngine
   class Shape < ActiveRecord::Base
     belongs_to :data_set, inverse_of: :shapes
-    belongs_to :trip,     inverse_of: :shapes, shared_key: :shape_id
+    belongs_to :trip,     inverse_of: :shapes,
+               foreign_key: :shape_id, primary_key: :shape_id
   end
 end

data/app/models/gtfs_engine/stop.rb

@@ -16,7 +16,8 @@ module GtfsEngine
   class Stop < ActiveRecord::Base
     belongs_to :data_set, inverse_of: :stops
 
-    has_many :stop_time, inverse_of: :stop, shared_key: :stop_id
+    has_many :stop_time, inverse_of: :stop,
+             foreign_key: :stop_id, primary_key: :stop_id
 
     with_options foreign_key: :origin_id, primary_key: :zone_id do
       has_many :origin_rules,      inverse_of: :stop, class_name: 'fare_rule'

data/app/models/gtfs_engine/stop_time.rb

@@ -15,7 +15,9 @@
 module GtfsEngine
   class StopTime < ActiveRecord::Base
     belongs_to :data_set, inverse_of: :stop_times
-    belongs_to :trip,     inverse_of: :stop_times, shared_key: :trip_id
-    belongs_to :stop,     inverse_of: :stop_time,  shared_key: :stop_id
+    belongs_to :trip,     inverse_of: :stop_times,
+               foreign_key: :trip_id, primary_key: :trip_id
+    belongs_to :stop,     inverse_of: :stop_time,
+               foreign_key: :stop_id, primary_key: :stop_id
   end
 end

data/app/models/gtfs_engine/trip.rb

@@ -15,12 +15,17 @@
 module GtfsEngine
   class Trip < ActiveRecord::Base
     belongs_to :data_set, inverse_of: :trips
-    belongs_to :route,    inverse_of: :trips, shared_key: :route_id
-    belongs_to :calendar, inverse_of: :trips, shared_key: :service_id
+    belongs_to :route,    inverse_of: :trips,
+               foreign_key: :route_id, primary_key: :route_id
+    belongs_to :calendar, inverse_of: :trips,
+               foreign_key: :service_id, primary_key: :service_id
 
-    has_many :frequencies, inverse_of: :trip, shared_key: :trip_id
-    has_many :shapes,      inverse_of: :trip, shared_key: :shape_id
-    has_many :stop_times,  inverse_of: :trip, shared_key: :trip_id
+    has_many :frequencies, inverse_of: :trip,
+             foreign_key: :trip_id, primary_key: :trip_id
+    has_many :shapes,      inverse_of: :trip,
+             foreign_key: :shape_id, primary_key: :shape_id
+    has_many :stop_times,  inverse_of: :trip,
+             foreign_key: :trip_id, primary_key: :trip_id
 
     has_many :stops, through: :stop_times
   end

data/lib/gtfs_engine/version.rb

@@ -17,7 +17,7 @@ module GtfsEngine
     # The following four lines are generated, so don't mess with them.
     MAJOR = 1
     MINOR = 4
-    PATCH = 0
+    PATCH = 1
     BUILD = nil
 
     def self.to_s

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gtfs_engine
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Jon Sangster
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-07 00:00:00.000000000 Z
+date: 2014-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.1'
 - !ruby/object:Gem::Dependency
-  name: gtfs-reader
+  name: gtfs_reader
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: activerecord-import
   requirement: !ruby/object:Gem::Requirement
@@ -150,8 +150,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.2'
-description: 'Reads and parses zip files conforming to Google''s GTFS spec. GTFS Spec:
-  https://developers.google.com/transit/gtfs'
+description: 'A Rails Engine to provide a basic RESTful interface for GTFS feeds.
+  GTFS Spec: https://developers.google.com/transit/gtfs'
 email: jon@ertt.ca
 executables:
 - rails
@@ -202,7 +202,6 @@ files:
 - app/views/gtfs_engine/transfers/to.json.jsend
 - app/views/gtfs_engine/trips/block.json.jsend
 - bin/rails
-- config/initializers/extensions_loader.rb
 - config/routes.rb
 - db/migrate/20140320045108_create_gtfs_engine_data_sets.rb
 - db/migrate/20140320045232_create_gtfs_engine_calendars.rb
@@ -218,8 +217,6 @@ files:
 - db/migrate/20140406071922_create_gtfs_engine_frequencies.rb
 - db/migrate/20140406072309_create_gtfs_engine_transfers.rb
 - db/migrate/20140406073548_create_gtfs_engine_feed_infos.rb
-- lib/ext.rb
-- lib/ext/active_record/associations/association.rb
 - lib/gtfs_engine.rb
 - lib/gtfs_engine/concerns.rb
 - lib/gtfs_engine/concerns/controllers.rb

data/config/initializers/extensions_loader.rb

@@ -1,15 +0,0 @@
-# This file is part of the KNOWtime server.
-#
-# The KNOWtime server is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the Free
-# Software Foundation, either version 3 of the License, or (at your option) any
-# later version.
-#
-# The KNOWtime server is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-# details.
-#
-# You should have received a copy of the GNU General Public License
-# along with the KNOWtime server.  If not, see <http://www.gnu.org/licenses/>.
-require 'ext'

data/lib/ext.rb

@@ -1,19 +0,0 @@
-# This file is part of the KNOWtime server.
-#
-# The KNOWtime server is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the Free
-# Software Foundation, either version 3 of the License, or (at your option) any
-# later version.
-#
-# The KNOWtime server is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-# details.
-#
-# You should have received a copy of the GNU General Public License
-# along with the KNOWtime server.  If not, see <http://www.gnu.org/licenses/>.
-dir = File.dirname(__FILE__) + '/'
-
-Dir[dir + 'ext/**/*.rb'].each do |extension|
-  require extension[dir.length..-1]
-end

data/lib/ext/active_record/associations/association.rb

@@ -1,41 +0,0 @@
-# This file is part of the KNOWtime server.
-#
-# The KNOWtime server is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the Free
-# Software Foundation, either version 3 of the License, or (at your option) any
-# later version.
-#
-# The KNOWtime server is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-# details.
-#
-# You should have received a copy of the GNU General Public License
-# along with the KNOWtime server.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Many GTFS associations reference arbitrary fields in the referenced table.
-# This requires the use of the +primary_key:+ named parameter. Coincidentally,
-# the name of the +foreign_key:+ is often the same as the referenced field. As
-# a convenience, this file adds a +shared_key:+ named parameter which simply
-# sets these two parameters to the same value.
-module ActiveRecord
-  module Associations
-    class Association
-      def build_record_with_shared_key(attributes)
-        share_key attributes
-        build_record_without_shared_key attributes
-      end
-      alias_method_chain :build_record, :shared_key
-
-      private
-
-      def share_key(attributes)
-        h = attributes.last
-        if Hash === h and h.key? :shared_key
-          key = h.delete :shared_key
-          h.reverse_merge! foreign_key: key, primary_key: key
-        end
-      end
-    end
-  end
-end