fixing Query::Builder#find with parameters

Author: gaorlov

lib/json_api_client/query/builder.rb

@@ -7,7 +7,7 @@ class Builder
 
       def initialize(klass, opts = {})
         @klass             = klass
-        @primary_key       = nil
+        @primary_key       = opts.fetch( :primary_key, nil )
         @pagination_params = opts.fetch( :pagination_params, {} )
         @path_params       = opts.fetch( :path_params, {} )
         @additional_params = opts.fetch( :additional_params, {} )
@@ -87,12 +87,12 @@ def to_a
       def find(args = {})
         case args
         when Hash
-          where(args)
+          scope = where(args)
         else
-          @primary_key = args
+          scope = _new_scope( primary_key: args )
         end
 
-        klass.requestor.get(params)
+        klass.requestor.get(scope.params)
       end
 
       def method_missing(method_name, *args, &block)
@@ -103,6 +103,7 @@ def method_missing(method_name, *args, &block)
 
       def _new_scope( opts = {} )
         self.class.new( @klass,
+             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, {} ) ),

test/unit/query_builder_test.rb

@@ -243,12 +243,17 @@ def test_find_with_args
     all_stub = stub_request(:get, "http://example.com/articles")
         .to_return(headers: {content_type: "application/vnd.api+json"}, body: { data: [] }.to_json)
 
+    find_stub = stub_request(:get, "http://example.com/articles/6")
+        .to_return(headers: {content_type: "application/vnd.api+json"}, body: { data: [] }.to_json)
+
     scope = Article.where()
 
     scope.find( "author.id" => "foo" )
+    scope.find(6)
     scope.all
 
     assert_requested first_stub, times: 1
     assert_requested all_stub, times: 1
+    assert_requested find_stub, times: 1
   end
 end