aspector 0.7.0 → 0.7.1

data/performance-tests/after_test.rb

@@ -0,0 +1,25 @@
+require File.expand_path(File.dirname(__FILE__) + '/test_helper')
+
+class AfterTest < Test::Unit::TestCase
+  include RubyProf::Test
+
+  class Klass
+
+    aspector do
+      after :test, :after_test
+    end
+
+    def test_no_aspect; end
+
+    def test; end
+
+    def after_test result; end
+  end
+
+  def test_after
+    o = Klass.new
+    o.test_no_aspect
+    o.test
+  end
+end
+

data/performance-tests/around_test.rb

@@ -0,0 +1,27 @@
+require File.expand_path(File.dirname(__FILE__) + '/test_helper')
+
+class AroundTest < Test::Unit::TestCase
+  include RubyProf::Test
+
+  class Klass
+
+    aspector do
+      around :test, :around_test
+    end
+
+    def test_no_aspect; end
+
+    def test; end
+
+    def around_test &block
+      block.call
+    end
+  end
+
+  def test_around
+    o = Klass.new
+    o.test_no_aspect
+    o.test
+  end
+end
+

data/performance-tests/before_test.rb

@@ -0,0 +1,25 @@
+require File.expand_path(File.dirname(__FILE__) + '/test_helper')
+
+class BeforeTest < Test::Unit::TestCase
+  include RubyProf::Test
+
+  class Klass
+
+    aspector do
+      before :test, :before_test
+    end
+
+    def test_no_aspect; end
+
+    def test; end
+
+    def before_test; end
+  end
+
+  def test_before
+    o = Klass.new
+    o.test_no_aspect
+    o.test
+  end
+end
+

data/performance-tests/combined_test.rb

@@ -0,0 +1,33 @@
+require File.expand_path(File.dirname(__FILE__) + '/test_helper')
+
+class CombinedTest < Test::Unit::TestCase
+  include RubyProf::Test
+
+  class Test
+
+    aspector do
+      before :test, :before_test
+      after  :test, :after_test
+      around :test, :around_test
+    end
+
+    def test_no_aspect; end
+
+    def test; end
+
+    def before_test; end
+
+    def after_test result; end
+
+    def around_test &block
+      block.call
+    end
+  end
+
+  def test_combined
+    o = Test.new
+    o.test_no_aspect
+    o.test
+  end
+end
+

data/performance-tests/method_invocation_test.rb

@@ -0,0 +1,25 @@
+require File.expand_path(File.dirname(__FILE__) + '/test_helper')
+
+class MethodInvokationTest < Test::Unit::TestCase
+  include RubyProf::Test
+
+  class Klass
+    def do_something; end
+
+    def test
+      do_something
+    end
+
+    do_something_method = instance_method(:do_something)
+
+    define_method :test_with_method_object do
+      do_something_method.bind(self).call
+    end
+  end
+
+  def test_method_invocation
+    o = Klass.new
+    o.test
+    o.test_with_method_object
+  end
+end

data/performance-tests/test_helper.rb

@@ -0,0 +1,9 @@
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
+require 'rubygems'
+require 'test/unit'
+require 'ruby-prof/test'
+require 'aspector'
+
+RubyProf::Test::PROFILE_OPTIONS[:count     ] = 10000
+RubyProf::Test::PROFILE_OPTIONS[:output_dir] = File.dirname(__FILE__) + "/output"

data/spec/functional/advices_on_private_methods_spec.rb

@@ -0,0 +1,21 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe "Advices on private methods" do
+  it "should work" do
+    klass = create_test_class do
+      private :test
+    end
+
+    aspector(klass) do
+      before :test do value << "do_before(public_methods_only)" end
+    end
+
+    aspector(klass, :private_methods => true) do
+      before :test do value << "do_before" end
+    end
+
+    obj = klass.new
+    obj.send :test
+    obj.value.should == %w"do_before test"
+  end
+end

data/spec/functional/aspect_on_eigen_class_spec.rb

@@ -0,0 +1,66 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe "Aspector for eigen class" do
+  it "should work" do
+    klass = Class.new do
+      class << self
+        def value
+          @value ||= []
+        end
+
+        def test
+          value << "test"
+        end
+      end
+    end
+
+    aspector(klass, :eigen_class => true) do
+      before :test do value << "do_before" end
+
+      after  :test do value << "do_after"  end
+
+      around :test do |&block|
+        value   <<  "do_around_before"
+        result  =   block.call
+        value   <<  "do_around_after"
+        result
+      end
+    end
+
+    klass.test
+    klass.value.should == %w"do_before do_around_before test do_around_after do_after"
+  end
+
+  it "new methods" do
+    klass = Class.new do
+      class << self
+        def value
+          @value ||= []
+        end
+      end
+    end
+
+    aspector(klass, :eigen_class => true) do
+      before :test do value << "do_before" end
+
+      after  :test do value << "do_after"  end
+
+      around :test do |&block|
+        value   <<  "do_around_before"
+        result  =   block.call
+        value   <<  "do_around_after"
+        result
+      end
+    end
+
+    klass.instance_eval do
+      def test
+        value << "test"
+      end
+    end
+
+    klass.test
+    klass.value.should == %w"do_before do_around_before test do_around_after do_after"
+  end
+
+end

data/spec/functional/aspect_on_object_spec.rb

@@ -0,0 +1,20 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe "Aspector for object" do
+  it "should work" do
+    klass = create_test_class
+
+    obj = klass.new
+
+    aspector(obj) do
+      before :test do value << "do_before" end
+    end
+
+    obj.test
+    obj.value.should == %w"do_before test"
+
+    obj2 = klass.new
+    obj2.test
+    obj2.value.should == %w"test"
+  end
+end

data/spec/{aspector_spec.rb → functional/aspector_spec.rb}

@@ -1,55 +1,29 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe "Aspector" do
   it "should work" do
-    klass = Class.new do
-      def value
-        @value ||= []
-      end
-
-      def test
-        value << "test"
-      end
+    klass = create_test_class
 
-      def do_before
-        value << "do_before"
-      end
+    aspector(klass) do
+      before :test do value << "do_before" end
 
-      def do_after result
-        value << "do_after"
-        result
-      end
+      after  :test do value << "do_after"  end
 
-      def do_around &block
-        value << "do_around_before"
-        result = block.call
-        value << "do_around_after"
+      around :test do |&block|
+        value   <<  "do_around_before"
+        result  =   block.call
+        value   <<  "do_around_after"
         result
       end
     end
 
-    aspector(klass) do
-      before :test, :do_before
-      after  :test, :do_after
-      around :test, :do_around
-    end
-
     obj = klass.new
     obj.test
     obj.value.should == %w"do_before do_around_before test do_around_after do_after"
   end
 
   it "multiple aspects should work together" do
-    klass = Class.new do
-      def value
-        @value ||= []
-      end
-
-      def test
-        value << "test"
-      end
-    end
-
+    klass = create_test_class
     aspector(klass) do
       before(:test) { value << 'first_aspect' }
     end
@@ -64,20 +38,11 @@ describe "Aspector" do
   end
 
   it "treating Aspect as regular class should work" do
-    klass = Class.new do
-      def value
-        @value ||= []
-      end
-
-      def test
-        value << "test"
-      end
-    end
-
     class TestAspect < Aspector::Base
       before(:test) { value << 'before_test' }
     end
 
+    klass = create_test_class
     TestAspect.apply(klass)
 
     obj = klass.new
@@ -85,21 +50,12 @@ describe "Aspector" do
     obj.value.should == %w"before_test test"
   end
 
-  it "applied multiple times" do
-    klass = Class.new do
-      def value
-        @value ||= []
-      end
-
-      def test
-        value << "test"
-      end
-    end
-
+  it "can be applied multiple times" do
     aspect = Aspector do
       before(:test) { value << 'before_test' }
     end
 
+    klass = create_test_class
     aspect.apply(klass)
     aspect.apply(klass)
 

data/spec/functional/aspects_combined_spec.rb

@@ -0,0 +1,42 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe "Aspects combined" do
+  it "should work" do
+    klass = create_test_class
+
+    aspector(klass) do
+      before :test do value << "do_before" end
+
+      after  :test do value << "do_after"  end
+
+      around :test do |&block|
+        value   <<  "do_around_before"
+        result  =   block.call
+        value   <<  "do_around_after"
+        result
+      end
+    end
+
+    aspector(klass) do
+      before :test do value << "do_before2" end
+
+      after  :test do value << "do_after2"  end
+
+      around :test do |&block|
+        value   <<  "do_around_before2"
+        result  =   block.call
+        value   <<  "do_around_after2"
+        result
+      end
+    end
+
+    obj = klass.new
+    obj.test
+    obj.value.should == %w"
+      do_before2 do_around_before2
+      do_before do_around_before
+      test
+      do_around_after do_after
+      do_around_after2 do_after2"
+  end
+end

data/spec/functional/execution_order_spec.rb

@@ -0,0 +1,36 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe "Aspect execution order" do
+  it "should work" do
+    klass = create_test_class
+
+    aspector(klass) do
+      before :test do value << "do_before" end
+
+      after  :test do value << "do_after"  end
+
+      around :test do |&block|
+        value   <<  "do_around_before"
+        result  =   block.call
+        value   <<  "do_around_after"
+        result
+      end
+
+      before :test do value << "do_before2" end
+
+      after  :test do value << "do_after2"  end
+
+      around :test do |&block|
+        value   <<  "do_around_before2"
+        result  =   block.call
+        value   <<  "do_around_after2"
+        result
+      end
+    end
+
+    obj = klass.new
+    obj.test
+    obj.value.should == %w"do_before do_before2 do_around_before do_around_before2 test
+                           do_around_after2 do_around_after do_after do_after2"
+  end
+end

data/spec/spec_helper.rb

@@ -8,5 +8,20 @@ require 'aspector'
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |config|
-  config.mock_with :mocha
 end
+
+def create_test_class &block
+  klass = Class.new do
+    def value
+      @value ||= []
+    end
+
+    def test
+      value << "test"
+    end
+  end
+
+  klass.class_eval &block if block_given?
+  klass
+end
+

data/spec/unit/advice_spec.rb

@@ -0,0 +1,4 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe "Aspector::Advice" do
+end

data/spec/{aspector → unit}/after_spec.rb

@@ -2,15 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe "After advices" do
   it "should work" do
-    klass = Class.new do
-      def value
-        @value ||= []
-      end
-
-      def test
-        value << "test"
-      end
-
+    klass = create_test_class do
       def do_this result
         value << "do_this"
         result
@@ -27,65 +19,76 @@ describe "After advices" do
   end
 
   it "context_arg" do
-    klass = Class.new do
-      def value
-        @value ||= []
+    klass = create_test_class do
+      def do_this context, result
+        value << "do_this(#{context.method_name})"
+        result
       end
+    end
 
-      def test
-        value << "test"
-      end
+    aspector(klass) do
+      after :test, :do_this, :context_arg => true
+    end
 
-      def do_this context, result
-        value << "do_this"
+    obj = klass.new
+    obj.test
+    obj.value.should == %w"test do_this(test)"
+  end
+
+  it "method_name_arg" do
+    klass = create_test_class do
+      def do_this method, result
+        value << "do_this(#{method})"
         result
       end
     end
 
     aspector(klass) do
-      after :test, :do_this, :context_arg => true
+      after :test, :do_this, :method_name_arg => true
     end
 
     obj = klass.new
     obj.test
-    obj.value.should == %w"test do_this"
+    obj.value.should == %w"test do_this(test)"
   end
 
-  it "result_arg set to false" do
-    klass = Class.new do
-      def value
-        @value ||= []
+  it "new result will be returned by default" do
+    klass = create_test_class
+
+    aspector(klass) do
+      after :test do |result|
+        value << "do_after"
+        'do_after'
       end
+    end
 
+    obj = klass.new
+    obj.test.should == 'do_after'
+    obj.value.should == %w"test do_after"
+  end
+
+  it "result_arg set to false" do
+    klass = create_test_class do
       def test
         value << "test"
         'test'
       end
-
-      def do_this
-        value << "do_this"
-      end
     end
 
     aspector(klass) do
-      after :test, :do_this, :result_arg => false
+      after :test, :result_arg => false do
+        value << "do_after"
+        'do_after'
+      end
     end
 
     obj = klass.new
     obj.test.should == 'test'
-    obj.value.should == %w"test do_this"
+    obj.value.should == %w"test do_after"
   end
 
   it "logic in block" do
-    klass = Class.new do
-      def value
-        @value ||= []
-      end
-
-      def test
-        value << "test"
-      end
-    end
+    klass = create_test_class
 
     aspector(klass) do
       after(:test) do |result|
@@ -99,3 +102,4 @@ describe "After advices" do
     obj.value.should == %w"test do_block"
   end
 end
+

data/spec/{aspector → unit}/around_spec.rb

@@ -2,15 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe "Around advices" do
   it "should work" do
-    klass = Class.new do
-      def value
-        @value ||= []
-      end
-
-      def test
-        value << "test"
-      end
-
+    klass = create_test_class do
       def do_this &block
         value << "before"
         result = block.call
@@ -29,15 +21,7 @@ describe "Around advices" do
   end
 
   it "logic in block" do
-    klass = Class.new do
-      def value
-        @value ||= []
-      end
-
-      def test
-        value << "test"
-      end
-    end
+    klass = create_test_class
 
     aspector(klass) do
       around :test do |&block|
@@ -52,4 +36,24 @@ describe "Around advices" do
     obj.test
     obj.value.should == %w"before test after"
   end
+
+  it "method_name_arg" do
+    klass = create_test_class do
+      def do_this method, &block
+        value << "before(#{method})"
+        result = block.call
+        value << "after(#{method})"
+        result
+      end
+    end
+
+    aspector(klass) do
+      around :test, :do_this, :method_name_arg => true
+    end
+
+    obj = klass.new
+    obj.test
+    obj.value.should == %w"before(test) test after(test)"
+  end
 end
+

data/spec/unit/base_class_methods_spec.rb

@@ -0,0 +1,28 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe "Aspector::Base class methods" do
+  it "before" do
+    klass = Class.new(Aspector::Base) do
+      before :test, :do_before
+    end
+
+    klass.advices.size.should == 1
+    advice = klass.advices.first
+    advice.before?.should be_true
+    advice.options[:skip_if_false].should_not be_true
+    advice.with_method.should == 'do_before'
+  end
+
+  it "before_filter" do
+    klass = Class.new(Aspector::Base) do
+      before_filter :test, :do_before
+    end
+
+    klass.advices.size.should == 1
+    advice = klass.advices.first
+    advice.before?.should be_true
+    advice.options[:skip_if_false].should be_true
+    advice.with_method.should == 'do_before'
+  end
+
+end