Merge branch 'master' into 0.8.x

hanami · Nov 14, 2016 · cf12b6e · cf12b6e
2 parents 01f40d3 + f54191a
commit cf12b6e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,7 +6,7 @@ Rack compatible HTTP router for Ruby
 - [Kyle Chong] Referenced params from body parses in Rack env via `router.parsed_body`
 
 ### Fixed
-- [Luca Guidi] Ensure params from routes take precedence over params from body parsing
+- [Luca Guidi & Lucas Hosseini] Ensure params from routes take precedence over params from body parsing
 - [Luca Guidi] Ensure inspector to respect path prefix of mouted apps
 
 ### Changed

diff --git a/lib/hanami/routing/parsers.rb b/lib/hanami/routing/parsers.rb
@@ -49,25 +49,25 @@ def _redefine_call
           env[RACK_INPUT].rewind    # somebody might try to read this stream
 
           env[ROUTER_PARAMS] ||= {} # prepare params
-          parsed_body = _parse(env, body)
-          env[ROUTER_PARSED_BODY] = parsed_body
-          env[ROUTER_PARAMS]      = parsed_body.merge(env[ROUTER_PARAMS])
+          env[ROUTER_PARSED_BODY] = _parse(env, body)
+          env[ROUTER_PARAMS]      = _symbolize(env[ROUTER_PARSED_BODY]).merge(env[ROUTER_PARAMS])
 
           env
         end
       end
 
+      def _symbolize(body)
+        if body.is_a?(Hash)
+          Utils::Hash.new(body).deep_dup.symbolize!.to_h
+        else
+          { FALLBACK_KEY => body }
+        end
+      end
+
       def _parse(env, body)
-        result = @parsers[
+        @parsers[
           media_type(env)
         ].parse(body)
-
-        case result
-        when Hash
-          Utils::Hash.new(result).symbolize!.to_h
-        else
-          {FALLBACK_KEY => result}
-        end
       end
 
       def media_type(env)

diff --git a/test/routing/parsers_test.rb b/test/routing/parsers_test.rb
@@ -51,7 +51,7 @@
 
         it "stores parsed body" do
           result = @parsers.call(env)
-          result['router.parsed_body'].must_equal({attribute: "ok"})
+          result['router.parsed_body'].must_equal({'attribute' => "ok"})
         end
 
         describe "with non hash body" do
@@ -64,7 +64,7 @@
 
           it "stores parsed body" do
             result = @parsers.call(env)
-            result['router.parsed_body'].must_equal({"_" => ["foo"]})
+            result['router.parsed_body'].must_equal(["foo"])
           end
         end
 
@@ -87,7 +87,7 @@
 
         it "stores parsed body" do
           result = @parsers.call(env)
-          result['router.parsed_body'].must_equal({attribute: "ok"})
+          result['router.parsed_body'].must_equal({'attribute' => "ok"})
         end
 
         describe 'with malformed json' do