gtfs_engine 1.5.3 → 2.0.0

data/lib/gtfs_engine/middleware/base.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.
@@ -20,23 +7,23 @@ module GtfsEngine
     class Base
       attr_reader :app
 
-      HEADERS = { 'Content-Type' => 'application/json' }
+      HEADERS = { 'Content-Type' => 'application/json' }.freeze
 
       def initialize(app)
         @app = app
       end
 
-    protected
+      protected
 
       def accepts_json?(env)
-        request = ActionDispatch::Request.new env
+        request = ActionDispatch::Request.new(env)
         !!collector.negotiate_format(request)
       end
 
-    private
+      private
 
       def collector
-        @collector ||= ActionController::MimeResponds::Collector.new ['json']
+        @collector ||= ActionController::MimeResponds::Collector.new(['json'])
       end
     end
   end

data/lib/gtfs_engine/middleware/json_parse_errors.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.
@@ -31,15 +18,14 @@ module GtfsEngine
       MESSAGE = 'The body of your request is not valid JSON'
 
       def call(env)
-        app.call env
+        app.call(env)
+      rescue ActionDispatch::ParamsParser::ParseError => e
+        raise e unless accepts_json?(env)
 
-      rescue ActionDispatch::ParamsParser::ParseError => error
-        raise error unless accepts_json? env
-
-        [ 400, HEADERS, [create_json(error)] ]
+        [400, HEADERS, [create_json(e)]]
       end
 
