aspector 0.9.0 → 0.9.1

data/Gemfile

@@ -14,4 +14,5 @@ group :development do
   gem 'growl', "~> 1.0.3"
 
   gem 'awesome_print'
+  gem 'pry'
 end

data/Gemfile.lock

@@ -2,6 +2,7 @@ GEM
   remote: http://rubygems.org/
   specs:
     awesome_print (1.0.2)
+    coderay (1.0.5)
     diff-lcs (1.1.3)
     git (1.2.5)
     growl (1.0.3)
@@ -18,6 +19,11 @@ GEM
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
+    method_source (0.7.1)
+    pry (0.9.8.4)
+      coderay (~> 1.0.5)
+      method_source (~> 0.7.1)
+      slop (>= 2.4.4, < 3)
     rake (0.9.2.2)
     rb-fsevent (0.4.3.1)
     rspec (2.8.0)
@@ -29,6 +35,7 @@ GEM
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.8.0)
     ruby-prof (0.10.8)
+    slop (2.4.4)
     thor (0.14.6)
 
 PLATFORMS
@@ -42,6 +49,7 @@ DEPENDENCIES
   guard-rspec (~> 0.5.2)
   guard-shell (~> 0.1.1)
   jeweler (~> 1.6.4)
+  pry
   rb-fsevent (~> 0.4.3.1)
   rspec
   ruby-prof

data/VERSION

@@ -1 +1 @@
-0.9.0
+0.9.1

data/aspector.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "aspector"
-  s.version = "0.9.0"
+  s.version = "0.9.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Guoliang Cao"]
-  s.date = "2012-03-08"
+  s.date = "2012-03-13"
   s.description = ""
   s.email = "gcao99@gmail.com"
   s.extra_rdoc_files = [
@@ -91,6 +91,7 @@ Gem::Specification.new do |s|
       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"])
+      s.add_development_dependency(%q<pry>, [">= 0"])
     else
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
@@ -102,6 +103,7 @@ Gem::Specification.new do |s|
       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"])
+      s.add_dependency(%q<pry>, [">= 0"])
     end
   else
     s.add_dependency(%q<rspec>, [">= 0"])
@@ -114,6 +116,7 @@ Gem::Specification.new do |s|
     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"])
+    s.add_dependency(%q<pry>, [">= 0"])
   end
 end
 

data/lib/aspector/aspect_instances.rb

@@ -3,6 +3,7 @@ module Aspector
 
     def apply_to_method method
       each do |aspect_instance|
+        next if aspect_instance.aop_options[:old_methods_only]
         aspect_instance.aop_apply_to_method method, aspect_instance.aop_advices
       end
     end

data/lib/aspector/base.rb

@@ -26,6 +26,34 @@ module Aspector
       after_initialize
     end
 
+    def aop_enable
+      class << self
+        def aop_disabled?; end
+      end
+    end
+    alias enable aop_enable
+
+    def aop_disable
+      class << self
+        def aop_disabled?; true; end
+      end
+    end
+    alias disable aop_disable
+
+    def aop_reset_disabled
+      class << self
+        remove_method :aop_disabled?
+      end
+    end
+    alias reset_disabled :aop_reset_disabled
+
+    def aop_disabled?
+    end
+
+    def disabled?
+      aop_disabled
+    end
+
     def aop_advices
       shared_advices = self.class.aop_advices
 
@@ -45,14 +73,30 @@ module Aspector
       before_apply
       aop_invoke_deferred_logics
       aop_define_methods_for_advice_blocks
-      aop_add_to_instances
-      aop_apply_to_methods
+      aop_add_to_instances unless @aop_options[:old_methods_only]
+      aop_apply_to_methods unless @aop_options[:new_methods_only]
+      aop_add_method_hooks unless @aop_options[:old_methods_only]
       after_apply
     end
     alias :apply :aop_apply
 
     def aop_apply_to_methods
       advices = aop_advices
+
+      # If method/methods option is set and all are String or Symbol, apply to those only, instead of
+      # iterating through all methods
+      methods = [@aop_options[:method] || @aop_options[:methods]]
+      methods.compact!
+      methods.flatten!
+
+      if not methods.empty? and methods.all?{|method| method.is_a? String or method.is_a? Symbol }
+        methods.each do |method|
+          aop_apply_to_method(method.to_s, advices)
+        end
+
+        return
+      end
+
       @aop_context.public_instance_methods.each do |method|
         aop_apply_to_method(method.to_s, advices, :public)
       end
@@ -243,10 +287,10 @@ module Aspector
 <% end %>
 
     define_method :<%= method %> do |*args, &block|
-      return orig_method.bind(self).call(*args, &block) if aspect.class.aop_disabled?
+      return orig_method.bind(self).call(*args, &block) if aspect.aop_disabled?
 
 <% if is_outermost %>
-      catch(:aop_return) do
+      catch(:aop_returns) do
 <% end %>
 
       # Before advices

data/lib/aspector/base_class_methods.rb

@@ -4,20 +4,18 @@ module Aspector
       ::Aspector::Base.extend(self)
 
       def aop_enable
-        @aop_disabled = nil
+        def aop_disabled?
+        end
       end
       alias :enable :aop_enable
 
       def aop_disable
-        @aop_disabled = true
+        def aop_disabled?
+          true
+        end
       end
       alias :disable :aop_disable
 
-      def aop_disabled?
-        @aop_disabled
-      end
-      alias :disabled? :aop_disabled?
-
       def aop_advices
         @aop_advices ||= []
       end
@@ -31,7 +29,6 @@ module Aspector
       def aop_apply target, options = {}
         aspect_instance = new(target, options)
         aspect_instance.send :aop_apply
-        aspect_instance.send :aop_add_method_hooks
         aspect_instance
       end
       alias :apply :aop_apply
@@ -66,6 +63,8 @@ module Aspector
       alias :around :aop_around
 
       def aop_target code = nil, &block
+        return unless code or block_given?
+
         logic = DeferredLogic.new(code || block)
         aop_deferred_logics << logic
         logic

data/lib/aspector/object_extension.rb

@@ -21,10 +21,10 @@ module Aspector
       klass
     end
 
-    def aop_return value = nil
-      throw :aop_return, value
+    def aop_returns value = nil
+      throw :aop_returns, value
     end
-    alias :returns :aop_return
+    alias :returns :aop_returns
 
   end
 end

data/spec/functional/aspector_spec.rb

@@ -95,4 +95,74 @@ describe "Aspector" do
     obj.value.should == %w"before_test before_test test"
   end
 
+  it "if new_methods_only is true, do not apply to existing methods" do
+    aspect = Aspector do
+      before(:test) { value << 'before_test' }
+    end
+
+    klass = create_test_class
+    aspect.apply(klass, :new_methods_only => true)
+
+    obj = klass.new
+    obj.test
+    obj.value.should == %w"test"
+  end
+
+  it "if new_methods_only is true, do apply to new methods" do
+    aspect = Aspector do
+      before(:test) { value << 'before_test' }
+    end
+
+    klass = Class.new do
+      def value
+        @value ||= []
+      end
+    end
+
+    aspect.apply(klass, :new_methods_only => true)
+
+    klass.send :define_method, :test do
+      value << "test"
+    end
+
+    obj = klass.new
+    obj.test
+    obj.value.should == %w"before_test test"
+  end
+
+  it "if old_methods_only is true, do apply to methods already defined" do
+    aspect = Aspector do
+      before(:test) { value << 'before_test' }
+    end
+
+    klass = create_test_class
+    aspect.apply(klass, :old_methods_only => true)
+
+    obj = klass.new
+    obj.test
+    obj.value.should == %w"before_test test"
+  end
+
+  it "if old_methods_only is true, do not apply to new methods" do
+    aspect = Aspector do
+      before(:test) { value << 'before_test' }
+    end
+
+    klass = Class.new do
+      def value
+        @value ||= []
+      end
+    end
+
+    aspect.apply(klass, :old_methods_only => true)
+
+    klass.send :define_method, :test do
+      value << "test"
+    end
+
+    obj = klass.new
+    obj.test
+    obj.value.should == %w"test"
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: aspector
 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: 2012-03-08 00:00:00 Z
+date: 2012-03-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
@@ -172,6 +172,20 @@ dependencies:
   name: awesome_print
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id011
+  name: pry
+  prerelease: false
+  type: :development
 description: ""
 email: gcao99@gmail.com
 executables: []