#270 - Return a query builder for has many associations instead of array

lib/json_api_client/associations/has_many.rb

@@ -10,7 +10,17 @@ def has_many(attr_name, options = {})
       end
 
       class Association < BaseAssociation
+        def query_builder(url)
+          association_class.query_builder.new(
+            association_class,
+            association_class.requestor_class.new(association_class, url)
+          )
+        end
+
+        def data(url)
+          query_builder(url)
+        end
       end
     end
   end
-end
+end

lib/json_api_client/query/builder.rb

@@ -2,11 +2,12 @@ module JsonApiClient
   module Query
     class Builder
 
-      attr_reader :klass
+      attr_reader :klass, :requestor
       delegate :key_formatter, to: :klass
 
-      def initialize(klass)
+      def initialize(klass, requestor = nil)
         @klass = klass
+        @requestor = requestor || klass.requestor
         @primary_key = nil
         @pagination_params = {}
         @path_params = {}
@@ -97,7 +98,7 @@ def find(args = {})
           @primary_key = args
         end
 
-        klass.requestor.get(params)
+        requestor.get(params)
       end
 
       def method_missing(method_name, *args, &block)

lib/json_api_client/query/requestor.rb

@@ -4,8 +4,9 @@ class Requestor
       extend Forwardable
       include Helpers::URI
 
-      def initialize(klass)
+      def initialize(klass, path = nil)
         @klass = klass
+        @path = path
       end
 
       # expects a record
@@ -45,14 +46,15 @@ def custom(method_name, options, params)
 
       protected
 
-      attr_reader :klass
+      attr_reader :klass, :path
       def_delegators :klass, :connection
 
       def resource_path(parameters)
+        base_path = path || klass.path(parameters)
         if resource_id = parameters[klass.primary_key]
-          File.join(klass.path(parameters), encode_part(resource_id))
+          File.join(base_path, encode_part(resource_id))
         else
-          klass.path(parameters)
+          base_path
         end
       end
 

test/unit/association_test.rb

@@ -224,8 +224,12 @@ def test_has_many_fetches_relationship
         ]
       }.to_json)
     owner = Owner.find(1).first
-    properties = owner.properties
-    assert_equal(Array, properties.class)
+    properties_query_builder = owner.properties
+    properties = properties_query_builder.to_a
+    assert_equal(JsonApiClient::Query::Builder, properties_query_builder.class)
+    assert_equal(Property, properties_query_builder.klass)
+    assert_equal(JsonApiClient::Query::Requestor, properties_query_builder.requestor.class)
+    assert_equal(JsonApiClient::ResultSet, properties.class)
     assert_equal("314 150th Ave", properties.last.address)
   end