rspec 0.3.2 → 0.4.0

data/CHANGES

@@ -13,6 +13,14 @@
 * Make sure the PKG_VERSION constant in Rakefile.rb is
   consistent with the latest version in this document.
 
+== Version 0.4.0
+
+The "two Daves walked into a bar" release.
+
+* merge Astels' and Chelimsky's work on ShouldHelper
+* this would be 0.5.0 if I updated the documentation
+* it breaks all of your existing specifications.  We're not sorry.
+
 == Version 0.3.2
 
 The "srbaker is an idiot" release.

data/Rakefile

@@ -19,7 +19,7 @@ PKG_NAME = "rspec"
 # (This is subject to change - AH)
 #
 # REMEMBER TO KEEP PKG_VERSION IN SYNC WITH CHANGELOG
-PKG_VERSION = "0.3.2"
+PKG_VERSION = "0.4.0"
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 PKG_FILES = FileList[
   '[A-Z]*',

data/examples/add_specification_spec.rb

@@ -3,13 +3,13 @@ require 'spec'
 class AddSpecification < Spec::Context
 
   def a_passing_spec
-    true.should_equal true
+    true.should.be true
   end
   
   def a_failing_spec
-    true.should_equal false
+    true.should.be false
   end
   
 end
 
-AddSpecification.add_specification('another_failing_spec') { false.should_equal true }
+AddSpecification.add_specification('another_failing_spec') { false.should.be true }

data/examples/craps_spec.rb

@@ -13,77 +13,77 @@ class CrapsSpecification < Spec::Context
   
   def come_out_roll_of_1_6_wins
     _load_dice([1], [6])
-    @game.play.should_be_true
+    @game.play.should.be true
   end
 
   def come_out_roll_of_2_5_wins
     _load_dice([2], [5])
-    @game.play.should_be_true
+    @game.play.should.be true
   end
 
   def come_out_roll_of_3_4_wins
     _load_dice([3], [4])
-    @game.play.should_be_true
+    @game.play.should.be true
   end
 
   def come_out_roll_of_4_3_wins
     _load_dice([4], [3])
-    @game.play.should_be_true
+    @game.play.should.be true
   end
 
   def come_out_roll_of_5_2_wins
     _load_dice([5], [2])
-    @game.play.should_be_true
+    @game.play.should.be true
   end  
 
   def come_out_roll_of_6_1_wins
     _load_dice([6], [1])
-    @game.play.should_be_true
+    @game.play.should.be true
   end
 
   # coming out roll of 11
   
   def come_out_roll_of_5_6_wins
     _load_dice([5], [6])
-    @game.play.should_be_true
+    @game.play.should.be true
   end
 
   def come_out_roll_of_6_5_wins
     _load_dice([6], [5])
-    @game.play.should_be_true
+    @game.play.should.be true
   end
   
   # coming out roll of 2
   
   def come_out_roll_of_1_1_looses
     _load_dice([1], [1])
-    @game.play.should_be_false
+    @game.play.should.be false
   end
   
   # coming out roll of 3
   
   def come_out_roll_of_1_2_looses
     _load_dice([1], [2])
-    @game.play.should_be_false
+    @game.play.should.be false
   end
 
   def come_out_roll_of_2_1_looses
     _load_dice([2], [1])
-    @game.play.should_be_false
+    @game.play.should.be false
   end
 
   # coming out roll of 12
   
   def come_out_roll_of_6_6_looses
     _load_dice([6], [6])
-    @game.play.should_be_false
+    @game.play.should.be false
   end
   
   # loosing with a point
   
 #  def second_roll_of_7_looses
 #    _load_dice([2, 4], [2, 3])
-#    @game.play.should_be_false
+#    @game.play.should.be false
 #  end
   
   # support

data/examples/dsl_spec.rb

@@ -1,8 +1,8 @@
 specification "failing_spec" do
-  true.should_equal false
+  true.should.be false
 end
 
 
 specification "passing_spec" do
-  true.should_equal true
+  true.should.be true
 end

data/examples/movie_spec.rb

@@ -9,11 +9,11 @@ class EmptyMovieList < Spec::Context
   end
     
   def should_have_size_of_0
-    @list.size.should_equal 0
+    @list.size.should.equal 0
   end
   
   def should_not_include_star_wars
-    @list.should_not_include "Star Wars"
+    @list.should.not.include "Star Wars"
   end
   
 end
@@ -27,17 +27,11 @@ class OneMovieList < Spec::Context
   end
   
   def should_have_size_of_1
-    @list.size.should_equal 1
+    @list.size.should.equal 1
   end
   
   def should_include_star_wars
-    @list.should_include "Star Wars"
+    @list.should.include "Star Wars"
   end
   
-end
-
-if __FILE__ == $0
-  runner = Spec::TextRunner.new($stdout)
-  runner.run(EmptyMovieList)
-  runner.run(OneMovieList)
-end
+end

data/lib/spec.rb

@@ -1,4 +1,14 @@
 require 'spec/context'
+require 'spec/should_base'
+require 'spec/have_helper'
+require 'spec/should_helper'
+require 'spec/kind_helper'
+require 'spec/instance_helper'
+require 'spec/respond_helper'
+require 'spec/should_negator'
+require 'spec/kind_negator'
+require 'spec/instance_negator'
+require 'spec/respond_negator'
 require 'spec/expectations'
 require 'spec/exceptions'
 require 'spec/text_runner'

data/lib/spec/expectations.rb

@@ -1,126 +1,12 @@
 module Spec
-  module ExpectationHelperMethods
-    def should(message=nil)
-      message ||= "Expectation not met."
-      if (! yield)
-        raise Spec::Exceptions::ExpectationNotMetError.new(message)
-      end
-    end
-    
-    def default_message(expectation, expected)
-      "<#{self.inspect}:#{self.class}>\n#{expectation}:\n<#{expected.inspect}:#{expected.class}>"
-    end
-  end
-  
-  module ObjectExpectations
-    include ExpectationHelperMethods
-
-    def should_equal(expected, message=nil)
-      message ||= default_message("should be equal to", expected)
-      should(message) { self == expected }
-    end
-
-    def should_not_equal(expected, message=nil)
-      message ||= default_message("should not be equal to", expected)
-      should(message) { not self == expected }
-    end
-
-    def should_be_same_as(expected, message=nil)
-      message ||= default_message("should be same as", expected)
-      should(message) { self.equal?(expected) }
-    end
-
-    def should_not_be_same_as(expected, message=nil)
-      message ||= default_message("should not be same as", expected)
-      should(message) { not self.equal?(expected) }
-    end
-
-    def should_match(expected, message=nil)
-      message ||= default_message("should match", expected)
-      should(message) { self =~ expected }
-    end
-
-    def should_not_match(expected, message=nil)
-      message ||= default_message("should not match", expected)
-      should(message) { not self =~ expected }
-    end
 
-    def should_be_nil(message=nil)
-      message ||= "<#{self}> should be nil"
-      should(message) { self.nil? }
-    end
-
-    def should_not_be_nil(message=nil)
-      message ||= "<#{self}> should not be nil"
-      should(message) { not self.nil? }
-    end
-
-    def should_be_empty(message=nil)
-      message ||= "<#{self.inspect}> should be empty"
-      should(message) { self.empty? }
-    end
-
-    def should_not_be_empty(message=nil)
-      message ||= "<#{self.inspect}> should not be empty"
-      should(message) { not self.empty? }
-    end
-
-    def should_include(sub, message=nil)
-      message ||= "<#{self.inspect}> should include <#{sub.inspect}>"
-      should(message) { self.include? sub }
-    end
+  module ObjectExpectations
 
-    def should_not_include(sub, message=nil)
-      message ||= "<#{self.inspect}> should not include <#{sub.inspect}>"
-      should(message) { not self.include? sub }
-    end
-    
-    def should_be_true(message=nil)
-      message ||= "<#{self}> should be true"
-      should(message) { self }
-    end
+		def should
+			ShouldHelper.new self
+		end
+	end
 
-    def should_be_false(message=nil)
-      message ||= "<#{self}> should be false"
-      should(message) { not self }
-    end
-    
-  end
-  
-  
-  module ProcExpectations
-    include ExpectationHelperMethods
-    
-    def should_raise(exception=Exception, message=nil)
-      message ||= default_message("should raise", exception.class.to_s)
-      should(message) do
-        begin
-          self.call
-          false
-        rescue exception
-          true
-        rescue
-          false
-        end
-      end
-    end
-    
-    def should_not_raise(exception=Exception, message=nil)
-      message ||= default_message("should not raise", exception.class.to_s)
-      should(message) do
-        begin
-          self.call
-          true
-        rescue exception
-          false
-        rescue
-          true
-        end
-      end
-    end
-  
-  end
-  
 end
 
 
@@ -128,6 +14,3 @@ class Object
   include Spec::ObjectExpectations
 end
 
-class Proc
-  include Spec::ProcExpectations
-end

data/lib/spec/have_helper.rb

@@ -0,0 +1,56 @@
+module Spec
+
+  class HaveHelper < ShouldBase
+
+    def initialize(target, expected=nil)
+      @target = target
+      @expected = expected
+      @min = false
+      @max = false
+    end
+    
+    def method_missing(sym, *args)
+      fail_with_message(build_message(sym)) unless as_specified?(sym)
+    end
+    
+    def collection(sym)
+      @target.send(sym)
+    end
+    
+    def actual_size(collection)
+      return collection.length if collection.respond_to? :length
+      return collection.size if collection.respond_to? :size
+    end
+    
+    def build_message(sym)
+      message = "<#{@target.class.to_s}> should have"
+      message += " at least" if @min
+      message += " at most" if @max
+      message += " #{@expected} #{sym} (has #{actual_size(collection(sym))})"
+    end
+    
+    def as_specified?(sym)
+      return actual_size(collection(sym)) >= @expected if @min
+      return actual_size(collection(sym)) <= @expected if @max
+      return actual_size(collection(sym)) == @expected
+    end
+
+    def at
+      self
+    end
+    
+    def least(min)
+      @expected = min
+      @min = true
+      self
+    end
+    
+    def most(max)
+      @expected = max
+      @max = true
+      self
+    end
+
+  end
+
+end

data/lib/spec/instance_helper.rb

@@ -0,0 +1,15 @@
+module Spec
+
+	class InstanceHelper < ShouldBase
+	
+		def initialize(target)
+			@target = target
+		end
+		
+		def of(expected_class)
+			fail_with_message(default_message("should be an instance of", expected_class)) unless @target.instance_of? expected_class
+		end
+		
+	end
+
+end

data/lib/spec/instance_negator.rb

@@ -0,0 +1,15 @@
+module Spec
+
+	class InstanceNegator < ShouldBase
+	
+		def initialize(target)
+			@target = target
+		end
+		
+		def of(expected_class)
+			fail_with_message(default_message("should not be an instance of", expected_class)) if @target.instance_of? expected_class
+		end
+		
+	end
+
+end

data/lib/spec/kind_helper.rb

@@ -0,0 +1,15 @@
+module Spec
+
+	class KindHelper < ShouldBase
+	
+		def initialize(target)
+			@target = target
+		end
+		
+		def of(expected_class)
+			fail_with_message(default_message("should be a kind of", expected_class)) unless @target.kind_of? expected_class
+		end
+		
+	end
+
+end

data/lib/spec/kind_negator.rb

@@ -0,0 +1,15 @@
+module Spec
+
+	class KindNegator < ShouldBase
+	
+		def initialize(target)
+			@target = target
+		end
+		
+		def of(expected_class)
+			fail_with_message(default_message("should not be a kind of", expected_class)) if @target.kind_of? expected_class
+		end
+		
+	end
+
+end