-    private
+      private
 
       def create_json(cause)
         JsendWrapper::ErrorRenderer.new(

data/lib/gtfs_engine/sources.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 'set'
 require 'activerecord-import'
 
@@ -23,52 +11,53 @@ module GtfsEngine
     end
 
     def method_missing(name, &block)
-      source = @config.sources.__send__ name
-      add_default_importers source
-      source.instance_exec source, &block if ::Kernel.block_given?
-      source
+      @config.sources.__send__(name).tap do |source|
+        add_default_importers(source)
+        source.instance_exec(source, &block) if ::Kernel.block_given?
+      end
     end
 
     private
 
     def add_default_importers(source)
       id = source.__id__
-      return if @source_ids.include? id
-      @source_ids.add id
+      return if @source_ids.include?(id)
+
+      @source_ids.add(id)
 
       get_method = ::Kernel.instance_method(:method).bind self
-      bulk_importer = get_method.call :bulk_importer
-      set_id = ::OpenStruct.new id: -1
+      bulk_importer = get_method.call(:bulk_importer)
+      set_id = ::OpenStruct.new(id: -1)
 
       source.before do |etag|
         if DataSet.where(name: source.name, etag: etag).empty?
-          set = DataSet.create name: source.name,
+          set = DataSet.create(name: source.name,
                                title: source.title,
                                etag: etag,
-                               url: source.url
+                               url: source.url)
           set.reload
           set_id.id = set.id
         else
-          ::Kernel.raise ::GtfsReader::SkipSourceError,
-                         "Data Pull already exists for #{etag}"
+          ::Kernel.raise(::GtfsReader::SkipSourceError,
+                         "Data Pull already exists for #{etag}")
         end
       end
 
-      source.handlers bulk_importer, set_id, bulk: 1024 do |importer, set_id|
-        agency          &importer.call( Agency, set_id )
-        calendar        &importer.call( Calendar, set_id )
-        calendar_dates  &importer.call( CalendarDate, set_id )
-        fare_attributes &importer.call( FareAttribute, set_id )
-        fare_rules      &importer.call( FareRule, set_id )
-        feed_info       &importer.call( FeedInfo, set_id )
-        frequencies     &importer.call( Frequency, set_id )
-        stop_times      &importer.call( StopTime, set_id )
-        routes          &importer.call( Route, set_id )
-        shapes          &importer.call( Shape, set_id )
-        stops           &importer.call( Stop, set_id )
-        stop_times      &importer.call( StopTime, set_id )
-        transfers       &importer.call( Transfer, set_id )
-        trips           &importer.call( Trip, set_id )
+      source.handlers(bulk_importer, set_id, bulk: 1024) do |importer, set_id|
+        agency(&importer.call(Agency, set_id))
+        calendar(&importer.call(Calendar, set_id))
+        calendar_dates(&importer.call(CalendarDate, set_id))
+        fare_attributes(&importer.call(FareAttribute, set_id))
+        fare_rules(&importer.call(FareRule, set_id))
+        feed_info(&importer.call(FeedInfo, set_id))
+        frequencies(&importer.call(Frequency, set_id))
+        stop_times(&importer.call(StopTime, set_id))
+        routes(&importer.call(Route, set_id))
+        shapes(&importer.call(Shape, set_id))
+        stops(&importer.call(Stop, set_id))
+        stop_times(&importer.call(StopTime, set_id))
+        transfers(&importer.call(Transfer, set_id))
+        trips(&importer.call(Trip, set_id))
       end
     end
 
@@ -76,9 +65,9 @@ module GtfsEngine
       ::Proc.new do
         bulk do |values, count, total, columns|
           id = data_set_id_holder.id
-          values.each {|v| v << id }
-          model_class.import (columns + [:data_set_id]), values
-          ::Rails.logger.info "Inserted #{count} #{model_class} records (total: #{total})"
+          values.each { |v| v << id }
+          model_class.import((columns + [:data_set_id]), values)
+          ::Rails.logger.info("Inserted #{count} #{model_class} records (total: #{total})")
         end
       end
     end

data/lib/gtfs_engine/version.rb

@@ -1,37 +1,27 @@
-# 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 Version
     # The following four lines are generated, so don't mess with them.
-    MAJOR = 1
-    MINOR = 5
-    PATCH = 3
+    MAJOR = 2
+    MINOR = 0
+    PATCH = 0
     BUILD = nil
 
     def self.to_s
-      [MAJOR, MINOR, PATCH, BUILD].compact.join '.'
+      [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
     end
 
     # A helper class which bumps the version number stored in this file
     class Bumper
-      PARTS = %i[major minor patch]
-      PATTERN = %r[(\s+)MAJOR = \d+\s+MINOR = \d+\s+PATCH = \d+\s+BUILD = .+]
+      PARTS = %i[major minor patch].freeze
+      PATTERN = /(\s+)MAJOR = \d+\s+MINOR = \d+\s+PATCH = \d+\s+BUILD = .+/.freeze
+
+      def initialize(filename = __FILE__, part)
+        raise "#{part} not one of #{PARTS}" unless PARTS.include?(part)
 
-      def initialize(filename=__FILE__, part)
-        raise "#{part} not one of #{PARTS}" unless PARTS.include? part
-        @filename, @part = filename, part
+        @filename = filename
+        @part = part
       end
 
       # Increase the version number and write it to this file
@@ -40,18 +30,18 @@ module GtfsEngine
         text = '\1' + ["MAJOR = #{parts[:major]}",
                        "MINOR = #{parts[:minor]}",
                        "PATCH = #{parts[:patch]}",
-                       "BUILD = #{parts[:build] || 'nil'}"].join( '\1' )
+                       "BUILD = #{parts[:build] || 'nil'}"].join('\1')
 
-        out_data = File.read( @filename ).gsub PATTERN, text
-        #puts out_data
-        File.open( @filename, 'w' ) { |out| out << out_data }
-        puts "Bumped version to #{to_s}"
+        out_data = File.read(@filename).gsub(PATTERN, text)
+        # puts out_data
+        File.open(@filename, 'w') { |out| out << out_data }
+        puts "Bumped version to #{self}"
       end
 
-      #@return [String] What the new version string will be.
+      # @return [String] What the new version string will be.
       def to_s
         p = new_version
-        [p[:major], p[:minor], p[:patch], p[:build]].compact.join ?.
+        [p[:major], p[:minor], p[:patch], p[:build]].compact.join('.')
       end
 
       private
@@ -60,23 +50,26 @@ module GtfsEngine
         @vers ||= { major: MAJOR,
                     minor: MINOR,
                     patch: PATCH,
-                    build: BUILD }.merge new_parts
+                    build: BUILD }.merge(new_parts)
       end
 
       def new_parts
         case @part
