api_resource 0.6.5 → 0.6.6

data/lib/api_resource/associations/association_proxy.rb

@@ -24,6 +24,9 @@ module ApiResource
 
         id_method_name = self.foreign_key_name(assoc_name)
         associated_class = opts[:class_name] || assoc_name.to_s.classify
+
+        # pass this along
+        opts[:name] = assoc_name
         
         klass.api_resource_generated_methods.module_eval <<-EOE, __FILE__, __LINE__ + 1
           def #{assoc_name}

data/lib/api_resource/associations/has_many_remote_object_proxy.rb

@@ -33,13 +33,34 @@ module ApiResource
         # if we don't have a remote path and we do have and id,
         # we set it before we call the internal object
         # this lets us dynamically generate the correct path
-        if self.remote_path.blank? && self.owner.try(:id).present?
-          self.remote_path = self.klass.collection_path(
-            self.owner.class.to_s.foreign_key => self.owner.id
+        if self.remote_path.blank?
+          # first try for a set of ids e.g. /objects.json?ids[]=1
+          associated_ids = self.owner.read_attribute(
+            self.association_id_method
           )
+          if associated_ids.is_a?(Array) && associated_ids.present?
+            self.remote_path = self.klass.collection_path(
+              :ids => associated_ids
+            )
+          # next try for a foreign key e.g. /objects.json?owner_id=1
+          elsif self.owner.try(:id).present?
+            self.remote_path = self.klass.collection_path(
+              self.owner.class.to_s.foreign_key => self.owner.id
+            )
+          end
         end
         super
       end
+
+      protected
+
+      # The method by which we get ids for the association
+      # e.g. object_ids
+      def association_id_method
+        self.class.foreign_key_name(@options["name"])
+      end
+
+
     end
   end
 end

data/lib/api_resource/conditions/abstract_condition.rb

@@ -6,14 +6,16 @@ module ApiResource
 
 			include Enumerable
 
-			attr_reader :conditions, :klass, :included_objects, :internal_object, :association,
-									:remote_path
+			attr_reader :conditions, :klass, :included_objects, 
+				:internal_object, :association, :remote_path
 			
 			# TODO: add the other load forcing methods here for collections
-			delegate :[], :[]=, :<<, :first, :second, :last, :blank?, :nil?, :include?, :push, :pop,
-							 :+, :concat, :flatten, :flatten!, :compact, :compact!, :empty?, :fetch, :map,
-							 :reject, :reject!, :reverse, :select, :select!, :size, :sort, :sort!, :uniq, :uniq!,
-							 :to_a, :sample, :slice, :slice!, :count, :present?, :to => :internal_object
+			delegate :[], :[]=, :<<, :first, :second, :last, :blank?, :nil?, 
+				:include?, :push, :pop, :+, :concat, :flatten, :flatten!, :compact, 
+				:compact!, :empty?, :fetch, :map, :reject, :reject!, :reverse, 
+				:select, :select!, :size, :sort, :sort!, :uniq, :uniq!, :to_a, 
+				:sample, :slice, :slice!, :count, :present?, :delete_if,
+				:to => :internal_object
 
 			# need to figure out what to do with args in the subclass,
 			# parent is the set of scopes we have right now

data/lib/api_resource/version.rb

@@ -1,3 +1,3 @@
 module ApiResource
-  VERSION = "0.6.5"
+  VERSION = "0.6.6"
 end

data/spec/lib/associations/has_many_remote_object_proxy_spec.rb

@@ -20,6 +20,23 @@ module ApiResource
 
       end
 
+      context "#load" do
+
+        it "does a find based on its set of ids if present" do
+          tr = TestResource.new
+          tr.has_many_object_ids = [1,2]
+
+          HasManyObject.connection.expects(:get)
+            .with("/has_many_objects.json?ids%5B%5D=1&ids%5B%5D=2")
+            .returns([{"name" => "Test"}])
+
+          tr.has_many_objects.length.should be 1
+          tr.has_many_objects.first.name.should eql("Test")
+
+        end
+
+      end
+
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: api_resource
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-16 00:00:00.000000000 Z
+date: 2013-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake