aspector 0.10.1 → 0.11.0

data/VERSION

@@ -1 +1 @@
-0.10.1
+0.11.0

data/aspector.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = "aspector"
-  s.version = "0.10.1"
+  s.name = %q{aspector}
+  s.version = "0.11.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Guoliang Cao"]
-  s.date = "2012-03-20"
-  s.description = ""
-  s.email = "gcao99@gmail.com"
+  s.date = %q{2012-04-15}
+  s.description = %q{}
+  s.email = %q{gcao99@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -46,6 +46,7 @@ Gem::Specification.new do |s|
     "lib/aspector/base_class_methods.rb",
     "lib/aspector/deferred_logic.rb",
     "lib/aspector/deferred_option.rb",
+    "lib/aspector/logger.rb",
     "lib/aspector/method_matcher.rb",
     "lib/aspector/module_extension.rb",
     "lib/aspector/object_extension.rb",
@@ -55,6 +56,7 @@ Gem::Specification.new do |s|
     "performance-tests/before_test.rb",
     "performance-tests/combined_test.rb",
     "performance-tests/method_invocation_test.rb",
+    "performance-tests/raw_test.rb",
     "performance-tests/test_helper.rb",
     "spec/functional/advices_on_private_methods_spec.rb",
     "spec/functional/aspect_on_eigen_class_spec.rb",
@@ -70,13 +72,14 @@ Gem::Specification.new do |s|
     "spec/unit/base_spec.rb",
     "spec/unit/before_spec.rb",
     "spec/unit/deferred_logic_spec.rb",
-    "spec/unit/method_matcher_spec.rb"
+    "spec/unit/method_matcher_spec.rb",
+    "spec/unit/raw_spec.rb"
   ]
-  s.homepage = "http://github.com/gcao/aspector"
+  s.homepage = %q{http://github.com/gcao/aspector}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.18"
-  s.summary = "Aspect Oriented Ruby Programming"
+  s.rubygems_version = %q{1.6.2}
+  s.summary = %q{Aspect Oriented Ruby Programming}
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/examples/activerecord_hooks.rb

@@ -13,16 +13,16 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'aspector'
 
 class ActiveRecordHooks < Aspector::Base
-  aspect = self
+  logger.level = Aspector::Logger::TRACE
 
   default :private_methods => true
 
   before :initialize do
-    puts "#{aspect}: before creating #{self.class.name} instance"
+    puts "Before creating #{self.class.name} instance"
   end
 
   before :save do
-    puts "#{aspect}: before saving"
+    puts "Before saving #{self.class.name} instance"
   end
 end
 
@@ -32,4 +32,3 @@ ActiveRecordHooks.apply(A)
 
 a = A.new
 a.save
-

data/examples/cache_aspect.rb

@@ -46,7 +46,7 @@ require 'aspector'
 class CacheAspect < Aspector::Base
   default :ttl => 60
 
-  around options[:method], :aspect_arg => true, :method_arg => true do |aspect, method, proxy, &block|
+  around :aspect_arg => true, :method_arg => true do |aspect, method, proxy, &block|
     key = method
     ttl = aspect.options[:ttl]
 
@@ -59,8 +59,8 @@ end
 
 ##############################
 
-CacheAspect.apply A, :method => :test, :ttl => 2  # 2 seconds
-CacheAspect.apply A, :method => :test2
+CacheAspect.apply "A#test", :ttl => 2  # 2 seconds
+CacheAspect.apply "A#test2"
 
 a = A.new
 

data/examples/exception_handler.rb

@@ -22,13 +22,13 @@ class ExceptionHandler < Aspector::Base
     end
   end
 
-  around options[:method], :handle_exception
+  around :handle_exception
 
 end
 
 ##############################
 
-ExceptionHandler.apply(A, :method => :test)
+ExceptionHandler.apply "A#test"
 
 a = A.new
 a.test 'good'

data/examples/retry_aspect.rb

@@ -28,13 +28,13 @@ class RetryAspect < Aspector::Base
     end
   end
 
-  around options[:method], :retry_this
+  around :retry_this
 
 end
 
 ##############################
 
-RetryAspect.apply(A, :method => :test)
+RetryAspect.apply "A#test"
 
 a = A.new
 a.test

data/lib/aspector/advice.rb

@@ -4,8 +4,10 @@ module Aspector
     BEFORE = 1
     AFTER  = 2
     AROUND = 3
+    RAW    = 4
 
     attr_reader :type, :method_matcher, :options, :advice_block
+    attr_accessor :index
 
     def initialize parent, type, method_matcher, with_method, options = {}, &block
       @parent         = parent
@@ -31,6 +33,10 @@ module Aspector
       not @except.match?(method)
     end
 
+    def raw?
+      type == RAW
+    end
+
     def before?
       type == BEFORE
     end
@@ -52,19 +58,21 @@ module Aspector
       when BEFORE then @options[:skip_if_false] ? "BEFORE_FILTER" : "BEFORE"
       when AFTER  then "AFTER"
       when AROUND then "AROUND"
+      when RAW    then "RAW"
       else "UNKNOWN?!"
       end
     end
 
     def to_s
-      s = type_name
+      s = "<advice " << index.to_s << ">: "
+      s << type_name
       s << " [" << @method_matcher.to_s << "] DO "
-      s << @with_method.to_s
-      s << " WITH OPTIONS "
-      @options.each do |key, value|
-        next if key == :skip_if_false
-        s << key.to_s << ":" << value.to_s << " "
+      if @with_method
+        s << @with_method.to_s
+      else
+        s << "stuff in block"
       end
+      s << " WITH OPTIONS " << @options.inspect
       s
     end
 

data/lib/aspector/advice_metadata.rb

@@ -12,6 +12,7 @@ module Aspector
     BEFORE_FILTER = new Aspector::Advice::BEFORE, nil, :skip_if_false => true
     AFTER         = new Aspector::Advice::AFTER,  { :result_arg => true }, nil
     AROUND        = new Aspector::Advice::AROUND, nil, nil
+    RAW           = new Aspector::Advice::RAW, nil, nil
   end
 end
 

data/lib/aspector/base.rb

@@ -4,7 +4,10 @@ module Aspector
   class Base
 
     attr :aop_options
-    alias :options :aop_options
+    alias options aop_options
+
+    attr :aop_target
+    alias target aop_target
 
     attr :aop_wrapped_methods
 
@@ -51,7 +54,7 @@ module Aspector
 
       aop_disabled?
     end
-    alias reset_disabled :aop_reset_disabled
+    alias reset_disabled aop_reset_disabled
 
     def aop_disabled?
     end
@@ -60,10 +63,15 @@ module Aspector
       aop_disabled?
     end
 
+    def aop_logger
+      @aop_logger ||= Logger.new(self, self.class.logger.level)
+    end
+    alias logger aop_logger
+
     def aop_advices
       self.class.aop_advices
     end
-    alias :advices :aop_advices
+    alias advices aop_advices
 
     def aop_apply
       before_apply
@@ -74,7 +82,7 @@ module Aspector
       aop_add_method_hooks unless @aop_options[:old_methods_only]
       after_apply
     end
-    alias :apply :aop_apply
+    alias apply aop_apply
 
     def aop_apply_to_methods
       advices = aop_advices
@@ -112,6 +120,7 @@ module Aspector
       advices = aop_filter_advices advices, method
       return if advices.empty?
 
+      aop_logger.log Logger::APPLY_TO_METHOD, method
       before_apply_to_method method, advices
 
       scope ||=
@@ -173,6 +182,7 @@ module Aspector
 
     def aop_define_methods_for_advice_blocks
       aop_advices.each do |advice|
+        next if advice.raw?
         next unless advice.advice_block
         @aop_context.send :define_method, advice.with_method, advice.advice_block
         @aop_context.send :private, advice.with_method
@@ -224,9 +234,24 @@ module Aspector
     end
 
     def aop_recreate_method method, advices, scope
-      @aop_wrapped_methods[method] = @aop_context.instance_method(method)
       @aop_context.instance_variable_set(:@aop_creating_method, true)
 
+      raw_advices = advices.select {|advice| advice.raw? }
+
+      if raw_advices.size > 0
+        raw_advices.each do |advice|
+          if @aop_target.is_a? Module and not @aop_options[:class_methods]
+            @aop_target.class_exec method, self, &advice.advice_block
+          else
+            @aop_target.instance_exec method, self, &advice.advice_block
+          end
+        end
+
+        return if raw_advices.size == advices.size
+      end
+
+      @aop_wrapped_methods[method] = @aop_context.instance_method(method)
+
       before_advices = advices.select {|advice| advice.before? }
       after_advices  = advices.select {|advice| advice.after?  }
       around_advices = advices.select {|advice| advice.around? }
@@ -240,79 +265,137 @@ module Aspector
 
       @aop_context.send scope, method if scope != :public
     ensure
-      @aop_context.instance_variable_set(:@aop_creating_method, nil)
+      @aop_context.send :remove_instance_variable, :@aop_creating_method
     end
 
     def aop_recreate_method_with_advices method, before_advices, after_advices, around_advice, is_outermost = false
       aspect = self
 
       code = METHOD_TEMPLATE.result(binding)
-      #puts code
+      aspect.aop_logger.log Logger::GENERATE_CODE, method, code
       @aop_context.class_eval code, __FILE__, __LINE__ + 4
     end
 
-    METHOD_TEMPLATE = ERB.new <<-CODE
-    orig_method = aspect.aop_wrapped_methods['<%= method %>']
+    METHOD_TEMPLATE = ERB.new <<-CODE, nil, "%<>"
 
-<% if around_advice %>
+    orig_method = aspect.aop_wrapped_methods['<%= method %>']
+% if around_advice
     wrapped_method = instance_method(:<%= method %>)
-<% end %>
+% end
 
     define_method :<%= method %> do |*args, &block|
-      return orig_method.bind(self).call(*args, &block) if aspect.aop_disabled?
+% if aop_logger.visible?(Logger::TRACE)
+      aspect.aop_logger.log_method_call '<%= method %>', Aspector::Logger::ENTER_GENERATED_METHOD
+% end
+
+      if aspect.aop_disabled?
+% if aop_logger.visible?(Logger::TRACE)
+        aspect.aop_logger.log_method_call '<%= method %>', Aspector::Logger::EXIT_BECAUSE_DISABLED
+% end
+        return orig_method.bind(self).call(*args, &block)
+      end
 
-<% if is_outermost %>
-      catch(:aop_returns) do
-<% end %>
+% if is_outermost
+    result = catch(:aop_returns) do
+% end
 
+% unless before_advices.empty?
       # Before advices
-<% before_advices.each do |advice| %>
+% end
+% before_advices.each do |advice|
+%   if aop_logger.visible?(Logger::TRACE)
+      aspect.aop_logger.log_method_call '<%= method %>', Aspector::Logger::BEFORE_INVOKE_ADVICE, '<advice <%= advice.index %>>'
+% end
       result = <%= advice.with_method %> <%
         if advice.options[:aspect_arg] %>aspect, <% end %><%
         if advice.options[:method_arg] %>'<%= method %>', <% end
         %>*args
+% if aop_logger.visible?(Logger::TRACE)
+      aspect.aop_logger.log_method_call '<%= method %>', Aspector::Logger::AFTER_INVOKE_ADVICE, '<advice <%= advice.index %>>'
+% end
+%   if advice.options[:skip_if_false]
+      unless result
+% if aop_logger.visible?(Logger::TRACE)
+        aspect.aop_logger.log_method_call '<%= method %>', Aspector::Logger::EXIT_FROM_BEFORE_FILTER, '<advice <%= advice.index %>>'
+% end
+        return
+      end
+%   end
+% end
 
-<%  if advice.options[:skip_if_false] %>
-      return unless result
-<%  end
-  end
-%>
-
-<% if around_advice %>
+% if around_advice
       # Around advice
+% if aop_logger.visible?(Logger::TRACE)
+      aspect.aop_logger.log_method_call '<%= method %>', Aspector::Logger::BEFORE_INVOKE_ADVICE, '<advice <%= around_advice.index %>>'
+% end
+% if aop_logger.visible?(Logger::TRACE)
+      proxy = lambda do |*args, &block|
+        aspect.aop_logger.log_method_call '<%= method %>', Aspector::Logger::BEFORE_INVOKE_PROXY
+        res = wrapped_method.bind(self).call *args, &block
+        aspect.aop_logger.log_method_call '<%= method %>', Aspector::Logger::AFTER_INVOKE_PROXY
+        res
+      end
+      result = <%= around_advice.with_method %> <%
+        if around_advice.options[:aspect_arg] %>aspect, <% end %><%
+        if around_advice.options[:method_arg] %>'<%= method %>', <% end
+        %>proxy, *args, &block
+% else
       result = <%= around_advice.with_method %> <%
         if around_advice.options[:aspect_arg] %>aspect, <% end %><%
         if around_advice.options[:method_arg] %>'<%= method %>', <% end
         %>wrapped_method.bind(self), *args, &block
-<% else %>
+% end
+% if aop_logger.visible?(Logger::TRACE)
+      aspect.aop_logger.log_method_call '<%= method %>', Aspector::Logger::AFTER_INVOKE_ADVICE, '<advice <%= around_advice.index %>>'
+% end
+
+% else
+
       # Invoke original method
+% if aop_logger.visible?(Logger::TRACE)
+      aspect.aop_logger.log_method_call '<%= method %>', Aspector::Logger::BEFORE_WRAPPED_METHOD
+% end
       result = orig_method.bind(self).call *args, &block
-<% end %>
+% if aop_logger.visible?(Logger::TRACE)
+      aspect.aop_logger.log_method_call '<%= method %>', Aspector::Logger::AFTER_WRAPPED_METHOD
+% end
 
+% end
+
+% unless after_advices.empty?
       # After advices
-<% unless after_advices.empty?
-    after_advices.each do |advice|
-      if advice.options[:result_arg]
-%>
+%   after_advices.each do |advice|
+% if aop_logger.visible?(Logger::TRACE)
+      aspect.aop_logger.log_method_call '<%= method %>', Aspector::Logger::BEFORE_INVOKE_ADVICE, '<advice <%= advice.index %>>'
+% end
+%     if advice.options[:result_arg]
       result = <%= advice.with_method %> <%
         if advice.options[:aspect_arg] %>aspect, <% end %><%
         if advice.options[:method_arg] %>'<%= method %>', <% end %><%
         if advice.options[:result_arg] %>result, <% end
         %>*args
-<%    else %>
+%     else
       <%= advice.with_method %> <%
         if advice.options[:aspect_arg] %>aspect, <% end %><%
         if advice.options[:method_arg] %>'<%= method %>', <% end
         %>*args
-<%    end
-    end
-%>
+%     end
+% if aop_logger.visible?(Logger::TRACE)
+      aspect.aop_logger.log_method_call '<%= method %>', Aspector::Logger::AFTER_INVOKE_ADVICE, '<advice <%= advice.index %>>'
+% end
+%   end
+% end
+
+% if is_outermost
       result
-<% end %>
 
-<% if is_outermost %>
-      end
-<% end %>
+    end # end of catch
+% end
+
+% if aop_logger.visible?(Logger::TRACE)
+      aspect.aop_logger.log_method_call '<%= method %>', Aspector::Logger::EXIT_GENERATED_METHOD
+% end
+      result
     end
     CODE
 

data/lib/aspector/base_class_methods.rb

@@ -4,33 +4,41 @@ module Aspector
       ::Aspector::Base.extend(self)
 
       def aop_enable
+        aop_logger.log Logger::ENABLE_ASPECT
         send :define_method, :aop_disabled? do
         end
 
         nil
       end
-      alias :enable :aop_enable
+      alias enable aop_enable
 
       def aop_disable
+        aop_logger.log Logger::DISABLE_ASPECT
         send :define_method, :aop_disabled? do
           true
         end
 
         nil
       end
-      alias :disable :aop_disable
+      alias disable aop_disable
+
+      def aop_logger
+        @aop_logger ||= Logger.new(self)
+      end
+      alias logger aop_logger
 
       def aop_advices
         @aop_advices ||= []
       end
-      alias :advices :aop_advices
+      alias advices aop_advices
 
       def aop_default_options
         @aop_default_options ||= {}
       end
-      alias :default_options :aop_default_options
+      alias default_options aop_default_options
 
       def aop_apply target, options = {}
+        aop_logger.log Logger::APPLY, target, options.inspect
         # Handle 'Klass#method' and 'Klass.method' shortcut
         if target.is_a? String
           if target.index('.')
@@ -48,7 +56,7 @@ module Aspector
         aspect_instance.send :aop_apply
         aspect_instance
       end
-      alias :apply :aop_apply
+      alias apply aop_apply
 
       def aop_default options
         if @aop_default_options
@@ -57,27 +65,47 @@ module Aspector
           @aop_default_options = options
         end
       end
-      alias :default :aop_default
+      alias default aop_default
 
       def aop_before *methods, &block
-        aop_advices << aop_create_advice(Aspector::AdviceMetadata::BEFORE, self, methods, &block)
+        aop_advices << advice = aop_create_advice(Aspector::AdviceMetadata::BEFORE, self, methods, &block)
+        advice.index = aop_advices.size
+        aop_logger.log Logger::DEFINE_ADVICE, advice
+        advice
       end
-      alias :before :aop_before
+      alias before aop_before
 
       def aop_before_filter *methods, &block
-        aop_advices << aop_create_advice(Aspector::AdviceMetadata::BEFORE_FILTER, self, methods, &block)
+        aop_advices << advice = aop_create_advice(Aspector::AdviceMetadata::BEFORE_FILTER, self, methods, &block)
+        advice.index = aop_advices.size
+        aop_logger.log Logger::DEFINE_ADVICE, advice
+        advice
       end
-      alias :before_filter :aop_before_filter
+      alias before_filter aop_before_filter
 
       def aop_after *methods, &block
-        aop_advices << aop_create_advice(Aspector::AdviceMetadata::AFTER, self, methods, &block)
+        aop_advices << advice = aop_create_advice(Aspector::AdviceMetadata::AFTER, self, methods, &block)
+        advice.index = aop_advices.size
+        aop_logger.log Logger::DEFINE_ADVICE, advice
+        advice
       end
-      alias :after :aop_after
+      alias after aop_after
 
       def aop_around *methods, &block
-        aop_advices << aop_create_advice(Aspector::AdviceMetadata::AROUND, self, methods, &block)
+        aop_advices << advice = aop_create_advice(Aspector::AdviceMetadata::AROUND, self, methods, &block)
+        advice.index = aop_advices.size
+        aop_logger.log Logger::DEFINE_ADVICE, advice
+        advice
+      end
+      alias around aop_around
+
+      def aop_raw *methods, &block
+        aop_advices << advice = aop_create_advice(Aspector::AdviceMetadata::RAW, self, methods, &block)
+        advice.index = aop_advices.size
+        aop_logger.log Logger::DEFINE_ADVICE, advice
+        advice
       end
-      alias :around :aop_around
+      alias raw aop_raw
 
       def aop_target code = nil, &block
         return unless code or block_given?
@@ -86,12 +114,12 @@ module Aspector
         aop_deferred_logics << logic
         logic
       end
-      alias :target :aop_target
+      alias target aop_target
 
       def aop_options
         DeferredOption.new
       end
-      alias :options :aop_options
+      alias options aop_options
 
       private
 
@@ -111,7 +139,12 @@ module Aspector
           methods[i] = methods[i].to_s if methods[i].is_a? Symbol
         end
 
-        with_method = methods.pop unless block_given?
+        if meta_data.advice_type == Aspector::Advice::RAW
+          raise "Bad raw advice - code block is required" unless block_given?
+          with_method = nil
+        else
+          with_method = methods.pop unless block_given?
+        end
 
         methods << aop_options[:method] << aop_options[:methods] if methods.empty?
 

data/lib/aspector/deferred_option.rb

@@ -8,5 +8,9 @@ module Aspector
       self
     end
 
+    def inspect
+      "options[:#{key}]"
+    end
   end
 end
+

data/lib/aspector/logger.rb

@@ -0,0 +1,110 @@
+module Aspector
+  class Logger
+    # Log levels
+    ERROR = 50
+    WARN  = 40
+    INFO  = 30
+    DEBUG = 20
+    TRACE = 10
+
+    DEFAULT_VISIBLE_LEVEL = INFO
+
+    # Actions
+    DEFINE_ADVICE          = %W"define-advice"
+    APPLY                  = %W"apply"
+    APPLY_TO_METHOD        = %W"apply-to-method #{DEBUG}"
+    ENABLE_ASPECT          = %W"enable-aspect"
+    DISABLE_ASPECT         = %W"disable-aspect"
+
+    GENERATE_CODE          = %W"generate-code #{DEBUG}"
+
+    ENTER_GENERATED_METHOD = %W"enter-generated-method #{TRACE}"
+    EXIT_GENERATED_METHOD  = %W"exit--generated-method #{TRACE}"
+    EXIT_BECAUSE_DISABLED  = %W"exit--because-disabled #{TRACE}"
+    BEFORE_INVOKE_ADVICE   = %W"before-invoke-advice #{TRACE}"
+    AFTER_INVOKE_ADVICE    = %W"after--invoke-advice #{TRACE}"
+    BEFORE_WRAPPED_METHOD  = %W"before-wrapped-method #{TRACE}"
+    AFTER_WRAPPED_METHOD   = %W"after--wrapped-method #{TRACE}"
+    BEFORE_INVOKE_PROXY    = %W"before-invoke-proxy #{TRACE}"
+    AFTER_INVOKE_PROXY     = %W"after--invoke-proxy #{TRACE}"
+
+    attr_reader :context
+    attr_writer :level
+
+    def initialize context, level = nil
+      @context = context
+      @level = level
+    end
+
+    def level
+      return @level if @level
+
+      if (level_string = ENV['ASPECTOR_LOG_LEVEL'])
+        @level = string_to_level(level_string)
+      else
+        @level = DEFAULT_VISIBLE_LEVEL
+      end
+    end
+
+    def log action_level, *args
+      action, level = parse_action_level(action_level)
+
+      return if self.level > level
+
+      puts log_prefix(level) << action << " | " << args.join(" | ")
+    end
+
+    def log_method_call method, action_level, *args
+      action, level = parse_action_level(action_level)
+
+      return if self.level > level
+
+      puts log_prefix(level) << method << " | " << action << " | " << args.join(" | ")
+    end
+
+    def visible? level
+      self.level <= level
+    end
+
+    private
+
+    def parse_action_level action_level
+      action = action_level[0]
+      level = (action_level[1] || INFO).to_i
+      return action, level
+    end
+
+    def log_prefix level
+      s = "Aspector | " << level_to_string(level) << " | "
+      if context.is_a? Aspector::Base
+        s << context.class.to_s << " | " << context.aop_target.to_s << " | "
+      else
+        s << context.to_s << " | "
+      end
+    end
+
+    def level_to_string level
+      case level
+      when ERROR then "ERROR"
+      when WARN  then "WARN "
+      when INFO  then "INFO "
+      when DEBUG then "DEBUG"
+      when TRACE then "TRACE"
+      else level.to_s
+      end
+    end
+
+    def string_to_level level_string
+      return if level_string.nil? or level_string.strip == ''
+
+      case level_string.downcase
+      when 'error' then ERROR
+      when 'warn'  then WARN
+      when 'info'  then INFO
+      when 'debug' then DEBUG
+      when 'trace' then TRACE
+      end
+    end
+  end
+end
+

data/lib/aspector/module_extension.rb

@@ -19,7 +19,7 @@ module Aspector
 
         yield if block_given?
       ensure
-        instance_variable_set(aop_applied_flag, nil)
+        remove_instance_variable aop_applied_flag
       end
     end
 
@@ -42,7 +42,7 @@ module Aspector
 
         yield if block_given?
       ensure
-        eigen_class.instance_variable_set(aop_applied_flag, nil)
+        eigen_class.send :remove_instance_variable, aop_applied_flag
       end
     end
 

data/lib/aspector.rb

@@ -1,3 +1,5 @@
+require 'aspector/logger'
+
 require 'aspector/object_extension'
 require 'aspector/module_extension'
 

data/performance-tests/around_advice_benchmark.rb

@@ -26,14 +26,15 @@ class AroundAspect < Aspector::Base
 end
 
 class RawAspect < Aspector::Base
-  target do
-    wrapped_method = instance_method(:test)
-    define_method :test do |*args, &block|
-      begin
-        wrapped_method.bind(self).call *args, &block
-      rescue => e
-      end
+  raw :test do |method,|
+    eval <<-CODE
+    alias #{method}_without_aspect #{method}
+
+    def #{method} *args, &block
+      #{method}_without_aspect *args, &block
+    rescue => e
     end
+    CODE
   end
 end
 

data/performance-tests/raw_test.rb

@@ -0,0 +1,37 @@
+require File.expand_path(File.dirname(__FILE__) + '/test_helper')
+
+class RawTest < Test::Unit::TestCase
+  include RubyProf::Test
+
+  class Klass
+
+    aspector do
+
+      raw :test do |method, aspect|
+        eval <<-CODE
+        alias #{method}_without_aspect #{method}
+
+        define_method :#{method} do
+          return #{method}_without_aspect if aspect.disabled?
+          before_#{method}
+          #{method}_without_aspect
+        end
+        CODE
+      end
+
+    end
+
+    def test_no_aspect; end
+
+    def test; end
+
+    def before_test; end
+  end
+
+  def test_raw
+    o = Klass.new
+    o.test_no_aspect
+    o.test
+  end
+end
+

data/performance-tests/test_helper.rb

@@ -5,5 +5,5 @@ require 'test/unit'
 require 'ruby-prof/test'
 require 'aspector'
 
-RubyProf::Test::PROFILE_OPTIONS[:count     ] = 10000
+RubyProf::Test::PROFILE_OPTIONS[:count     ] = 200000
 RubyProf::Test::PROFILE_OPTIONS[:output_dir] = File.dirname(__FILE__) + "/output"

data/spec/unit/raw_spec.rb

@@ -0,0 +1,53 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe "Raw advices" do
+  it "should work" do
+    klass = create_test_class
+
+    aspector(klass) do
+      raw :test do
+        alias test_without_aspect test
+        def test
+          value << "raw_before"
+          test_without_aspect
+        end
+      end
+    end
+
+    obj = klass.new
+    obj.test
+    obj.value.should == %w"raw_before test"
+  end
+
+  it "new methods should work" do
+    klass = Class.new do
+      aspector do
+        raw :test do
+          alias test_without_aspect test
+          def test
+            do_this
+            test_without_aspect
+          end
+        end
+      end
+
+      def value
+        @value ||= []
+      end
+
+      def test
+        value << "test"
+      end
+
+      def do_this
+        value << "do_this"
+      end
+    end
+
+    obj = klass.new
+    obj.test
+    obj.value.should == %w"do_this test"
+  end
+
+end
+

metadata

@@ -1,200 +1,202 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: aspector
-version: !ruby/object:Gem::Version
-  version: 0.10.1
+version: !ruby/object:Gem::Version 
+  hash: 51
   prerelease: 
+  segments: 
+  - 0
+  - 11
+  - 0
+  version: 0.11.0
 platform: ruby
-authors:
+authors: 
 - Guoliang Cao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-20 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+
+date: 2012-04-15 00:00:00 -04:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  type: :development
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: !ruby/object:Gem::Requirement
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: rspec
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 6
+        - 4
         version: 1.6.4
-  type: :development
+  name: jeweler
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  type: :development
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.6.4
-- !ruby/object:Gem::Dependency
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   name: ruby-prof
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.8.4
   type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 55
+        segments: 
+        - 0
+        - 8
+        - 4
         version: 0.8.4
-- !ruby/object:Gem::Dependency
-  name: guard-bundler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.1.3
-  type: :development
+  name: guard
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  type: :development
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 0
+        - 1
+        - 3
         version: 0.1.3
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.5.2
-  type: :development
+  name: guard-bundler
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  type: :development
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 0
+        - 5
+        - 2
         version: 0.5.2
-- !ruby/object:Gem::Dependency
-  name: guard-shell
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-  type: :development
+  name: guard-rspec
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  type: :development
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 1
+        - 1
         version: 0.1.1
-- !ruby/object:Gem::Dependency
-  name: rb-fsevent
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.4.3.1
-  type: :development
+  name: guard-shell
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  type: :development
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 97
+        segments: 
+        - 0
+        - 4
+        - 3
+        - 1
         version: 0.4.3.1
-- !ruby/object:Gem::Dependency
-  name: growl
-  requirement: !ruby/object:Gem::Requirement
+  name: rb-fsevent
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 1
+        - 0
+        - 3
         version: 1.0.3
-  type: :development
+  name: growl
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  type: :development
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.3
-- !ruby/object:Gem::Dependency
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   name: awesome_print
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: ''
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: pry
+  version_requirements: *id011
+description: ""
 email: gcao99@gmail.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - LICENSE.txt
 - README.rdoc
-files:
+files: 
 - .document
 - .irbrc
 - .rspec
@@ -224,6 +226,7 @@ files:
 - lib/aspector/base_class_methods.rb
 - lib/aspector/deferred_logic.rb
 - lib/aspector/deferred_option.rb
+- lib/aspector/logger.rb
 - lib/aspector/method_matcher.rb
 - lib/aspector/module_extension.rb
 - lib/aspector/object_extension.rb
@@ -233,6 +236,7 @@ files:
 - performance-tests/before_test.rb
 - performance-tests/combined_test.rb
 - performance-tests/method_invocation_test.rb
+- performance-tests/raw_test.rb
 - performance-tests/test_helper.rb
 - spec/functional/advices_on_private_methods_spec.rb
 - spec/functional/aspect_on_eigen_class_spec.rb
@@ -249,32 +253,40 @@ files:
 - spec/unit/before_spec.rb
 - spec/unit/deferred_logic_spec.rb
 - spec/unit/method_matcher_spec.rb
+- spec/unit/raw_spec.rb
+has_rdoc: true
 homepage: http://github.com/gcao/aspector
-licenses:
+licenses: 
 - MIT
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 3014402332352836990
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.18
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Aspect Oriented Ruby Programming
 test_files: []
+