remotable 0.2.2 → 0.2.3

data/lib/remotable/active_record_extender.rb

@@ -144,7 +144,7 @@ module Remotable
       # so you can use the remoted record in associations.
       def instantiate(*args)
         record = super
-        if record.expired? && !Remotable.nosync?
+        if record.expired? && !record.nosync?
           record.pull_remote_data!
           record = nil if record.destroyed?
         end
@@ -248,6 +248,7 @@ module Remotable
       end
       
       def remote_path_for_composite_key(route, local_key, values)
+        values.flatten!
         unless values.length == local_key.length
           raise ArgumentError, "local_key has #{local_key.length} attributes but values has #{values.length}"
         end
@@ -348,7 +349,11 @@ module Remotable
   private
     
     def fetch_value
-      self[local_key]
+      if local_key.is_a?(Array)
+        local_key.map(&method(:send))
+      else
+        send(local_key)
+      end
     end
     
     def fetch_remote_resource
@@ -397,7 +402,8 @@ module Remotable
     end
     
     def destroy_remote_resource
-      if remote_resource && remote_resource.destroy
+      return nil unless remote_resource
+      if remote_resource.destroy
         true
       else
         merge_remote_errors(remote_resource.errors)

data/lib/remotable/active_resource_fixes.rb

@@ -5,18 +5,11 @@ 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.
-  # It also responds to any method that matches an attribute name.
-  def respond_to?(method_symbol, include_private=false)
-    method_name = method_symbol.to_s
-    if method_name =~ /\w+=/
-      true
-    elsif attributes.include?(method_name)
-      true
-    else
-      super(method_symbol, include_private)
-    end
+  
+  # ! ActiveModel::AttributeMethods assumes that :attribute is the target
+  # for attribute lookup. ActiveResource doesn't define that method.
+  def attribute(method)
+    attributes[method]
   end
   
   
@@ -43,6 +36,20 @@ end
 
 
 module ActiveResourceFixes30
+
+  # ActiveResource hacks method_missing without hacking respond_to?
+  # In fact, it responds to any method that ends in an equals sign.
+  # It also responds to any method that matches an attribute name.
+  def respond_to?(method_symbol, include_private=false)
+    method_name = method_symbol.to_s
+    if method_name =~ /\w+=/
+      true
+    elsif attributes.include?(method_name)
+      true
+    else
+      super(method_symbol, include_private)
+    end
+  end
   
   # ! in this method, don't check the Content-Type header: rack doesn't always return it
   def load_attributes_from_response(response)
@@ -56,6 +63,20 @@ end
 
 module ActiveResourceFixes31
   
+  # ActiveResource hacks method_missing without hacking respond_to?
+  # In fact, it responds to any method that ends in an equals sign.
+  # It also responds to any method that matches an attribute name.
+  def respond_to?(method_symbol, include_private=false)
+    method_name = method_symbol.to_s
+    if method_name =~ /\w+=/
+      true
+    elsif attributes.include?(method_name)
+      true
+    else
+      super(method_symbol, include_private)
+    end
+  end
+  
   # ! in this method, don't check the Content-Type header: rack doesn't always return it
   def load_attributes_from_response(response)
     if !response.body.nil? && response.body.strip.size > 0
@@ -66,8 +87,9 @@ module ActiveResourceFixes31
   
 end
 
-
-if Rails.version < '3.1'
+if Rails.version >= '3.2'
+  #
+elsif Rails.version < '3.1'
   ActiveResource::Base.send(:include, ActiveResourceFixes30)
 else
   ActiveResource::Base.send(:include, ActiveResourceFixes31)

data/lib/remotable/version.rb

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

data/test/remotable_test.rb

@@ -27,7 +27,7 @@ class RemotableTest < ActiveSupport::TestCase
   end
   
   test "should be able to generate paths for composite keys" do
-    assert_equal "groups/5/tenants/test",   RemoteWithCompositeKey.remote_path_for([:group_id, :slug], 5, "test")
+    assert_equal "groups/5/tenants/test",   RemoteWithCompositeKey.remote_path_for([:group_id, :slug], [5, "test"])
   end
   
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: remotable
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-12 00:00:00.000000000 Z
+date: 2012-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
-  requirement: &2156933760 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156933760
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2156930420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156930420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2156927360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156927360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2156946400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156946400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &2156943380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156943380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &2156962240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156962240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &2156969980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156969980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2156968120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +133,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156968120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: active_resource_simulator
-  requirement: &2156965300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +149,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156965300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2156982000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +165,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156982000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &2156980560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +181,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156980560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &2156979980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +197,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156979980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Remotable keeps a locally-stored ActiveRecord synchronized with a remote
   resource.
 email:
@@ -194,7 +254,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2708411385846481518
+      hash: 3994390182043534799
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -203,10 +263,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2708411385846481518
+      hash: 3994390182043534799
 requirements: []
 rubyforge_project: remotable
-rubygems_version: 1.8.15
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Binds an ActiveRecord model to a remote resource and keeps the two synchronized