hyperdrive 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d771b35e3bf1f63f0319a13657e7cf5b8eed07b4
-  data.tar.gz: 0a023a7d94436547475ca7c3c52a2e879edeabde
+  metadata.gz: b0b6a24d689066609923e410bd852efd6775931d
+  data.tar.gz: cdfc89fe0f8e15161bd92d0e1b312601a0bf5aeb
 SHA512:
-  metadata.gz: e57fcc5a0fc983d0eef36c18773346c3b013c3be3f59e2081ccf94c96dc930f040faaac655c695fe5e55076690f4fa7cec3cbf8d34be6b976530b7ece110f4d2
-  data.tar.gz: 4b79e421774282b70f94d40354d62957e4db5d9c5b839888193a6f71228417b9c463e62244409985ef8323782e85dc3ccf47e7a8d27078d89e59b227de6f8b94
+  metadata.gz: 9addf9d0be72f105b5bb99b67b60d1d60c70ac06290829ec16e52fdccd3858200719eb14fa6d7963eebf302d6b7b1282ed48cde9e816afd781190b989d2099d2
+  data.tar.gz: 033ff57831220b2e83119c72bc668329c002c85b625165e00a172b1f69b2a959375772081c17b27a120466553ad8ac8a687938ef698c39c115ecc46c69a7d0e0

data/.travis.yml

@@ -4,10 +4,10 @@ rvm:
   - 2.1.1
   - 1.9.3
   - jruby-head
-  - rbx
+  - rbx-2
 matrix:
   allow_failures:
-    - rvm: rbx
+    - rvm: rbx-2
 env:
   global:
     secure: Tl3oBsBZRI5bMrtNH5mtTDvSTlTxNbsKaAnQ7KQ2KMyiH/eHolOSIbUYB9NB3GRMC6XSyFShRCaYPA/ET36HI+Jw3PFT/XADdiOdFqlk6VyJEUPznNQ1nlp8AsyNn+IexZXIl8DdqmZxGHlY6YKDbQV/U1v+FeW8X5j3TLN1mcw=

data/lib/hyperdrive/errors/json_parse_error.rb

@@ -0,0 +1,11 @@
+module Hyperdrive
+  module Errors
+    class JSONParseError < HTTPError
+      def initialize
+        @http_status_code = 400
+        @message = 'The JSON sent in the request cannot be parsed due to bad syntax.'
+      end
+    end
+  end
+end
+

data/lib/hyperdrive/errors.rb

@@ -7,6 +7,7 @@ require 'hyperdrive/errors/dsl/unknown_argument'
 require 'hyperdrive/errors/http_error'
 require 'hyperdrive/errors/bad_request' # 400 (Generic)
 require 'hyperdrive/errors/internal_server_error' # 500 (Generic)
+require 'hyperdrive/errors/json_parse_error' # 400 (Specific)
 require 'hyperdrive/errors/method_not_allowed' # 405
 require 'hyperdrive/errors/missing_required_param' # 400 (Specific)
 require 'hyperdrive/errors/no_response' # 444

data/lib/hyperdrive/middleware/parse_json_body.rb

@@ -0,0 +1,28 @@
+# encoding: utf-8
+
+module Hyperdrive
+  module Middleware
+    class ParseJSONBody
+      def initialize(app)
+        @app = app
+      end
+
+      def call(env)
+        req = Rack::Request.new(env)
+        if req.media_type =~ /json$/
+          begin
+            json_body = MultiJson.load(env['rack.input'].read)
+            env["rack.input"].rewind
+          rescue => e
+            puts "JSONParseError: #{e.message}"
+            raise Hyperdrive::Errors::JSONParseError.new
+          end
+          env['rack.request.form_hash'] ||= {}
+          env['rack.request.form_hash'].merge!(json_body)
+          env['rack.request.form_input'] = Rack::Utils.build_query(env['rack.request.form_hash'])
+        end
+        @app.call(env)
+      end
+    end
+  end
+end

data/lib/hyperdrive/middleware.rb

@@ -5,6 +5,7 @@ require 'hyperdrive/middleware/cors'
 require 'hyperdrive/middleware/content_negotiation'
 require 'hyperdrive/middleware/error'
 require 'hyperdrive/middleware/pagination'
+require 'hyperdrive/middleware/parse_json_body'
 require 'hyperdrive/middleware/resource'
 require 'hyperdrive/middleware/request_method'
 require 'hyperdrive/middleware/required_params'

data/lib/hyperdrive/server.rb

@@ -28,6 +28,7 @@ module Hyperdrive
           map resource.endpoint do
             use Hyperdrive::Middleware::Resource, resource
             use Hyperdrive::Middleware::RequestMethod
+            use Hyperdrive::Middleware::ParseJSONBody
             use Hyperdrive::Middleware::SanitizeParams
             use Hyperdrive::Middleware::Pagination
             use Hyperdrive::Middleware::RequiredParams

data/lib/hyperdrive/version.rb

@@ -1,3 +1,3 @@
 module Hyperdrive
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 end

data/spec/hyperdrive/errors/json_parse_error_spec.rb

@@ -0,0 +1,18 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe Hyperdrive::Errors::JSONParseError do
+  before do
+    @error = Hyperdrive::Errors::JSONParseError.new
+  end
+
+  it "returns a 400 status code" do
+    @error.http_status_code.must_equal 400
+  end
+
+  it "has a message" do
+    @error.message.must_match(/JSON/)
+  end
+end
+

data/spec/hyperdrive/middleware/parse_json_body_spec.rb

@@ -0,0 +1,29 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe Hyperdrive::Middleware::ParseJSONBody do
+  def app
+    inner_app = ->(env) { [200,{},[env['rack.request.form_input']]] }
+    Hyperdrive::Middleware::ParseJSONBody.new(inner_app)
+  end
+
+  before do
+    @json = '{"ok":"player","nested":{"key":"value"}}'
+    @headers = { 'CONTENT_TYPE' => 'application/json' }
+  end
+
+  it "parses json input" do
+    post '/', @json, @headers
+    last_response.body.must_equal "ok=player&nested=%7B%22key%22%3D%3E%22value%22%7D"
+  end
+
+  it "overrides values in the query string with those in the json input" do
+    post '/?ok=playa', @json, @headers
+    last_response.body.must_equal "ok=player&nested=%7B%22key%22%3D%3E%22value%22%7D"
+  end
+
+  it "throws an error if the json can't be parsed" do
+    -> { post '/', "{ badjson }", @headers }.must_raise Hyperdrive::Errors::JSONParseError
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hyperdrive
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - StyleSeek Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-11 00:00:00.000000000 Z
+date: 2014-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: linguistics
@@ -136,6 +136,7 @@ files:
 - lib/hyperdrive/errors/dsl/unknown_argument.rb
 - lib/hyperdrive/errors/http_error.rb
 - lib/hyperdrive/errors/internal_server_error.rb
+- lib/hyperdrive/errors/json_parse_error.rb
 - lib/hyperdrive/errors/method_not_allowed.rb
 - lib/hyperdrive/errors/missing_required_param.rb
 - lib/hyperdrive/errors/no_response.rb
@@ -152,6 +153,7 @@ files:
 - lib/hyperdrive/middleware/cors.rb
 - lib/hyperdrive/middleware/error.rb
 - lib/hyperdrive/middleware/pagination.rb
+- lib/hyperdrive/middleware/parse_json_body.rb
 - lib/hyperdrive/middleware/request_method.rb
 - lib/hyperdrive/middleware/required_params.rb
 - lib/hyperdrive/middleware/resource.rb
@@ -170,6 +172,7 @@ files:
 - spec/hyperdrive/errors/dsl/unknown_argument_spec.rb
 - spec/hyperdrive/errors/http_error_spec.rb
 - spec/hyperdrive/errors/internal_server_error_spec.rb
+- spec/hyperdrive/errors/json_parse_error_spec.rb
 - spec/hyperdrive/errors/method_not_allowed_spec.rb
 - spec/hyperdrive/errors/missing_required_param_spec.rb
 - spec/hyperdrive/errors/no_response_spec.rb
@@ -185,6 +188,7 @@ files:
 - spec/hyperdrive/middleware/cors_spec.rb
 - spec/hyperdrive/middleware/error_spec.rb
 - spec/hyperdrive/middleware/pagination_spec.rb
+- spec/hyperdrive/middleware/parse_json_body_spec.rb
 - spec/hyperdrive/middleware/request_method_spec.rb
 - spec/hyperdrive/middleware/required_params_spec.rb
 - spec/hyperdrive/middleware/resource_spec.rb
@@ -228,6 +232,7 @@ test_files:
 - spec/hyperdrive/errors/dsl/unknown_argument_spec.rb
 - spec/hyperdrive/errors/http_error_spec.rb
 - spec/hyperdrive/errors/internal_server_error_spec.rb
+- spec/hyperdrive/errors/json_parse_error_spec.rb
 - spec/hyperdrive/errors/method_not_allowed_spec.rb
 - spec/hyperdrive/errors/missing_required_param_spec.rb
 - spec/hyperdrive/errors/no_response_spec.rb
@@ -243,6 +248,7 @@ test_files:
 - spec/hyperdrive/middleware/cors_spec.rb
 - spec/hyperdrive/middleware/error_spec.rb
 - spec/hyperdrive/middleware/pagination_spec.rb
+- spec/hyperdrive/middleware/parse_json_body_spec.rb
 - spec/hyperdrive/middleware/request_method_spec.rb
 - spec/hyperdrive/middleware/required_params_spec.rb
 - spec/hyperdrive/middleware/resource_spec.rb