classproxy 0.7.4 → 0.7.9

data/README.md

@@ -46,7 +46,7 @@ class UserDb
 
   primary_fetch  { |args| where(args).first or (raise NotFound) }
   fallback_fetch { |args| Octokit.user(args[:username]) }
-  after_fallback_fetch { |model, obj| model.username = obj.login }
+  after_fallback_fetch { |obj| self.username = obj.login }
 
   key :name, String
   key :reverse_name, String

data/lib/classproxy/classproxy.rb

@@ -32,10 +32,10 @@ module ClassProxy
     #     include ClassProxy
     #
     #     fallback_fetch { |args| Octokit.user(args[:login]) }
-    #     after_fallback_fetch do |model, obj|
+    #     after_fallback_fetch do |obj|
     #       # obj is what `fallback_fetch` returns
-    #       model.name  = obj.name
-    #       model.login = obj.login
+    #       self.name  = obj.name
+    #       self.login = obj.login
     #     end
     #
     #     attr_accessor :name, :login
@@ -50,7 +50,7 @@ module ClassProxy
     #     include ClassProxy
     #
     #     fallback_fetch { |args| Octokit.user(args[:login]) }
-    #     after_fallback_fetch { |model, obj| model.name = obj.name; model.login = obj.login }
+    #     after_fallback_fetch { |obj| self.name = obj.name; self.login = obj.login }
     #
     #     attr_accessor :name, :followers :login
     #
@@ -101,17 +101,23 @@ module ClassProxy
     private
 
     def run_fallback(args, _self=nil)
-      fallback_obj = @fallback_fetch[args]
+      obj = _self || self.new
+
+      fallback_obj = obj.instance_exec args, &@fallback_fetch
 
       # Use the after_fallback_method
-      obj = _self || self.new
-      @after_fallback_method[obj, fallback_obj] if @after_fallback_method.is_a?(Proc)
+      obj.instance_exec fallback_obj, &@after_fallback_method if @after_fallback_method.is_a? Proc
 
       # Go through the keys of the return object and try to use setters
       if fallback_obj and obj and fallback_obj.respond_to? :keys and fallback_obj.keys.respond_to? :each
         fallback_obj.keys.each do |key|
-          next unless obj.respond_to? "#{key}=" and obj.send(key) == nil
-          obj.send("#{key}=", fallback_obj.send(key))
+          next unless obj.respond_to? "#{key}="
+
+          # check if its set to something else
+          get_method = obj.respond_to?("no_proxy_#{key}") ? "no_proxy_#{key}" : key
+          if obj.respond_to? get_method and obj.send(get_method) == nil
+            obj.send("#{key}=", fallback_obj.send(key))
+          end
         end
       end
 
@@ -120,7 +126,9 @@ module ClassProxy
 
     def proxy_method(method_name, proc=nil)
       self.class_eval do
-        alias_method "no_proxy_#{method_name}".to_sym, method_name
+        unless self.instance_methods.include? "no_proxy_#{method_name}".to_sym
+          alias_method "no_proxy_#{method_name}".to_sym, method_name
+        end
 
         define_method(method_name) do |*args|
           # Use the no_proxy one first
@@ -133,9 +141,11 @@ module ClassProxy
           # to establish the dirty attribute, since the getter is being replaced
           # here and the setter is being used when appropriate, the @mutex_in_call_for
           # prevents endless recursion.
-          if v == nil and @mutex_in_call_for != method_name
-            @mutex_in_call_for = method_name
+          @mutex_in_call_for ||= []
+          if v == nil and not @mutex_in_call_for.include? method_name
+            @mutex_in_call_for << method_name
             method = "_run_fallback_#{method_name}".to_sym
+
             if self.respond_to?(method)
               v = if self.method(method).arity == 1
                 # Callback method is expecting to receive the fallback object
@@ -148,13 +158,8 @@ module ClassProxy
               end
             else
               # This method has no callback, so just run the fallback
-              args = {}
-              (self.methods - self.class.methods).each do |key|
-                next if key[-1] == '=' # don't run for set
-                hkey = key.to_s.gsub(/^no_proxy_/, '')
-                args[hkey.to_sym] = self.send(key)
-              end
-              self.class.send :run_fallback, args, self
+              args_class = ArgsClass.new(self)
+              self.class.send :run_fallback, args_class, self
 
               # The value might have changed, so check here
               v = self.send("no_proxy_#{method_name}".to_sym)
@@ -162,7 +167,7 @@ module ClassProxy
 
             # Set the defaults when this class responds to the same method
             self.send("#{method_name}=".to_sym, v) if v and self.respond_to?("#{method_name}=")
-            @mutex_in_call_for = nil
+            @mutex_in_call_for.delete method_name
           end
 
           return v
@@ -177,4 +182,25 @@ module ClassProxy
   def self.included(receiver)
     receiver.extend ClassMethods
   end
-end
+
+  # This class makes methods accessible as a hash key, useful to pass
+  # as a fallback_fetch argument
+  class ArgsClass < BasicObject
+    def initialize(object)
+      @target = object
+    end
+
+    def [](key)
+      @target.respond_to?(key) ? @target.send(key) : @target[key]
+    end
+
+    def inspect
+      "ArgsClass [#{@target.inspect}] " +
+      (@target.methods - @target.class.methods).join(', ')
+    end
+
+    def target
+      @target
+    end
+  end
+end

data/lib/classproxy/version.rb

@@ -1,3 +1,3 @@
 module ClassProxy
-  VERSION = '0.7.4'
+  VERSION = '0.7.9'
 end

data/lib/classproxy.rb

@@ -1,2 +1,3 @@
+require 'active_support'
 require 'classproxy/classproxy'
 require 'classproxy/version'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: classproxy
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-16 00:00:00.000000000 Z
+date: 2012-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -55,7 +55,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1419408935821382140
+      hash: 3154749862381023825
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: