aspector 0.7.0 → 0.7.1

data/Gemfile

@@ -2,13 +2,13 @@ source "http://rubygems.org"
 
 group :development do
   gem "rspec", "~> 2.3.0"
-  gem "mocha", "~> 0.10.0"
-  gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.6.4"
   gem "rcov", ">= 0"
   gem "reek", "~> 1.2.8"
   gem "roodi", "~> 2.1.0"
 
+  gem 'ruby-prof'
+
   gem "guard", "~> 0.8.4"
   gem "guard-bundler", "~> 0.1.3"
   gem "guard-rspec", "~> 0.5.2"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    awesome_print (0.4.0)
+    awesome_print (1.0.2)
     diff-lcs (1.1.3)
     git (1.2.5)
     growl (1.0.3)
@@ -10,7 +10,7 @@ GEM
     guard-bundler (0.1.3)
       bundler (>= 1.0.0)
       guard (>= 0.2.2)
-    guard-rspec (0.5.2)
+    guard-rspec (0.5.11)
       guard (>= 0.8.4)
     guard-shell (0.1.1)
       guard (>= 0.2.0)
@@ -18,12 +18,9 @@ GEM
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    metaclass (0.0.1)
-    mocha (0.10.0)
-      metaclass (~> 0.0.1)
     rake (0.9.2.2)
     rb-fsevent (0.4.3.1)
-    rcov (0.9.11)
+    rcov (1.0.0)
     reek (1.2.8)
       ruby2ruby (~> 1.2)
       ruby_parser (~> 2.0)
@@ -38,12 +35,13 @@ GEM
     rspec-expectations (2.3.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.3.0)
+    ruby-prof (0.10.8)
     ruby2ruby (1.3.1)
       ruby_parser (~> 2.0)
       sexp_processor (~> 3.0)
     ruby_parser (2.3.1)
       sexp_processor (~> 3.0)
-    sexp_processor (3.0.7)
+    sexp_processor (3.0.10)
     thor (0.14.6)
 
 PLATFORMS
@@ -51,16 +49,15 @@ PLATFORMS
 
 DEPENDENCIES
   awesome_print
-  bundler (~> 1.0.0)
   growl (~> 1.0.3)
   guard (~> 0.8.4)
   guard-bundler (~> 0.1.3)
   guard-rspec (~> 0.5.2)
   guard-shell (~> 0.1.1)
   jeweler (~> 1.6.4)
-  mocha (~> 0.10.0)
   rb-fsevent (~> 0.4.3.1)
   rcov
   reek (~> 1.2.8)
   roodi (~> 2.1.0)
   rspec (~> 2.3.0)
+  ruby-prof

data/README.rdoc

@@ -32,16 +32,17 @@ gem install aspector
       end
     end
 
-    before :test, :do_this
-    before :test do
+    before options[:method], :do_this
+
+    before options[:method] do
       puts 'do_that'
     end
   end
 
-  TestAspect.apply(A)
-
   ##############################
 
+  TestAspect.apply A, :method => :test
+
   A.new.test
 
   # Expected output:

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.7.1

data/aspector.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{aspector}
-  s.version = "0.7.0"
+  s.version = "0.7.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Guoliang Cao"]
-  s.date = %q{2011-12-09}
+  s.date = %q{2012-02-09}
   s.description = %q{}
   s.email = %q{gcao99@gmail.com}
   s.extra_rdoc_files = [
@@ -34,6 +34,9 @@ Gem::Specification.new do |s|
     "examples/aspector_apply_example.rb",
     "examples/aspector_example.rb",
     "examples/cache_aspect.rb",
+    "examples/exception_handler.rb",
+    "examples/logging_aspect.rb",
+    "examples/retry_aspect.rb",
     "lib/aspector.rb",
     "lib/aspector/advice.rb",
     "lib/aspector/advice_metadata.rb",
@@ -47,18 +50,27 @@ Gem::Specification.new do |s|
     "lib/aspector/module_extension.rb",
     "lib/aspector/object_extension.rb",
     "lib/aspector/return_this.rb",
-    "spec/advices_on_private_methods_spec.rb",
-    "spec/aspect_on_eigen_class_spec.rb",
-    "spec/aspect_on_object_spec.rb",
-    "spec/aspector/after_spec.rb",
-    "spec/aspector/around_spec.rb",
-    "spec/aspector/aspect_spec.rb",
-    "spec/aspector/base_spec.rb",
-    "spec/aspector/before_spec.rb",
-    "spec/aspector_spec.rb",
-    "spec/aspects_combined_spec.rb",
-    "spec/execution_order_spec.rb",
-    "spec/spec_helper.rb"
+    "performance-tests/after_test.rb",
+    "performance-tests/around_test.rb",
+    "performance-tests/before_test.rb",
+    "performance-tests/combined_test.rb",
+    "performance-tests/method_invocation_test.rb",
+    "performance-tests/test_helper.rb",
+    "spec/functional/advices_on_private_methods_spec.rb",
+    "spec/functional/aspect_on_eigen_class_spec.rb",
+    "spec/functional/aspect_on_object_spec.rb",
+    "spec/functional/aspector_spec.rb",
+    "spec/functional/aspects_combined_spec.rb",
+    "spec/functional/execution_order_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/unit/advice_spec.rb",
+    "spec/unit/after_spec.rb",
+    "spec/unit/around_spec.rb",
+    "spec/unit/base_class_methods_spec.rb",
+    "spec/unit/base_spec.rb",
+    "spec/unit/before_spec.rb",
+    "spec/unit/deferred_logic_spec.rb",
+    "spec/unit/method_matcher_spec.rb"
   ]
   s.homepage = %q{http://github.com/gcao/aspector}
   s.licenses = ["MIT"]
@@ -71,12 +83,11 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_development_dependency(%q<mocha>, ["~> 0.10.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<reek>, ["~> 1.2.8"])
       s.add_development_dependency(%q<roodi>, ["~> 2.1.0"])
+      s.add_development_dependency(%q<ruby-prof>, [">= 0"])
       s.add_development_dependency(%q<guard>, ["~> 0.8.4"])
       s.add_development_dependency(%q<guard-bundler>, ["~> 0.1.3"])
       s.add_development_dependency(%q<guard-rspec>, ["~> 0.5.2"])
@@ -86,12 +97,11 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<awesome_print>, [">= 0"])
     else
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_dependency(%q<mocha>, ["~> 0.10.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<reek>, ["~> 1.2.8"])
       s.add_dependency(%q<roodi>, ["~> 2.1.0"])
+      s.add_dependency(%q<ruby-prof>, [">= 0"])
       s.add_dependency(%q<guard>, ["~> 0.8.4"])
       s.add_dependency(%q<guard-bundler>, ["~> 0.1.3"])
       s.add_dependency(%q<guard-rspec>, ["~> 0.5.2"])
@@ -102,12 +112,11 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-    s.add_dependency(%q<mocha>, ["~> 0.10.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
     s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<reek>, ["~> 1.2.8"])
     s.add_dependency(%q<roodi>, ["~> 2.1.0"])
+    s.add_dependency(%q<ruby-prof>, [">= 0"])
     s.add_dependency(%q<guard>, ["~> 0.8.4"])
     s.add_dependency(%q<guard-bundler>, ["~> 0.1.3"])
     s.add_dependency(%q<guard-rspec>, ["~> 0.5.2"])

data/examples/activerecord_hooks.rb

@@ -26,10 +26,10 @@ class ActiveRecordHooks < Aspector::Base
   end
 end
 
-ActiveRecordHooks.apply(A)
-
 ##############################
 
+ActiveRecordHooks.apply(A)
+
 a = A.new
 a.save
 

data/examples/around_example.rb

@@ -20,6 +20,7 @@ aspector(A) do
   end
 
   around :test, :do_this
+
   around :test do |&block|
     puts 'before(block)'
     block.call

data/examples/aspector_apply_example.rb

@@ -10,7 +10,7 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'aspector'
 
-TestAspect = Aspector do
+aspect = Aspector do
   target do
     def do_this
       puts 'do_this'
@@ -18,15 +18,16 @@ TestAspect = Aspector do
   end
 
   before :test, :do_this
+
   before :test do
     puts 'do_that'
   end
 end
 
-TestAspect.apply(A)
-
 ##############################
 
+aspect.apply(A)
+
 A.new.test
 
 # Expected output:

data/examples/aspector_example.rb

@@ -18,6 +18,7 @@ aspector(A) do
   end
 
   before :test, :do_this
+
   before :test do
     puts 'do_that'
   end

data/examples/cache_aspect.rb

@@ -57,11 +57,11 @@ class CacheAspect < Aspector::Base
 
 end
 
+##############################
+
 CacheAspect.apply A, :method => :test, :ttl => 2  # 2 seconds
 CacheAspect.apply A, :method => :test2
 
-##############################
-
 a = A.new
 
 # Will store value in cache

data/examples/exception_handler.rb

@@ -0,0 +1,36 @@
+class A
+
+  def test input
+    puts input.upcase
+  end
+
+end
+
+##############################
+
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
+require 'aspector'
+
+class ExceptionHandler < Aspector::Base
+
+  target do
+    def handle_exception *args, &block
+      block.call *args
+    rescue => e
+      puts "Rescued: #{e}"
+    end
+  end
+
+  around options[:method], :handle_exception
+
+end
+
+##############################
+
+ExceptionHandler.apply(A, :method => :test)
+
+a = A.new
+a.test 'good'
+a.test nil
+

data/examples/logging_aspect.rb

@@ -0,0 +1,35 @@
+class A
+
+  def test input
+    input.upcase
+  end
+
+end
+
+##############################
+
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
+require 'aspector'
+
+class LoggingAspect < Aspector::Base
+
+  ALL_METHODS = /.*/
+
+  around ALL_METHODS, :except => :class, :method_name_arg => true do |method, *args, &block|
+    class_method = "#{self.class}.#{method}"
+    puts "Entering #{class_method}: #{args.join(',')}"
+    result = block.call *args
+    puts "Exiting  #{class_method}: #{result}"
+    result
+  end
+
+end
+
+##############################
+
+LoggingAspect.apply(A)
+
+a = A.new
+a.test 'input'
+

data/examples/retry_aspect.rb

@@ -0,0 +1,41 @@
+class A
+
+  def test
+    puts 'test'
+    raise
+  end
+
+end
+
+##############################
+
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
+require 'aspector'
+
+class RetryAspect < Aspector::Base
+
+  target do
+    def retry_this &block
+      block.call
+    rescue => e
+      @retry_count ||= 3
+      @retry_count -= 1
+
+      @retry_count = nil or raise if @retry_count == 0
+
+      retry
+    end
+  end
+
+  around options[:method], :retry_this
+
+end
+
+##############################
+
+RetryAspect.apply(A, :method => :test)
+
+a = A.new
+a.test
+

data/lib/aspector/advice.rb

@@ -13,7 +13,7 @@ module Aspector
       @method_matcher = method_matcher
       @with_method    = with_method
       @options        = options
-      @advice_block   = block.to_proc if block_given?
+      @advice_block   = block
     end
 
     def with_method
@@ -26,17 +26,13 @@ module Aspector
 
       return true unless @options[:except]
 
-      @except ||= MethodMatcher.new([@options[:except]].flatten)
+      @except ||= MethodMatcher.new(@options[:except])
 
       not @except.match?(method)
     end
 
     def before?
-      type == BEFORE and not options[:skip_if_false]
-    end
-
-    def before_filter?
-      type == BEFORE and options[:skip_if_false]
+      type == BEFORE
     end
 
     def after?

data/lib/aspector/base.rb

@@ -18,7 +18,7 @@ module Aspector
       # @context is where advices will be applied (i.e. where methods are modified), can be different from target
       @context = get_context
 
-      after_initialization
+      after_initialize
     end
 
     def apply
@@ -27,7 +27,7 @@ module Aspector
       add_to_instances
       apply_to_methods
       add_method_hooks
-      after_application
+      after_apply
     end
 
     def deferred_logic_results logic
@@ -69,11 +69,11 @@ module Aspector
     protected
 
     # Hook method that runs after an aspect is instantiated
-    def after_initialization
+    def after_initialize
     end
 
     # Hook method that runs after an aspect is applied
-    def after_application
+    def after_apply
     end
 
     private
@@ -91,7 +91,7 @@ module Aspector
 
       @deferred_logic_results ||= {}
       self.class.deferred_logics.each do |logic|
-        @deferred_logic_results[logic] = logic.apply @context
+        @deferred_logic_results[logic] = logic.apply @context, self
       end
     end
 
@@ -150,8 +150,8 @@ module Aspector
     def recreate_method method, advices, scope
       @context.instance_variable_set(:@aspector_creating_method, true)
 
-      before_advices = advices.select {|advice| advice.before? or advice.before_filter? }
-      after_advices  = advices.select {|advice| advice.after? }
+      before_advices = advices.select {|advice| advice.before? }
+      after_advices  = advices.select {|advice| advice.after?  }
       around_advices = advices.select {|advice| advice.around? }
 
       if around_advices.size > 1
@@ -179,57 +179,80 @@ module Aspector
     wrapped_method = instance_method(:<%= method %>)
 
     define_method :<%= method %> do |*args, &block|
-      result = nil
-
       # Before advices
-<% before_advices.each do |advice| %>
-<% if advice.options[:context_arg] %>
+<% before_advices.each do |advice|
+    if advice.options[:context_arg]
+%>
       context = Aspector::Context.new(target, <%= self.hash %>, <%= advice.hash %>)
       context.method_name = '<%= method %>'
       result = <%= advice.with_method %> context, *args
-<% else %>
+<%  elsif advice.options[:method_name_arg] %>
+      result = <%= advice.with_method %> '<%= method %>', *args
+<%  else %>
       result = <%= advice.with_method %> *args
-<% end %>
+<%  end %>
 
       return result.value if result.is_a? ::Aspector::ReturnThis
-<% if advice.options[:skip_if_false] %>
+<%  if advice.options[:skip_if_false] %>
       return unless result
-<% end %>
-<% end %>
+<%  end
+  end
+%>
 
-<% if around_advice %>
-      # around advice
-<%   if around_advice.options[:context_arg] %>
+<% if around_advice
+    if around_advice.options[:context_arg]
+%>
       context = Aspector::Context.new(target, <%= self.hash %>, <%= around_advice.hash %>)
       context.method_name = '<%= method %>'
       result = <%= around_advice.with_method %> context, *args do |*args|
         wrapped_method.bind(self).call *args, &block
       end
-<%   else %>
+<%  elsif around_advice.options[:method_name_arg] %>
+      result = <%= around_advice.with_method %> '<%= method %>', *args do |*args|
+        wrapped_method.bind(self).call *args, &block
+      end
+<%  else %>
       result = <%= around_advice.with_method %> *args do |*args|
         wrapped_method.bind(self).call *args, &block
       end
-<%   end %>
-<% else %>
+<%  end
+  else
+%>
       # Invoke wrapped method
       result = wrapped_method.bind(self).call *args, &block
 <% end %>
 
       # After advices
-<% after_advices.each do |advice| %>
-<% if advice.options[:context_arg] and advice.options[:result_arg] %>
+<% unless after_advices.empty?
+    after_advices.each do |advice|
+      if advice.options[:context_arg]
+        if advice.options[:result_arg]
+%>
       context = Aspector::Context.new(target, <%= self.hash %>, <%= advice.hash %>)
       context.method_name = '<%= method %>'
       result = <%= advice.with_method %> context, result, *args
-<% elsif advice.options[:context_arg] %>
+<%      else %>
       <%= advice.with_method %> context, *args
-<% elsif advice.options[:result_arg] %>
+<%      end
+      elsif advice.options[:method_name_arg]
+        if advice.options[:result_arg]
+%>
+      result = <%= advice.with_method %> '<%= method %>', result, *args
+<%      else %>
+      <%= advice.with_method %> '<%= method %>', *args
+<%      end
+      else
+        if advice.options[:result_arg]
+%>
       result = <%= advice.with_method %> result, *args
-<% else %>
+<%      else %>
       <%= advice.with_method %> *args
-<% end %>
-<% end %>
+<%      end
+      end
+    end
+%>
       result
+<% end %>
     end
     CODE
 

data/lib/aspector/context.rb

@@ -1,10 +1,11 @@
 module Aspector
   class Context
 
+    attr :target
     attr_accessor :method_name
 
     def initialize(target, aspect_hash, advice_hash)
-      @target = target
+      @target      = target
       @aspect_hash = aspect_hash
       @advice_hash = advice_hash
     end

data/lib/aspector/deferred_logic.rb

@@ -1,18 +1,14 @@
 module Aspector
   class DeferredLogic
 
-    attr_reader :code, :value
+    attr_reader :code
 
     def initialize code
       @code = code
     end
 
-    def apply target
-      if @code.is_a? String
-        @value = target.class_eval(@code)
-      else
-        @value = target.class_eval(&@code)
-      end
+    def apply target, *args
+      target.class_exec(*args, &@code)
     end
 
   end

data/lib/aspector/method_matcher.rb

@@ -2,9 +2,10 @@ module Aspector
   class MethodMatcher
     def initialize *match_data
       @match_data = match_data
+      @match_data.flatten!
     end
 
-    def match? method, context = nil
+    def match? method, aspect = nil
       @match_data.detect do |item|
         case item
         when String
@@ -14,25 +15,21 @@ module Aspector
         when Symbol
           item.to_s == method
         when DeferredLogic
-          value = context.deferred_logic_results[item]
+          value = aspect.deferred_logic_results(item)
           if value
-            new_matcher = MethodMatcher.new(*[value].flatten)
+            new_matcher = MethodMatcher.new(value)
             new_matcher.match?(method)
           end
         when DeferredOption
-          value = context.options[item.key]
+          value = aspect.options[item.key]
           if value
-            new_matcher = MethodMatcher.new(*[value].flatten)
+            new_matcher = MethodMatcher.new(value)
             new_matcher.match?(method)
           end
         end
       end
     end
 
-    def has_regular_expressions?
-      @has_regexps ||= @match_data.detect { |item| item.is_a? Regexp }
-    end
-
     def to_s
       @match_data.map {|item| item.inspect }.join ", "
     end