gtfs_engine 1.5.3 → 2.0.0

data/db/migrate/20140405235947_create_gtfs_engine_fare_attributes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateGtfsEngineFareAttributes < ActiveRecord::Migration[4.2]
   TABLE = :gtfs_engine_fare_attributes
 

data/db/migrate/20140406063500_create_gtfs_engine_fare_rules.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 class CreateGtfsEngineFareRules < ActiveRecord::Migration[4.2]
   TABLE = :gtfs_engine_fare_rules
 
   def change
     create_table TABLE do |t|
-      t.string :fare_id,        null: false
+      t.string :fare_id, null: false
       t.string :route_id
       t.string :origin_id
       t.string :destination_id

data/db/migrate/20140406071922_create_gtfs_engine_frequencies.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateGtfsEngineFrequencies < ActiveRecord::Migration[4.2]
   TABLE = :gtfs_engine_frequencies
 

data/db/migrate/20140406072309_create_gtfs_engine_transfers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateGtfsEngineTransfers < ActiveRecord::Migration[4.2]
   TABLE = :gtfs_engine_transfers
 

data/db/migrate/20140406073548_create_gtfs_engine_feed_infos.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateGtfsEngineFeedInfos < ActiveRecord::Migration[4.2]
   TABLE = :gtfs_engine_feed_infos
 

data/lib/gtfs_engine.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
+
 require 'gtfs_reader'
 
 require 'gtfs_engine/engine'

data/lib/gtfs_engine/concerns.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::Concerns
   extend ActiveSupport::Autoload
 

data/lib/gtfs_engine/concerns/controllers.rb

@@ -1,20 +1,12 @@
-# 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/>.
-module GtfsEngine::Concerns::Controllers
-  extend ActiveSupport::Autoload
+# frozen_string_literal: true
 
-  autoload :DataAccess
-  autoload :Gtfs
+module GtfsEngine
+  module Concerns
+    module Controllers
+      extend ActiveSupport::Autoload
+
+      autoload :DataAccess
+      autoload :Gtfs
+    end
+  end
 end

data/lib/gtfs_engine/concerns/controllers/data_access.rb

@@ -1,47 +1,35 @@
-# 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
 
-# A Controller +Concern+ for convenient access to the +DataSet+ specified in
-# the URL.
-module GtfsEngine::Concerns::Controllers::DataAccess
-  extend ActiveSupport::Concern
+module GtfsEngine
+  module Concerns
+    module Controllers
+      module DataAccess
+        extend ActiveSupport::Concern
 
-
-  #@param param_key <Symbol> The key of the URL param to use as the feed's ID
-  #@return <DataSet>
-  def data(param_key=:data_set_id)
-    key = params[param_key]
-    (@data_sets ||= {})[key] =
-        Rails.cache.fetch "data_set_#{key}" do
-          if param_is_data_set_name? param_key
-            GtfsEngine::DataSet.where(name: key).newest
-          else
-            GtfsEngine::DataSet.find params[param_key]
-          end
+        # @param param_key <Symbol> The key of the URL param to use as the feed's ID
+        # @return <DataSet>
+        def data(param_key = :data_set_id)
+          key = params[param_key]
+          (@data_sets ||= {})[key] =
+            Rails.cache.fetch("data_set_#{key}") do
+              if param_is_data_set_name?(param_key)
+                GtfsEngine::DataSet.where(name: key).newest
+              else
+                GtfsEngine::DataSet.find(params[param_key])
+              end
+            end
         end
-  end
-
-
-  def data_cache(key)
-    Rails.cache.fetch("#{data.id}::#{key}") { yield }
-  end
 
+        def data_cache(key, &blk)
+          Rails.cache.fetch("#{data.id}::#{key}", &blk)
+        end
 
-  #@return <Bool> +true+ if the key is the name of the GTFS feed,
-  # instead of its ID
-  def param_is_data_set_name?(param_key)
-    not /[[:digit:]]/ === params[param_key].try(:first)
+        # @return <Bool> +true+ if the key is the name of the GTFS feed,
+        # instead of its ID
+        def param_is_data_set_name?(param_key)
+          !(/[[:digit:]]/ === params[param_key].try(:first))
+        end
+      end
+    end
   end
 end

data/lib/gtfs_engine/concerns/controllers/gtfs.rb

@@ -1,26 +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/>.
-#
-# This controller +Concern+ provides the functionality common among most of
-# the GTFS controllers.
+# frozen_string_literal: true
+
 module GtfsEngine::Concerns::Controllers::Gtfs
   extend ActiveSupport::Concern
 
-
   included do
-    around_filter :gtfs_cache, only: [:index, :show]
+    around_action :gtfs_cache, only: %i[index show]
 
     rescue_from GtfsEngine::UnknownFilters,     with: :unknown_filter
     rescue_from ActiveRecord::StatementInvalid, with: :statement_invalid
@@ -28,23 +12,20 @@ module GtfsEngine::Concerns::Controllers::Gtfs
     helper_method :filter
   end
 
-
   module ClassMethods
-    #@return [Symbol] the unique key for this GTFS association
-    def gtfs_id(id=nil)
+    # @return [Symbol] the unique key for this GTFS association
+    def gtfs_id(id = nil)
       @gtfs_id = id unless id.nil?
-      @gtfs_id or controller_name.singularize.foreign_key
+      @gtfs_id || controller_name.singularize.foreign_key
     end
 
-
     def filters(*attrs)
       attrs.flatten!
       @filters = attrs unless attrs.empty?
       @filters ||= []
     end
 
