api_resource 0.6.1 → 0.6.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    api_resource (0.6.0)
+    api_resource (0.6.1)
       colorize
       differ
       json
@@ -69,7 +69,7 @@ GEM
     guard-rspec (2.3.3)
       guard (>= 1.1)
       rspec (~> 2.11)
-    guard-spork (1.4.0)
+    guard-spork (1.4.1)
       childprocess (>= 0.2.3)
       guard (>= 1.1)
       spork (>= 0.8.4)
@@ -81,7 +81,7 @@ GEM
     i18n (0.6.1)
     journey (1.0.4)
     json (1.7.6)
-    listen (0.7.0)
+    listen (0.7.1)
     log4r (1.1.10)
     lumberjack (1.0.2)
     mail (2.4.4)
@@ -99,7 +99,7 @@ GEM
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.3.1)
-    rack (1.4.1)
+    rack (1.4.3)
     rack-cache (1.2)
       rack (>= 0.4)
     rack-ssl (1.3.2)

data/lib/api_resource/associations.rb

@@ -8,6 +8,7 @@ module ApiResource
     #TODO: many of these methods should also force loading of the resource definition
     extend ActiveSupport::Concern
     extend ActiveSupport::Autoload
+    include ActiveModel::Dirty
 
     autoload :AssociationProxy
     autoload :BelongsToRemoteObjectProxy
@@ -142,11 +143,18 @@ module ApiResource
       end
 
       # TODO: add a special foreign_key option to associations
-      def association_foreign_key_field(assoc)
+      def association_foreign_key_field(assoc, type = nil)
+
+        if type.nil? && has_many?(assoc)
+          type = :has_many
+        else
+          type = type.to_s.to_sym
+        end
+
         # for now just use the association name
         str = assoc.to_s.singularize.foreign_key
 
-        if has_many?(assoc)
+        if type == :has_many
           str = str.pluralize
         end
 
@@ -177,19 +185,15 @@ module ApiResource
         end
 
         def define_association_as_attribute(assoc_type, assoc_name)
+          id_method_name = association_foreign_key_field(assoc_name, assoc_type)
+
           # set up dirty tracking for associations, but only for ApiResource
           # these methods are also used for ActiveRecord
           # TODO: change this
           if self.ancestors.include?(ApiResource::Base)
             define_attribute_method(assoc_name)
+            define_attribute_method(id_method_name)
           end
-
-          id_method_name = assoc_name.to_s.singularize + "_id"
-
-          if assoc_type.to_s == "has_many"
-            id_method_name += "s"
-          end
-        
           # TODO: Come up with a better implementation for the foreign key thing
           # implement the rest of the active record methods, refactor this into something
           # a little bit more sensible
@@ -223,11 +227,19 @@ module ApiResource
             end
 
             def #{id_method_name}
