ick 0.2.2 → 0.2.3

data/History.txt

@@ -8,9 +8,11 @@
 * 3 minor enhancement:
   * refactored Wrapped into Wrap with runtime options
   * added ArrayWrapper and Tee classes
-* 4 minor enhancement
+* 4 tiny enhancement
   * fixed manifest.txt
   * TODO: build the manifest algorithmically!
-* 5 minor enhancement
+* 5 tiny enhancement
   * #fork
+* 6 tiny enhancement
+  * work in progress on Advisor
   

data/Manifest.txt

@@ -23,6 +23,7 @@ tasks/environment.rake
 tasks/website.rake
 test/test_helper.rb
 test/test_ick.rb
+test/test_advisor.rb
 website/index.html
 website/index.txt
 website/javascripts/rounded_corners_lite.inc.js

data/lib/ick/advisor.rb

@@ -1,28 +1,28 @@
 module Ick
   class Advisor < Wrapper
-    @@arounds = lambda { |callback, receiver, sym, *args|
-      callback.call()
-    }
-    def self.around target = nil, args = {}, &proc # { |callback, receiver, sym, *args| ... }
-      old_arounds = @@arounds
+    
+    def self.around *args, &proc # { |callback, receiver, sym, *args| ... }
+      target, conditions = self.extract_parameters(args)
+      old_arounds = self.around_chain 
       if target.kind_of?(Symbol)
         proc = lambda { |callback, receiver, sym, *args|
-          self.send(target, sym, *args, &proc)
+          self.send(target, callback, receiver, sym, *args, &proc)
         }
       elsif target.kind_of?(Class)
         proc = lambda { |callback, receiver, sym, *args|
           target.filter(receiver, sym, *args, &proc)
         }
       end
-      @@arounds = if args[:only]
+      self.around_chain = 
+        if conditions[:only]
           lambda { |callback, receiver, sym, *args|
             new_callback = lambda { old_arounds.call(callback, receiver, sym, *args) }
-            Array(args[:only]).include(sym) ? proc.call(callback, receiver, sym, *args) : callback.call()
+            Array(conditions[:only]).include?(sym) ? proc.call(callback, receiver, sym, *args) : callback.call()
           }
-        elsif args[:except]
+        elsif conditions[:except]
           lambda { |callback, receiver, sym, *args|
             new_callback = lambda { old_arounds.call(callback, receiver, sym, *args) }
-            Array(args[:only]).include(sym) ? new_callback.call() : proc.call(new_callback, receiver, sym, *args)
+            Array(conditions[:except]).include?(sym) ? new_callback.call() : proc.call(new_callback, receiver, sym, *args)
           }
         else
           lambda { |callback, receiver, sym, *args|
@@ -31,13 +31,60 @@ module Ick
           }
         end
     end
+    
+    def self.before *args, &proc # { |receiver, sym, *args| ... }
+      self.around *args, &(lambda { |callback, receiver, sym, *args|  
+        proc.call(receiver, sym, *args)
+        callback.call()
+      })
+    end
+    
+    def self.after *args, &proc # { |receiver, sym, *args| ... }
+      self.around *args, &(lambda { |callback, receiver, sym, *args|  
+        callback.call()
+        proc.call(receiver, sym, *args)
+      })
+    end
+    
     def __invoke__(sym, *args, &block)
