Merge branch 'master' into inspect-associations-for-computing-type

Author: gaorlov

CHANGELOG.md

@@ -2,8 +2,8 @@
 
 ## Unreleased
 
-## 1.23.0
 - [#403](https://github.com/JsonApiClient/json_api_client/pull/403) - Feature: Use the association options to lookup relationship class
+- [#406](https://github.com/JsonApiClient/json_api_client/pull/406) - Deep-merge nested `additional_params`
 
 ## 1.21.1
 - [#404](https://github.com/JsonApiClient/json_api_client/pull/404) - Expose NotFound json errors

lib/json_api_client/query/builder.rb

@@ -136,7 +136,7 @@ def _new_scope( opts = {} )
              primary_key:       opts.fetch( :primary_key, @primary_key ),
              pagination_params: @pagination_params.merge( opts.fetch( :pagination_params, {} ) ),
              path_params:       @path_params.merge( opts.fetch( :path_params, {} ) ),
-             additional_params: @additional_params.merge( opts.fetch( :additional_params, {} ) ),
+             additional_params: @additional_params.deep_merge( opts.fetch( :additional_params, {} ) ),
              filters:           @filters.merge( opts.fetch( :filters, {} ) ),
              includes:          @includes + opts.fetch( :includes, [] ),
              orders:            @orders + opts.fetch( :orders, [] ),

test/unit/query_builder_test.rb

@@ -122,6 +122,16 @@ def test_can_specify_additional_params
     Article.with_params(sort: "foo").to_a
   end
 
+  def test_can_merge_nested_additional_params
+    stub_request(:get, "http://example.com/articles")
+      .with(query: {top: {foos: 1, bars: 2}})
+      .to_return(headers: {content_type: "application/vnd.api+json"}, body: {
+        data: []
+      }.to_json)
+
+    Article.with_params(top: {foos: 1}).with_params(top: {bars: 2}).to_a
+  end
+
   def test_can_select_fields
     stub_request(:get, "http://example.com/articles")
       .with(query: {fields: {articles: 'title,body'}})