gtfs_engine 1.5.3 → 2.0.0

data/app/helpers/gtfs_engine/default_views_helper.rb

@@ -1,31 +1,18 @@
-# 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/>.
+# frozen_string_literal: true
+
 module GtfsEngine
   module DefaultViewsHelper
     def index(json, records)
-      json.cache! [controller_name, filter] do
-        json.ignore_nil! true
-        json.array!(records) {|record| json.extract! record, *fields }
+      json.cache!([controller_name, filter]) do
+        json.ignore_nil!(true)
+        json.array!(records) { |record| json.extract!(record, *fields) }
       end
     end
 
-
     def show(json, record)
-      json.cache! record do
-        json.ignore_nil! true
-        json.extract! record, *fields
+      json.cache!(record) do
+        json.ignore_nil!(true)
+        json.extract!(record, *fields)
       end
     end
   end

data/app/helpers/gtfs_engine/fields_helper.rb

@@ -1,17 +1,5 @@
-# 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/>.
+# frozen_string_literal: true
+
 module GtfsEngine
   module FieldsHelper
     def fields
@@ -26,7 +14,7 @@ module GtfsEngine
 
     def create_fields
       attributes = GtfsEngine.const_get(model).attribute_names
-      attributes - %w(id data_set_id)
+      attributes - %w[id data_set_id]
     end
   end
 end

data/app/models/gtfs_engine/agency.rb

@@ -1,19 +1,7 @@
-# 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/>.
+# frozen_string_literal: true
+
 module GtfsEngine
   class Agency < ActiveRecord::Base
-    belongs_to :data_set, inverse_of: :agencies
+    belongs_to :data_set, optional: false
   end
 end

data/app/models/gtfs_engine/calendar.rb

@@ -1,32 +1,17 @@
-# 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/>.
+# frozen_string_literal: true
+
 module GtfsEngine
   class Calendar < ActiveRecord::Base
-    belongs_to :data_set, inverse_of: :calendars
+    belongs_to :data_set, optional: false
 
-    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 :calendar_dates, foreign_key: :service_id, primary_key: :service_id
+    has_many :trips, foreign_key: :service_id, primary_key: :service_id
 
     has_many :routes, through: :trips
     has_many :shapes, through: :trips
 
     alias_attribute :dates, :calendar_dates
 
-
     class << self
       # @return <ActiveRecord_Relation> the set of Calendars that include the
       #   given date.
@@ -35,22 +20,22 @@ module GtfsEngine
       #
       # TODO: Currently, this method does 3 SQL queries. Try to lower this.
       def from_date_string(date)
-        dates = GtfsEngine::CalendarDate.where date: date
+        dates = GtfsEngine::CalendarDate.where(date: date)
 
-        add = dates.where(exception_type: 1).pluck :service_id
+        add = dates.where(exception_type: 1).pluck(:service_id)
         query =
           if add.any?
-            where '((start_date <= :date AND end_date >= :date)
-                   OR service_id IN (:ids)', date: date, ids: add
+            where('((start_date <= :date AND end_date >= :date)
+                   OR service_id IN (:ids)', date: date, ids: add)
           else
-            where '(start_date <= :date AND end_date >= :date)', date: date
+            where('(start_date <= :date AND end_date >= :date)', date: date)
           end
 
-        query = where_day_of_week query, date
+        query = where_day_of_week(query, date)
 
-        rem = dates.where(exception_type: 2).pluck :service_id
+        rem = dates.where(exception_type: 2).pluck(:service_id)
         if rem.any?
-          query.where '(service_id NOT IN (?))', rem
+          query.where('(service_id NOT IN (?))', rem)
         else
           query
         end
@@ -61,19 +46,17 @@ module GtfsEngine
       # Modifies the given query to only matches the day of the week represented
       # by the given date (format: YYYY-MM-DD)
       def where_day_of_week(query, date_str)
-        case Date.new( *date_str.split('-').map(&:to_i) ).cwday
-        when 1 then query.where monday:    true
-        when 2 then query.where tuesday:   true
-        when 3 then query.where wednesday: true
-        when 4 then query.where thursday:  true
-        when 5 then query.where friday:    true
-        when 6 then query.where saturday:  true
-        else        query.where sunday:    true
+        case Date.new(*date_str.split('-').map(&:to_i)).cwday
+        when 1 then query.where(monday:    true)
+        when 2 then query.where(tuesday:   true)
+        when 3 then query.where(wednesday: true)
+        when 4 then query.where(thursday:  true)
+        when 5 then query.where(friday:    true)
+        when 6 then query.where(saturday:  true)
+        else        query.where(sunday:    true)
         end
       end
-
     end
-
   end
 
   DateFormatError = Class.new StandardError

data/app/models/gtfs_engine/calendar_date.rb

@@ -1,21 +1,9 @@
-# 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/>.
+# frozen_string_literal: true
+
 module GtfsEngine
   class CalendarDate < ActiveRecord::Base
-    belongs_to :data_set, inverse_of: :calendar_dates
-    belongs_to :calendar, inverse_of: :calendar_dates,
-               foreign_key: :service_id, primary_key: :service_id
+    belongs_to :data_set, optional: false
+    belongs_to :calendar, optional: false,
+                          foreign_key: :service_id, primary_key: :service_id
   end
 end

data/app/models/gtfs_engine/data_set.rb

@@ -1,38 +1,26 @@
-# 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/>.
+# frozen_string_literal: true
+
 module GtfsEngine
   class DataSet < ActiveRecord::Base
-    with_options inverse_of: :data_set, dependent: :delete_all do |set|
-      set.has_many :agencies
-      set.has_many :calendars
-      set.has_many :calendar_dates
-      set.has_many :fare_attributes
-      set.has_many :fare_rules
-      set.has_many :feed_infos
-      set.has_many :frequencies
-      set.has_many :routes
-      set.has_many :shapes
-      set.has_many :stops
-      set.has_many :stop_times
-      set.has_many :transfers
-      set.has_many :trips
+    with_options dependent: :delete_all do |set|
+      set.has_many(:agencies)
+      set.has_many(:calendars)
+      set.has_many(:calendar_dates)
+      set.has_many(:fare_attributes)
+      set.has_many(:fare_rules)
+      set.has_many(:feed_infos)
+      set.has_many(:frequencies)
+      set.has_many(:routes)
+      set.has_many(:shapes)
+      set.has_many(:stops)
+      set.has_many(:stop_times)
+      set.has_many(:transfers)
+      set.has_many(:trips)
     end
 
     scope :newest, -> { order(created_at: :desc).first }
 
-    #@return [Hash] a hash of each record type and the number of records in
+    # @return [Hash] a hash of each record type and the number of records in
     #  this data set
     def details
       Rails.cache.fetch("gtfs_data_set_details_#{id}") { create_details }
@@ -47,13 +35,13 @@ module GtfsEngine
     private
 
     def create_details
-      self.class.reflections.select do |name, assoc|
+      self.class.reflections.select do |_name, assoc|
         assoc.macro == :has_many && assoc.options[:inverse_of] == :data_set
       end.each_with_object({}) do |(name, _), hash|
         controller_class = association_controller_class name
         hash[name] = {
-            count: send(name).count,
-            filters: controller_class.filters
+          count: send(name).count,
+          filters: controller_class.filters
         }
       end
     end

data/app/models/gtfs_engine/fare_attribute.rb

@@ -1,19 +1,7 @@
-# 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/>.
+# frozen_string_literal: true
+
 module GtfsEngine
   class FareAttribute < ActiveRecord::Base
-    belongs_to :data_set, inverse_of: :fare_attributes
+    belongs_to :data_set, optional: false
   end
 end

data/app/models/gtfs_engine/fare_rule.rb

@@ -1,30 +1,16 @@
-# 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/>.
+# frozen_string_literal: true
+
 module GtfsEngine
   class FareRule < ActiveRecord::Base
     belongs_to :data_set, inverse_of: :trips
-    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
+    belongs_to :fare_attribute, foreign_key: :fare_id, primary_key: :fare_id
+    belongs_to :route, 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,
-                                   foreign_key: :origin_id
-      rule.belongs_to :destination, inverse_of: :destination_rules,
-                                   foreign_key: :destination_id
+    with_options(class_name: 'Stop', primary_key: :zone_id) do |rule|
+      rule.belongs_to(:origin, inverse_of: :origin_rules,
+                               foreign_key: :origin_id)
+      rule.belongs_to(:destination, inverse_of: :destination_rules,
+                                    foreign_key: :destination_id)
     end
   end
 end

data/app/models/gtfs_engine/feed_info.rb

@@ -1,19 +1,7 @@
-# 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/>.
+# frozen_string_literal: true
+
 module GtfsEngine
   class FeedInfo < ActiveRecord::Base
-    belongs_to :data_set, inverse_of: :feed_infos
+    belongs_to :data_set, optional: false
   end
 end

data/app/models/gtfs_engine/frequency.rb

@@ -1,21 +1,9 @@
-# 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/>.
+# frozen_string_literal: true
+
 module GtfsEngine
   class Frequency < ActiveRecord::Base
-    belongs_to :data_set, inverse_of: :frequencies
-    belongs_to :trip,     inverse_of: :frequencies,
-               foreign_key: :trip_id, primary_key: :trip_id
+    belongs_to :data_set, optional: false
+    belongs_to :trip,     optional: false,
+                          foreign_key: :trip_id, primary_key: :trip_id
   end
 end

data/app/models/gtfs_engine/route.rb

@@ -1,23 +1,10 @@
-# 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/>.
+# frozen_string_literal: true
+
 module GtfsEngine
   class Route < ActiveRecord::Base
-    belongs_to :data_set, inverse_of: :routes
+    belongs_to :data_set, optional: false
 
-    has_many :trips, inverse_of: :route,
-             foreign_key: :route_id, primary_key: :route_id
+    has_many :trips, 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

@@ -1,21 +1,9 @@
-# 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/>.
+# frozen_string_literal: true
+
 module GtfsEngine
   class Shape < ActiveRecord::Base
-    belongs_to :data_set, inverse_of: :shapes
-    belongs_to :trip,     inverse_of: :shapes,
-               foreign_key: :shape_id, primary_key: :shape_id
+    belongs_to :data_set, optional: false
+    belongs_to :trip,     optional: false,
+                          foreign_key: :shape_id, primary_key: :shape_id
   end
 end