handshake 0.2.0 → 0.2.1

data/lib/handshake/block_contract.rb

@@ -1,36 +1,31 @@
-class Proc
-  attr_reader :contract
-
-  # Define a contract on this Proc.  When the contract is set, redefine this
-  # proc's call method to ensure that values that pass through the proc are
-  # checked according to the contract.
-  def contract=(proc_contract)
-    @contract = proc_contract
-  end
+module Handshake
+  class CheckedProc < Proc
+    attr_accessor :contract
 
-  def checked?
-    not @contract.nil?
-  end
+    def initialize(contract, &block)
+      @contract = contract
+      super(&block)
+    end
 
-  def checked_call(*args)
-    Handshake.catch_contract("Contract violated in call to proc #{self}") do
-      @contract.check_accepts! *args
-    end if checked?
-    
-    return_value = orig_call(*args)
-    
-    Handshake.catch_contract("Contract violated by proc #{self}") do
-      @contract.check_returns! return_value
-    end if checked?
-    
-    return_value
+    def checked?
+      not @contract.nil?
+    end
+  
+    def call(*args)
+      Handshake.catch_contract("Contract violated in call to proc #{self}") do
+        @contract.check_accepts! *args
+      end if checked?
+      
+      return_value = super(*args)
+      
+      Handshake.catch_contract("Contract violated by proc #{self}") do
+        @contract.check_returns! return_value
+      end if checked?
+      
+      return_value
+    end
   end
-  alias :orig_call :call
-  alias :call :checked_call
 
-end
-
-module Handshake
   # For block-checking, we need a class which is_a? Proc for instance checking
   # purposes but isn't the same so as not to prevent the user from passing in
   # explicitly defined procs as arguments.

data/lib/handshake/version.rb

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

data/lib/handshake.rb

@@ -550,8 +550,8 @@ module Handshake
       # contract checks work if receiver uses yield.
       return_val = nil
       if contract.expects_block?
-        block.contract = contract.block_contract
-        return_val = @proxied.send(meth_name, *args) { |*argz| block.call(*argz) }
+        cp = CheckedProc.new(contract.block_contract, &block)
+        return_val = @proxied.send(meth_name, *args) { |*argz| cp.call(*argz) }
       else
         return_val = @proxied.send(meth_name, *args, &block)
       end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: handshake
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
-date: 2007-05-01 00:00:00 -04:00
+  version: 0.2.1
+date: 2007-05-02 00:00:00 -04:00
 summary: Handshake is a simple design-by-contract system for Ruby.
 require_paths: 
 - lib