hooked 0.3.3 → 0.3.4

data/.travis.yml

@@ -0,0 +1,5 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - jruby
+  - rbx-2.0

data/README.md

@@ -3,6 +3,8 @@ Aspect Orientation Made Simple
 
 Hooked lets you transparently aspectify your methods and blocks.
 
+[![Build status](https://secure.travis-ci.org/lgierth/hooked.png)](http://travis-ci.org/lgierth/hooked)
+
 Getting Started
 ---------------
 
@@ -42,7 +44,7 @@ to methods of this class' objects".
     foo.after :breakfast do
       puts "Mmmh..."
     end
-    foo.around :breakfast, better_foo.method(:fuuu), :before => better_foo.method(:shower)
+    foo.around :breakfast, better_foo.method(:fuuu), :before => [better_foo.method(:shower)]
     
     foo.breakfast
 

data/lib/hooked.rb

@@ -13,6 +13,11 @@ module Hooked
     end
   end
   
+  def instead_of(pointcut, advice, &block)
+    hook! pointcut
+    hooked[pointcut].instead_pointcut = (advice || block)
+  end
+  
   def hook!(pointcut)
     @hooked ||= {}
     return if hooked[pointcut]
@@ -50,7 +55,7 @@ module Hooked
   module ClassMethods
     attr_reader :instance_hooked
     
-    [:before, :after, :around].each do |type|
+    [:before, :after, :around, :instead_of].each do |type|
       define_method :"instance_#{type}" do |pointcut, *args, &block|
         instance_hooked[pointcut] ||= []
         instance_hooked[pointcut] << {

data/lib/hooked/aspect.rb

@@ -17,7 +17,7 @@ module Hooked
     end
 
     def call(*args, &block)
-      args = advice.call(*args, &block) if before?
+      advice.call(args, &block) if before?
 
       result = if around?
         advice.call pointcut, *args, &block

data/lib/hooked/hook.rb

@@ -1,6 +1,6 @@
 module Hooked
   class Hook
-    attr_reader :pointcut, :graph
+    attr_reader :pointcut, :instead_pointcut, :graph
     
     def initialize(pointcut = nil, &block)
       if (pointcut && block) || (!pointcut && !block)
@@ -14,14 +14,20 @@ module Hooked
       graph << Aspect.new(*args, &block)
     end
     
+    def instead_pointcut=(instead)
+      @instead_pointcut = instead
+      @chain = nil
+    end
+    
     def call(*args, &block)
       @chain = build_chain if graph.changed? || !@chain
       @chain.call *args, &block
     end
     
     def build_chain
+    pc = instead_pointcut || pointcut
       graph.sort
-      graph.output.reverse.inject(pointcut) do |pointcut, aspect|
+      graph.output.reverse.inject(pc) do |pointcut, aspect|
         aspect.pointcut = pointcut; aspect
       end
     end

data/lib/hooked/version.rb

@@ -1,3 +1,3 @@
 module Hooked
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/spec/aspect_spec.rb

@@ -61,15 +61,16 @@ describe Hooked::Aspect do
         order.should == [:advice, :pointcut]
       end
       
-      it "manipulates the arguments" do
-        args_before, args_after = [:foo, 123], [456, :bar]
-        obj = Hooked::Aspect.new :before, mock("advice")
-        obj.pointcut = mock "pointcut"
-        
-        obj.advice.should_receive(:call).with(*args_before).and_return args_after
-        obj.pointcut.should_receive(:call).with *args_after
+      it "passes arguments as one array" do
+        arg1, arg2 = stub("arg#1"), stub("arg#2")
+        obj = Hooked::Aspect.new :before, advice
+        obj.pointcut = pointcut
+        advice.should_receive(:call) {|args|
+          args[0].should equal(arg1)
+          args[1].should equal(arg2)
+        }
         
-        obj.call *args_before
+        obj.call arg1, arg2
       end
     end
     
@@ -81,17 +82,6 @@ describe Hooked::Aspect do
         
         order.should == [:pointcut, :advice]
       end
-      
-      it "manipulates the return value" do
-        return_before, return_after = :foo, :bar
-        obj = Hooked::Aspect.new :after, mock("advice")
-        obj.pointcut = mock "pointcut"
-        
-        obj.pointcut.stub(:call).and_return return_before
-        obj.advice.should_receive(:call).with(return_before).and_return return_after
-        
-        obj.call.should == return_after
-      end
     end
     
     describe "with type == :around" do

data/spec/hook_spec.rb

@@ -41,6 +41,20 @@ describe Hooked::Hook do
     end
   end
   
+  describe "#instead_pointcut=" do
+    it "sets a substitute pointcut and clears the chain" do
+      pointcut = stub("pointcut", :call => nil)
+      instead = stub("substitute pointcut", :call => nil)
+      
+      obj = Hooked::Hook.new(pointcut)
+      obj.call
+      
+      obj.instead_pointcut = instead
+      obj.should_receive(:build_chain) { stub "chain", :call => nil }
+      obj.call
+    end
+  end
+  
   describe "#call" do
     it "rebuilds the chain if it hasn't been built yet or the graph changed" do
       obj = Hooked::Hook.new double("pointcut")
@@ -82,5 +96,19 @@ describe Hooked::Hook do
       chain.pointcut.pointcut.pos.should == 3
       chain.pointcut.pointcut.pointcut.should == obj.pointcut
     end
+    
+    it "uses the subsitute pointcut if it's set" do
+      pointcut = stub("pointcut")
+      instead = stub("substitute pointcut")
+      
+      obj = Hooked::Hook.new(pointcut)
+      obj.instead_pointcut = instead
+      
+      obj.build_chain
+      pointcut.should_not_receive :call
+      instead.should_receive :call
+      
+      obj.call
+    end
   end
 end

data/spec/hooked_spec.rb

@@ -30,6 +30,16 @@ describe Hooked do
     end
   end
   
+  describe "#instead_of" do
+    it "substitutes the pointcut" do
+      pointcut = stub("substitute pointcut")
+      obj = @klass.new
+      
+      obj.instead_of :foo, pointcut
+      obj.hooked[:foo].instead_pointcut.should equal(pointcut)
+    end
+  end
+  
   describe "#hook!" do
     it "replaces the original method with a hook" do
       obj = @klass.new
@@ -74,4 +84,14 @@ describe Hooked do
       end
     end
   end
+  
+  describe ".instance_instead_of" do
+    it "substitutes the pointcut on each new object of the class" do
+      pointcut = stub("substitute pointcut")
+      @klass.instance_instead_of :foo, pointcut
+      
+      obj = @klass.new
+      obj.hooked[:foo].instead_pointcut.should equal(pointcut)
+    end
+  end
 end

metadata

@@ -1,39 +1,36 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: hooked
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.3.4
   prerelease: 
-  version: 0.3.3
 platform: ruby
-authors: 
+authors:
 - Lars Gierth
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-16 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-07-20 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &78308770 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id001
+  version_requirements: *78308770
 description: Hooked lets you transparently aspectify your methods and blocks.
-email: 
+email:
 - lars.gierth@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .rspec
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
@@ -51,36 +48,26 @@ files:
 - spec/spec_helper.rb
 homepage: http://rubygems.org/gems/hooked
 licenses: []
-
 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: 312125903
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 312125903
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Aspect Orientation Made Simple
 test_files: []
-