aspector 0.5.0 → 0.6.0

data/README.rdoc

@@ -25,12 +25,12 @@ gem install aspector
 
   ##############################
 
-  TestAspect = Aspector do
-    target "
+  class TestAspect < Aspector::Base
+    target do
       def do_this
         puts 'do_this'
       end
-    "
+    end
 
     before :test, :do_this
     before :test do

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.6.0

data/aspector.gemspec

@@ -0,0 +1,117 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{aspector}
+  s.version = "0.6.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Guoliang Cao"]
+  s.date = %q{2011-11-18}
+  s.description = %q{}
+  s.email = %q{gcao99@gmail.com}
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    ".irbrc",
+    ".rspec",
+    ".rvmrc",
+    "Gemfile",
+    "Gemfile.lock",
+    "Guardfile",
+    "LICENSE.txt",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "aspector.gemspec",
+    "examples/activerecord_hooks.rb",
+    "examples/around_example.rb",
+    "examples/aspector_apply_example.rb",
+    "examples/aspector_example.rb",
+    "lib/aspector.rb",
+    "lib/aspector/advice.rb",
+    "lib/aspector/advice_metadata.rb",
+    "lib/aspector/aspects.rb",
+    "lib/aspector/base.rb",
+    "lib/aspector/deferred_logic.rb",
+    "lib/aspector/deferred_option.rb",
+    "lib/aspector/method_matcher.rb",
+    "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",
+    "spec/spec_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/gcao/aspector}
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.4.2}
+  s.summary = %q{Aspect Oriented Ruby Programming}
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
+      s.add_development_dependency(%q<mocha>, ["~> 0.10.0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<reek>, ["~> 1.2.8"])
+      s.add_development_dependency(%q<roodi>, ["~> 2.1.0"])
+      s.add_development_dependency(%q<guard>, ["~> 0.8.4"])
+      s.add_development_dependency(%q<guard-bundler>, ["~> 0.1.3"])
+      s.add_development_dependency(%q<guard-rspec>, ["~> 0.5.2"])
+      s.add_development_dependency(%q<guard-shell>, ["~> 0.1.1"])
+      s.add_development_dependency(%q<rb-fsevent>, ["~> 0.4.3.1"])
+      s.add_development_dependency(%q<growl>, ["~> 1.0.3"])
+      s.add_development_dependency(%q<awesome_print>, [">= 0"])
+    else
+      s.add_dependency(%q<rspec>, ["~> 2.3.0"])
+      s.add_dependency(%q<mocha>, ["~> 0.10.0"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<reek>, ["~> 1.2.8"])
+      s.add_dependency(%q<roodi>, ["~> 2.1.0"])
+      s.add_dependency(%q<guard>, ["~> 0.8.4"])
+      s.add_dependency(%q<guard-bundler>, ["~> 0.1.3"])
+      s.add_dependency(%q<guard-rspec>, ["~> 0.5.2"])
+      s.add_dependency(%q<guard-shell>, ["~> 0.1.1"])
+      s.add_dependency(%q<rb-fsevent>, ["~> 0.4.3.1"])
+      s.add_dependency(%q<growl>, ["~> 1.0.3"])
+      s.add_dependency(%q<awesome_print>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<rspec>, ["~> 2.3.0"])
+    s.add_dependency(%q<mocha>, ["~> 0.10.0"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<reek>, ["~> 1.2.8"])
+    s.add_dependency(%q<roodi>, ["~> 2.1.0"])
+    s.add_dependency(%q<guard>, ["~> 0.8.4"])
+    s.add_dependency(%q<guard-bundler>, ["~> 0.1.3"])
+    s.add_dependency(%q<guard-rspec>, ["~> 0.5.2"])
+    s.add_dependency(%q<guard-shell>, ["~> 0.1.1"])
+    s.add_dependency(%q<rb-fsevent>, ["~> 0.4.3.1"])
+    s.add_dependency(%q<growl>, ["~> 1.0.3"])
+    s.add_dependency(%q<awesome_print>, [">= 0"])
+  end
+end
+

data/examples/activerecord_hooks.rb

@@ -0,0 +1,35 @@
+class A
+  def initialize
+  end
+
+  def save
+  end
+end
+
+##############################
+
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
+require 'aspector'
+
+class ActiveRecordHooks < Aspector::Base
+  aspect = self
+
+  default :private_methods => true
+
+  before :initialize do
+    puts "#{aspect}: before creating #{self.class.name} instance"
+  end
+
+  before :save do
+    puts "#{aspect}: before saving"
+  end
+end
+
+ActiveRecordHooks.apply(A)
+
+##############################
+
+a = A.new
+a.save
+

data/examples/around_example.rb

@@ -1,7 +1,3 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-
-require 'aspector'
-
 class A
   def test
     puts 'test'
@@ -10,14 +6,18 @@ end
 
 ##############################
 
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
+require 'aspector'
+
 aspector(A) do
-  target "
+  target do
     def do_this &block
       puts 'before'
       block.call
       puts 'after'
     end
-  "
+  end
 
   around :test, :do_this
   around :test do |&block|
@@ -32,8 +32,8 @@ end
 A.new.test
 
 # Expected output:
-# before(block)
 # before
+# before(block)
 # test
-# after
 # after(block)
+# after

data/examples/aspector_apply_example.rb

@@ -1,7 +1,3 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-
-require 'aspector'
-
 class A
   def test
     puts 'test'
@@ -10,12 +6,16 @@ end
 
 ##############################
 
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
+require 'aspector'
+
 TestAspect = Aspector do
-  target "
+  target do
     def do_this
       puts 'do_this'
     end
-  "
+  end
 
   before :test, :do_this
   before :test do

data/examples/aspector_example.rb

@@ -1,7 +1,3 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-
-require 'aspector'
-
 class A
   def test
     puts 'test'
@@ -10,12 +6,16 @@ end
 
 ##############################
 
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
+require 'aspector'
+
 aspector(A) do
-  target "
+  target do
     def do_this
       puts 'do_this'
     end
-  "
+  end
 
   before :test, :do_this
   before :test do

data/lib/aspector.rb

@@ -1,13 +1,13 @@
 require 'aspector/object_extension'
 require 'aspector/module_extension'
 
-require 'aspector/aspect'
+require 'aspector/base'
 require 'aspector/advice'
 require 'aspector/advice_metadata'
 require 'aspector/method_matcher'
 require 'aspector/deferred_logic'
+require 'aspector/deferred_option'
 
-require 'aspector/aspect_instance'
-require 'aspector/aspect_instances'
+require 'aspector/aspects'
 
 require 'aspector/return_this'

data/lib/aspector/{aspect_instance.rb → base.rb}

@@ -1,5 +1,7 @@
+require 'erb'
+
 module Aspector
-  class AspectInstance
+  class Base
 
     METHOD_TEMPLATE = ERB.new <<-CODE
     wrapped_method = instance_method(:<%= method %>)
@@ -53,11 +55,11 @@ module Aspector
     end
     CODE
 
+    attr :options
 
-    def initialize target, aspect, options = {}
+    def initialize target, options = {}
       @target = target
-      @aspect = aspect
-      @options = options.merge(aspect.options)
+      @options = options.merge(self.class.options)
       @context = get_context # Context is where advices will be applied (i.e. where methods are modified)
     end
 
@@ -77,13 +79,19 @@ module Aspector
       @context.instance_methods.each do |method|
         apply_to_method(method)
       end
+
+      if @options[:private_methods]
+        @context.private_instance_methods.each do |method|
+          apply_to_method(method, true)
+        end
+      end
     end
 
-    def apply_to_method method
+    def apply_to_method method, is_private = false
       advices = advices_for_method method
       return if advices.empty?
 
-      recreate_method method, advices
+      recreate_method method, advices, is_private
     end
 
     def to_hash
@@ -91,7 +99,7 @@ module Aspector
         "type" => self.class.name,
         "context" => @context.name,
         "options" => @options,
-        "aspect" => @aspect.to_hash
+        "aspect" => self.class.to_hash
       }
     end
 
@@ -106,16 +114,16 @@ module Aspector
     end
 
     def invoke_deferred_logics
-      return unless @aspect.deferred_logics
+      return unless self.class.deferred_logics
 
       @deferred_logic_results ||= {}
-      @aspect.deferred_logics.each do |logic|
-        @deferred_logic_results[logic] = @context.class_eval(logic.code)
+      self.class.deferred_logics.each do |logic|
+        @deferred_logic_results[logic] = logic.apply @context
       end
     end
 
     def define_methods_for_advice_blocks
-      @aspect.advices.each do |advice|
+      self.class.advices.each do |advice|
         next unless advice.advice_block
         @context.send :define_method, advice.with_method, advice.advice_block
       end
@@ -160,41 +168,128 @@ module Aspector
     end
 
     def advices_for_method method
-      @aspect.advices.select do |advice|
+      self.class.advices.select do |advice|
         advice.match?(method, self)
       end
     end
 
-    def recreate_method method, advices
+    def recreate_method method, advices, is_private
       @context.instance_variable_set(:@aspector_creating_method, true)
-      grouped_advices = []
 
-      advices.each do |advice|
-        if advice.around? and not grouped_advices.empty?
-          recreate_method_with_advices method, grouped_advices
+      before_advices = advices.select {|advice| advice.before? or advice.before_filter? }
+      after_advices  = advices.select {|advice| advice.after? }
+      around_advices = advices.select {|advice| advice.around? }
 
-          grouped_advices = []
+      if around_advices.size > 1
+        (around_advices.size - 1).downto(1) do |i|
+          advice = around_advices[i]
+          recreate_method_with_advices method, [], [], advice
         end
-
-        grouped_advices << advice
       end
 
-      # create wrap method for before/after advices which are not wrapped inside around advice.
-      recreate_method_with_advices method, grouped_advices unless grouped_advices.empty?
+      recreate_method_with_advices method, before_advices, after_advices, around_advices.first
+
+      @context.send :private, method if is_private
     ensure
       @context.instance_variable_set(:@aspector_creating_method, nil)
     end
 
-    def recreate_method_with_advices method, advices
-      before_advices = advices.select {|advice| advice.before? or advice.before_filter? }
-      after_advices  = advices.select {|advice| advice.after?  }
-      around_advice  = advices.first if advices.first.around?
-
+    def recreate_method_with_advices method, before_advices, after_advices, around_advice
       code = METHOD_TEMPLATE.result(binding)
       #puts code
       # line no is the actual line no of METHOD_TEMPLATE + 5
-      @context.class_eval code, __FILE__, 5
+      @context.class_eval code, __FILE__, 7
     end
 
+    class << self
+
+      def advices
+        @advices ||= []
+      end
+
+      def options
+        @options ||= {}
+      end
+
+      def deferred_logics
+        @deferred_logics ||= []
+      end
+
+      def apply target, options = {}
+        instances = target.instance_variable_get(:@aspector_instances)
+        return if instances and instances.detect {|instance| instance.is_a?(self) }
+
+        aspect_instance = new(target, options)
+        aspect_instance.apply
+      end
+
+      def default options
+        if @options
+          @options.merge! options
+        else
+          @options = options
+        end
+      end
+
+      def before *methods, &block
+        advices << create_advice(Aspector::AdviceMetadata::BEFORE, self, methods, &block)
+      end
+
+      def before_filter *methods, &block
+        advices << create_advice(Aspector::AdviceMetadata::BEFORE_FILTER, self, methods, &block)
+      end
+
+      def after *methods, &block
+        advices << create_advice(Aspector::AdviceMetadata::AFTER, self, methods, &block)
+      end
+
+      def around *methods, &block
+        advices << create_advice(Aspector::AdviceMetadata::AROUND, self, methods, &block)
+      end
+
+      def target code = nil, &block
+        logic = DeferredLogic.new(code || block)
+        deferred_logics << logic
+        logic
+      end
+
+      def deferred_option key
+        DeferredOption.new(key)
+      end
+
+      def to_hash
+        {
+          "type" => self.name,
+          "options" => options,
+          "advices" => advices.map {|advice| advice.to_s }
+        }
+      end
+
+      private
+
+      def create_advice meta_data, klass_or_module, *methods, &block
+        methods.flatten!
+
+        options = meta_data.default_options.clone
+        options.merge!(methods.pop) if methods.last.is_a? Hash
+        options.merge!(meta_data.mandatory_options)
+
+        # Convert symbols to strings to avoid inconsistencies
+        methods.size.times do |i|
+          methods[i] = methods[i].to_s if methods[i].is_a? Symbol
+        end
+
+        with_method = methods.pop unless block_given?
+
+        Aspector::Advice.new(self,
+                             meta_data.advice_type,
+                             Aspector::MethodMatcher.new(*methods),
+                             with_method,
+                             options,
+                             &block)
+      end
+
+    end
   end
 end
+

data/lib/aspector/deferred_logic.rb

@@ -8,7 +8,11 @@ module Aspector
     end
 
     def apply target
-      @value = target.class_eval(@code)
+      if @code.is_a? String
+        @value = target.class_eval(@code)
+      else
+        @value = target.class_eval(&@code)
+      end
     end
 
   end

data/lib/aspector/deferred_option.rb

@@ -0,0 +1,11 @@
+module Aspector
+  class DeferredOption
+
+    attr_reader :key
+
+    def initialize key
+      @key = key
+    end
+
+  end
+end

data/lib/aspector/method_matcher.rb

@@ -14,8 +14,17 @@ module Aspector
         when Symbol
           item.to_s == method
         when DeferredLogic
-          new_matcher = MethodMatcher.new(context.deferred_logic_results[item])
-          new_matcher.match?(item)
+          value = context.deferred_logic_results[item]
+          if value
+            new_matcher = MethodMatcher.new(*[value].flatten)
+            new_matcher.match?(method)
+          end
+        when DeferredOption
+          value = context.options[item.key]
+          if value
+            new_matcher = MethodMatcher.new(*[value].flatten)
+            new_matcher.match?(method)
+          end
         end
       end
     end

data/lib/aspector/object_extension.rb

@@ -4,7 +4,7 @@ module Aspector
     def aspector *args, &block
       options = args.last.is_a?(Hash) ? args.pop : {}
 
-      aspect = Aspector::Aspect.new(options, &block)
+      aspect = Aspector(options, &block)
 
       aspect.apply(self) if self.is_a? Module
       args.each {|target| aspect.apply(target) }
@@ -13,7 +13,10 @@ module Aspector
     end
 
     def Aspector options = {}, &block
-      Aspector::Aspect.new(options, &block)
+      klass = Class.new(Aspector::Base)
+      klass.default options
+      klass.class_eval &block if block_given?
+      klass
     end
 
   end

data/spec/advices_on_private_methods_spec.rb

@@ -0,0 +1,29 @@
+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

@@ -37,7 +37,7 @@ describe "Aspector for eigen class" do
     end
 
     klass.test
-    klass.value.should == %w"do_around_before do_before test do_after do_around_after"
+    klass.value.should == %w"do_before do_around_before test do_around_after do_after"
   end
 
   it "new methods" do
@@ -80,7 +80,7 @@ describe "Aspector for eigen class" do
     end
 
     klass.test
-    klass.value.should == %w"do_around_before do_before test do_after do_around_after"
+    klass.value.should == %w"do_before do_around_before test do_around_after do_after"
   end
 
 end

data/spec/aspector/aspect_spec.rb

@@ -38,6 +38,34 @@ describe "Aspector::Aspect" do
       end
     end
 
+    aspect = Aspector do
+      target do
+        def do_this
+          value << "do_this"
+        end
+      end
+
+      before :test, :do_this
+    end
+
+    aspect.apply(klass)
+
+    obj = klass.new
+    obj.test
+    obj.value.should == %w"do_this test"
+  end
+
+  it "target takes String too" do
+     klass = Class.new do
+      def value
+        @value ||= []
+      end
+
+      def test
+        value << "test"
+      end
+    end
+
     aspect = Aspector do
       target '
         def do_this
@@ -54,4 +82,5 @@ describe "Aspector::Aspect" do
     obj.test
     obj.value.should == %w"do_this test"
   end
+
 end

data/spec/aspector/base_spec.rb

@@ -0,0 +1,35 @@
+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.options[:test].should == 'value'
+  end
+
+  it "deferred_option" do
+    klass = Class.new do
+      def value
+        @value ||= []
+      end
+
+      def test
+        value << "test"
+      end
+    end
+
+    aspect = Aspector do
+      before deferred_option(: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
+end

data/spec/aspector_spec.rb

@@ -36,7 +36,7 @@ describe "Aspector" do
 
     obj = klass.new
     obj.test
-    obj.value.should == %w"do_around_before do_before test do_after do_around_after"
+    obj.value.should == %w"do_before do_around_before test do_around_after do_after"
   end
 
   it "multiple aspects should work together" do
@@ -62,4 +62,50 @@ describe "Aspector" do
     obj.test
     obj.value.should == %w"second_aspect first_aspect test"
   end
+
+  it "treating Aspect as regular class should work" do
+    klass = Class.new do
+      def value
+        @value ||= []
+      end
+
+      def test
+        value << "test"
+      end
+    end
+
+    class TestAspect < Aspector::Base
+      before(:test) { value << 'before_test' }
+    end
+
+    TestAspect.apply(klass)
+
+    obj = klass.new
+    obj.test
+    obj.value.should == %w"before_test test"
+  end
+
+  it "should apply only once if called multiple times" do
+    klass = Class.new do
+      def value
+        @value ||= []
+      end
+
+      def test
+        value << "test"
+      end
+    end
+
+    aspect = Aspector do
+      before(:test) { value << 'before_test' }
+    end
+
+    aspect.apply(klass)
+    aspect.apply(klass)
+
+    obj = klass.new
+    obj.test
+    obj.value.should == %w"before_test test"
+  end
+
 end

data/spec/aspects_combined_spec.rb

@@ -50,6 +50,6 @@ describe "Aspects combined" do
 
     obj = klass.new
     obj.test
-    obj.value.should == %w"do_before_block do_around_before do_before new_test do_after do_around_after"
+    obj.value.should == %w"do_before_block do_before do_around_before new_test do_around_after do_after"
   end
 end

data/spec/execution_order_spec.rb

@@ -0,0 +1,62 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "Aspect execution order" do
+  it "should work" do
+    klass = Class.new do
+      def value
+        @value ||= []
+      end
+
+      def test
+        value << "test"
+      end
+
+      def do_before1
+        value << "do_before1"
+      end
+
+      def do_before2
+        value << "do_before2"
+      end
+
+      def do_after1 result
+        value << "do_after1"
+        result
+      end
+
+      def do_after2 result
+        value << "do_after2"
+        result
+      end
+
+      def do_around1 &block
+        value << "do_around_before1"
+        result = block.call
+        value << "do_around_after1"
+        result
+      end
+
+      def do_around2 &block
+        value << "do_around_before2"
+        result = block.call
+        value << "do_around_after2"
+        result
+      end
+
+    end
+
+    aspector(klass) do
+      before :test, :do_before1
+      after  :test, :do_after1
+      around :test, :do_around1
+      before :test, :do_before2
+      after  :test, :do_after2
+      around :test, :do_around2
+    end
+
+    obj = klass.new
+    obj.test
+    obj.value.should == %w"do_before1 do_before2 do_around_before1 do_around_before2 test
+                           do_around_after2 do_around_after1 do_after1 do_after2"
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: aspector
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 7
   prerelease: 
   segments: 
   - 0
-  - 5
+  - 6
   - 0
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Guoliang Cao
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-11 00:00:00 -05:00
+date: 2011-11-18 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -260,28 +260,33 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- aspector.gemspec
+- examples/activerecord_hooks.rb
 - examples/around_example.rb
 - examples/aspector_apply_example.rb
 - examples/aspector_example.rb
 - lib/aspector.rb
 - lib/aspector/advice.rb
 - lib/aspector/advice_metadata.rb
-- lib/aspector/aspect.rb
-- lib/aspector/aspect_instance.rb
-- lib/aspector/aspect_instances.rb
+- lib/aspector/aspects.rb
+- lib/aspector/base.rb
 - lib/aspector/deferred_logic.rb
+- lib/aspector/deferred_option.rb
 - lib/aspector/method_matcher.rb
 - 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
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/gcao/aspector

data/lib/aspector/aspect.rb

@@ -1,75 +0,0 @@
-require 'erb'
-
-module Aspector
-  class Aspect
-
-    attr_reader :advices, :options, :deferred_logics
-
-    def initialize options = {}, &block
-      @options = options
-      @advices = []
-      instance_eval &block
-    end
-
-    def apply target, options = {}
-      aspect_instance = AspectInstance.new(target, self, options)
-      aspect_instance.apply
-    end
-
-    def before *methods, &block
-      @advices << create_advice(Aspector::AdviceMetadata::BEFORE, self, methods, &block)
-    end
-
-    def before_filter *methods, &block
-      @advices << create_advice(Aspector::AdviceMetadata::BEFORE_FILTER, self, methods, &block)
-    end
-
-    def after *methods, &block
-      @advices << create_advice(Aspector::AdviceMetadata::AFTER, self, methods, &block)
-    end
-
-    def around *methods, &block
-      @advices << create_advice(Aspector::AdviceMetadata::AROUND, self, methods, &block)
-    end
-
-    def target code
-      logic = DeferredLogic.new(code)
-      @deferred_logics ||= []
-      @deferred_logics << logic
-      logic
-    end
-
-    def to_hash
-      {
-        "type" => self.class.name,
-        "options" => @options,
-        "advices" => @advices.map {|advice| advice.to_s }
-      }
-    end
-
-    private
-
-    def create_advice meta_data, klass_or_module, *methods, &block
-      methods.flatten!
-
-      options = meta_data.default_options.clone
-      options.merge!(methods.pop) if methods.last.is_a? Hash
-      options.merge!(meta_data.mandatory_options)
-
-      # Convert symbols to strings to avoid inconsistencies
-      methods.size.times do |i|
-        methods[i] = methods[i].to_s if methods[i].is_a? Symbol
-      end
-
-      with_method = methods.pop unless block_given?
-
-      Aspector::Advice.new(self,
-                           meta_data.advice_type,
-                           Aspector::MethodMatcher.new(*methods),
-                           with_method,
-                           options,
-                           &block)
-    end
-  end
-end
-