aspect4r 0.9.0 → 0.9.1

data/spec/aspect4r/around_spec.rb

@@ -20,7 +20,7 @@ describe Aspect4r::Around do
   
   it "should run advice method instead of original method" do
     @klass.class_eval do
-      def do_something orig, value
+      def do_something value
         raise 'error'
       end
   
@@ -35,7 +35,7 @@ describe Aspect4r::Around do
     i = 100
     
     @klass.class_eval do
-      around :test do |orig, value|
+      around :test do |value|
         i = 200
         'around_block_return'
       end
@@ -53,7 +53,7 @@ describe Aspect4r::Around do
     i = 100
     
     @klass.class_eval do
-      around [:test] do |orig, value|
+      around [:test] do |value|
         i = 200
       end
     end
@@ -66,7 +66,7 @@ describe Aspect4r::Around do
   
   it "should have access to instance variables inside advice block" do
     @klass.class_eval do
-      around :test do |orig, value|
+      around :test do |value|
         @var = 1
       end
     end
@@ -77,13 +77,28 @@ describe Aspect4r::Around do
     o.instance_variable_get(:@var).should == 1
   end
   
+  it "should pass method name as first arg to advice block(or method) if method_name_arg is true" do
+    s = nil
+    
+    @klass.class_eval do
+      around :test, :method_name_arg => true do |method, value, &block|
+        s = method
+      end
+    end
+    
+    o = @klass.new
+    o.test('something')
+
+    s.should == 'test'
+  end
+  
   it "should be able to invoke original method from advice block" do
     i = 100
     
     @klass.class_eval do
-      around :test do |proxy, value|
+      around :test do |value, &block|
         i = 200
-        a4r_invoke proxy, value
+        block.call value
       end
     end
     
@@ -97,8 +112,8 @@ describe Aspect4r::Around do
   
   it "should be able to invoke original method from advice method" do
     @klass.class_eval do
-      def do_something proxy, value
-        a4r_invoke proxy, value
+      def do_something value
+        yield value
       end
   
       around :test, :do_something
@@ -109,20 +124,4 @@ describe Aspect4r::Around do
     
     o.value.should == 'something'
   end
-  
-  it "should be able to access method name through proxy.name (this subjects to change)" do
-    s = nil
-    
-    @klass.class_eval do
-      around :test do |proxy, value|
-        s = proxy.name
-        a4r_invoke proxy, value
-      end
-    end
-    
-    o = @klass.new
-    o.test('something')
-
-    s.should == 'test'
-  end
 end

data/spec/aspect4r/before_spec.rb

@@ -4,7 +4,7 @@ describe Aspect4r::Before do
   before do
     @klass = Class.new do
       include Aspect4r::Before
-      
+
       attr :value
       
       def initialize

data/spec/aspect4r/class_inheritance_spec.rb

@@ -15,9 +15,9 @@ describe Aspect4r do
         @value << "test"
       end
       
-      around :test do |proxy|
+      around :test do |&block|
         @value << "around1"
-        a4r_invoke proxy
+        block.call
         @value << "around2"
       end
       
@@ -200,9 +200,9 @@ describe Aspect4r do
     class Child1 < parent
       include Aspect4r
       
-      around :test do |proxy|
+      around :test do |&block|
         @value << "around(before)"
-        a4r_invoke proxy
+        block.call
         @value << "around(after)"
       end
     end
@@ -239,9 +239,9 @@ describe Aspect4r do
     class Child2 < parent
       include Aspect4r
       
-      around :test do |proxy|
+      around :test do |&block|
         @value << "around(before)"
-        a4r_invoke proxy
+        block.call
         @value << "around(after)"
       end
     end
@@ -251,4 +251,38 @@ describe Aspect4r do
     
     o.value.should == %w(around(before) before test after around(after))
   end
+  
+  it "inherit advice from module" do
+    pending
+    mod = Module.new do
+      include Aspect4r
+      
+      before :test, :inherit => true do
+        @value << "before"
+      end
+      
+      after :test do
+        @value << "after"
+      end
+    end
+    
+    klass = Class.new do
+      include mod
+      
+      attr :value
+      
+      def initialize
+        @value = []
+      end
+      
+      def test
+        @value << "test"
+      end
+    end
+
+    o = klass.new
+    o.test
+    
+    o.value.should == %w(before test)
+  end
 end

data/spec/aspect4r/classic_spec.rb

@@ -17,9 +17,9 @@ describe Aspect4r::Classic do
         @value << "test"
       end
 
-      a4r_around :test do |proxy_method|
+      a4r_around :test do |&block|
         @value << "around1"
-        a4r_invoke proxy_method
+        block.call
         @value << "around2"
       end
       

data/spec/aspect4r/helper_spec.rb

@@ -43,9 +43,9 @@ describe Aspect4r::Helper do
           result
         end
         
-        def around_test proxy
+        def around_test
           @value << "around_test_before"
-          result = a4r_invoke proxy
+          result = yield
           @value << "around_test_after"
           result
         end

data/spec/aspect4r/inheritance_inclusion_combined_spec.rb

