hooked 0.3.1 → 0.3.2

data/README.md

@@ -77,7 +77,7 @@ Dependencies
 * stdlib's [TSort](http://rubydoc.info/stdlib/tsort/1.9.2/frames)
 * [RSpec](http://relishapp.com/rspec) for development
 
-Specs pass on MRI 1.9.2, others have not been tested yet.
+Specs pass on MRI 1.9.2, Rubinius 1.2.3, JRuby 1.6.1 and MRI 1.8.7.
 
 To do & Ideas
 -------------

data/lib/hooked.rb

@@ -18,7 +18,7 @@ module Hooked
     return if hooked[pointcut]
     
     hooked[pointcut] = Hooked::Hook.new method(pointcut)
-    singleton_class.class_eval do
+    (class << self; self; end).class_eval do
       undef_method pointcut
       define_method pointcut do |*args, &block|
         hooked[pointcut].call *args, &block
@@ -30,10 +30,45 @@ module Hooked
     return unless hooked && hooked[pointcut]
     
     p = hooked[pointcut].pointcut
-    singleton_class.class_eval do
+    (class << self; self; end).class_eval do
       remove_method pointcut
       define_method pointcut, &p
     end
     hooked.delete pointcut
   end
+  
+  def self.included(klass)
+    klass.instance_variable_set :@instance_hooked, {}
+    klass.extend ClassMethods
+    
+    class << klass
+      alias_method :new_without_hooked, :new
+      alias_method :new, :new_with_hooked
+    end
+  end
+  
+  module ClassMethods
+    attr_reader :instance_hooked
+    
+    [:before, :after, :around].each do |type|
+      define_method :"instance_#{type}" do |pointcut, *args, &block|
+        instance_hooked[pointcut] ||= []
+        instance_hooked[pointcut] << {
+          :type => type,
+          :args => args,
+          :block => block
+        }
+      end
+    end
+    
+    def new_with_hooked(*args, &block)
+      obj = new_without_hooked *args, &block
+      instance_hooked.each do |pointcut, aspects|
+        aspects.each do |aspect|
+          obj.send aspect[:type], pointcut, *aspect[:args], &aspect[:block]
+        end
+      end
+      obj
+    end
+  end
 end

data/lib/hooked/version.rb

@@ -1,3 +1,3 @@
 module Hooked
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/spec/graph_spec.rb

@@ -43,7 +43,11 @@ describe Hooked::Graph do
       aspects.each {|a| graph << a }
       graph.sort
       
-      graph.output.should == [aspects[2], aspects[0], aspects[3], aspects[1]]
+      g = graph.output
+      g.index(aspects[0]).should > g.index(aspects[2])
+      g.index(aspects[1]).should > g.index(aspects[0])
+      g.index(aspects[2]).should < g.index(aspects[3])
+      g.index(aspects[3]).should < g.index(aspects[1])
     end
     
     it "detects circular dependencies" do

data/spec/hooked_spec.rb

@@ -1,15 +1,17 @@
 require "spec_helper"
 
 describe Hooked do
-  klass = Class.new do
-    include Hooked
-    def foo; end
+  before do
+    @klass = Class.new do
+      include Hooked
+      def foo; end
+    end
   end
   
   [:before, :after, :around].each do |type|
     describe "##{type}" do
       it "hooks the method" do
-        obj = klass.new
+        obj = @klass.new
         obj.stub :hooked => {:foo => double("hooked", :add_aspect => nil)}
         
         obj.should_receive(:hook!).with(:foo)
@@ -17,7 +19,7 @@ describe Hooked do
       end
       
       it "adds an aspect to the hook" do
-        obj = klass.new
+        obj = @klass.new
         advice, deps = stub("advice"), stub("deps")
         
         obj.hook! :foo
@@ -30,7 +32,7 @@ describe Hooked do
   
   describe "#hook!" do
     it "replaces the original method with a hook" do
-      obj = klass.new
+      obj = @klass.new
       args, result = ["bar", 123], stub("result")
 
       obj.hook! :foo
@@ -39,7 +41,7 @@ describe Hooked do
     end
     
     it "doesn't hook a method twice" do
-      obj = klass.new
+      obj = @klass.new
       obj.hook! :foo
       
       Hooked::Hook.should_not_receive :new
@@ -49,7 +51,7 @@ describe Hooked do
   
   describe "#unhook!" do
     it "brings the original back in place" do
-      obj = klass.new
+      obj = @klass.new
       
       obj.hook! :foo
       hook = obj.hooked[:foo]
@@ -61,4 +63,15 @@ describe Hooked do
       obj.hooked[:foo].should be_nil
     end
   end
+  
+  [:before, :after, :around].each do |type|
+    describe ".instance_#{type}" do
+      it "hooks this pointcut on each new object of the class" do
+        @klass.send :"instance_#{type}", :foo, stub("advice")
+        
+        obj = @klass.new
+        obj.hooked[:foo].graph.changed?.should be_true
+      end
+    end
+  end
 end

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hooked
 version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: 
-  version: 0.3.1
+  segments: 
+  - 0
+  - 3
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Lars Gierth
@@ -10,19 +15,22 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-20 00:00:00 +02:00
+date: 2011-05-16 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
   name: rspec
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-  type: :development
-  prerelease: false
   version_requirements: *id001
 description: Hooked lets you transparently aspectify your methods and blocks.
 email: 
@@ -64,7 +72,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -167606191
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -73,14 +81,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -167606191
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Aspect Orientation Made Simple