aspector 0.7.0 → 0.7.1

data/spec/unit/base_spec.rb

@@ -0,0 +1,81 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe "Aspector::Base" do
+  it "default options" do
+    aspect = Aspector do
+      default :test => 'value'
+    end
+
+    aspect.default_options[:test].should == 'value'
+  end
+
+  it "#options is used to access options set when aspect is applied" do
+    klass = create_test_class
+
+    aspect = Aspector do
+      before options[:methods] do
+        value << "do_this"
+      end
+    end
+
+    aspect.apply(klass, :methods => :test)
+
+    obj = klass.new
+    obj.test
+    obj.value.should == %w"do_this test"
+  end
+
+  it "#apply" do
+    klass = create_test_class
+
+    aspect = Aspector do
+      before :test do value << "do_before" end
+    end
+
+    aspect.apply(klass)
+
+    obj = klass.new
+    obj.test
+    obj.value.should == %w"do_before test"
+  end
+
+  it "use #target to add method to target class/module" do
+    klass = create_test_class
+
+    aspector(klass) do
+      target do
+        def do_this
+          value << "do_this"
+        end
+      end
+
+      before :test, :do_this
+    end
+
+    obj = klass.new
+    obj.test
+    obj.value.should == %w"do_this test"
+  end
+
+  it "#target takes aspect as argument" do
+    klass = create_test_class
+
+    class TargetArgumentTestAspect < Aspector::Base
+      target do |aspect|
+        define_method :do_this do
+          value << "do_this(#{aspect.class})"
+        end
+      end
+
+      before :test, :do_this
+    end
+
+    TargetArgumentTestAspect.apply(klass)
+
+    obj = klass.new
+    obj.test
+    obj.value.should == %w"do_this(TargetArgumentTestAspect) test"
+  end
+
+end
+

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

@@ -2,15 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe "Before 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
         value << "do_this"
       end
@@ -26,15 +18,7 @@ describe "Before 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
       before(:test){ value << 'do_block' }
@@ -69,4 +53,29 @@ describe "Before advices" do
     obj.value.should == %w"do_this test"
   end
 
+  it "method_name_arg" do
+    klass = Class.new do
+      aspector do
+        before :test, :do_this, :method_name_arg => true
+      end
+
+      def value
+        @value ||= []
+      end
+
+      def test
+        value << "test"
+      end
+
+      def do_this method
+        value << "do_this(#{method})"
+      end
+    end
+
+    obj = klass.new
+    obj.test
+    obj.value.should == %w"do_this(test) test"
+  end
+
 end
+

data/spec/unit/deferred_logic_spec.rb

@@ -0,0 +1,23 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+module Aspector
+  describe DeferredLogic do
+    it "should work with block" do
+      klass = Class.new do
+        def self.test; 'test'; end
+      end
+
+      logic = DeferredLogic.new(lambda{ test })
+
+      logic.apply(klass).should == 'test'
+    end
+
+    it "block can take an argument" do
+      logic = DeferredLogic.new(lambda{|arg| arg })
+
+      logic.apply(Class.new, 'test').should == 'test'
+    end
+
+  end
+end
+

data/spec/unit/method_matcher_spec.rb

@@ -0,0 +1,43 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+module Aspector
+  describe MethodMatcher do
+    it "should match String" do
+      MethodMatcher.new('test').match?('test').should_not be_nil
+    end
+
+    it "should match regular expression" do
+      MethodMatcher.new(/test/).match?('test').should_not be_nil
+    end
+
+    it "should return true if any item matches" do
+      MethodMatcher.new('test1', 'test2').match?('test2').should_not be_nil
+    end
+
+    it "should return nil if none matches" do
+      MethodMatcher.new('test1', 'test2').match?('test3').should be_nil
+    end
+
+    it "deferred logic" do
+      logic = DeferredLogic.new ""
+      matcher = MethodMatcher.new(logic)
+
+      aspect = mock(Aspector::Base)
+      aspect.should_receive(:deferred_logic_results).with(logic).once.and_return(/test/)
+
+      matcher.match?('test', aspect).should_not be_nil
+    end
+
+    it "deferred option" do
+      option = DeferredOption.new[:methods]
+      matcher = MethodMatcher.new(option)
+
+      aspect = mock(Aspector::Base)
+      aspect.should_receive(:options).once.and_return({:methods => /test/})
+
+      matcher.match?('test', aspect).should_not be_nil
+    end
+
+  end
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: aspector
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 7
-  - 0
-  version: 0.7.0
+  - 1
+  version: 0.7.1
 platform: ruby
 authors: 
 - Guoliang Cao
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-09 00:00:00 -05:00
+date: 2012-02-09 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,43 +34,11 @@ dependencies:
         - 0
         version: 2.3.0
   requirement: *id001
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  name: mocha
-  type: :development
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 55
-        segments: 
-        - 0
-        - 10
-        - 0
-        version: 0.10.0
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  name: bundler
-  type: :development
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  requirement: *id003
 - !ruby/object:Gem::Dependency 
   prerelease: false
   name: jeweler
   type: :development
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -81,12 +49,12 @@ dependencies:
         - 6
         - 4
         version: 1.6.4
-  requirement: *id004
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
   prerelease: false
   name: rcov
   type: :development
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -95,12 +63,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id005
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
   prerelease: false
   name: reek
   type: :development
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -111,12 +79,12 @@ dependencies:
         - 2
         - 8
         version: 1.2.8
-  requirement: *id006
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
   prerelease: false
   name: roodi
   type: :development
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -127,12 +95,26 @@ dependencies:
         - 1
         - 0
         version: 2.1.0
-  requirement: *id007
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: ruby-prof
+  type: :development
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
   prerelease: false
   name: guard
   type: :development
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -143,12 +125,12 @@ dependencies:
         - 8
         - 4
         version: 0.8.4
-  requirement: *id008
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
   prerelease: false
   name: guard-bundler
   type: :development
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -159,12 +141,12 @@ dependencies:
         - 1
         - 3
         version: 0.1.3
-  requirement: *id009
+  requirement: *id008
 - !ruby/object:Gem::Dependency 
   prerelease: false
   name: guard-rspec
   type: :development
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -175,12 +157,12 @@ dependencies:
         - 5
         - 2
         version: 0.5.2
-  requirement: *id010
+  requirement: *id009
 - !ruby/object:Gem::Dependency 
   prerelease: false
   name: guard-shell
   type: :development
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -191,12 +173,12 @@ dependencies:
         - 1
         - 1
         version: 0.1.1
-  requirement: *id011
+  requirement: *id010
 - !ruby/object:Gem::Dependency 
   prerelease: false
   name: rb-fsevent
   type: :development
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -208,12 +190,12 @@ dependencies:
         - 3
         - 1
         version: 0.4.3.1
-  requirement: *id012
+  requirement: *id011
 - !ruby/object:Gem::Dependency 
   prerelease: false
   name: growl
   type: :development
-  version_requirements: &id013 !ruby/object:Gem::Requirement 
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -224,12 +206,12 @@ dependencies:
         - 0
         - 3
         version: 1.0.3
-  requirement: *id013
+  requirement: *id012
 - !ruby/object:Gem::Dependency 
   prerelease: false
   name: awesome_print
   type: :development
-  version_requirements: &id014 !ruby/object:Gem::Requirement 
+  version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -238,7 +220,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id014
+  requirement: *id013
 description: ""
 email: gcao99@gmail.com
 executables: []
@@ -266,6 +248,9 @@ files:
 - 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
@@ -279,18 +264,27 @@ files:
 - 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
+- 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
 has_rdoc: true
 homepage: http://github.com/gcao/aspector
 licenses: 

data/spec/advices_on_private_methods_spec.rb

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

data/spec/aspect_on_eigen_class_spec.rb

@@ -1,86 +0,0 @@
-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
-
-        def do_before
-          value << "do_before"
-        end
-
-        def do_after result
-          value << "do_after"
-          result
-        end
-
-        def do_around &block
-          value << "do_around_before"
-          result = block.call
-          value << "do_around_after"
-          result
-        end
-      end
-    end
-
-    aspector(klass, :eigen_class => true) do
-      before :test, :do_before
-      after  :test, :do_after
-      around :test, :do_around
-    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
-
-        def do_before
-          value << "do_before"
-        end
-
-        def do_after result
-          value << "do_after"
-          result
-        end
-
-        def do_around &block
-          value << "do_around_before"
-          result = block.call
-          value << "do_around_after"
-          result
-        end
-      end
-    end
-
-    aspector(klass, :eigen_class => true) do
-      before :test, :do_before
-      after  :test, :do_after
-      around :test, :do_around
-    end
-
-    klass.class_eval do
-      class << self
-        def test
-          value << "test"
-        end
-      end
-    end
-
-    klass.test
-    klass.value.should == %w"do_before do_around_before test do_around_after do_after"
-  end
-
-end

data/spec/aspect_on_object_spec.rb

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