remotable 0.2.0 → 0.2.2

data/lib/remotable.rb

@@ -73,7 +73,7 @@ module Remotable
   #  * getters and setters for each attribute
   #
   def remote_model(*args)
-    if args.any?
+    if args.length >= 1
       @remote_model = args.first
       
       @__remotable_included ||= begin
@@ -82,7 +82,7 @@ module Remotable
         true
       end
       
-      extend_remote_model(@remote_model)
+      extend_remote_model(@remote_model) if @remote_model
     end
     @remote_model
   end

data/lib/remotable/active_record_extender.rb

@@ -19,7 +19,7 @@ module Remotable
       before_create   :create_remote_resource,  :unless => :nosync?
       before_destroy  :destroy_remote_resource, :unless => :nosync?
       
-      before_validation :reset_expiration_date, :on => :create, :unless => :nosync?
+      before_validation :initialize_expiration_date, :on => :create
       
       validates_presence_of :expires_at
       
@@ -34,7 +34,7 @@ module Remotable
       include Nosync
       
       def nosync?
-        Remotable.nosync? || super
+        Remotable.nosync? || remote_model.nil? || super
       end
       
       # Sets the key with which a resource is identified remotely.
@@ -326,7 +326,11 @@ module Remotable
     
     
     def pull_remote_data!
-      merge_remote_data!(remote_resource)
+      if remote_resource
+        merge_remote_data!(remote_resource)
+      elsif fetch_value
+        remote_model_has_been_destroyed!
+      end
     end
     
     
@@ -343,33 +347,33 @@ module Remotable
     
   private
     
+    def fetch_value
+      self[local_key]
+    end
+    
     def fetch_remote_resource
-      fetch_value = self[local_key]
-      # puts "local_key", local_key.inspect, "",
-      #      "remote_key", remote_key.inspect, "",
-      #      "fetch_value", fetch_value
-      find_remote_resource_by(remote_key, fetch_value)
+      fetch_value && find_remote_resource_by(remote_key, fetch_value)
     end
     
     def merge_remote_data!(remote_resource)
-      if remote_resource.nil?
-        nosync { destroy }
-      
-      else
-        merge_remote_data(remote_resource)
-        reset_expiration_date
-        nosync { save! }
-      end
-      
+      merge_remote_data(remote_resource)
+      reset_expiration_date
+      nosync { save! }
       self
     end
     
+    def remote_model_has_been_destroyed!
+      nosync { destroy }
+    end
+    
     
     
     def update_remote_resource
-      if any_remote_changes?
+      if any_remote_changes? && remote_resource
         merge_local_data(remote_resource, true)
-        unless remote_resource.save
+        if remote_resource.save
+          merge_remote_data!(remote_resource)
+        else
           merge_remote_errors(remote_resource.errors)
           raise ActiveRecord::RecordInvalid.new(self)
         end
@@ -393,11 +397,20 @@ module Remotable
     end
     
     def destroy_remote_resource
-      remote_resource && remote_resource.destroy
+      if remote_resource && remote_resource.destroy
+        true
+      else
+        merge_remote_errors(remote_resource.errors)
+        false
+      end
     end
     
     
     
+    def initialize_expiration_date
+      reset_expiration_date unless self.expires_at
+    end
+    
     def reset_expiration_date
       self.expires_at = expires_after.from_now
     end

data/lib/remotable/active_resource_fixes.rb

@@ -1,7 +1,9 @@
 require "active_resource"
+require "active_support/concern"
 
 
 module ActiveResourceFixes
+  extend ActiveSupport::Concern
   
   # ActiveResource hacks method_missing without hacking respond_to?
   # In fact, it responds to any method that ends in an equals sign.
@@ -17,11 +19,30 @@ module ActiveResourceFixes
     end
   end
   
+  
+  included do
+    alias_method_chain :destroy, :validation
+  end
+  
+  
+  # ActiveResource::Validations overrides ActiveResource::Base#save
+  # to rescue from ActiveResource::ResourceInvalid and record the
+  # resource's errors. Do the same for `destroy`.
+  def destroy_with_validation
+    destroy_without_validation
+  rescue ActiveResource::ResourceInvalid => error
+    # cache the remote errors because every call to <tt>valid?</tt> clears
+    # all errors. We must keep a copy to add these back after local
+    # validations.
+    @remote_errors = error
+    load_remote_errors(@remote_errors, true)
+    false
+  end
+  
 end
 
 
 module ActiveResourceFixes30
-  include ActiveResourceFixes
   
   # ! in this method, don't check the Content-Type header: rack doesn't always return it
   def load_attributes_from_response(response)
@@ -34,7 +55,6 @@ end
 
 
 module ActiveResourceFixes31
-  include ActiveResourceFixes
   
   # ! in this method, don't check the Content-Type header: rack doesn't always return it
   def load_attributes_from_response(response)
@@ -54,6 +74,9 @@ else
 end
 
 
+ActiveResource::Base.send(:include, ActiveResourceFixes)
+
+
 # ActiveResource expects that errors will be an array of string
 # However, this is not what Rails Responders are inclined to return.
 

data/lib/remotable/version.rb

@@ -1,3 +1,3 @@
 module Remotable
-  VERSION = "0.2.0"
+  VERSION = "0.2.2"
 end

data/test/active_resource_test.rb

@@ -15,7 +15,7 @@ class ActiveResourceTest < ActiveSupport::TestCase
   
   
   # ========================================================================= #
-  # Finding                                                                   #
+  #  Finding                                                                  #
   # ========================================================================= #
   
   test "should be able to find resources by different attributes" do
@@ -166,7 +166,7 @@ class ActiveResourceTest < ActiveSupport::TestCase
     RemoteTenant.run_simulation do |s|
       s.show(tenant.remote_id, {
         :id => tenant.remote_id,
-        :slug => tenant.slug,
+        :slug => "totally-wonky",
         :church_name => tenant.name
       })
       
@@ -178,6 +178,7 @@ class ActiveResourceTest < ActiveSupport::TestCase
       mock(tenant.remote_resource).save { true }
       
       tenant.save!
+      assert_equal "totally-wonky", tenant.slug, "After updating a record, remote data should be merge"
     end
   end
   
@@ -227,6 +228,7 @@ class ActiveResourceTest < ActiveSupport::TestCase
       tenant.save!
       
       assert_equal true, tenant.remote_resource.persisted?
+      assert_equal 143, tenant.remote_id, "After creating a record, remote data should be merge"
     end
   end
   
@@ -305,12 +307,14 @@ class ActiveResourceTest < ActiveSupport::TestCase
         :church_name => tenant.name
       })
       
-      s.destroy(tenant.remote_id, :status => 500)
+      s.destroy(tenant.remote_id, 
+        :body => { :errors => { :base => ["nope"] } },
+        :status => 422)
       
       tenant.nosync = false
-      assert_raises(ActiveResource::ServerError) do
-        tenant.destroy
-      end
+      tenant.destroy
+      assert_equal false, tenant.destroyed?
+      assert_equal ["nope"], tenant.errors[:base]
     end
   end
   

data/test/remotable_test.rb

@@ -7,6 +7,10 @@ class RemotableTest < ActiveSupport::TestCase
   
   
   
+  # ========================================================================= #
+  #  Keys                                                                     #
+  # ========================================================================= #
+  
   test "should consider :id to be the remote key if none is specified" do
     assert_equal :id,         RemoteWithoutKey.remote_key
     assert_equal :remote_id,  RemoteWithoutKey.local_key
@@ -28,6 +32,10 @@ class RemotableTest < ActiveSupport::TestCase
   
   
   
+  # ========================================================================= #
+  #  Temporary remote models                                                  #
+  # ========================================================================= #
+  
   test "should support temporary models" do
     assert_nil BespokeTenant.find_by_slug("404")
     assert_not_nil BespokeTenant.with_remote_model(BespokeModel2.new) { BespokeTenant.find_by_slug("404") }
@@ -40,10 +48,57 @@ class RemotableTest < ActiveSupport::TestCase
     assert_nil BespokeTenant.find_by_slug("405")
   end
   
+  test "should support setting remote_model to nil" do
+    Tenant.with_remote_model(nil) do
+      Tenant.remote_model
+      assert_equal nil, Tenant.remote_model, "remote_model didn't get set to nil"
+      Tenant.create!(:name => "Test 1", :slug => "test-1")
+      assert_not_nil Tenant.find_by_name("Test 1"), "new tenant was not found"
+    end
+  end
+  
+  
+  
+  # ========================================================================= #
+  #  Edge cases                                                               #
+  #                                                                           #
+  #  Suppose some records of a table are remoted and others aren't.           #
+  #  If a record is saved which is local-only, it's remote primary key        #
+  #  isn't stored. If this record is expired, then make sure that             #
+  #  Remotable doesn't break when it tries to look up a remote record         #
+  #  with a nil key.                                                          #
+  # ========================================================================= #
+  
+  test "should not break when refreshing a record which does not have a foreign key" do
+    tenant = Tenant.nosync { Tenant.create!(
+      :name => "Test 1",
+      :slug => "test-1",
+      :remote_id => nil,
+      :expires_at => 1.day.ago ) }
+    assert_equal nil, tenant.remote_id
+    
+    # Fetching this tenant, Remotable will want to
+    # refresh it, but it shouldn't because it can't.
+    puts "->"
+    assert_not_nil Tenant.where(:slug => "test-1").first, "A tenant with the slug \"test-1\" was not found"
+  end
+  
+  test "should not break when updating a record which does not have a foreign key" do
+    tenant = Tenant.nosync { Tenant.create!(
+      :name => "Test 1",
+      :slug => "test-1",
+      :remote_id => nil ) }
+    assert_equal nil, tenant.remote_id
+    
+    # Updating this tenatn, Remotable will want to
+    # sync it, but it shouldn't because it can't.
+    assert_equal true, tenant.update_attributes(:name => "Test 2"), "The tenant was not updated (errors: #{tenant.errors.full_messages.join(", ")})"
+  end
+  
   
   
   # ========================================================================= #
-  # Finders                                                                   #
+  #  Finders                                                                  #
   # ========================================================================= #
   
   test "should create expected finders" do
@@ -68,7 +123,7 @@ class RemotableTest < ActiveSupport::TestCase
   
   
   # ========================================================================= #
-  # Validating Models                                                         #
+  #  Validating Models                                                        #
   # ========================================================================= #
   
   test "should raise an exception if a remote model does not respond to all class methods" do

metadata

@@ -1,160 +1,156 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: remotable
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.2.2
   prerelease: 
-  version: 0.2.0
 platform: ruby
-authors: 
+authors:
 - Robert Lail
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-20 00:00:00 -06:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-04-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activeresource
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2156933760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2156933760
+- !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &2156930420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2156930420
+- !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &2156927360 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2156927360
+- !ruby/object:Gem::Dependency
   name: rails
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &2156946400 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2156946400
+- !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &2156943380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2156943380
+- !ruby/object:Gem::Dependency
   name: turn
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &2156962240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2156962240
+- !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &2156969980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2156969980
+- !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &2156968120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2156968120
+- !ruby/object:Gem::Dependency
   name: active_resource_simulator
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &2156965300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2156965300
+- !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &2156982000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2156982000
+- !ruby/object:Gem::Dependency
   name: rr
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &2156980560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2156980560
+- !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &2156979980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id012
-description: Remotable keeps a locally-stored ActiveRecord synchronized with a remote resource.
-email: 
+  version_requirements: *2156979980
+description: Remotable keeps a locally-stored ActiveRecord synchronized with a remote
+  resource.
+email:
 - robert.lail@cph.org
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .simplecov
 - Gemfile
@@ -184,41 +180,37 @@ files:
 - test/support/schema.rb
 - test/test_helper.rb
 - test/understanding_test.rb
-has_rdoc: true
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -758603566209047915
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -2708411385846481518
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -758603566209047915
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -2708411385846481518
 requirements: []
-
 rubyforge_project: remotable
-rubygems_version: 1.6.2
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Binds an ActiveRecord model to a remote resource and keeps the two synchronized
-test_files: 
+test_files:
 - test/active_resource_test.rb
 - test/bespoke_test.rb
 - test/factories/tenants.rb