-
-    #@return [Class] the +ActiveRecord::Base+ class associated with this
+    # @return [Class] the +ActiveRecord::Base+ class associated with this
     #  controller
     def record_class
       @record_class ||= begin
@@ -53,7 +34,6 @@ module GtfsEngine::Concerns::Controllers::Gtfs
     end
   end
 
-
   # GET / collection of elements for the given GTFS type
   # The returned collection may be filtered with query parameters
   def index
@@ -61,15 +41,13 @@ module GtfsEngine::Concerns::Controllers::Gtfs
     respond_with @records, template: 'gtfs_engine/gtfs/index'
   end
 
-
   # GET /:id for a specific element of the given GTFS type
   def show
     @record = record
     respond_with @record, template: 'gtfs_engine/gtfs/show'
   end
 
-
-  #@return <ActionController::Parameters> the map of fields to filter;
+  # @return <ActionController::Parameters> the map of fields to filter;
   # derived from the query string
   def filter
     @filter ||= begin
@@ -82,53 +60,45 @@ module GtfsEngine::Concerns::Controllers::Gtfs
       unless unknown.empty?
         raise GtfsEngine::UnknownFilters.new(unknown), 'unknown filter'
       end
+
       query_params = ActionController::Parameters.new query
       query_params.permit filters
     end
   end
 
-
   protected
 
-
-  #@return [ActiveRecord::Relation] all the records in this GTFS association
+  # @return [ActiveRecord::Relation] all the records in this GTFS association
   def collection
     data.send controller_name
   end
 
-
-  #@return [ActiveRecord::Relation] all the records in this GTFS
+  # @return [ActiveRecord::Relation] all the records in this GTFS
   #  association that match the filter specified in the query string
   def filtered_collection
     collection.where filter
   end
 
-
-  #@return [ActiveRecord::Base] the record identified by +params[:id]+ in this
+  # @return [ActiveRecord::Base] the record identified by +params[:id]+ in this
   #  GTFS association
   def record
     collection.find_by! gtfs_id => params[:id]
   end
 
-
   def gtfs_id
     self.class.gtfs_id
   end
 
-
   def filters
     self.class.filters
   end
 
-
   def query
     request.query_parameters
   end
 
-
   private
 
-
   def format
     request.format.to_sym
   end
@@ -144,23 +114,21 @@ module GtfsEngine::Concerns::Controllers::Gtfs
     yield if stale? options
   end
 
-
-  #@param ex [GtfsEngine::UnknownFilter]
+  # @param ex [GtfsEngine::UnknownFilter]
   def unknown_filter(ex)
     render status: :bad_request, jsend: {
       error: 'unknown filter', data: ex.to_h
     }
   end
 
-
   def statement_invalid(ex)
     inner = ex.original_exception
     case inner
     when PG::InvalidDatetimeFormat, PG::DatetimeFieldOverflow
       lines = inner.message.split "\n"
-      /.*"([^"]+)"[^"]+/ === lines[1][0..lines[2].size] and begin
+      (/.*"([^"]+)"[^"]+/ === lines[1][0..lines[2].size]) && begin
         render status: :bad_request, jsend: {
-          message: 'invalid date', data: {$1 => 'invalid date'}
+          message: 'invalid date', data: { Regexp.last_match(1) => 'invalid date' }
         }
       end
     else
@@ -168,10 +136,9 @@ module GtfsEngine::Concerns::Controllers::Gtfs
     end
   end
 
-
-  def record_not_found(ex)
+  def record_not_found(_ex)
     render status: :not_found, jsend: {
-      error: 'record not found', data: {gtfs_id => params[:id]}
+      error: 'record not found', data: { gtfs_id => params[:id] }
     }
   end
 end

data/lib/gtfs_engine/engine.rb

@@ -1,17 +1,4 @@
-# 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
 
 # The following line is required for jsend_wrapper/rails to be available when
 # mounted in another rails application.
@@ -33,7 +20,7 @@ module GtfsEngine
 
     initializer 'gtfs_engine.middleware' do |app|
       app.config.middleware.insert_before ActionDispatch::Cookies,
-        GtfsEngine::Middleware::JsonParseErrors
+                                          GtfsEngine::Middleware::JsonParseErrors
     end
   end
 end

data/lib/gtfs_engine/exceptions.rb

@@ -1,34 +1,19 @@
-# 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
   Error = Class.new StandardError
 
-
   class UnknownFilters < Error
     attr_reader :fields
 
-
-    #@param fields [Array<String>] the names of the unknown fields which the
+    # @param fields [Array<String>] the names of the unknown fields which the
     # caller tried to filter with
     def initialize(fields)
       @fields = fields
     end
 
-
     def to_hash
-      fields.each_with_object( {} ) do |field, hash|
+      fields.each_with_object({}) do |field, hash|
         hash[field] = message
       end
     end

data/lib/gtfs_engine/json_responder.rb

@@ -1,26 +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
+
 require 'action_controller/responder'
 
 class GtfsEngine::JsonResponder < ActionController::Responder
-  def to_json
-    if has_errors?
-      display_errors
-    else
-      default_render
-    end
+  def to_json(*_args)
+    has_errors? ? display_errors : default_render
   end
 
   protected
@@ -28,8 +12,10 @@ class GtfsEngine::JsonResponder < ActionController::Responder
   def display_errors
     options[:status] ||= :unprocessable_entity
 
-    controller.render status: options[:status], jsend: {
-        error: 'could not process request', data: resource_errors[:errors]
-    }
+    controller.render(
+      status: options[:status],
+      jsend: { error: 'could not process request',
+               data: resource_errors[:errors] }
+    )
   end
 end