aspect4r 0.8.0 → 0.8.1

data/VERSION

@@ -1 +1 @@
-0.8.0
+0.8.1

data/aspect4r.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{aspect4r}
-  s.version = "0.8.0"
+  s.version = "0.8.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Guoliang Cao"]
-  s.date = %q{2010-06-10}
+  s.date = %q{2010-06-11}
   s.description = %q{AOP for ruby - use before, after and around to trim your fat methods and reduce code duplication}
   s.email = %q{gcao99@gmail.com}
   s.extra_rdoc_files = [
@@ -99,7 +99,8 @@ Gem::Specification.new do |s|
      "examples/after_example.rb",
      "examples/around_example.rb",
      "examples/before_example.rb",
-     "examples/combined_example.rb"
+     "examples/combined_example.rb",
+     "examples/method_to_advices_example.rb"
   ]
 
   if s.respond_to? :specification_version then

data/examples/around_example.rb

@@ -12,7 +12,7 @@ class A
   
   around :test do |proxy, value|
     puts 'before test'
-    result = send proxy, value
+    result = a4r_invoke proxy, value
     puts 'after test'
     result
   end

data/examples/before_example.rb

@@ -31,32 +31,3 @@ A.new.test -1
 # ==== Output ====
 # before test
 # check before test
-
-
-module M
-  include Aspect4r
-  
-  before :test do |value|
-    puts 'before test'
-  end
-  
-  before_filter :test do |value|
-    puts 'check before test'
-    value >= 0
-  end
-end
-
-class B
-  def test value
-    puts 'test'
-  end
-  
-  include M
-end
-
-puts "\nExample 3:"
-B.new.test 1
-# ==== Output ====
-# before test
-# check before test
-# test

data/lib/aspect4r/base.rb

@@ -36,6 +36,25 @@ module Aspect4r
           a4r_data.change_group
         end
       end
+
+      def a4r_disable_advices_temporarily *methods
+        methods.each do |method|
+          advices = a4r_data[method.to_sym]
+          next if advices.nil? or advices.empty?
+          
+          Aspect4r::Helper.define_method self, method, advices.wrapped_method
+        end
+        
+        yield
+      ensure
+        methods.each do |method|
+          advices = a4r_data[method.to_sym]
+          
+          next if advices.nil? or advices.empty?
+          
+          Aspect4r::Helper.create_method self, method
+        end
+      end
     end
   end
 end

data/lib/aspect4r/helper.rb

@@ -13,6 +13,13 @@ module Aspect4r
       @creating_method
     end
     
+    def self.define_method klass_or_module, *args, &block
+      @creating_method = true
+      klass_or_module.send :define_method, *args, &block
+    ensure
+      @creating_method = false
+    end
+
     def self.eigen_class klass_or_module
       klass_or_module.module_eval do
         class << self
@@ -37,13 +44,15 @@ module Aspect4r
         with_method = methods.pop
       end
       
+      a4r_data = klass_or_module.a4r_data
+      advice   = Aspect4r::Model::Advice.new(meta_data.advice_type, with_method, a4r_data.group, options)
+      
       methods.each do |method|
         method = method.to_sym
         klass_or_module.a4r_data.methods_with_advices << method
         
-        a4r_data = klass_or_module.a4r_data
-        aspect   = a4r_data[method] ||= Aspect4r::Model::AdvicesForMethod.new(method)
-        aspect.add Aspect4r::Model::Advice.new(meta_data.advice_type, with_method, a4r_data.group, options)
+        aspect = a4r_data[method] ||= Aspect4r::Model::AdvicesForMethod.new(method)
+        aspect.add advice
         
         if not aspect.wrapped_method and klass_or_module.instance_methods.include?(method.to_s)
           aspect.wrapped_method = klass_or_module.instance_method(method)
@@ -58,12 +67,8 @@ module Aspect4r
       @creating_method = true
       
       aspect = klass.a4r_data[method.to_sym]
-
-      if aspect.nil? or aspect.empty?
-        # There is no aspect defined.
-        @creating_method = nil
-        return
-      end
+      
+      return if aspect.nil? or aspect.empty?
       
       grouped_advices = []
       group           = nil
@@ -93,7 +98,7 @@ module Aspect4r
       unless grouped_advices.empty?
         create_method_for_before_after_advices klass, method, grouped_advices, inner_most unless grouped_advices.empty?
       end
-
+    ensure
       @creating_method = nil
     end
     

data/spec/aspect4r/advice_test_spec.rb

@@ -99,4 +99,13 @@ describe "Test Advices" do
 
     o.value.should == %w(after)
   end
+  
+  it "test method without advices" do
+    @klass.a4r_disable_advices_temporarily :test do
+      o = @klass.new
+      o.test 1
+      
+      o.value.should == %w(test)
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: aspect4r
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: false
   segments: 
   - 0
   - 8
-  - 0
-  version: 0.8.0
+  - 1
+  version: 0.8.1
 platform: ruby
 authors: 
 - Guoliang Cao
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-10 00:00:00 -04:00
+date: 2010-06-11 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -94,6 +94,7 @@ files:
 - test/combined_test.rb
 - test/method_invocation_test.rb
 - test/test_helper.rb
+- examples/method_to_advices_example.rb
 has_rdoc: true
 homepage: http://github.com/gcao/aspect4r
 licenses: []
@@ -155,3 +156,4 @@ test_files:
 - examples/around_example.rb
 - examples/before_example.rb
 - examples/combined_example.rb
+- examples/method_to_advices_example.rb