gtfs_engine 1.5.3 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 78ec8eda402765bdfe6c1b0229be9b216277e81f
-  data.tar.gz: ca6ee20bbf4fd958f6b378b616687d29618ab33b
+SHA256:
+  metadata.gz: 02cb0a7ffc669fa4275fb0c6a35ad9473e120ce7ce2145a4a4a14ebc3393b273
+  data.tar.gz: 4cd67072f4747c6bd758f5857d4dc65c9b1bf7dbc029a52e89a1d5114429b0b5
 SHA512:
-  metadata.gz: 78fccb3e66380b25bbd0ddd3c70502277e587a65b7934658baaec59392295912e4573a1fd59cb97c0cf39349311a21b3d882538a7d947d6ba65d953e53c4d91f
-  data.tar.gz: fe8bd3064d742d70025a3eb3317e66a7549b1d3fd5da81c900cf2dd0738473d8644c996f5b040eb00758f97d2987f290b3636a76ea1344630a9e07cf84b495eb
+  metadata.gz: 91649e7f8fa25159ae6866bcbe8d1bbefc19841a070af12e5072daa58f4adc871cbf0ce37d9bf9706c7190f1b16294137227b9b212b28f5796187cc5f44f8795
+  data.tar.gz: f242bfc52c4cc6e96346abd85058ca16f46e29ad6ed2a306e598c861ff6f0b8cbe259e3590791fbc0380dcb67b255883fbf1f15236c8489f270d36b682915760

data/Rakefile

@@ -1,20 +1,21 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 begin
   require 'bundler/setup'
 rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
 
-require 'jeweler'
+require 'juwelier'
 require File.dirname(__FILE__) + '/lib/gtfs_engine/version'
 
-Jeweler::Tasks.new do |gem|
+Juwelier::Tasks.new do |gem|
   gem.name = 'gtfs_engine'
   gem.version = GtfsEngine::Version.to_s
   gem.homepage = 'http://github.com/sangster/gtfs_engine'
   gem.license = 'GPL-3.0'
   gem.summary = 'Read General Transit Feed Specification zip files'
-  gem.description = <<-EOF.strip.gsub /\s+/, ' '
+  gem.description = <<-EOF.strip.gsub(/\s+/, ' ')
     A Rails Engine to provide a basic RESTful interface for GTFS feeds.
 
     GTFS Spec: https://developers.google.com/transit/gtfs
@@ -25,7 +26,7 @@ Jeweler::Tasks.new do |gem|
   gem.files = Dir['{app,config,db,lib}/**/*', 'Rakefile']
 end
 
-Jeweler::RubygemsDotOrgTasks.new
+Juwelier::RubygemsDotOrgTasks.new
 
 task bump: ['bump:patch']
 namespace :bump do

data/app/controllers/gtfs_engine/agencies_controller.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
   class AgenciesController < ApplicationController
     include Concerns::Controllers::Gtfs

data/app/controllers/gtfs_engine/application_controller.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
   class ApplicationController < ActionController::Base
     include Concerns::Controllers::DataAccess

data/app/controllers/gtfs_engine/calendar_dates_controller.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
   class CalendarDatesController < ApplicationController
     include Concerns::Controllers::Gtfs

data/app/controllers/gtfs_engine/calendars_controller.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
   class CalendarsController < ApplicationController
     include Concerns::Controllers::Gtfs
@@ -30,20 +18,20 @@ module GtfsEngine
 
     def for_date
       date = params[:YYYY_MM_DD]
-      check_format! date
-      @records = Calendar.from_date_string date
-      respond_with @records, template: 'gtfs_engine/gtfs/index'
+      check_format!(date)
+      @records = Calendar.from_date_string(date)
+      respond_with(@records, template: 'gtfs_engine/gtfs/index')
     end
 
     def dates
       @dates = record.dates
-      render :dates
+      render(:dates)
     end
 
     private
 
     def check_format!(date_str)