@@ -9,9 +9,9 @@ describe Aspect4r do
         @value << "test"
       end
       
-      around :test do |proxy|
+      around :test do |&block|
         @value << "around1"
-        a4r_invoke proxy
+        block.call
         @value << "around2"
       end
       
@@ -52,9 +52,9 @@ describe Aspect4r do
         @value << "test(module)"
       end
       
-      around :test do |proxy|
+      around :test do |&block|
         @value << "around1"
-        a4r_invoke proxy
+        block.call
         @value << "around2"
       end
       

data/spec/aspect4r/method_added_spec.rb

@@ -11,9 +11,9 @@ describe "method_added" do
         @value = []
       end
   
-      around :test do |proxy|
+      around :test do |&block|
         @value << "around1"
-        a4r_invoke proxy
+        block.call
         @value << "around2"
       end   
       

data/spec/aspect4r/{advice_group_spec.rb → model/advice_group_spec.rb}

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 describe "Group of advices" do
   it "should work" do

data/spec/aspect4r/model/advice_spec.rb

@@ -0,0 +1,52 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+module Aspect4r::Model
+  describe Advice do
+    it "before? returns true for before advice" do
+      advice = Advice.new Advice::BEFORE, MethodMatcher.new, :advice_method, :group
+      advice.before?.should be_true
+    end
+  
+    it "before_filter? returns false for before advice" do
+      advice = Advice.new Advice::BEFORE, MethodMatcher.new, :advice_method, :group
+      advice.before_filter?.should be_false
+    end
+  
+    it "before? returns false for before_filter advice" do
+      advice = Advice.new Advice::BEFORE, MethodMatcher.new, :advice_method, :group, :skip_if_false => true
+      advice.before?.should be_false
+    end
+  
+    it "before_filter? returns true for before_filter advice" do
+      advice = Advice.new Advice::BEFORE, MethodMatcher.new, :advice_method, :group, :skip_if_false => true
+      advice.before_filter?.should be_true
+    end
+  
+    it "invoke before advice" do
+      advice = Advice.new Advice::BEFORE, MethodMatcher.new, :advice_method, :group
+    
+      o = Object.new
+      o.expects(:advice_method).with(1)
+    
+      advice.invoke(o, 1)
+    end
+  
+    it "invoke after advice" do
+      advice = Advice.new Advice::AFTER, MethodMatcher.new, :advice_method, :group
+    
+      o = Object.new
+      o.expects(:advice_method).with(1)
+    
+      advice.invoke(o, 1)
+    end
+  
+    it "invoke around advice" do
+      advice = Advice.new Advice::AROUND, MethodMatcher.new, :advice_method, :group
+    
+      o = Object.new
+      o.expects(:advice_method).with(1)
+    
+      advice.invoke(o, 1)
+    end
+  end
+end

data/spec/aspect4r/model/method_matcher_spec.rb

@@ -0,0 +1,23 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+module Aspect4r
+  module Model
+    describe MethodMatcher do
+      it "should match String" do
+        MethodMatcher.new('test').match?('test').should_not be_nil
+      end
+      
+      it "should match regular expression" do
+        MethodMatcher.new(/test/).match?('test').should_not be_nil
+      end
+      
+      it "should return true if any item matches" do
+        MethodMatcher.new('test1', 'test2').match?('test2').should_not be_nil
+      end
+      
+      it "should return nil if none matches" do
+        MethodMatcher.new('test1', 'test2').match?('test3').should be_nil
+      end
+    end
+  end
+end

data/spec/aspect4r/module_inclusion_spec.rb

@@ -17,9 +17,9 @@ describe Aspect4r do
         @value << "test"
       end
   
-      around :test do |proxy|
+      around :test do |&block|
         @value << "around1"
-        a4r_invoke proxy
+        block.call
         @value << "around2"
       end   
       
@@ -60,9 +60,9 @@ describe Aspect4r do
         @value << "test(module)"
       end
   
-      around :test do |proxy|
+      around :test do |&block|
         @value << "around1"
-        send proxy
+        block.call
         @value << "around2"
       end   
       
@@ -125,9 +125,9 @@ describe Aspect4r do
         @value << "test(module)"
       end
   
-      around :test do |proxy|
+      around :test do |&block|
         @value << "around1"
-        a4r_invoke proxy
+        block.call
         @value << "around2"
       end
       
@@ -169,9 +169,9 @@ describe Aspect4r do
         @value << "test(module)"
       end
   
-      around :test do |proxy|
+      around :test do |&block|
         @value << "around1"
-        a4r_invoke proxy
+        block.call
         @value << "around2"
       end
       

data/spec/aspect4r/regexp_methods_spec.rb

