aspector 0.9.1 → 0.10.0

data/.rvmrc

@@ -1,8 +1,8 @@
 rvm_gemset_create_on_use_flag=1
 
-if [ "$RUBY_VERSION" == "1.9" ]; then
-  rvm use 1.9.2@aspector
-else
+if [ "$RUBY_VERSION" == "1.8" ]; then
   rvm use 1.8.7@aspector
+else
+  rvm use 1.9.3@aspector
 fi
 

data/VERSION

@@ -1 +1 @@
-0.9.1
+0.10.0

data/aspector.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "aspector"
-  s.version = "0.9.1"
+  s.version = "0.10.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Guoliang Cao"]
-  s.date = "2012-03-13"
+  s.date = "2012-03-19"
   s.description = ""
   s.email = "gcao99@gmail.com"
   s.extra_rdoc_files = [
@@ -74,7 +74,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/gcao/aspector"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.15"
+  s.rubygems_version = "1.8.18"
   s.summary = "Aspect Oriented Ruby Programming"
 
   if s.respond_to? :specification_version then

data/examples/cache_aspect.rb

@@ -46,15 +46,12 @@ require 'aspector'
 class CacheAspect < Aspector::Base
   default :ttl => 60
 
-  def after_initialize
-    aspect = self
-    around options[:method], :method_name_arg => true do |method, proxy, &block|
-      key = method
-      ttl = aspect.options[:ttl]
-
-      SimpleCache.cache key, ttl do
-        proxy.call &block
-      end
+  around options[:method], :aspect_arg => true, :method_arg => true do |aspect, method, proxy, &block|
+    key = method
+    ttl = aspect.options[:ttl]
+
+    SimpleCache.cache key, ttl do
+      proxy.call &block
     end
   end
 

data/examples/logging_aspect.rb

@@ -16,7 +16,7 @@ class LoggingAspect < Aspector::Base
 
   ALL_METHODS = /.*/
 
-  around ALL_METHODS, :except => :class, :method_name_arg => true do |method, proxy, *args, &block|
+  around ALL_METHODS, :except => :class, :method_arg => true do |method, proxy, *args, &block|
     class_method = "#{self.class}.#{method}"
     puts "Entering #{class_method}: #{args.join(',')}"
     result = proxy.call *args, &block

data/lib/aspector/base.rb

@@ -30,6 +30,8 @@ module Aspector
       class << self
         def aop_disabled?; end
       end
+
+      aop_disabled?
     end
     alias enable aop_enable
 
@@ -37,6 +39,8 @@ module Aspector
       class << self
         def aop_disabled?; true; end
       end
+
+      aop_disabled?
     end
     alias disable aop_disable
 
@@ -44,6 +48,8 @@ module Aspector
       class << self
         remove_method :aop_disabled?
       end
+
+      aop_disabled?
     end
     alias reset_disabled :aop_reset_disabled
 
@@ -51,21 +57,11 @@ module Aspector
     end
 
     def disabled?
-      aop_disabled
+      aop_disabled?
     end
 
     def aop_advices
-      shared_advices = self.class.aop_advices
-
-      if shared_advices and shared_advices.size > 0
-        if @aop_advices
-          @aop_advices + shared_advices
-        else
-          shared_advices
-        end
-      else
-        @aop_advices or []
-      end
+      self.class.aop_advices
     end
     alias :advices :aop_advices
 
@@ -152,30 +148,6 @@ module Aspector
     def after_apply_to_method method, advices
     end
 
-    def aop_before *methods, &block
-      @aop_advices ||= []
-      @aop_advices << self.class.send(:aop_create_advice, Aspector::AdviceMetadata::BEFORE, self, methods, &block)
-    end
-    alias :before :aop_before
-
-    def aop_before_filter *methods, &block
-      @aop_advices ||= []
-      @aop_advices << self.class.send(:aop_create_advice, Aspector::AdviceMetadata::BEFORE_FILTER, self, methods, &block)
-    end
-    alias :before_filter :aop_before_filter
-
-    def aop_after *methods, &block
-      @aop_advices ||= []
-      @aop_advices << self.class.send(:aop_create_advice, Aspector::AdviceMetadata::AFTER, self, methods, &block)
-    end
-    alias :after :aop_after
-
-    def aop_around *methods, &block
-      @aop_advices ||= []
-      @aop_advices << self.class.send(:aop_create_advice, Aspector::AdviceMetadata::AROUND, self, methods, &block)
-    end
-    alias :around :aop_around
-
     private
 
     def aop_deferred_logic_results logic
@@ -294,12 +266,11 @@ module Aspector
 <% end %>
 
       # Before advices
-<% before_advices.each do |advice|
-    if advice.options[:method_name_arg] %>
-      result = <%= advice.with_method %> '<%= method %>', *args
-<%  else %>
-      result = <%= advice.with_method %> *args
-<%  end %>
+<% before_advices.each do |advice| %>
+      result = <%= advice.with_method %> <%
+        if advice.options[:aspect_arg] %>aspect, <% end %><%
+        if advice.options[:method_arg] %>'<%= method %>', <% end
+        %>*args
 
 <%  if advice.options[:skip_if_false] %>
       return unless result
@@ -309,13 +280,11 @@ module Aspector
 
 <% if around_advice %>
       # Around advice
-<%  if around_advice.options[:method_name_arg] %>
-      result = <%= around_advice.with_method %> '<%= method %>', wrapped_method.bind(self), *args, &block
-<%  else %>
-      result = <%= around_advice.with_method %> wrapped_method.bind(self), *args, &block
-<%  end
-  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 %>
       # Invoke original method
       result = orig_method.bind(self).call *args, &block
 <% end %>
@@ -323,18 +292,18 @@ module Aspector
       # After advices
 <% unless after_advices.empty?
     after_advices.each do |advice|
-      if advice.options[:method_name_arg]
-        if advice.options[:result_arg]
-%>
-      result = <%= advice.with_method %> '<%= method %>', result, *args
-<%      else %>
-      <%= advice.with_method %> '<%= method %>', *args
-<%      end
-      elsif advice.options[:result_arg]
+      if advice.options[:result_arg]
 %>
-      result = <%= advice.with_method %> result, *args
+      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 %>
-      <%= advice.with_method %> *args
+      <%= advice.with_method %> <%
+        if advice.options[:aspect_arg] %>aspect, <% end %><%
+        if advice.options[:method_arg] %>'<%= method %>', <% end
+        %>*args
 <%    end
     end
 %>

data/lib/aspector/base_class_methods.rb

@@ -4,15 +4,19 @@ module Aspector
       ::Aspector::Base.extend(self)
 
       def aop_enable
-        def aop_disabled?
+        send :define_method, :aop_disabled? do
         end
+
+        nil
       end
       alias :enable :aop_enable
 
       def aop_disable
-        def aop_disabled?
+        send :define_method, :aop_disabled? do
           true
         end
+
+        nil
       end
       alias :disable :aop_disable
 

data/spec/functional/aspector_spec.rb

@@ -25,34 +25,6 @@ describe "Aspector" do
     obj.value.should == %w"do_before do_around_before test do_around_after do_after"
   end
 
-  it "advices defined in after_initialization" do
-    klass = create_test_class
-
-    aspector(klass) do
-      def after_initialize
-        name = 'this'
-
-        before(:test) { value << "do_before(#{name})" }
-
-        after(:test)  do |result|
-          value << "do_after(#{name})"
-          result
-        end
-
-        around(:test) do |proxy, &block|
-          value   <<  "do_around_before(#{name})"
-          result  =   proxy.call &block
-          value   <<  "do_around_after(#{name})"
-          result
-        end
-      end
-    end
-
-    obj = klass.new
-    obj.test
-    obj.value.should == %w"do_before(this) do_around_before(this) test do_around_after(this) do_after(this)"
-  end
-
   it "multiple aspects should work together" do
     klass = create_test_class
     aspector(klass) do

data/spec/unit/after_spec.rb

@@ -18,7 +18,7 @@ describe "After advices" do
     obj.value.should == %w"test do_this"
   end
 
-  it "method_name_arg" do
+  it "method_arg" do
     klass = create_test_class do
       def do_this method, result
         value << "do_this(#{method})"
@@ -27,7 +27,7 @@ describe "After advices" do
     end
 
     aspector(klass) do
-      after :test, :do_this, :method_name_arg => true
+      after :test, :do_this, :method_arg => true
     end
 
     obj = klass.new

data/spec/unit/around_spec.rb

@@ -37,7 +37,7 @@ describe "Around advices" do
     obj.value.should == %w"before test after"
   end
 
-  it "method_name_arg" do
+  it "method_arg" do
     klass = create_test_class do
       def do_this method, proxy, &block
         value << "before(#{method})"
@@ -48,7 +48,7 @@ describe "Around advices" do
     end
 
     aspector(klass) do
-      around :test, :do_this, :method_name_arg => true
+      around :test, :do_this, :method_arg => true
     end
 
     obj = klass.new

data/spec/unit/before_spec.rb

@@ -53,10 +53,10 @@ describe "Before advices" do
     obj.value.should == %w"do_this test"
   end
 
-  it "method_name_arg" do
+  it "method_arg" do
     klass = Class.new do
       aspector do
-        before :test, :do_this, :method_name_arg => true
+        before :test, :do_this, :method_arg => true
       end
 
       def value

metadata

@@ -1,201 +1,200 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: aspector
-version: !ruby/object:Gem::Version 
-  hash: 57
+version: !ruby/object:Gem::Version
+  version: 0.10.0
   prerelease: 
-  segments: 
-  - 0
-  - 9
-  - 1
-  version: 0.9.1
 platform: ruby
-authors: 
+authors:
 - Guoliang Cao
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-13 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id001
+date: 2012-03-19 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 6
-        - 4
+      - !ruby/object:Gem::Version
         version: 1.6.4
-  version_requirements: *id002
-  name: jeweler
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id003
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.4
+- !ruby/object:Gem::Dependency
   name: ruby-prof
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  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: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 55
-        segments: 
-        - 0
-        - 8
-        - 4
+      - !ruby/object:Gem::Version
         version: 0.8.4
-  version_requirements: *id004
-  name: guard
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 0
-        - 1
-        - 3
-        version: 0.1.3
-  version_requirements: *id005
+      - !ruby/object:Gem::Version
+        version: 0.8.4
+- !ruby/object:Gem::Dependency
   name: guard-bundler
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.3
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 0
-        - 5
-        - 2
-        version: 0.5.2
-  version_requirements: *id006
+      - !ruby/object:Gem::Version
+        version: 0.1.3
+- !ruby/object:Gem::Dependency
   name: guard-rspec
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.2
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 1
-        - 1
-        version: 0.1.1
-  version_requirements: *id007
+      - !ruby/object:Gem::Version
+        version: 0.5.2
+- !ruby/object:Gem::Dependency
   name: guard-shell
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.1
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 97
-        segments: 
-        - 0
-        - 4
-        - 3
-        - 1
-        version: 0.4.3.1
-  version_requirements: *id008
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+- !ruby/object:Gem::Dependency
   name: rb-fsevent
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.3.1
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 1
-        - 0
-        - 3
-        version: 1.0.3
-  version_requirements: *id009
+      - !ruby/object:Gem::Version
+        version: 0.4.3.1
+- !ruby/object:Gem::Dependency
   name: growl
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.3
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id010
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.3
+- !ruby/object:Gem::Dependency
   name: awesome_print
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id011
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: pry
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-description: ""
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: ''
 email: gcao99@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
-files: 
+files:
 - .document
 - .irbrc
 - .rspec
@@ -250,37 +249,31 @@ files:
 - spec/unit/deferred_logic_spec.rb
 - spec/unit/method_matcher_spec.rb
 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 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -2602659987837807092
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.18
 signing_key: 
 specification_version: 3
 summary: Aspect Oriented Ruby Programming
 test_files: []
-