remotable 0.2.5.beta1 → 0.2.5.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dced86b6d1612537910a489e785e2dbb9b280018
-  data.tar.gz: db13ecad5bf99f21719f5e03ed4057fce8ed14f1
+  metadata.gz: bafa573e3a1665e4e5e26c14d06326d953de1232
+  data.tar.gz: 13cf353936b00ab92a8a1d1fd2dfc9d35098288f
 SHA512:
-  metadata.gz: 9fcb24667b7b4914f7d64efd18a7e27f8906e22adbc17c14ca2191d05a53f31d3e25a9d9fb58dbd244d47fad34bd63a9b7908d1526d871271dd980664a7bddbb
-  data.tar.gz: 189ac92190ec9add70eb40d364d434b7706dba41b49459e276500db31db14f99b15f63cd1270d5ca33aebf9e2bf8399bdf32731c445620634c33c45f6b17d1df
+  metadata.gz: 1df144f380b385f74558f8c5a8003a0b74962ac948fd72c23f4b97b5b0a459f3c1eddb6bf529c0c1b42f5dd915de7998fac23f46948b6efefc9b9d9b3cf09a3f
+  data.tar.gz: 8f8585e47f6dade2c263787546ff5ab0f7a95a291df5066d246d827296ed9b83d9b5255039d2ef10ca33dfdaecf70eaff7ab935767ba3c2bbfd9849cc5c38ac9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    remotable (0.2.4)
+    remotable (0.2.5.beta2)
       activerecord
       activeresource
       activesupport

data/lib/remotable/adapters/active_resource.rb

@@ -24,6 +24,22 @@ module Remotable
       
       
       
+      # If we use `remote_key` to explicitly set the path where
+      # this resource ought to be found, then we should use the
+      # same path when updating or destroying this resource.
+      # 
+      # To accomplish this, we need to override ActiveResource's
+      # element_path to return the canonical path for this resource.
+      
+      attr_accessor :remote_key_path
+      
+      def element_path(*args)
+        return remote_key_path if remote_key_path
+        super
+      end
+      
+      
+      
       module ClassMethods
         
         IF_MODIFIED_SINCE = "If-Modified-Since".freeze
@@ -63,7 +79,9 @@ module Remotable
         def find_by!(path)
           expanded_path = expanded_path_for(path)
           Remotable.logger.info "[remotable:#{name.underscore}] GET #{expanded_path} (timeout: #{timeout})"
-          find(:one, :from => expanded_path)
+          find(:one, :from => expanded_path).tap do |resource|
+            resource.remote_key_path = expanded_path if resource
+          end
         rescue ::ActiveResource::TimeoutError
           $!.extend Remotable::TimeoutError
           raise

data/lib/remotable/version.rb

@@ -1,3 +1,3 @@
 module Remotable
-  VERSION = "0.2.5.beta1"
+  VERSION = "0.2.5.beta2"
 end

data/test/active_resource_test.rb

@@ -211,6 +211,29 @@ class ActiveResourceTest < ActiveSupport::TestCase
     end
   end
   
+  test "should be able to update resources by different attributes" do
+    tenant = RemoteWithKey.where(id: Factory(:tenant).id).first
+    new_name = "Totally Wonky"
+    
+    RemoteTenant.run_simulation do |s|
+      s.show(nil, {
+        :id => tenant.id,
+        :slug => tenant.slug,
+        :church_name => tenant.name
+      }, :path => "/api/accounts/by_slug/#{tenant.slug}.json", :headers => if_modified_since(tenant))
+      
+      s.update(nil, :path => "/api/accounts/by_slug/#{tenant.slug}.json")
+      
+      tenant.nosync = false
+      tenant.name = new_name
+      assert_equal true, tenant.any_remote_changes?
+      
+      tenant.save!
+      
+      # pending "Not sure how to test that an update happened"
+    end
+  end
+  
   test "should fail to update a record locally when failing to update one remotely" do
     tenant = Factory(:tenant)
     new_name = "Totally Wonky"
@@ -327,6 +350,25 @@ class ActiveResourceTest < ActiveSupport::TestCase
     end
   end
   
+  
+  test "should destroy resources by different attributes" do
+    tenant = RemoteWithKey.where(id: Factory(:tenant).id).first
+    new_name = "Totally Wonky"
+    
+    RemoteTenant.run_simulation do |s|
+      s.show(nil, {
+        :id => tenant.id,
+        :slug => tenant.slug,
+        :church_name => tenant.name
+      }, :path => "/api/accounts/by_slug/#{tenant.slug}.json", :headers => if_modified_since(tenant))
+      
+      s.destroy(nil, :path => "/api/accounts/by_slug/#{tenant.slug}.json")
+      
+      tenant.nosync = false
+      tenant.destroy
+    end
+  end
+  
   test "should fail to destroy a record locally when failing to destroy one remotely" do
     tenant = Factory(:tenant)
     

data/test/support/active_resource.rb

@@ -31,7 +31,7 @@ class RemoteWithKey < ActiveRecord::Base
   self.table_name = "tenants"
   
   remote_model RemoteTenant
-  attr_remote :slug
+  attr_remote :slug, :church_name => :name
   remote_key :slug
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: remotable
 version: !ruby/object:Gem::Version
-  version: 0.2.5.beta1
+  version: 0.2.5.beta2
 platform: ruby
 authors:
 - Robert Lail
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-10 00:00:00.000000000 Z
+date: 2014-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource