aspect4r 0.8.2 → 0.9.0

data/README.rdoc

@@ -59,6 +59,9 @@ Execution model: http://gcao.posterous.com/aspect4r-documentation-advice-executi
 
 See github issues http://github.com/gcao/aspect4r/issues
 
+Experiment: change Base.included to define method_added and singleton_method_added. This will restrict
+impact on the class that includes Aspect4r
+
 == Note on Patches/Pull Requests
  
 * Fork the project.

data/VERSION

@@ -1 +1 @@
-0.8.2
+0.9.0

data/aspect4r.gemspec

@@ -1,118 +1,115 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{aspect4r}
-  s.version = "0.8.2"
+  s.version = "0.9.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Guoliang Cao"]
-  s.date = %q{2010-07-01}
+  s.date = %q{2011-04-29}
   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 = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "LICENSE",
-     "NOTES.rdoc",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "aspect4r.gemspec",
-     "examples/advices_on_class_method_example.rb",
-     "examples/after_example.rb",
-     "examples/around_example.rb",
-     "examples/before_example.rb",
-     "examples/combined_example.rb",
-     "examples/test_advices_example.rb",
-     "lib/aspect4r.rb",
-     "lib/aspect4r/after.rb",
-     "lib/aspect4r/around.rb",
-     "lib/aspect4r/base.rb",
-     "lib/aspect4r/before.rb",
-     "lib/aspect4r/classic.rb",
-     "lib/aspect4r/errors.rb",
-     "lib/aspect4r/extensions/module_extension.rb",
-     "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/return_this.rb",
-     "spec/aspect4r/advice_group_spec.rb",
-     "spec/aspect4r/advice_on_class_method_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",
-     "spec/aspect4r/class_inheritance_spec.rb",
-     "spec/aspect4r/classic_spec.rb",
-     "spec/aspect4r/helper_spec.rb",
-     "spec/aspect4r/include_advices_from_module_spec.rb",
-     "spec/aspect4r/inheritance_inclusion_combined_spec.rb",
-     "spec/aspect4r/method_added_spec.rb",
-     "spec/aspect4r/module_inclusion_spec.rb",
-     "spec/aspect4r/singleton_method_added_spec.rb",
-     "spec/aspect4r/super_in_method_spec.rb",
-     "spec/aspect4r_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb",
-     "test/after_test.rb",
-     "test/around_test.rb",
-     "test/before_test.rb",
-     "test/combined_test.rb",
-     "test/method_invocation_test.rb",
-     "test/test_helper.rb"
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "aspect4r.gemspec",
+    "examples/advices_on_class_method_example.rb",
+    "examples/after_example.rb",
+    "examples/around_example.rb",
+    "examples/before_example.rb",
+    "examples/combined_example.rb",
+    "examples/test_advices_example.rb",
+    "lib/aspect4r.rb",
+    "lib/aspect4r/after.rb",
+    "lib/aspect4r/around.rb",
+    "lib/aspect4r/base.rb",
+    "lib/aspect4r/before.rb",
+    "lib/aspect4r/classic.rb",
+    "lib/aspect4r/errors.rb",
+    "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/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",
+    "spec/aspect4r/class_inheritance_spec.rb",
+    "spec/aspect4r/classic_spec.rb",
+    "spec/aspect4r/helper_spec.rb",
+    "spec/aspect4r/include_advices_from_module_spec.rb",
+    "spec/aspect4r/inheritance_inclusion_combined_spec.rb",
+    "spec/aspect4r/method_added_spec.rb",
+    "spec/aspect4r/module_inclusion_spec.rb",
+    "spec/aspect4r/singleton_method_added_spec.rb",
+    "spec/aspect4r/super_in_method_spec.rb",
+    "spec/aspect4r_spec.rb",
+    "spec/spec.opts",
+    "spec/spec_helper.rb",
+    "test/after_test.rb",
+    "test/around_test.rb",
+    "test/before_test.rb",
+    "test/combined_test.rb",
+    "test/method_invocation_test.rb",
+    "test/test_helper.rb"
   ]
   s.homepage = %q{http://github.com/gcao/aspect4r}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.4.2}
   s.summary = %q{Aspect Oriented Programming for ruby}
   s.test_files = [
+    "examples/advices_on_class_method_example.rb",
+    "examples/after_example.rb",
+    "examples/around_example.rb",
+    "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_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",
-     "spec/aspect4r/class_inheritance_spec.rb",
-     "spec/aspect4r/classic_spec.rb",
-     "spec/aspect4r/helper_spec.rb",
-     "spec/aspect4r/include_advices_from_module_spec.rb",
-     "spec/aspect4r/inheritance_inclusion_combined_spec.rb",
-     "spec/aspect4r/method_added_spec.rb",
-     "spec/aspect4r/module_inclusion_spec.rb",
-     "spec/aspect4r/singleton_method_added_spec.rb",
-     "spec/aspect4r/super_in_method_spec.rb",
-     "spec/aspect4r_spec.rb",
-     "spec/spec_helper.rb",
-     "test/after_test.rb",
-     "test/around_test.rb",
-     "test/before_test.rb",
-     "test/combined_test.rb",
-     "test/method_invocation_test.rb",
-     "test/test_helper.rb",
-     "examples/advices_on_class_method_example.rb",
-     "examples/after_example.rb",
-     "examples/around_example.rb",
-     "examples/before_example.rb",
-     "examples/combined_example.rb",
-     "examples/test_advices_example.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",
+    "spec/aspect4r/class_inheritance_spec.rb",
+    "spec/aspect4r/classic_spec.rb",
+    "spec/aspect4r/helper_spec.rb",
+    "spec/aspect4r/include_advices_from_module_spec.rb",
+    "spec/aspect4r/inheritance_inclusion_combined_spec.rb",
+    "spec/aspect4r/method_added_spec.rb",
+    "spec/aspect4r/module_inclusion_spec.rb",
+    "spec/aspect4r/singleton_method_added_spec.rb",
+    "spec/aspect4r/super_in_method_spec.rb",
+    "spec/aspect4r_spec.rb",
+    "spec/spec_helper.rb",
+    "test/after_test.rb",
+    "test/around_test.rb",
+    "test/before_test.rb",
+    "test/combined_test.rb",
+    "test/method_invocation_test.rb",
+    "test/test_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/lib/aspect4r/after.rb

@@ -3,8 +3,11 @@ require 'aspect4r/base'
 module Aspect4r
   module After
     def self.included(base)
-      base.send(:include, Base::InstanceMethods)
-      base.extend(Base::ClassMethods, ClassMethods)
+      base.send(:include, Base)
+      base.extend(ClassMethods)
+      
+      eigen_class = class << base; self; end
+      eigen_class.extend(ClassMethods)
     end
 
     module ClassMethods
@@ -15,8 +18,11 @@ module Aspect4r
     
     module Classic
       def self.included(base)
-        base.send(:include, Base::InstanceMethods)
-        base.extend(Base::ClassMethods, ClassMethods)
+        base.send(:include, Base)
+        base.extend(ClassMethods)
+
+        eigen_class = class << base; self; end
+        eigen_class.extend(ClassMethods)
       end
 
       module ClassMethods

data/lib/aspect4r/around.rb

@@ -3,8 +3,11 @@ require 'aspect4r/base'
 module Aspect4r
   module Around
     def self.included(base)
-      base.send(:include, Base::InstanceMethods)
-      base.extend(Base::ClassMethods, ClassMethods)
+      base.send(:include, Base)
+      base.extend(ClassMethods)
+      
+      eigen_class = class << base; self; end
+      eigen_class.extend(ClassMethods)
     end
 
     module ClassMethods
@@ -15,8 +18,11 @@ module Aspect4r
     
     module Classic
       def self.included(base)
-        base.send(:include, Base::InstanceMethods)
-        base.extend(Base::ClassMethods, ClassMethods)
+        base.send(:include, Base)
+        base.extend(ClassMethods)
+      
+        eigen_class = class << base; self; end
+        eigen_class.extend(ClassMethods)
       end
 
       module ClassMethods

data/lib/aspect4r/base.rb

@@ -7,14 +7,15 @@ require 'aspect4r/return_this'
 
 require 'aspect4r/helper'
 
-require 'aspect4r/extensions/module_extension'
-
 module Aspect4r
   module Base
     def self.included(base)
       base.send(:include, InstanceMethods)
       base.extend(ClassMethods)
-      base.instance_variable_set('@a4r_data', Aspect4r::Model::AspectData.new(base))
+
+      eigen_class = class << base; self; end
+      eigen_class.send(:include, InstanceMethods)
+      eigen_class.extend(ClassMethods)
     end
 
     module InstanceMethods
@@ -23,7 +24,33 @@ module Aspect4r
       end
     end
 
-    module ClassMethods
+    module ClassMethods      
+      def method_added method
+        super method
+
+        return if method.to_s[0..2] == "a4r"
+
+        # save unbound method and create new method
+        if method_advices = a4r_data[method] and not Aspect4r::Helper.creating_method?
+          method_advices.wrapped_method = instance_method(method)
+          Aspect4r::Helper.create_method self, method
+        end
+      end
+  
+      def singleton_method_added method
+        super method
+    
+        return if method.to_s[0..2] == "a4r"
+
+        eigen_class = class << self; self; end
+
+        # save unbound method and create new method
+        if method_advices = eigen_class.a4r_data[method] and not Aspect4r::Helper.creating_method?
+          method_advices.wrapped_method = eigen_class.instance_method(method)
+          Aspect4r::Helper.create_method eigen_class, method
+        end
+      end
+
       def a4r_data
         @a4r_data ||= Aspect4r::Model::AspectData.new(self)
       end

data/lib/aspect4r/before.rb

@@ -3,8 +3,11 @@ require 'aspect4r/base'
 module Aspect4r
   module Before
     def self.included(base)
-      base.send(:include, Base::InstanceMethods)
-      base.extend(Base::ClassMethods, ClassMethods)
+      base.send(:include, Base)
+      base.extend(ClassMethods)
+      
+      eigen_class = class << base; self; end
+      eigen_class.extend(ClassMethods)
     end
 
     module ClassMethods
@@ -19,8 +22,11 @@ module Aspect4r
     
     module Classic
       def self.included(base)
-        base.send(:include, Base::InstanceMethods)
-        base.extend(Base::ClassMethods, ClassMethods)
+        base.send(:include, Base)
+        base.extend(ClassMethods)
+      
+        eigen_class = class << base; self; end
+        eigen_class.extend(ClassMethods)
       end
     
       module ClassMethods

data/lib/aspect4r/classic.rb

@@ -5,8 +5,7 @@ require 'aspect4r/around'
 module Aspect4r
   module Classic
     def self.included(base)
-      base.send(:include, Base::InstanceMethods)
-      base.extend Base::ClassMethods, Before::Classic::ClassMethods, After::Classic::ClassMethods, Around::Classic::ClassMethods
+      base.send(:include, Before::Classic, After::Classic, Around::Classic)
     end
   end
 end

data/lib/aspect4r/helper.rb

@@ -112,11 +112,7 @@ module Aspect4r
 
 <% if around_advice %>
         # around advice
-<%   if around_advice.options[:method_name_arg] %>
-        result = <%= around_advice.with_method %> '<%= method %>', wrapped_method, *args
-<%   else %>
         result = <%= around_advice.with_method %> wrapped_method, *args
-<%   end %>
 <% else %>
         # Invoke wrapped method
         result = wrapped_method.bind(self).call *args

data/lib/aspect4r.rb

@@ -5,7 +5,6 @@ require 'aspect4r/classic'
 
 module Aspect4r
   def self.included(base)
-    base.send(:include, Base::InstanceMethods)
-    base.extend Base::ClassMethods, Before::ClassMethods, After::ClassMethods, Around::ClassMethods
+    base.send(:include, Before, After, Around)
   end
 end

data/spec/aspect4r/advice_on_class_method_spec.rb

@@ -3,9 +3,10 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 describe "Advices on singleton method (also known as class method)" do
   it "class method" do
     class AdvicesOnClassMethod
+      include Aspect4r
+
       class << self
-        include Aspect4r
-        
+
         def value
           @value ||= []
         end
@@ -36,9 +37,10 @@ describe "Advices on singleton method (also known as class method)" do
 
   it "module singleton method" do
     module AdvicesOnModuleSingletonMethod
+      include Aspect4r
+
       class << self
-        include Aspect4r
-        
+ 
         def value
           @value ||= []
         end

data/spec/aspect4r/advice_scope_spec.rb

@@ -0,0 +1,15 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Aspect4r do
+  it "should limit changes to module that includes Aspect4r" do
+    module ScopeParent
+      include Aspect4r
+    end
+    
+    module ScopeChild
+      include ScopeParent
+    end
+    
+    ScopeChild.methods.should_not include('a4r_data')
+  end
+end

data/spec/aspect4r/around_spec.rb

@@ -110,12 +110,12 @@ describe Aspect4r::Around do
     o.value.should == 'something'
   end
   
-  it "should pass method name to advice block(or method) as first arg if method_name_arg is true" do
+  it "should be able to access method name through proxy.name (this subjects to change)" do
     s = nil
     
     @klass.class_eval do
-      around :test, :method_name_arg => true do |method, proxy, value|
-        s = method
+      around :test do |proxy, value|
+        s = proxy.name
         a4r_invoke proxy, value
       end
     end

data/spec/aspect4r/singleton_method_added_spec.rb

@@ -3,12 +3,13 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 describe "singleton_method_added" do
   it "should work if target method is defined after singleton_method_added and singleton_method_added calls super" do
     class AdvicesOnClassMethod1
+      include Aspect4r
+        
       def self.singleton_method_added(method)
         super
       end
       
       class << self
-        include Aspect4r
         
         def value
           @value ||= []

metadata

@@ -2,12 +2,12 @@
 name: aspect4r
 version: !ruby/object:Gem::Version 
   hash: 59
-  prerelease: false
+  prerelease: 
   segments: 
   - 0
-  - 8
-  - 2
-  version: 0.8.2
+  - 9
+  - 0
+  version: 0.9.0
 platform: ruby
 authors: 
 - Guoliang Cao
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-01 00:00:00 -04:00
+date: 2011-04-29 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,9 +45,7 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
 - LICENSE
-- NOTES.rdoc
 - README.rdoc
 - Rakefile
 - VERSION
@@ -65,7 +63,6 @@ files:
 - lib/aspect4r/before.rb
 - lib/aspect4r/classic.rb
 - lib/aspect4r/errors.rb
-- lib/aspect4r/extensions/module_extension.rb
 - lib/aspect4r/helper.rb
 - lib/aspect4r/model/advice.rb
 - lib/aspect4r/model/advice_metadata.rb
@@ -74,6 +71,7 @@ files:
 - 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
@@ -103,8 +101,8 @@ homepage: http://github.com/gcao/aspect4r
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -128,13 +126,20 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Aspect Oriented Programming for ruby
 test_files: 
+- examples/advices_on_class_method_example.rb
+- examples/after_example.rb
+- examples/around_example.rb
+- 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
@@ -158,9 +163,3 @@ test_files:
 - test/combined_test.rb
 - test/method_invocation_test.rb
 - test/test_helper.rb
-- examples/advices_on_class_method_example.rb
-- examples/after_example.rb
-- examples/around_example.rb
-- examples/before_example.rb
-- examples/combined_example.rb
-- examples/test_advices_example.rb

data/.gitignore

@@ -1,22 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC
-test/output

data/NOTES.rdoc

@@ -1,42 +0,0 @@
-== TEST TODO
-
-Class inheritance
-
-Module inclusion
-
-Mix aspects in body and in module
-
-Mix aspects from multiple modules
-
-Mix aspects in body and inherited
-
-Mix aspects in body, inherited and in module
-
-== optimization idea
-
-On create method, define method as a place holder which will generate the real method on first execution
-
-== Inheritance / inclusion
-
-Automatically group aspects by the class/module that creates them
-Before aspects defined in base class run immediately before wrapped method
-After aspects run immediagely after
-Around aspects wrap around wrapped method
-
-Before aspects defined in module that are included at the beginning run before aspects from base class and after those in current class
-After aspects in module run after aspects from base class and before those in current class
-Around aspects in module wrap around wrapped method + before/after aspects in base class
-
-Before aspects defined in module that are included later run before all aspects already defined so far
-After aspects in module run after all aspects
-Around aspects in module wrap around wrapped method + before/after aspects
-
-== Clean up
-
-Reduce duplication in before/after/around.rb
-
-Include Aspect4r::Base in target module/class when a module with advices is included.
-
-Add included_with_a4r(for module) and inherited_with_a4r(for class) when Aspect4r::Base is included
-
-Rename class AspectForMethod, Definition etc.

data/lib/aspect4r/extensions/module_extension.rb

@@ -1,39 +0,0 @@
-class Module
-  def method_added_with_a4r(method)
-    method_added_without_a4r(method)
-    
-    return if method.to_s =~ /a4r/
-
-    # save unbound method and create new method
-    if @a4r_data and method_advices = @a4r_data[method] and not Aspect4r::Helper.creating_method?
-      method_advices.wrapped_method = instance_method(method)
-      Aspect4r::Helper.create_method self, method
-    end
-  end
-  
-  alias method_added_without_a4r method_added
-  alias method_added             method_added_with_a4r
-
-  def singleton_method_added_with_a4r(method)
-    singleton_method_added_without_a4r(method)
-    
-    return if method.to_s =~ /a4r/
-
-    # save unbound method and create new method
-    eigen_class = instance_eval do
-      class << self
-        self
-      end
-    end
-
-    my_advices  = eigen_class.instance_variable_get(:@a4r_data)
-    
-    if my_advices and method_advices = my_advices[method] and not Aspect4r::Helper.creating_method?
-      method_advices.wrapped_method = eigen_class.instance_method(method)
-      Aspect4r::Helper.create_method eigen_class, method
-    end
-  end
-  
-  alias singleton_method_added_without_a4r singleton_method_added
-  alias singleton_method_added             singleton_method_added_with_a4r
-end