expectation 0.2.0 → 0.3.1

data/lib/expectation.rb

@@ -24,27 +24,35 @@
 #   end
 
 module Expectation
-  # Verifies a number of expectations. Raises an ArgumentError if one
-  # or more expectations are not met.
-  #
-  # In contrast to Expectation#expect this method can not be
-  # disabled at runtime.
+  def self.timeout=(timeout)
+    Thread.current[:expectation_timeout] = timeout
+  end
+
+  def self.timeout
+    Thread.current[:expectation_timeout]
+  end
+  
+  def self.last_error=(error)
+    Thread.current[:expectation_last_error] = error
+  end
+  
+  def self.last_error
+    Thread.current[:expectation_last_error]
+  end
+
   def expect!(*expectations, &block)
-    if block_given?
-      Expectation.verify! true, block
-    end
-    
-    expectations.each do |expectation|
-      case expectation
-      when Hash
-        expectation.each do |value, e|
-          Expectation.verify! value, e
-        end
-      else
-        Expectation.verify! expectation, :truish
-      end
+    return if Expectation.met_expectations?(*expectations, &block)
+
+    # build exception with adjusted backtrace.
+    backtrace = caller #[3 .. -1]
+
+    e = ArgumentError.new Expectation.last_error
+    e.singleton_class.send(:define_method, :backtrace) do
+      backtrace
     end
-  end
+
+    raise e
+  end  
 
   # Verifies a number of expectations. If one or more expectations are 
   # not met it raises an ArgumentError.
@@ -59,6 +67,41 @@ module Expectation
   # Expectation are disabled.
   def expect_dummy!(*expectations, &block) #:nodoc:
   end
+
+  # Verifies a number of expectations. Raises an ArgumentError if one
+  # or more expectations are not met.
+  #
+  # In contrast to Expectation#expect this method can not be
+  # disabled at runtime.
+  def self.met_expectations?(*expectations, &block)
+    return false unless expectations.all? do |expectation|
+      case expectation
+      when Hash
+        expectation.all? { |value, e| Expectation.verify! value, e }
+      else
+        Expectation.verify! expectation, :truish
+      end
+    end
+
+    return true unless block_given? 
+
+    # Dynamic expectation? When Expectation.timeout is set, we test the 
+    # dynamic expectation, i.e. the block, for a certain time period.
+    begin
+      timeout, Expectation.timeout = Expectation.timeout, nil
+
+      runs = timeout ? (timeout / 0.05).to_i : 0
+      runs = 1 if runs < 1
+      
+      runs.times.any? do
+        next true if Expectation.verify! 1, block
+        Thread.send :sleep, 0.05
+        false
+      end
+    ensure
+      Expectation.timeout = timeout
+    end
+  end
   
   # Does a value meet the expectation? Retruns +true+ or +false+. 
   def self.met?(value, expectation) #:nodoc:
@@ -72,8 +115,9 @@ module Expectation
     end
   end
 
-  # Verifies a value against an expectation. Builds and raises
-  # an ArgumentError exception if the expectation is not met.
+  # Verifies a value against an expectation; returns true if ok, 
+  # false if the expectation was not met. In case of an error 
+  # the Expectation.last_error value is set.
   def self.verify!(value, expectation)
     failed_value, failed_expectation, message = value, expectation, nil
     
@@ -93,16 +137,11 @@ module Expectation
     end
     
     # are we good?
-    return if good
-
-    # build exception with adjusted backtrace.
-    backtrace = caller[5 .. -1]
+    return true if good
     
-    e = ArgumentError.new "#{failed_value.inspect} does not meet expectation #{failed_expectation.inspect}#{message && ", #{message}"}"
-    e.singleton_class.send(:define_method, :backtrace) do
-      backtrace
-    end
-    raise e
+    Expectation.last_error = "#{failed_value.inspect} does not meet expectation #{failed_expectation.inspect}#{message && ", #{message}"}"
+
+    return false
   end
 
   # Enable the Expectation#expect method.

data/lib/expectation/assertions.rb

@@ -26,23 +26,16 @@ end
 #   end
 #
 module Expectation::Assertions
-  alias_method :original_expect!, :expect! #:nodoc:
-
-  def assert_expectation(should_succeed, *expectation, &block) #:nodoc:
-    original_expect! *expectation, &block
-    assert_block { should_succeed }
-  rescue ArgumentError
-    assert_block($!.to_s) { !should_succeed }
-  end
-  
   # verifies the passed in expectations
   def expect!(*expectation, &block)
-    assert_expectation true, *expectation, &block
+    good = Expectation.met_expectations?(*expectation, &block)
+    assert_block(Expectation.last_error) { good }
   end
   
   # verifies the failure of the passed in expectations
   def inexpect!(*expectation, &block)
-    assert_expectation false, *expectation, &block
+    good = Expectation.met_expectations?(*expectation, &block)
+    assert_block("Expectation(s) should fail, but didn't") { !good }
   end
 end
 

data/lib/expectation/version.rb

@@ -4,5 +4,5 @@
 # License::   Distributes under the terms of the Modified BSD License, see LICENSE.BSD for details.
 module Expectation
   # The expectation gem's version.
-  VERSION="0.2.0"
+  VERSION="0.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: expectation
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-20 00:00:00.000000000 Z
+date: 2013-01-08 00:00:00.000000000 Z
 dependencies: []
 description: Defensive programming with expectations
 email: eno@radiospiel.org
@@ -38,7 +38,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2749941318204507479
+      hash: 4441031152163392854
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -47,7 +47,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2749941318204507479
+      hash: 4441031152163392854
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24