@@ -0,0 +1,47 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe "Advices matched by regular expression" do
+  it "should not apply to methods defined before advice" do
+    @klass = Class.new do
+      include Aspect4r
+
+      attr :value
+      
+      def initialize
+        @value = []
+      end
+      
+      def test
+        @value << "test"
+      end
+      
+      before /test/ do
+        @value << "before"
+      end
+    end
+
+    @klass.new.test.should == %w"test"
+  end
+  
+  it "should not apply to methods defined after advice" do
+    @klass = Class.new do
+      include Aspect4r
+
+      attr :value
+      
+      def initialize
+        @value = []
+      end
+      
+      before /test/ do
+        @value << "before"
+      end
+      
+      def test
+        @value << "test"
+      end
+    end
+
+    @klass.new.test.should == %w"before test"
+  end
+end

data/spec/aspect4r/singleton_method_added_spec.rb

@@ -15,9 +15,9 @@ describe "singleton_method_added" do
           @value ||= []
         end
   
-        around :test do |proxy|
+        around :test do |&block|
           value << "around1"
-          a4r_invoke proxy
+          block.call
           value << "around2"
         end   
       

data/spec/aspect4r_spec.rb

@@ -1,5 +1,41 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
+describe "Mixing regular expressions and string" do
+  it "should work" do
+    @klass = Class.new do
+      include Aspect4r
+      
+      before /do_/, "test" do
+        @value << "before"
+      end
+      
+      attr :value
+      
+      def initialize
+        @value = []
+      end
+      
+      def test
+        @value << "test"
+      end
+      
+      def do_something
+        @value << "do_something"
+      end
+    end
+    
+    o = @klass.new
+    o.test
+    
+    o.value.should == %w(before test)
+    
+    o = @klass.new
+    o.do_something
+    
+    o.value.should == %w(before do_something)
+  end
+end
+
 describe "Aspect4r execution order" do
   before do
     @klass = Class.new do
@@ -19,9 +55,9 @@ describe "Aspect4r execution order" do
   
   it "around + before + after" do
     @klass.class_eval do
-      around :test do |proxy|
+      around :test do |&block|
         @value << "around1"
-        a4r_invoke proxy
+        block.call
         @value << "around2"
       end
       
@@ -51,9 +87,9 @@ describe "Aspect4r execution order" do
         @value << "after"
       end
       
-      around :test do |proxy|
+      around :test do |&block|
         @value << "around1"
-        a4r_invoke proxy
+        block.call
         @value << "around2"
       end
     end
@@ -66,15 +102,15 @@ describe "Aspect4r execution order" do
   
   it "2 around + 2 before + 2 after" do
     @klass.class_eval do
-      around :test do |proxy|
+      around :test do |&block|
         @value << "around11"
-        a4r_invoke proxy
+        block.call
         @value << "around12"
       end
       
-      around :test do |proxy|
+      around :test do |&block|
         @value << "around21"
-        a4r_invoke proxy
+        block.call
         @value << "around22"
       end
       
@@ -111,9 +147,9 @@ describe "Aspect4r execution order" do
         @value << "after1"
       end
       
-      around :test do |proxy|
+      around :test do |&block|
         @value << "around1"
-        a4r_invoke proxy
+        block.call
         @value << "around2"
       end
       
@@ -142,8 +178,8 @@ describe "Aspect4r result handling" do
         "test"
       end
       
-      around :test do |proxy|
-        result = a4r_invoke proxy
+      around :test do |&block|
+        result = block.call
         "around1 #{result} around2"
       end
 
@@ -180,9 +216,9 @@ describe "Aspect4r chaining (add advice to advice method)" do
         @value << "process_result"
       end
       
-      around :test do |proxy|
+      around :test do |&block|
         @value << "around11"
-        a4r_invoke proxy
+        block.call
         @value << "around12"
       end
       
@@ -231,8 +267,8 @@ describe "Aspect4r chaining (add advice to advice method)" do
         "test"
       end
       
-      def around_test proxy
-        result = a4r_invoke proxy
+      def around_test
+        result = yield
         "around1 #{result} around2"
       end
       
@@ -265,8 +301,8 @@ describe "Aspect4r chaining (add advice to advice method)" do
         "test"
       end
       
-      def around_test proxy
-        result = a4r_invoke proxy
+      def around_test
+        result = yield
         "around1 #{result} around2"
       end
       
@@ -278,13 +314,13 @@ describe "Aspect4r chaining (add advice to advice method)" do
       
       after :test, :after_test
       
-      around :after_test do |proxy, *args|
-        result = a4r_invoke proxy, *args
+      around :after_test do |*args, &block|
+        result = block.call *args
         "around1(after_test) " + result + " around2(after_test)"
       end
       
-      around :around_test do |proxy, *args|
-        result = a4r_invoke proxy, *args
+      around :around_test do |*args, &block|
+        result = block.call *args
         "around1(around_test) " + result + " around2(around_test)"
       end
     end

data/test/around_test.rb

@@ -12,8 +12,8 @@ class AroundTest < Test::Unit::TestCase
     
     def test; end
     
-    def around_test proxy
-      a4r_invoke proxy
+    def around_test
+      yield
     end
   end
   

data/test/combined_test.rb

@@ -24,8 +24,8 @@ class CombinedTest < Test::Unit::TestCase
     
     def after_test result; end
     
-    def around_test proxy
-      a4r_invoke proxy
+    def around_test
+      yield
     end
   end