renee-core 0.3.0 → 0.3.1

data/lib/renee_core/chaining.rb

@@ -13,8 +13,9 @@ module Renee
     module Chaining
       # @private
       class ChainingProxy
-        def initialize(target, proxy_blk)
-          @target, @proxy_blk, @calls = target, proxy_blk, []
+        def initialize(target, m, args)
+          @target, @calls = target, []
+          @calls << [m, args]
         end
 
         def method_missing(m, *args, &blk)
@@ -22,20 +23,19 @@ module Renee
           if blk.nil? && @target.class.private_method_defined?(:"#{m}_without_chain")
             self
           else
+            inner_args = []
             ret = nil
-            @proxy_blk.call(proc do |*inner_args|
-              callback = proc do |*callback_args|
-                inner_args.concat(callback_args)
-                if @calls.size == 0
-                  return blk.call(*inner_args) if blk
-                else
-                  call = @calls.shift
-                  ret = @target.send(call.at(0), *call.at(1), &callback)
-                end
+            callback = proc do |*callback_args|
+              inner_args.concat(callback_args)
+              if @calls.size == 0
+                return blk.call(*inner_args) if blk
+              else
+                call = @calls.shift
+                ret = @target.send(call.at(0), *call.at(1), &callback)
               end
-              call = @calls.shift
-              ret = @target.send(call.at(0), *call.at(1), &callback)
-            end)
+            end
+            call = @calls.shift
+            ret = @target.send(call.at(0), *call.at(1), &callback)
             ret
           end
         end
@@ -48,9 +48,7 @@ module Renee
             class_eval <<-EOT, __FILE__, __LINE__ + 1
               alias_method :#{m}_without_chain, :#{m}
               def #{m}(*args, &blk)
-                chain(blk) do |subblk|
-                  #{m}_without_chain(*args, &subblk)
-                end
+                blk.nil? ? ChainingProxy.new(self, #{m.inspect}, args) : #{m}_without_chain(*args, &blk)
               end
               private :#{m}_without_chain
             EOT
@@ -58,11 +56,6 @@ module Renee
         end
       end
 
-      private
-      def chain(blk, &proxy)
-        blk ? yield(blk) : ChainingProxy.new(self, proxy)
-      end
-
       def self.included(o)
         o.extend(ClassMethods)
       end

data/lib/renee_core/version.rb

@@ -1,6 +1,6 @@
 module Renee
   class Core
     # The current version of Renee::Core
-    VERSION = "0.3.0"
+    VERSION = "0.3.1"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: renee-core
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Josh Hull
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-25 00:00:00 Z
+date: 2011-10-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement