codebrulee-attr_remote 0.0.5 → 0.0.6

data/attr_remote.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name     = "attr_remote"
-  s.version  = "0.0.5"
+  s.version  = "0.0.6"
   s.date     = "2008-01-06"
   s.summary  = "Painlessly integrate ActiveResource into ActiveRecord."
   s.email    = "smithk14@gmail.com"

data/lib/attr_remote.rb

@@ -4,14 +4,11 @@ require 'active_resource'
 
 module AttrRemote
   module ClassMethods
+    
     def remote_attributes
       @remote_attributes ||= []
     end
     
-    def remote_changed?
-      @remote_changed == true
-    end
-    
     def attr_remote(*remote_attrs)
       remote_class = "Remote#{self.to_s}"
       remote_instance_meth = remote_class.underscore
@@ -19,7 +16,7 @@ module AttrRemote
       
       remote_attributes.concat(remote_attrs).uniq!
     
-      class_eval <<-remote_access
+      class_eval <<-remote_access, __FILE__, __LINE__+1
   # def remote_user
   #   @remote_user ||= RemoteUser.find(self.remote_user_id) rescue nil
   # end
@@ -79,7 +76,7 @@ module AttrRemote
     before_update :update_#{remote_instance_meth}
     
   # def update_remote_user
-  #   if self.remote_user_id and self.class.remote_changed?
+  #   if self.remote_user_id and self.remote_attributes_changed?
   #     remote_hash = {}
   #     self.class.remote_attributes.each do |attr|
   #       remote_hash[attr.to_sym] = self.send(attr.to_sym)
@@ -93,13 +90,13 @@ module AttrRemote
   #       end
   #       return false
   #     else
-  #       @remote_changed = false
+  #       @remote_attributes_changed = false
   #       return true
   #     end
   #   end
   # end
     def update_#{remote_instance_meth}
-      if self.#{remote_instance_id} and self.class.remote_changed?
+      if self.#{remote_instance_id} and self.remote_attributes_changed?
         remote_hash = {}
         self.class.remote_attributes.each do |attr|
           remote_hash[attr.to_sym] = self.send(attr.to_sym)
@@ -113,7 +110,7 @@ module AttrRemote
           end
           return false
         else
-          @remote_changed = false
+          @remote_attributes_changed = false
           return true
         end
       end
@@ -128,7 +125,7 @@ module AttrRemote
 remote_access
 
       remote_attributes.each do |attr|      
-        class_eval <<-remote_attribute
+        class_eval <<-remote_attribute, __FILE__, __LINE__+1
   def #{attr}                             # def username
     remote_#{attr} || ''                  #   remote_username || ''
   end                                     # end
@@ -147,12 +144,36 @@ remote_access
 
   def #{attr}=(attr_value)                # def username=(attr_value)
     @#{attr} = attr_value                 #   @username = attr_value
-    @remote_changed = true                #   @remote_changed = true
+    @remote_attributes_changed = true     #   @remote_attributes_changed = true
   end                                     # end
 remote_attribute
       end
     end
   end
+  
+  module InstanceMethods
+    def self.included(base)
+      base.alias_method_chain :save, :dirty_remote
+      base.alias_method_chain :save!, :dirty_remote
+    end
+    
+    def remote_attributes_changed?
+      @remote_attributes_changed == true
+    end
+    
+    def save_with_dirty_remote(*args) #:nodoc:
+      if status = save_without_dirty_remote(*args)
+        @remote_attributes_changed = false
+      end
+      status
+    end
+    def save_with_dirty_remote!(*args) #:nodoc:
+      status = save_without_dirty_remote!(*args)
+      @remote_attributes_changed = false
+      status
+    end
+  end
 end
 
 ActiveRecord::Base.extend AttrRemote::ClassMethods
+ActiveRecord::Base.send(:include, AttrRemote::InstanceMethods)

data/test/factories.rb

@@ -1,3 +1,8 @@
+Factory.sequence :remote_user_id do |n|
+  n
+end
+
 Factory.define :user do |u|
   u.name "Kevin"
+  u.remote_user_id { Factory.next(:remote_user_id) }
 end

data/test/helper.rb

@@ -17,29 +17,18 @@ ActiveRecord::Base.establish_connection({
   :dbfile => File.dirname(__FILE__) + '/db/test.db'
 })
 
-ActiveResource::HttpMock.respond_to do |mock|
-  # user is a successful creation
-  mock.get "/users/1.xml", {}, {
-    :name => "Kevin"
-  }.to_xml(:root => "user")
-  
-  mock.post "/users.xml", {}, {
-    :name => "Kevin"
-  }.to_xml(:root => "user"), 200, {
-    'Location' => 'http://0.0.0.0:3000/users/1'
-  }
+class Test::Unit::TestCase
+  def mock_user(user)
+    ActiveResource::HttpMock.respond_to do |mock|
+      mock.get "/users/#{user.remote_user_id}.xml", {}, {
+        :id => user.remote_user_id,
+        :name => user.name
+      }.to_xml(:root => "user")
+      mock.put "/users/#{user.remote_user_id}.xml", {}, '', 200, {}
+    end
+  end
   
-  mock.put "/users/1.xml", {}, '', 200, {}
   
-  # bob is not so lucky
-  mock.post "/bobs.xml", 
-            {}, 
-            returning(ActiveRecord::Errors.new(Bob.new)) { |errors|
-              errors.add(:email, "can't be blank")
-            }.to_xml, 422
-end
-
-class Test::Unit::TestCase
   def teardown
     # cleanup all our test data
     User.delete_all

data/test/test_attr_remote.rb

@@ -9,7 +9,7 @@ class TestAttrRemote < Test::Unit::TestCase
   
   context "remote object access" do
     before do
-      @user = Factory(:user)
+      mock_user(@user = Factory(:user, :name => "Kevin"))
     end
     test "that an instance should have a method for the remote object" do
       assert @user.respond_to?(:remote_user)
@@ -31,7 +31,10 @@ class TestAttrRemote < Test::Unit::TestCase
     end
     
     test "that after first read, an instance variable contains the value" do
-      user = Factory.build(:user, :name => nil, :remote_user_id => 1)
+      mock_user(user = Factory(:user))
+      expected_name = user.name
+      
+      user = User.find(user.id)
       assert_nil user.instance_variable_get('@name')
       user.name
       assert_equal "Kevin", user.instance_variable_get('@name')
@@ -59,8 +62,16 @@ class TestAttrRemote < Test::Unit::TestCase
       assert_equal "test", user.name
     end
     test "that the remote object id is set after creation" do
-      user = Factory(:user, :name => "Kevin")
-      assert_equal 1, user.remote_user_id
+      user = Factory.build(:user, :remote_user_id => nil)
+      ActiveResource::HttpMock.respond_to do |mock|
+        mock.post "/users.xml", {}, {
+          :name => user.name
+        }.to_xml(:root => "user"), 200, {
+          'Location' => 'http://0.0.0.0:3000/users/1'
+        }
+      end
+      assert user.save
+      assert_not_nil user.remote_user_id
     end
     
     test "that remote errors halt save process" do
@@ -70,33 +81,55 @@ class TestAttrRemote < Test::Unit::TestCase
     end
     
     test "that failure of local validations halts remote creation and therefore remote errors do not show up" do
+      ActiveResource::HttpMock.respond_to do |mock|
+        mock.post "/bobs.xml", 
+                  {}, 
+                  returning(ActiveRecord::Errors.new(Bob.new)) { |errors|
+                    errors.add(:email, "can't be blank")
+                  }.to_xml, 422
+      end
       bob = Bob.create(:title => nil)
       assert !bob.save
       assert_not_nil bob.errors.on(:title)
       assert_nil bob.errors.on(:email)
     end
+    
+    test "that after a successful creation an instance is marked as not having any remote changes" do
+      user = Factory(:user, :remote_user_id => 2)
+      assert !user.remote_attributes_changed?
+    end
   end
   
   context "updates" do
     test "that a remote attribute change is propogated" do
-      user = Factory(:user)
+      mock_user(user = Factory(:user))
       user.name = "boo"
       assert user.save
-      ActiveResource::HttpMock.respond_to do |mock|
-        mock.get "/users/1.xml", {}, {
-          :name => "boo"
-        }.to_xml(:root => "user")
-      end
+      mock_user(user)
       user = User.find(user.id)
       assert_equal "boo", user.name
     end
     
+    test "that after a successful update an instance is marked as not having any remote changes" do
+      user = Factory(:user)
+      mock_user(user)
+      user.name = "new name"
+      assert user.save
+      assert !user.remote_attributes_changed?
+    end
+    
     test "that save doesn't cause a remote hit if a remote attribute has not been changed" do
       user = Factory(:user, :remote_user_id => 2)
       # purposely not mocking the ARes call to "prove" 
-      # that it isn't invoked son save
+      # that it isn't invoked on save
       assert user.save
     end
+    
+    test "that changing a local attribute does not trigger a remote save" do
+      bob = Bob.new(:remote_bob_id => 3)
+      bob.title = "test"
+      assert bob.save
+    end
   end
   
   context "deletes" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: codebrulee-attr_remote
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Kevin Smith