-      unless %r{^\d{4}-\d\d-\d\d$} === date_str
+      unless /^\d{4}-\d\d-\d\d$/ === date_str
         raise DateFormatError, "Got '#{date_str}. Expected format: YYYY-MM-DD'"
       end
     end

data/app/controllers/gtfs_engine/data_sets_controller.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 DataSetsController < ApplicationController
     def index
-      expires_in 3.hours
+      expires_in(3.hours)
 
       @data_sets = Rails.cache.fetch('data_sets_index') do
         {}.tap do |sets|
@@ -25,22 +13,20 @@ module GtfsEngine
         end
       end
 
-      dates = @data_sets.values.flatten.collect &:created_at
-      if stale? last_modified: dates.max, public: true
-        respond_with @data_sets
-      end
+      dates = @data_sets.values.flatten.collect(&:created_at)
+      respond_with(@data_sets) if stale?(last_modified: dates.max, public: true)
     end
 
     def show
-      expires_in 2.hours
+      expires_in(2.hours)
 
-      @data_set = data :id
+      @data_set = data(:id)
 
       # Set location if the given id is a data-source name and not an ID
-      if param_is_data_set_name? :id
-        respond_with @data_set, location: data_set_url(@data_set)
+      if param_is_data_set_name?(:id)
+        respond_with(@data_set, location: data_set_url(@data_set))
       else
-        respond_with @data_set
+        respond_with(@data_set)
       end
     end
   end

data/app/controllers/gtfs_engine/fare_attributes_controller.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
   class FareAttributesController < ApplicationController
     include Concerns::Controllers::Gtfs

data/app/controllers/gtfs_engine/fare_rules_controller.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
   class FareRulesController < ApplicationController
     include Concerns::Controllers::Gtfs

data/app/controllers/gtfs_engine/feed_infos_controller.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
   class FeedInfosController < ApplicationController
     include Concerns::Controllers::Gtfs

data/app/controllers/gtfs_engine/frequencies_controller.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
   class FrequenciesController < ApplicationController
     include Concerns::Controllers::Gtfs

data/app/controllers/gtfs_engine/routes_controller.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
   class RoutesController < ApplicationController
     include Concerns::Controllers::Gtfs

data/app/controllers/gtfs_engine/shapes_controller.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
   class ShapesController < ApplicationController
     include Concerns::Controllers::Gtfs

data/app/controllers/gtfs_engine/stop_times_controller.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
   class StopTimesController < ApplicationController
     include Concerns::Controllers::Gtfs

data/app/controllers/gtfs_engine/stops_controller.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
   class StopsController < ApplicationController
     include Concerns::Controllers::Gtfs

data/app/controllers/gtfs_engine/transfers_controller.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
   class TransfersController < ApplicationController
     include Concerns::Controllers::Gtfs
@@ -20,19 +8,19 @@ module GtfsEngine
             :min_transfer_time
 
     def from
-      @transfers = collection.where from_stop_id: params[:stop_id]
-      respond_with @transfers
+      @transfers = collection.where(from_stop_id: params[:stop_id])
+      respond_with(@transfers)
     end
 
     def to
-      @transfers = collection.where to_stop_id: params[:stop_id]
-      respond_with @transfers
+      @transfers = collection.where(to_stop_id: params[:stop_id])
+      respond_with(@transfers)
     end
 
     def from_to
-      @transfer = collection.find_by from_stop_id: params[:from_id],
-                                       to_stop_id: params[:to_id]
-      respond_with @transfer
+      @transfer = collection.find_by(from_stop_id: params[:from_id],
+                                     to_stop_id: params[:to_id])
+      respond_with(@transfer)
     end
   end
 end

data/app/controllers/gtfs_engine/trips_controller.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
   class TripsController < ApplicationController
     include Concerns::Controllers::Gtfs
@@ -27,8 +15,8 @@ module GtfsEngine
             :bikes_allowed
 
     def block
-      @trips = collection.where block_id: params[:id]
-      respond_with @trips
+      @trips = collection.where(block_id: params[:id])
+      respond_with(@trips)
     end
   end
 end