gtfs_engine 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41bacc2ca460c53a0d6bfab8dad6a6accba8d24d
-  data.tar.gz: 92aad173090d8dd6105e35e1e40d9603e197d5ea
+  metadata.gz: 146717ee9ac8cc7dc0455271478b5d37986f8d81
+  data.tar.gz: 67be5776653dad9d7d4038f30fe49606f4843199
 SHA512:
-  metadata.gz: a7ee299a9408d4d277c9006cf08d1184d98c1e81e4a7fb16127bb5b9b639e4256bf3da6f88a2abd6f6431f068a9b711d9162443a5a6e86463b7da819a9c1a7d8
-  data.tar.gz: 30b80c487979031d30a18af1ab036f5f2fd0cd85fcb4a447df21d9aae97a65a8fa154a6809c37287562a063f138451d63741b3430de6a97cd0478e82814b2d81
+  metadata.gz: 9cb0dd5b1904e1c456fc83635c9ae94c9d8483956967dbb603f0822a3317921151853360d016e95e961c70170d2f7cb2a9f2d46f393d8871fbc06c25e5ddff0a
+  data.tar.gz: c965696b02274443d77454c6c75aceff13d6d478fed0f0afe8e28900f5872bc992b91c410b3d45a1d7614ada5e6419229700b0e41436dcb2cd89303c559214a0

data/lib/gtfs_engine/engine.rb

@@ -15,6 +15,7 @@
 
 # The following line is required for jsend_wrapper/rails to be available when
 # mounted in another rails application.
+require 'gtfs_engine/middleware/json_parse_errors'
 require 'jsend_wrapper/rails'
 
 module GtfsEngine
@@ -29,5 +30,10 @@ module GtfsEngine
       javascripts         false
       fixture_replacement :factory_girl, dir: 'spec/factories'
     end
+
+    initializer 'gtfs_engine.middleware' do |app|
+      app.config.middleware.insert_before ActionDispatch::ParamsParser,
+        GtfsEngine::Middleware::JsonParseErrors
+    end
   end
 end

data/lib/gtfs_engine/middleware/base.rb

@@ -0,0 +1,43 @@
+# 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/>.
+
+# The following line is required for jsend_wrapper/rails to be available when
+# mounted in another rails application.
+module GtfsEngine
+  module Middleware
+    class Base
+      attr_reader :app
+
+      HEADERS = { 'Content-Type' => 'application/json' }
+
+      def initialize(app)
+        @app = app
+      end
+
+    protected
+
+      def accepts_json?(env)
+        request = ActionDispatch::Request.new env
+        !!collector.negotiate_format(request)
+      end
+
+    private
+
+      def collector
+        @collector ||= ActionController::MimeResponds::Collector.new ['json']
+      end
+    end
+  end
+end

data/lib/gtfs_engine/middleware/json_parse_errors.rb

@@ -0,0 +1,51 @@
+# 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/>.
+
+# The following line is required for jsend_wrapper/rails to be available when
+# mounted in another rails application.
+require 'gtfs_engine/middleware/base'
+require 'jsend_wrapper/renderers/error_renderer'
+
+module GtfsEngine
+  module Middleware
+    # Normally one handles exceptions with `rescue_from`; however, the body of
+    # the request is parsed before your controller gets involved, so we need to
+    # handle parse errors at the middleware-level.
+    #
+    # Rails has a built-in JSON response when such an error occurs, but this
+    # middleware will return an error message in JSend format.
+    class JsonParseErrors < Base
+      ERROR_CODE = 1001
+      MESSAGE = 'The body of your request is not valid JSON'
+
+      def call(env)
+        app.call env
+
+      rescue ActionDispatch::ParamsParser::ParseError => error
+        raise error unless accepts_json? env
+
+        [ 400, HEADERS, [create_json(error)] ]
+      end
+
+    private
+
+      def create_json(cause)
+        JsendWrapper::ErrorRenderer.new(
+          MESSAGE, code: ERROR_CODE, data: cause.to_s
+        ).to_s
+      end
+    end
+  end
+end

data/lib/gtfs_engine/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gtfs_engine
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Jon Sangster
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-22 00:00:00.000000000 Z
+date: 2014-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -228,6 +228,8 @@ files:
 - lib/gtfs_engine/engine.rb
 - lib/gtfs_engine/exceptions.rb
 - lib/gtfs_engine/json_responder.rb
+- lib/gtfs_engine/middleware/base.rb
+- lib/gtfs_engine/middleware/json_parse_errors.rb
 - lib/gtfs_engine/sources.rb
 - lib/gtfs_engine/version.rb
 - lib/tasks/gtfs_engine_tasks.rake