-              @attributes_cache[:#{id_method_name}] ||= 
-                  @attributes[:#{id_method_name}] || self.#{assoc_name}.collect(&:id)
+              @attributes_cache[:#{id_method_name}] ||= begin
+                if @attributes.key?(:#{id_method_name})
+                  @attributes[:#{id_method_name}]
+                else
+                  self.#{assoc_name}.collect(&:id)
+                end
+              end
             end
 
-            def #{id_method_name}=(val)
+            def #{id_method_name}=(val, force = false)
+              unless @attributes_cache[:#{id_method_name}] == val
+                #{id_method_name}_will_change!
+              end
               @attributes_cache[:#{id_method_name}] = val
             end
 

data/lib/api_resource/base.rb

@@ -536,6 +536,16 @@ module ApiResource
           !self.attribute?(key) || self.protected_attribute?(key) ? accum : accum.merge(key => val)
         end
       end
+
+      # also add in the _id fields that are changed
+      ret = self.association_names.inject(ret) do |accum, assoc_name|
+        id_method = self.class.association_foreign_key_field(assoc_name)
+        if self.changes[id_method].present?
+          accum[id_method] = self.changes[id_method].last
+        end
+        accum
+      end
+
       options[:include_associations].each do |assoc|
         if self.association?(assoc)
           ret[assoc] = self.send(assoc).serializable_hash({

data/lib/api_resource/finders/abstract_finder.rb

@@ -60,9 +60,14 @@ module ApiResource
 				id_hash = HashWithIndifferentAccess.new(id_hash)
 				# load each individually
 				self.condition.included_objects.inject(hsh) do |accum, assoc|
-					accum[assoc.to_sym] = self.klass.association_class(assoc).all( 
-						:params => {:ids => id_hash[assoc]}
-					)
+					id_hash[assoc].each_slice(400).each do |ids|
+						accum[assoc.to_sym] ||= []
+						accum[assoc.to_sym].concat(
+							self.klass.association_class(assoc).all(
+								:params => {:ids => ids}
+							)
+						)
+					end
 					accum
 				end
 

data/lib/api_resource/scopes.rb

@@ -51,7 +51,7 @@ module ApiResource
                   args.slice(i, args.count)
               # Else we are only dealing with a single argument
               else
-                if arg_types[i] == :req || args[i].present?
+                if arg_types[i] == :req || (i < args.count)
                   finder_opts[scope_name][arg_name] = args[i]
                 end
               end

data/lib/api_resource/version.rb

@@ -1,3 +1,3 @@
 module ApiResource
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

data/spec/lib/associations_spec.rb

@@ -260,6 +260,21 @@ describe "Associations" do
       ap.test.should eql("testval")
 
     end
+
+    it "should include the foreign_key_id when saving" do
+      tr = TestResource.new
+      tr.belongs_to_object_id = 4
+      hsh = tr.serializable_hash
+      hsh[:belongs_to_object_id].should eql(4)
+    end
+
+    it "should serialize the foreign_key_id when saving if it is updated" do
+      TestResource.connection
+      tr = TestResource.find(1)
+      tr.belongs_to_object_id = 5
+      hsh = tr.serializable_hash
+      hsh[:belongs_to_object_id].should eql(5)
+    end
   end
 
   describe "Multi Object Associations" do
@@ -343,6 +358,27 @@ describe "Associations" do
           )
           ap.remote_path.should eql("/route")
         end
+
+        it "should include the foreign_key_id when saving" do
+          tr = TestResource.new
+          tr.has_many_object_ids = [4]
+          hsh = tr.serializable_hash
+          hsh[:has_many_object_ids].should eql([4])
+        end
+
+        it "should serialize the foreign_key_id when saving if it is updated" do
+          tr = TestResource.find(1)
+          tr.has_many_object_ids = [5]
+          hsh = tr.serializable_hash
+          hsh[:has_many_object_ids].should eql([5])
+        end
+
+        it "should not try to load if the foreign key is nil" do
+          TestResource.connection.expects(:get).returns(:id => 1, :belongs_to_object_id => nil)
+          tr = TestResource.find(1)
+          tr.id.should eql(1)
+          tr.belongs_to_object_id.should be_nil
+        end
       end
 
     end

data/spec/lib/conditions/abstract_conditions_spec.rb

@@ -75,4 +75,11 @@ describe "Conditions" do
 		obj.collect{|o| o * 2}.should eql([2,4])
 	end
 
+	it "should not typecast nil and false to true when creating condition hashes" do
+		obj = TestResource.paginate(false, nil)
+		hsh = obj.to_hash["paginate"]
+		hsh["per_page"].should eql(false)
+		hsh.should be_key(:current_page)
+	end
+
 end

data/spec/lib/finders_spec.rb

@@ -35,4 +35,23 @@ describe ApiResource::Finders do
 		TestResource.includes(:has_many_objects).find(1)
 	end
 
+	it "should be able to use a scope with arguments" do
+		TestResource.connection.expects(:get)
+			.with("/test_resources.json?active=true&birthday%5Bdate%5D=5").returns([{"id" => 10}])
+
+		res = TestResource.active.birthday(5).all
+		res.should be_a(Array)
+		res.first.id.should eql(10)
+	end
+
+	it "should be able to use a scope with multiple arguments" do
+		TestResource.connection.expects(:get)
+			.with("/test_resources.json?paginate%5Bcurrent_page%5D=10&paginate%5Bper_page%5D=5")
+			.returns([{:id => 20}])
+
+		res = TestResource.paginate(5, 10).all
+		res.should be_a(Array)
+		res.first.id.should eql(20)
+	end
+
 end

metadata

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