apia 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 149ff24b39258aecaa9aaf738ff5d65c0d4ef24ccbc74844ae4ae12df5fe3e07
-  data.tar.gz: 5c6a4ea4c17f482e6b2614a44aab4e3bf7e9eccae7caacb1acdabe000f7f6838
+  metadata.gz: 33cb0099fcbfe56a47b0c3f6253252a7fbe64963627695d8580936f72731ee37
+  data.tar.gz: 9744e82b89172cad5f5eac2870484f43dfe0cf23e793e2db6265b7dcbdd20f12
 SHA512:
-  metadata.gz: 2b85dd5fea1f2f566e687686883180d73c53f0623598a3552a8f2566ebe6ff0f8987c3446334b2947b83e355466886ffd092b25e132275a1b783c1b2488f0e1e
-  data.tar.gz: 7ee2812dc10ac8928bcb9674a18fee6ab6fae117becc9f43a864dc4d35ad7db6bbc95c3ea61d80bcb029e8feb3c463260c012c036d255df8b36205c1ee628831
+  metadata.gz: 195b2874b6deeeb9d52f8fd568cf553da7fd09f43a10e04a4302736eae62ea3ecd4272077e8b7d446cfb46a74d9023ba6af69c6d6d5796ecf3036fcb95bde9d2
+  data.tar.gz: 8f37aca1ff128cbe3d3fe6b0341a64b68df34ba273f6eb7503c8c3b8ec6e672fb14efe24f589e40f81c1d3fb325e6f0649dc5ccdb0a55925bcf68f9818d995c7

data/VERSION

@@ -1 +1 @@
-3.0.2
+3.0.3

data/lib/apia/argument_set.rb

@@ -5,6 +5,7 @@ require 'apia/definitions/argument_set'
 require 'apia/errors/invalid_argument_error'
 require 'apia/errors/missing_argument_error'
 require 'apia/helpers'
+require 'apia/deep_merge'
 
 module Apia
   class ArgumentSet
@@ -46,7 +47,11 @@ module Apia
       # @param request [Apia::Request]
       # @return [Apia::ArgumentSet]
       def create_from_request(request)
-        new(request.json_body || request.params || {}, request: request)
+        json_body = request.json_body || {}
+        params = request.params || {}
+        merged_params = DeepMerge.merge(params, json_body)
+
+        new(merged_params, request: request)
       end
 
     end

data/lib/apia/deep_merge.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Apia
+  module DeepMerge
+
+    class << self
+
+      def merge(hash_a, hash_b, &block)
+        hash_a.merge!(hash_b) do |key, this_val, other_val|
+          if this_val.is_a?(Hash) && other_val.is_a?(Hash)
+            merge(this_val, other_val, &block)
+          elsif block_given?
+            block.call(key, this_val, other_val)
+          else
+            other_val
+          end
+        end
+      end
+
+    end
+
+  end
+end

data/lib/apia/request.rb

@@ -39,6 +39,12 @@ module Apia
       has_header?('rack.input')
     end
 
+    def params
+      return {} unless body?
+
+      super
+    end
+
     private
 
     def parse_json_from_string(body)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apia
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Adam Cooke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-18 00:00:00.000000000 Z
+date: 2021-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -52,6 +52,7 @@ files:
 - lib/apia/authenticator.rb
 - lib/apia/callable_with_environment.rb
 - lib/apia/controller.rb
+- lib/apia/deep_merge.rb
 - lib/apia/defineable.rb
 - lib/apia/definition.rb
 - lib/apia/definitions/api.rb