-        when :major then {
+        when :major
+          {
             major: MAJOR + 1,
             minor: 0,
             patch: 0
-        }
-        when :minor then {
+          }
+        when :minor
+          {
             minor: MINOR + 1,
             patch: 0
-        }
-        else {
+          }
+        else
+          {
             patch: PATCH + 1
-        }
+          }
         end
       end
     end

data/lib/tasks/gtfs_engine_tasks.rake

@@ -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 'colorize'
 
 namespace :gtfs_engine do
@@ -23,7 +11,7 @@ namespace :gtfs_engine do
     end
 
     if args.name
-      GtfsReader.update args.name.to_sym
+      GtfsReader.update(args.name.to_sym)
     else
       GtfsReader.update_all!
     end
@@ -35,14 +23,15 @@ namespace :gtfs_engine do
     desc 'List the data sets for each source'
     task list: :environment do
       GtfsEngine::DataSet.distinct.pluck(:name).each do |name|
-        list_source_data_sets name
+        list_source_data_sets(name)
       end
     end
 
     desc 'Delete a data set and all the models from it'
-    task :delete, [:name, :etag] => :environment do |_, args|
-      set = GtfsEngine::DataSet.find_by name: args.name, etag: args.etag
-      name, etag = [args.name.to_s.light_blue, args.etag.yellow]
+    task :delete, %i[name etag] => :environment do |_, args|
+      set = GtfsEngine::DataSet.find_by(name: args.name, etag: args.etag)
+      name = args.name.to_s.light_blue
+      etag = args.etag.yellow
 
       if set
         set.delete
@@ -54,12 +43,13 @@ namespace :gtfs_engine do
     end
 
     desc 'Count the number of models in a data set'
-    task :count, [:name, :etag] => :environment do |_, args|
-      set = GtfsEngine::DataSet.find_by name: args.name, etag: args.etag
-      name, etag = [args.name.to_s.light_blue, args.etag.yellow]
+    task :count, %i[name etag] => :environment do |_, args|
+      set = GtfsEngine::DataSet.find_by(name: args.name, etag: args.etag)
+      name = args.name.to_s.light_blue
+      etag = args.etag.yellow
       puts "Model count for #{name} data set with etag #{etag}"
 
-      width = model_lists.inject(0) {|max, n| [max, n.to_s.length].max }
+      width = model_lists.inject(0) { |max, n| [max, n.to_s.length].max }
       model_lists.each do |list|
         count = set.send(list).count
         puts "\t#{list.to_s.rjust(width).yellow}: #{count}"
@@ -71,7 +61,7 @@ end
 def list_source_data_sets(name)
   puts name.underline.green
 
-  sets = GtfsEngine::DataSet.where(name: name).order :created_at
+  sets = GtfsEngine::DataSet.where(name: name).order(:created_at)
   if sets.count == 0
     puts "\tnone".light_black
   else
@@ -84,6 +74,6 @@ end
 def model_lists
   @model_lists ||= begin
     has_many = GtfsEngine::DataSet.reflect_on_all_associations(:has_many)
-    has_many.collect &:name
+    has_many.collect(&:name)
   end
 end

metadata

@@ -1,175 +1,169 @@
 --- !ruby/object:Gem::Specification
 name: gtfs_engine
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 2.0.0
 platform: ruby
 authors:
 - Jon Sangster
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-15 00:00:00.000000000 Z
+date: 2020-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: activerecord-import
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.0'
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.0'
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: responders
+  name: gtfs_reader
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: gtfs_reader
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
-  name: activerecord-import
+  name: responders
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: jbuilder
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '2.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '2.10'
 - !ruby/object:Gem::Dependency
   name: jsend_wrapper-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
-  name: pry-rails
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '4.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '4.7'
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: juwelier
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: '0.9'
 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
@@ -269,8 +263,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Read General Transit Feed Specification zip files