method_decorators 0.9.1 → 0.9.2

data/README.md

@@ -50,7 +50,7 @@ Include these with `require 'method_decorators/decorators/name_of_decorator'`, o
 
 ```ruby
 class Transactional < MethodDecorator
-  def call(wrapped, *args, &blk)
+  def call(wrapped, this, *args, &blk)
     ActiveRecord::Base.transaction do
       wrapped.call(*args, &blk)
     end

data/lib/method_decorators.rb

@@ -39,7 +39,7 @@ module MethodDecorators
 
   def self.decorate_callable(orig, decorators)
     decorators.reduce(orig) do |callable, decorator|
-      lambda{ |*a, &b| decorator.call(callable, *a, &b) }
+      lambda{ |*a, &b| decorator.call(callable, orig.receiver, *a, &b) }
     end
   end
 

data/lib/method_decorators/decorators/memoize.rb

@@ -1,11 +1,11 @@
 class Memoize < MethodDecorator
-  def initialize
-    @cache ||= {}
-    super
+  def call(orig, this, *args, &blk)
+    return cache(this)[args] if cache(this).has_key?(args)
+    cache(this)[args] = orig.call(*args, &blk)
   end
 
-  def call(orig, *args, &blk)
-    return @cache[args] if @cache.has_key?(args)
-    @cache[args] = orig.call(*args, &blk)
+private
+  def cache(this)
+    this.instance_variable_get("@_memoize_cache") || this.instance_variable_set("@_memoize_cache", {})
   end
 end

data/lib/method_decorators/decorators/precondition.rb

@@ -3,8 +3,8 @@ class Precondition < MethodDecorator
     @block = blk
   end
 
-  def call(orig, *args, &blk)
-    unless passes?(orig.receiver, *args)
+  def call(orig, this, *args, &blk)
+    unless passes?(this, *args)
       raise ArgumentError, "failed precondition"
     end
     orig.call(*args, &blk)

data/lib/method_decorators/decorators/retry.rb

@@ -3,7 +3,7 @@ class Retry < MethodDecorator
     @max = max
   end
 
-  def call(orig, *args, &blk)
+  def call(orig, this, *args, &blk)
     attempts = 0
     begin
       attempts += 1

data/lib/method_decorators/version.rb

@@ -1,3 +1,3 @@
 module MethodDecorators
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end

data/spec/decorators/memoize_spec.rb

@@ -4,32 +4,33 @@ require 'method_decorators/decorators/memoize'
 describe Memoize do
   describe "#call" do
     let(:method) { double(:method, :call => :calculation) }
+    let(:this) { Object.new }
     subject { Memoize.new }
 
     it "calculates the value the first time the arguments are supplied" do
       method.should_receive(:call)
-      subject.call(method, 10)
+      subject.call(method, this, 10)
     end
 
     it "stores the value of the method call" do
       method.stub(:call).and_return(:foo, :bar)
-      subject.call(method, 10).should == :foo
-      subject.call(method, 10).should == :foo
+      subject.call(method, this, 10).should == :foo
+      subject.call(method, this, 10).should == :foo
     end
 
     it "memoizes the return value and skips the call the second time" do
-      subject.call(method, 10)
+      subject.call(method, this, 10)
       method.should_not_receive(:call)
-      subject.call(method, 10)
+      subject.call(method, this, 10)
     end
 
     it "memoizes different values for different arguments" do
       method.stub(:call).with(10).and_return(:foo, :bar)
       method.stub(:call).with(20).and_return(:bar, :foo)
-      subject.call(method, 10).should == :foo
-      subject.call(method, 10).should == :foo
-      subject.call(method, 20).should == :bar
-      subject.call(method, 20).should == :bar
+      subject.call(method, this, 10).should == :foo
+      subject.call(method, this, 10).should == :foo
+      subject.call(method, this, 20).should == :bar
+      subject.call(method, this, 20).should == :bar
     end
   end
 
@@ -40,14 +41,25 @@ describe Memoize do
         def count
           @count ||= 0
           @count += 1
+          rand
         end
       end
     end
     subject { klass.new }
 
     it "memoizes calls to the method" do
-      subject.count.should == 1
-      subject.count.should == 1
+      x = subject.count
+      subject.count.should == x
+      #subject.count.should == 1
+      #subject.count.should == 1
+    end
+
+    context "with two instances of the decorated class" do
+      let(:o1) { subject }
+      let(:o2) { klass.new }
+      it "cache does not interact with that of other instances" do
+        o1.count.should_not == o2.count
+      end
     end
   end
 end

data/spec/decorators/precondition_spec.rb

@@ -10,12 +10,12 @@ describe Precondition do
   describe "#call" do
     it "raises when the precondition fails" do
       subject.stub(:passes?){ false }
-      expect{ subject.call(method) }.to raise_error(ArgumentError)
+      expect{ subject.call(method, nil) }.to raise_error(ArgumentError)
     end
 
     it "executes the method when authorization succeeds" do
       subject.stub(:passes?){ true }
-      subject.call(method).should == :secret
+      subject.call(method, nil).should == :secret
     end
   end
 
@@ -30,16 +30,34 @@ describe Precondition do
         def multiply(a)
 	  a * @x
         end
+
+        +Precondition.new{ |a| a + @x == 10 }
+        +Precondition.new{ |a| a * @x == 21 }
+        def concat(a)
+          "#{@x}#{a}"
+        end
       end
     end
     subject { klass.new(3) }
 
-    it "calls the method if the precondition passes" do
-      subject.multiply(2).should == 6
+    context "with one precondition" do
+      it "calls the method if the precondition passes" do
+        subject.multiply(2).should == 6
+      end
+
+      it "raises if the precondition fails" do
+        expect{ subject.multiply(8) }.to raise_error(ArgumentError)
+      end
     end
 
-    it "raises if the precondition passes" do
-      expect{ subject.multiply(8) }.to raise_error(ArgumentError)
+    context "with multiple preconditions" do
+      it "calls the method if the precondition passes" do
+        subject.concat(7).should == "37"
+      end
+
+      it "raises if the precondition fails" do
+        expect{ subject.concat(8) }.to raise_error(ArgumentError)
+      end
     end
   end
 end

data/spec/decorators/retry_spec.rb

@@ -10,12 +10,12 @@ describe Retry do
       method.stub(:call){ raise }
 
       method.should_receive(:call).exactly(3).times
-      expect{ subject.call(method) }.to raise_error
+      expect{ subject.call(method, nil) }.to raise_error
     end
 
     it "does not retry the method if it succeeds" do
       method.should_receive(:call).once.and_return(3)
-      subject.call(method).should == 3
+      subject.call(method, nil).should == 3
     end
   end
 

data/spec/support/add_n.rb

@@ -3,7 +3,7 @@ class AddN < MethodDecorator
     @n = n
   end
 
-  def call(orig, *args, &blk)
+  def call(orig, this, *args, &blk)
     orig.call(*args, &blk) + @n
   end
 end

data/spec/support/reverse.rb

@@ -1,5 +1,5 @@
 class Reverse < MethodDecorator
-  def call(orig, *args, &blk)
+  def call(orig, this, *args, &blk)
     orig.call(*args.reverse, &blk)
   end
 end

data/spec/support/stringify.rb

@@ -1,5 +1,5 @@
 class Stringify < MethodDecorator
-  def call(orig, *args, &blk)
+  def call(orig, this, *args, &blk)
     orig.call(*args, &blk).to_s
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: method_decorators
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-01 00:00:00.000000000 Z
+date: 2012-07-15 00:00:00.000000000 Z
 dependencies: []
 description: Python's function decorators for Ruby
 email: