aspect4r 0.9.0 → 0.9.1

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: aspect4r
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: 
   segments: 
   - 0
   - 9
-  - 0
-  version: 0.9.0
+  - 1
+  version: 0.9.1
 platform: ruby
 authors: 
 - Guoliang Cao
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-29 00:00:00 -04:00
+date: 2011-05-02 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -66,15 +66,12 @@ files:
 - lib/aspect4r/helper.rb
 - lib/aspect4r/model/advice.rb
 - lib/aspect4r/model/advice_metadata.rb
-- lib/aspect4r/model/advices_for_method.rb
 - lib/aspect4r/model/aspect_data.rb
+- lib/aspect4r/model/method_matcher.rb
 - lib/aspect4r/return_this.rb
-- spec/aspect4r/advice_group_spec.rb
 - spec/aspect4r/advice_on_class_method_spec.rb
 - spec/aspect4r/advice_scope_spec.rb
-- spec/aspect4r/advice_spec.rb
 - spec/aspect4r/advice_test_spec.rb
-- spec/aspect4r/advices_for_method_spec.rb
 - spec/aspect4r/after_spec.rb
 - spec/aspect4r/around_spec.rb
 - spec/aspect4r/before_spec.rb
@@ -84,7 +81,11 @@ files:
 - spec/aspect4r/include_advices_from_module_spec.rb
 - spec/aspect4r/inheritance_inclusion_combined_spec.rb
 - spec/aspect4r/method_added_spec.rb
+- spec/aspect4r/model/advice_group_spec.rb
+- spec/aspect4r/model/advice_spec.rb
+- spec/aspect4r/model/method_matcher_spec.rb
 - spec/aspect4r/module_inclusion_spec.rb
+- spec/aspect4r/regexp_methods_spec.rb
 - spec/aspect4r/singleton_method_added_spec.rb
 - spec/aspect4r/super_in_method_spec.rb
 - spec/aspect4r_spec.rb
@@ -137,12 +138,9 @@ test_files:
 - examples/before_example.rb
 - examples/combined_example.rb
 - examples/test_advices_example.rb
-- spec/aspect4r/advice_group_spec.rb
 - spec/aspect4r/advice_on_class_method_spec.rb
 - spec/aspect4r/advice_scope_spec.rb
-- spec/aspect4r/advice_spec.rb
 - spec/aspect4r/advice_test_spec.rb
-- spec/aspect4r/advices_for_method_spec.rb
 - spec/aspect4r/after_spec.rb
 - spec/aspect4r/around_spec.rb
 - spec/aspect4r/before_spec.rb
@@ -152,7 +150,11 @@ test_files:
 - spec/aspect4r/include_advices_from_module_spec.rb
 - spec/aspect4r/inheritance_inclusion_combined_spec.rb
 - spec/aspect4r/method_added_spec.rb
+- spec/aspect4r/model/advice_group_spec.rb
+- spec/aspect4r/model/advice_spec.rb
+- spec/aspect4r/model/method_matcher_spec.rb
 - spec/aspect4r/module_inclusion_spec.rb
+- spec/aspect4r/regexp_methods_spec.rb
 - spec/aspect4r/singleton_method_added_spec.rb
 - spec/aspect4r/super_in_method_spec.rb
 - spec/aspect4r_spec.rb

data/lib/aspect4r/model/advices_for_method.rb

@@ -1,26 +0,0 @@
-module Aspect4r
-  module Model
-    class AdvicesForMethod < Array
-      attr_reader :method
-      attr_accessor :wrapped_method
-    
-      def initialize method
-        @method = method
-      end
-    
-      def add new_advice
-        self << new_advice unless include?(new_advice)
-      end
-
-      def include? new_advice
-        detect { |advice| advice.name == new_advice.name }
-      end
-      
-      def [] index
-        return super unless index.is_a? String or index.is_a? Symbol
-        
-        detect {|advice| advice.name.to_sym == index.to_sym }
-      end
-    end
-  end
-end

data/spec/aspect4r/advice_spec.rb

@@ -1,62 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-
-describe Aspect4r::Model::Advice do
-  it "before? returns true for before advice" do
-    advice = Aspect4r::Model::Advice.new Aspect4r::Model::Advice::BEFORE, :advice_method, :group
-    advice.before?.should be_true
-  end
-  
-  it "before_filter? returns false for before_filter advice" do
-    advice = Aspect4r::Model::Advice.new Aspect4r::Model::Advice::BEFORE, :advice_method, :group
-    advice.before_filter?.should be_false
-  end
-  
-  it "before? returns false for before advice" do
-    advice = Aspect4r::Model::Advice.new Aspect4r::Model::Advice::BEFORE, :advice_method, :group, :skip_if_false => true
-    advice.before?.should be_false
-  end
-  
-  it "before_filter? returns true for before_filter advice" do
-    advice = Aspect4r::Model::Advice.new Aspect4r::Model::Advice::BEFORE, :advice_method, :group, :skip_if_false => true
-    advice.before_filter?.should be_true
-  end
-  
-  it "invoke before advice" do
-    advice = Aspect4r::Model::Advice.new Aspect4r::Model::Advice::BEFORE, :advice_method, :group
-    
-    o = Object.new
-    o.class.send :define_method, :advice_method do |*args|
-      do_something *args
-    end
-    
-    o.expects(:do_something).with(1)
-    
-    advice.invoke(o, 1)
-  end
-  
-  it "invoke after advice" do
-    advice = Aspect4r::Model::Advice.new Aspect4r::Model::Advice::AFTER, :advice_method, :group
-    
-    o = Object.new
-    o.class.send :define_method, :advice_method do |result, *args|
-      do_something result, *args
-    end
-    
-    o.expects(:do_something).with(1)
-    
-    advice.invoke(o, 1)
-  end
-  
-  it "invoke around advice" do
-    advice = Aspect4r::Model::Advice.new Aspect4r::Model::Advice::AROUND, :advice_method, :group
-    
-    o = Object.new
-    o.class.send :define_method, :advice_method do |proxy, *args|
-      a4r_invoke proxy, *args
-    end
-    
-    o.expects(:a4r_invoke).with(:proxy, 1)
-    
-    advice.invoke(o, :proxy, 1)
-  end
-end

data/spec/aspect4r/advices_for_method_spec.rb

@@ -1,17 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-
-describe Aspect4r::Model::AdvicesForMethod do
-  it "should be able to get advice by name" do
-    advices = Aspect4r::Model::AdvicesForMethod.new(:test)
-    advice1 = Aspect4r::Model::Advice.new Aspect4r::Model::Advice::BEFORE, :advice_method, :group, :name => :advice1
-    advices.add advice1
-    advices[:advice1].should == advice1
-  end
-  
-  it "should be able to get advice by name String" do
-    advices = Aspect4r::Model::AdvicesForMethod.new(:test)
-    advice1 = Aspect4r::Model::Advice.new Aspect4r::Model::Advice::BEFORE, :advice_method, :group, :name => :advice1
-    advices.add advice1
-    advices['advice1'].should == advice1
-  end
-end