-      @@arounds.call(
+      self.__class.around_chain.call(
         lambda { @value.__send__(sym, *args, &block) },
         @value,
         sym,
         *args
       )
     end
+    
+    is_not_contagious
+    
+    private
+    
+    def self.around_chain
+      @around_chain || lambda { |callback, receiver, sym, *args|
+      callback.call()
+    }
+    end
+    
+    def self.around_chain=(chain)
+      @around_chain = chain
+    end
+    
+    def self.extract_parameters arr
+      if arr.empty?
+        []
+      elsif arr.size == 2
+        arr
+      elsif arr.size > 2
+        [arr[0..-2], arr[-1]]
+      elsif arr.first.kind_of?(Class) or arr.first.kind_of?(Symbol)
+        [arr[0], {}]
+      elsif arr.first.respond_to?(:[])
+        [nil, arr.first]
+      else
+        raise "Argument problem with #{arr}"
+      end
+    end
+    
   end
+  
 end

data/lib/ick/version.rb

@@ -2,7 +2,7 @@ module Ick #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 2
+    TINY  = 3
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/test_advisor.rb

@@ -0,0 +1,70 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class NoAdvice < Ick::Advisor
+end
+
+class NameUpdator < Ick::Advisor
+  around :only => :value= do |callback, receiver, sym, *args|
+    callback.call()
+    receiver.name = receiver.to_s
+  end
+end
+
+class NameUpdatorByMethod < Ick::Advisor
+  around :update, :only => :value=
+  
+  def self.update(callback, receiver, sym, *args)
+    callback.call()
+    receiver.name = receiver.to_s
+  end
+end
+
+class DoublePlusOne < Ick::Advisor
+  around :only => :value= do |callback, receiver, sym, *args|
+    callback.call()
+    receiver.name = receiver.to_s
+  end
+end
+
+class TestAdvisor < Test::Unit::TestCase
+  
+  def setup
+    @box1 = Box.new(1)
+    @box_one = Box.new(1)
+  end
+  
+  def test_no_advice
+    nullo = NoAdvice.new(@box1)
+    nullo.value = 2
+    assert_equal(2, @box1.value)
+  end
+  
+  def test_simple_around_advice
+    old_string = @box1.name
+    @box1.value = 2
+    assert_equal(2, @box1.value)
+    assert_equal(old_string, @box1.name) # The name has not changed
+    assert_not_equal(old_string, @box1.to_s) # but the string has
+    updating = NameUpdator.new(@box_one)
+    updating.value = 2
+    assert_equal(updating.to_s, updating.name) # updated the name
+  end
+  
+  def test_simple_by_method
+    updating = NameUpdatorByMethod.new(@box_one)
+    updating.value = 2
+    assert_equal(updating.to_s, updating.name) # updated the name
+  end
+  
+  def test_simple_around_advice
+    old_string = @box1.name
+    @box1.value = 2
+    assert_equal(2, @box1.value)
+    assert_equal(old_string, @box1.name) # The name has not changed
+    assert_not_equal(old_string, @box1.to_s) # but the string has
+    updating = NameUpdator.new(@box_one)
+    updating.value = 2
+    assert_equal(updating.to_s, updating.name) # updated the name
+  end
+  
+end

data/test/test_helper.rb

@@ -2,3 +2,25 @@ require 'test/unit'
 require File.dirname(__FILE__) + '/../lib/ick'
   
 Ick.sugarize
+
+class Box
+  attr_accessor :value, :name
+  
+  def initialize(_value)
+    self.value = _value
+    self.name = self.to_s
+  end
+  
+  def == (other)
+    other.respond_to?(:value) && self.value == other.value
+  end
+  
+  def to_s
+    "Box(#{value})"
+  end
+  
+  def inspect
+    "Box(#{value})"
+  end
+  
+end

data/test/test_ick.rb

@@ -1,26 +1,5 @@
 require File.dirname(__FILE__) + '/test_helper.rb'
 
-class Box
-  attr_accessor :value
-  
-  def initialize(_value)
-    self.value = _value
-  end
-  
-  def == (other)
-    other.respond_to?(:value) && self.value == other.value
-  end
-  
-  def to_s
-    "Box(#{value})"
-  end
-  
-  def inspect
-    "Box(#{value})"
-  end
-  
-end
-
 class TestIck < Test::Unit::TestCase
   
   attr_accessor :value

data/website/index.html

@@ -33,7 +33,7 @@
     <h1>Invocation Construction Kit</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/ick"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/ick" class="numbers">0.2.2</a>
+      <a href="http://rubyforge.org/projects/ick" class="numbers">0.2.3</a>
     </div>
     <h1>&#x2192; &#8216;ick&#8217;</h1>
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: ick
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
-date: 2008-03-09 00:00:00 -05:00
+  version: 0.2.3
+date: 2008-03-10 00:00:00 -04:00
 summary: Invocation Construction Kit
 require_paths: 
 - lib
@@ -55,12 +55,14 @@ files:
 - tasks/website.rake
 - test/test_helper.rb
 - test/test_ick.rb
+- test/test_advisor.rb
 - website/index.html
 - website/index.txt
 - website/javascripts/rounded_corners_lite.inc.js
 - website/stylesheets/screen.css
 - website/template.rhtml
 test_files: 
+- test/test_advisor.rb
 - test/test_helper.rb
 - test/test_ick.rb
 rdoc_options: