rspec-expectations 2.0.0.a2 → 2.0.0.a3

data/README.markdown

@@ -1,8 +1,23 @@
 # RSpec Expectations
 
-See README.markdown at [http://github.com/rspec/meta](http://github.com/rspec/meta)
+rspec-expectations adds `should` and `should_not` to every object and includes
+Rspec::Matchers, a library of standard matchers.
+
+rspec-expectations is currently in alpha release. While you are welcome to
+track, fork, explore, etc, we're too early in the process to start fielding
+pull requests and or issues from outside the core development team, so please
+don't waste your time until this notice changes.
+
+## Install
+
+    [sudo] gem install rspec --prerelease
+
+This will install rspec, rspec-core, rspec-expectations and rspec-mocks.
+
 
 #### Also see
 
-* [http://github.com/rspec/core](http://github.com/rspec/core)
-* [http://github.com/rspec/mocks](http://github.com/rspec/mocks)
+* [http://github.com/rspec/rspec](http://github.com/rspec/rspec)
+* [http://github.com/rspec/rspec-core](http://github.com/rspec/rspec-core)
+* [http://github.com/rspec/rspec-mocks](http://github.com/rspec/rspec-mocks)
+* [http://github.com/rspec/rspec-dev](http://github.com/rspec/rspec-dev)

data/Rakefile

@@ -48,3 +48,10 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
+task :clobber do
+  rm_rf 'pkg'
+  rm_rf 'tmp'
+  rm_rf 'coverage'
+end
+
+

data/Upgrade.markdown

@@ -1,4 +1,19 @@
-# Upgrade to rspec-2.0
+# Upgrade to rspec-expectations-2.0
+
+## What's new
+
+### New `eq` matcher.
+
+`Rspec::Matchers` now offers you two approaches to differentiating between
+object identity. You can use the rspec-1 approach:
+
+    actual.should == expected     # object equality
+    actual.should equal(expected) # object identity
+
+... or, if you prefer:
+
+    actual.should eq(expected) # object equality
+    actual.should be(expected) # object identity
 
 ## What's been removed
 

data/lib/rspec/expectations/fail_with.rb

@@ -13,22 +13,6 @@ module Rspec
           raise ArgumentError, "Failure message is nil. Does your matcher define the " +
                                "appropriate failure_message_for_* method to return a string?"
         end
-        if (Array === message) & (message.length == 3)
-          ::Rspec::Core.warn(<<-NOTICE
-
-*****************************************************************
-DEPRECATION WARNING: you are using deprecated behaviour that will
-be removed from a future version of RSpec.
-
-* Support for matchers that return arrays from failure message
-methods is deprecated.
-* Instead, the matcher should return a string, and expose methods
-for the expected() and actual() values.
-*****************************************************************
-NOTICE
-          )
-          message, expected, target = message[0], message[1], message[2]
-        end
         unless (differ.nil? || expected.nil? || target.nil?)
           if expected.is_a?(String)
             message << "\nDiff:" << self.differ.diff_as_string(target.to_s, expected)
@@ -40,4 +24,4 @@ NOTICE
       end
     end
   end
-end
+end

data/lib/rspec/expectations/version.rb

@@ -5,7 +5,7 @@ module Rspec # :nodoc:
         MAJOR  = 2
         MINOR  = 0
         TINY   = 0
-        PRE    = 'a2'
+        PRE    = 'a3'
 
         STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
 

data/lib/rspec/matchers.rb

@@ -7,6 +7,7 @@ require 'rspec/matchers/be_close'
 require 'rspec/matchers/be_instance_of'
 require 'rspec/matchers/be_kind_of'
 require 'rspec/matchers/change'
+require 'rspec/matchers/eq'
 require 'rspec/matchers/eql'
 require 'rspec/matchers/equal'
 require 'rspec/matchers/errors'

data/lib/rspec/matchers/be.rb

@@ -1,169 +1,206 @@
+require 'rspec/matchers/dsl'
+
+Rspec::Matchers.define :be_true do
+  match do |actual|
+    !!actual
+  end
+end
+
+Rspec::Matchers.define :be_false do
+  match do |actual|
+    !actual
+  end
+end
+
+Rspec::Matchers.define :be_nil do
+  match do |actual|
+    actual.nil?
+  end
+
+  failure_message_for_should do |actual|
+    "expected nil, got #{actual.inspect}"
+  end
+
+  failure_message_for_should_not do
+    "expected not nil, got nil"
+  end
+end
+
 module Rspec
   module Matchers
-    
+
     class Be #:nodoc:
       include Rspec::Matchers::Pretty
       
-      def initialize(*args)
-        @expected = args.empty? ? true : set_expected(args.shift)
+      def initialize(*args, &block)
         @args = args
-        @comparison_method = nil
       end
       
       def matches?(actual)
         @actual = actual
-        handling_predicate? ? run_predicate_on(actual) : match_or_compare(actual)
+        !!@actual
+      end
+
+      def failure_message_for_should
+        "expected #{@actual.inspect} to evaluate to true"
+      end
+      
+      def failure_message_for_should_not
+        "expected #{@actual.inspect} to evaluate to false"
+      end
+      
+      def description
+        "be"
+      end
+
+      [:==, :<, :<=, :>=, :>, :===].each do |operator|
+        define_method operator do |operand|
+          BeComparedTo.new(operand, operator)
+        end
+      end
+
+    private
+
+      def args_to_s
+        @args.empty? ? "" : parenthesize(inspected_args.join(', '))
+      end
+      
+      def parenthesize(string)
+        return "(#{string})"
+      end
+      
+      def inspected_args
+        @args.collect{|a| a.inspect}
+      end
+      
+      def expected_to_sentence
+        split_words(@expected)
+      end
+      
+      def args_to_sentence
+        to_sentence(@args)
+      end
+        
+    end
+
+    class BeComparedTo < Be
+
+      def initialize(operand, operator)
+        @expected, @operator = operand, operator
+        @args = []
+      end
+
+      def matches?(actual)
+        @actual = actual
+        @actual.__send__(@operator, @expected)
+      end
+
+      def failure_message_for_should
+        "expected #{@operator} #{@expected}, got #{@actual.inspect}"
+      end
+      
+      def failure_message_for_should_not
+        message = <<-MESSAGE
+'should_not be #{@operator} #{@expected}' not only FAILED,
+it is a bit confusing.
+          MESSAGE
+          
+        raise message << ([:===,:==].include?(@operator) ?
+          "It might be more clearly expressed without the \"be\"?" :
+          "It might be more clearly expressed in the positive?")
+      end
+
+      def description
+        "be #{@operator} #{expected_to_sentence}#{args_to_sentence}"
+      end
+
+    end
+
+    class BePredicate < Be
+
+      def initialize(*args, &block)
+        @expected = parse_expected(args.shift)
+        @args = args
+        @block = block
       end
       
-      def run_predicate_on(actual)
+      def matches?(actual)
+        @actual = actual
         begin
-          return @result = actual.__send__(predicate, *@args)
+          return @result = actual.__send__(predicate, *@args, &@block)
         rescue NameError => predicate_missing_error
           "this needs to be here or rcov will not count this branch even though it's executed in a code example"
         end
 
         begin
-          return @result = actual.__send__(present_tense_predicate, *@args)
+          return @result = actual.__send__(present_tense_predicate, *@args, &@block)
         rescue NameError
           raise predicate_missing_error
         end
       end
       
       def failure_message_for_should
-        if handling_predicate?
-          if predicate == :nil?
-            "expected nil, got #{@actual.inspect}"
-          else
-            "expected #{predicate}#{args_to_s} to return true, got #{@result.inspect}"
-          end
-        else
-          "expected #{@comparison_method} #{expected}, got #{@actual.inspect}".gsub('  ',' ')
-        end
+        "expected #{predicate}#{args_to_s} to return true, got #{@result.inspect}"
       end
       
       def failure_message_for_should_not
-        if handling_predicate?
-          if predicate == :nil?
-            "expected not nil, got nil"
-          else
-          "expected #{predicate}#{args_to_s} to return false, got #{@result.inspect}"
-          end
-        else
-          message = <<-MESSAGE
-'should_not be #{@comparison_method} #{expected}' not only FAILED,
-it is a bit confusing.
-          MESSAGE
-          
-          raise message << ([:===,:==].include?(@comparison_method) ?
-            "It might be more clearly expressed without the \"be\"?" :
-            "It might be more clearly expressed in the positive?")
-        end
+        "expected #{predicate}#{args_to_s} to return false, got #{@result.inspect}"
       end
-      
+
       def description
-        "#{prefix_to_sentence}#{comparison} #{expected_to_sentence}#{args_to_sentence}".gsub(/\s+/,' ')
+        "#{prefix_to_sentence}#{expected_to_sentence}#{args_to_sentence}"
       end
 
-      [:==, :<, :<=, :>=, :>, :===].each do |method|
-        define_method method do |expected|
-          compare_to(expected, :using => method)
-          self
-        end
-      end
+    private
 
-      private
-        def match_or_compare(actual)
-          TrueClass === @expected ? @actual : @actual.__send__(comparison_method, @expected)
-        end
+      def predicate
+        "#{@expected}?".to_sym
+      end
       
-        def comparison_method
-          @comparison_method || :equal?
-        end
+      def present_tense_predicate
+        "#{@expected}s?".to_sym
+      end
       
-        def expected
-          @expected
-        end
+      def parse_expected(expected)
+        @prefix, expected = prefix_and_expected(expected)
+        expected
+      end
 
-        def compare_to(expected, opts)
-          @expected, @comparison_method = expected, opts[:using]
-        end
+      def prefix_and_expected(symbol)
+        symbol.to_s =~ /^(be_(an?_)?)(.*)/
+        return $1, $3
+      end
 
-        def set_expected(expected)
-          Symbol === expected ? parse_expected(expected) : expected
-        end
-        
-        def parse_expected(expected)
-          ["be_an_","be_a_","be_"].each do |prefix|
-            handling_predicate!
-            if expected.to_s =~ /^#{prefix}/
-              set_prefix(prefix)
-              expected = expected.to_s.sub(prefix,"")
-              [true, false, nil].each do |val|
-                return val if val.to_s == expected
-              end
-              return expected.to_sym
-            end
-          end
-        end
-        
-        def set_prefix(prefix)
-          @prefix = prefix
-        end
-        
-        def prefix
-          # FIXME - this is a bit goofy - but we get failures
-          # if just defining @prefix = nil in initialize
-          @prefix = nil unless defined?(@prefix)
-          @prefix
-        end
+      def prefix_to_sentence
+        split_words(@prefix)
+      end
 
-        def handling_predicate!
-          @handling_predicate = true
-        end
-        
-        def handling_predicate?
-          return false if [true, false, nil].include?(expected)
-          # FIXME - this is a bit goofy - but we get failures
-          # if just defining @handling_predicate = nil or false in initialize
-          return defined?(@handling_predicate) ? @handling_predicate : nil
-        end
+    end
 
-        def predicate
-          "#{@expected.to_s}?".to_sym
-        end
-        
-        def present_tense_predicate
-          "#{@expected.to_s}s?".to_sym
-        end
-        
-        def args_to_s
-          @args.empty? ? "" : parenthesize(inspected_args.join(', '))
-        end
-        
-        def parenthesize(string)
-          return "(#{string})"
-        end
-        
-        def inspected_args
-          @args.collect{|a| a.inspect}
-        end
-        
-        def comparison
-          @comparison_method.nil? ? " " : "be #{@comparison_method.to_s} "
-        end
-        
-        def expected_to_sentence
-          split_words(expected)
-        end
-        
-        def prefix_to_sentence
-          split_words(prefix)
-        end
+    class BeSameAs < Be
+      
+      def initialize(*args, &block)
+        @expected = args.shift
+        @args = args
+      end
+      
+      def matches?(actual)
+        @actual = actual
+        @actual.equal?(@expected)
+      end
+
+      def failure_message_for_should
+        "expected #{@expected}, got #{@actual.inspect}"
+      end
+      
+      def failure_message_for_should_not
+        "expected not #{@expected}, got #{@actual.inspect}"
+      end
+
+      def description
+        "be #{expected_to_sentence}#{args_to_sentence}"
+      end
 
-        def args_to_sentence
-          to_sentence(@args)
-        end
-        
     end
  
     # :call-seq:
@@ -179,7 +216,7 @@ it is a bit confusing.
     # the caller should satisfy an if condition (to be or not to be). 
     #
     # Predicates are any Ruby method that ends in a "?" and returns true or false.
-    # Given be_ followed by arbitrary_predicate (without the "?"), RSpec will match
+    # Given be_ followed by arbitrary_predicate (without the "?"), Rspec will match
     # convert that into a query against the target object.
     #
     # The arbitrary_predicate feature will handle any predicate
@@ -197,7 +234,9 @@ it is a bit confusing.
     #   target.should_not be_empty #passes unless target.empty?
     #   target.should_not be_old_enough(16) #passes unless target.old_enough?(16)
     def be(*args)
-      Matchers::Be.new(*args)
+      args.empty? ?
+        Matchers::Be.new :
+        Matchers::BeSameAs.new(*args)
     end
 
     # passes if target.kind_of?(klass)
@@ -208,3 +247,4 @@ it is a bit confusing.
     alias_method :be_an, :be_a
   end
 end
+

data/lib/rspec/matchers/eq.rb

@@ -0,0 +1,47 @@
+module Rspec
+  module Matchers
+    # :call-seq:
+    #   should eq(expected)
+    #   should_not eq(expected)
+    #
+    # Passes if actual == expected.
+    #
+    # See http://www.ruby-doc.org/core/classes/Object.html#M001057 for more information about equality in Ruby.
+    #
+    # == Examples
+    #
+    #   5.should eq(5)
+    #   5.should_not eq(3)
+    def eq(expected)
+      Matcher.new :eq, expected do |_expected_|
+        match do |actual|
+          actual == _expected_
+        end
+
+        failure_message_for_should do |actual|
+          <<-MESSAGE
+
+expected #{_expected_.inspect}
+     got #{actual.inspect}
+
+(compared using ==)
+MESSAGE
+        end
+
+        failure_message_for_should_not do |actual|
+          <<-MESSAGE
+
+expected #{actual.inspect} not to equal #{_expected_.inspect}
+
+(compared using ==)
+MESSAGE
+        end
+
+        description do
+          "== #{_expected_}"
+        end
+      end
+    end
+  end
+end
+

data/lib/rspec/matchers/method_missing.rb

@@ -1,8 +1,8 @@
 module Rspec
   module Matchers
     def method_missing(sym, *args, &block) # :nodoc:
-      return Matchers::Be.new(sym, *args) if sym.to_s =~ /^be_/
-      return Matchers::Has.new(sym, *args) if sym.to_s =~ /^have_/
+      return Matchers::BePredicate.new(sym, *args, &block) if sym.to_s =~ /^be_/
+      return Matchers::Has.new(sym, *args, &block) if sym.to_s =~ /^have_/
       super
     end
   end

data/rspec-expectations.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-expectations}
-  s.version = "2.0.0.a2"
+  s.version = "2.0.0.a3"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Chelimsky", "Chad Humphries"]
-  s.date = %q{2010-01-24}
+  s.date = %q{2010-02-03}
   s.email = %q{dchelimsky@gmail.com;chad.humphries@gmail.com}
   s.extra_rdoc_files = [
     "README.markdown"
@@ -39,6 +39,7 @@ Gem::Specification.new do |s|
      "lib/rspec/matchers/change.rb",
      "lib/rspec/matchers/compatibility.rb",
      "lib/rspec/matchers/dsl.rb",
+     "lib/rspec/matchers/eq.rb",
      "lib/rspec/matchers/eql.rb",
      "lib/rspec/matchers/equal.rb",
      "lib/rspec/matchers/errors.rb",
@@ -71,6 +72,7 @@ Gem::Specification.new do |s|
      "spec/rspec/matchers/compatibility_spec.rb",
      "spec/rspec/matchers/description_generation_spec.rb",
      "spec/rspec/matchers/dsl_spec.rb",
+     "spec/rspec/matchers/eq_spec.rb",
      "spec/rspec/matchers/eql_spec.rb",
      "spec/rspec/matchers/equal_spec.rb",
      "spec/rspec/matchers/exist_spec.rb",
@@ -79,7 +81,6 @@ Gem::Specification.new do |s|
      "spec/rspec/matchers/include_spec.rb",
      "spec/rspec/matchers/match_array_spec.rb",
      "spec/rspec/matchers/match_spec.rb",
-     "spec/rspec/matchers/matcher_methods_spec.rb",
      "spec/rspec/matchers/matcher_spec.rb",
      "spec/rspec/matchers/matchers_spec.rb",
      "spec/rspec/matchers/operator_matcher_spec.rb",
@@ -87,7 +88,6 @@ Gem::Specification.new do |s|
      "spec/rspec/matchers/respond_to_spec.rb",
      "spec/rspec/matchers/satisfy_spec.rb",
      "spec/rspec/matchers/throw_symbol_spec.rb",
-     "spec/spec.opts",
      "spec/spec_helper.rb",
      "spec/suite.rb",
      "spec/support/classes.rb"
@@ -111,6 +111,7 @@ Gem::Specification.new do |s|
      "spec/rspec/matchers/compatibility_spec.rb",
      "spec/rspec/matchers/description_generation_spec.rb",
      "spec/rspec/matchers/dsl_spec.rb",
+     "spec/rspec/matchers/eq_spec.rb",
      "spec/rspec/matchers/eql_spec.rb",
      "spec/rspec/matchers/equal_spec.rb",
      "spec/rspec/matchers/exist_spec.rb",
@@ -119,7 +120,6 @@ Gem::Specification.new do |s|
      "spec/rspec/matchers/include_spec.rb",
      "spec/rspec/matchers/match_array_spec.rb",
      "spec/rspec/matchers/match_spec.rb",
-     "spec/rspec/matchers/matcher_methods_spec.rb",
      "spec/rspec/matchers/matcher_spec.rb",
      "spec/rspec/matchers/matchers_spec.rb",
      "spec/rspec/matchers/operator_matcher_spec.rb",
@@ -137,15 +137,15 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec-core>, [">= 2.0.0.a2"])
-      s.add_development_dependency(%q<rspec-mocks>, [">= 2.0.0.a2"])
+      s.add_development_dependency(%q<rspec-core>, [">= 2.0.0.a3"])
+      s.add_development_dependency(%q<rspec-mocks>, [">= 2.0.0.a3"])
     else
-      s.add_dependency(%q<rspec-core>, [">= 2.0.0.a2"])
-      s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.a2"])
+      s.add_dependency(%q<rspec-core>, [">= 2.0.0.a3"])
+      s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.a3"])
     end
   else
-    s.add_dependency(%q<rspec-core>, [">= 2.0.0.a2"])
-    s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.a2"])
+    s.add_dependency(%q<rspec-core>, [">= 2.0.0.a3"])
+    s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.a3"])
   end
 end
 

data/spec/rspec/expectations/differs/default_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper.rb'
+require 'spec_helper'
 require 'ostruct'
 
 module Rspec

data/spec/rspec/expectations/extensions/kernel_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper.rb'
+require 'spec_helper'
 
 describe Object, "#should" do
   before(:each) do

data/spec/rspec/expectations/fail_with_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 
 describe Rspec::Expectations, "#fail_with with no diff" do
   before(:each) do
@@ -21,13 +21,6 @@ describe Rspec::Expectations, "#fail_with with Array" do
   before(:each) do
     Rspec::Core.stub!(:warn)
   end
-  
-  it "is deprecated" do
-    Rspec::Core.should_receive(:warn)
-    lambda {
-      Rspec::Expectations.fail_with ["message", "expected", "actual"]
-    }.should raise_error
-  end
 end
 
 describe Rspec::Expectations, "#fail_with with diff" do

data/spec/rspec/expectations/handler_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 
 module ExampleExpectations
   

data/spec/rspec/matchers/be_close_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 module Rspec
   module Matchers
     describe "[actual.should] be_close(expected, delta)" do

data/spec/rspec/matchers/be_instance_of_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 
 module Rspec
   module Matchers

data/spec/rspec/matchers/be_kind_of_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 
 module Rspec
   module Matchers

data/spec/rspec/matchers/be_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 
 describe "should be_predicate" do  
   it "should pass when actual returns true for :predicate?" do
@@ -117,27 +117,143 @@ describe "should_not be_predicate(*args)" do
   end
 end
 
+describe "should be_predicate(&block)" do
+  it "should pass when actual returns true for :predicate?(&block)" do
+    actual = mock("actual")
+    delegate = mock("delegate")
+    actual.should_receive(:happy?).and_yield
+    delegate.should_receive(:check_happy).and_return(true)
+    actual.should be_happy { delegate.check_happy }
+  end
+
+  it "should fail when actual returns false for :predicate?(&block)" do
+    actual = mock("actual")
+    delegate = mock("delegate")
+    actual.should_receive(:happy?).and_yield
+    delegate.should_receive(:check_happy).and_return(false)
+    lambda {
+      actual.should be_happy { delegate.check_happy }
+    }.should fail_with("expected happy? to return true, got false")
+  end
+
+  it "should fail when actual does not respond to :predicate?" do
+    delegate = mock("delegate", :check_happy => true)
+    lambda {
+      Object.new.should be_happy { delegate.check_happy }
+    }.should raise_error(NameError)
+  end
+end
+
+describe "should_not be_predicate(&block)" do
+  it "should pass when actual returns false for :predicate?(&block)" do
+    actual = mock("actual")
+    delegate = mock("delegate")
+    actual.should_receive(:happy?).and_yield
+    delegate.should_receive(:check_happy).and_return(false)
+    actual.should_not be_happy { delegate.check_happy }
+  end
+
+  it "should fail when actual returns true for :predicate?(&block)" do
+    actual = mock("actual")
+    delegate = mock("delegate")
+    actual.should_receive(:happy?).and_yield
+    delegate.should_receive(:check_happy).and_return(true)
+    lambda {
+      actual.should_not be_happy { delegate.check_happy }
+    }.should fail_with("expected happy? to return false, got true")
+  end
+
+  it "should fail when actual does not respond to :predicate?" do
+    delegate = mock("delegate", :check_happy => true)
+    lambda {
+      Object.new.should_not be_happy { delegate.check_happy }
+    }.should raise_error(NameError)
+  end
+end
+
+describe "should be_predicate(*args, &block)" do
+  it "should pass when actual returns true for :predicate?(*args, &block)" do
+    actual = mock("actual")
+    delegate = mock("delegate")
+    actual.should_receive(:older_than?).with(3).and_yield(3)
+    delegate.should_receive(:check_older_than).with(3).and_return(true)
+    actual.should be_older_than(3) { |age| delegate.check_older_than(age) }
+  end
+
+  it "should fail when actual returns false for :predicate?(*args, &block)" do
+    actual = mock("actual")
+    delegate = mock("delegate")
+    actual.should_receive(:older_than?).with(3).and_yield(3)
+    delegate.should_receive(:check_older_than).with(3).and_return(false)
+    lambda {
+      actual.should be_older_than(3) { |age| delegate.check_older_than(age) }
+    }.should fail_with("expected older_than?(3) to return true, got false")
+  end
+
+  it "should fail when actual does not respond to :predicate?" do
+    delegate = mock("delegate", :check_older_than => true)
+    lambda {
+      Object.new.should be_older_than(3) { |age| delegate.check_older_than(age) }
+    }.should raise_error(NameError)
+  end
+end
+
+describe "should_not be_predicate(*args, &block)" do
+  it "should pass when actual returns false for :predicate?(*args, &block)" do
+    actual = mock("actual")
+    delegate = mock("delegate")
+    actual.should_receive(:older_than?).with(3).and_yield(3)
+    delegate.should_receive(:check_older_than).with(3).and_return(false)
+    actual.should_not be_older_than(3) { |age| delegate.check_older_than(age) }
+  end
+
+  it "should fail when actual returns true for :predicate?(*args, &block)" do
+    actual = mock("actual")
+    delegate = mock("delegate")
+    actual.should_receive(:older_than?).with(3).and_yield(3)
+    delegate.should_receive(:check_older_than).with(3).and_return(true)
+    lambda {
+      actual.should_not be_older_than(3) { |age| delegate.check_older_than(age) }
+    }.should fail_with("expected older_than?(3) to return false, got true")
+  end
+
+  it "should fail when actual does not respond to :predicate?" do
+    delegate = mock("delegate", :check_older_than => true)
+    lambda {
+      Object.new.should_not be_older_than(3) { |age| delegate.check_older_than(age) }
+    }.should raise_error(NameError)
+  end
+end
+
 describe "should be_true" do
-  it "should pass when actual equal(true)" do
+  it "should pass when actual equal?(true)" do
     true.should be_true
   end
 
-  it "should fail when actual equal(false)" do
+  it "should pass when actual is 1" do
+    1.should be_true
+  end
+
+  it "should fail when actual equal?(false)" do
     lambda {
       false.should be_true
-    }.should fail_with("expected true, got false")
+    }.should fail_with("expected false to be true")
   end
 end
 
 describe "should be_false" do
-  it "should pass when actual equal(false)" do
+  it "should pass when actual equal?(false)" do
     false.should be_false
   end
 
-  it "should fail when actual equal(true)" do
+  it "should pass when actual equal?(nil)" do
+    nil.should be_false
+  end
+
+  it "should fail when actual equal?(true)" do
     lambda {
       true.should be_false
-    }.should fail_with("expected false, got true")
+    }.should fail_with("expected true to be false")
   end
 end
 
@@ -173,6 +289,10 @@ describe "should be <" do
   it "should fail when < operator returns false" do
     lambda { 3.should be < 3 }.should fail_with("expected < 3, got 3")
   end
+
+  it "should describe itself" do
+    be.<(4).description.should == "be < 4"
+  end
 end
 
 describe "should be <=" do
@@ -236,17 +356,32 @@ describe "should_not with operators" do
 end
 
 describe "should be" do
-  it "should pass if actual is true or a set value" do
+  it "should pass if actual is truthy" do
     true.should be
     1.should be
   end
 
   it "should fail if actual is false" do
-    lambda {false.should be}.should fail_with("expected true, got false")
+    lambda {false.should be}.should fail_with("expected false to evaluate to true")
   end
 
   it "should fail if actual is nil" do
-    lambda {nil.should be}.should fail_with("expected true, got nil")
+    lambda {nil.should be}.should fail_with("expected nil to evaluate to true")
+  end
+
+  it "should describe itself" do
+    be.description.should == "be"
+  end
+end
+
+describe "should_not be" do
+  it "should pass if actual is falsy" do
+    false.should_not be
+    nil.should_not be
+  end
+
+  it "should fail on true" do
+    lambda {true.should_not be}.should fail_with("expected true to evaluate to false")
   end
 end
 
@@ -254,9 +389,23 @@ describe "should be(value)" do
   it "should pass if actual.equal?(value)" do
     5.should be(5)
   end
+
   it "should fail if !actual.equal?(value)" do
     lambda { 5.should be(6) }.should fail_with("expected 6, got 5")
   end
+
+  it "should describe itself" do
+    be(5).description.should == "be 5"
+  end
+end
+
+describe "should_not be(value)" do
+  it "should pass if !actual.equal?(value)" do
+    5.should_not be(6)
+  end
+  it "should fail if !actual.equal?(value)" do
+    lambda { 5.should_not be(5) }.should fail_with("expected not 5, got 5")
+  end
 end
 
 describe "'should be' with operator" do
@@ -308,4 +457,5 @@ describe "be_an_instance_of" do
   it "fails when class is higher up hierarchy" do
     5.should_not be_an_instance_of(Numeric)
   end
-end
+end
+

data/spec/rspec/matchers/change_spec.rb

@@ -1,6 +1,6 @@
 #Based on patch from Wilson Bilkovich
 
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 class SomethingExpected
   attr_accessor :some_value
 end

data/spec/rspec/matchers/compatibility_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 
 Rspec::Matchers.define :have_public_instance_method do |method|
   match do |klass|

data/spec/rspec/matchers/description_generation_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 
 describe "Matchers should be able to generate their own descriptions" do
   after(:each) do

data/spec/rspec/matchers/dsl_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 
 module Rspec
   module Matchers

data/spec/rspec/matchers/eq_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+module Rspec
+  module Matchers
+    describe "eq" do
+      it "matches when actual == expected" do
+        1.should eq(1)
+      end
+      
+      it "does not match when actual != expected" do
+        1.should_not eq(2)
+      end
+      
+      it "describes itself" do
+        matcher = eq(1)
+        matcher.matches?(1)
+        matcher.description.should == "== 1"
+      end
+      
+      it "provides message, expected and actual on #failure_message" do
+        matcher = eq("1")
+        matcher.matches?(1)
+        matcher.failure_message_for_should.should == "\nexpected \"1\"\n     got 1\n\n(compared using ==)\n"
+      end
+      
+      it "provides message, expected and actual on #negative_failure_message" do
+        matcher = eq(1)
+        matcher.matches?(1)
+        matcher.failure_message_for_should_not.should == "\nexpected 1 not to equal 1\n\n(compared using ==)\n"
+      end
+    end
+  end
+end
+

data/spec/rspec/matchers/eql_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 
 module Rspec
   module Matchers

data/spec/rspec/matchers/equal_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 module Rspec
   module Matchers
     describe "equal" do

data/spec/rspec/matchers/exist_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 
 class Substance
   def initialize exists, description

data/spec/rspec/matchers/has_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 
 describe "should have_sym(*args)" do
   it "should pass if #has_sym?(*args) returns true" do

data/spec/rspec/matchers/have_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 
 share_as :HaveSpecHelper do
   def create_collection_owner_with(n)

data/spec/rspec/matchers/include_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 
 describe "should include(expected)" do
   it "should pass if target includes expected" do

data/spec/rspec/matchers/match_array_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 
 class UnsortableObject
   def initialize(id)

data/spec/rspec/matchers/match_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 
 describe "should match(expected)" do
   it "should pass when target (String) matches expected (Regexp)" do

data/spec/rspec/matchers/matchers_spec.rb

@@ -1,2 +1,2 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 

data/spec/rspec/matchers/operator_matcher_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 
 require 'rspec/expectations/differs/default'
 

data/spec/rspec/matchers/raise_error_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 
 describe "should raise_error" do
   it "should pass if anything is raised" do

data/spec/rspec/matchers/respond_to_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 
 describe "should respond_to(:sym)" do
   

data/spec/rspec/matchers/satisfy_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 
 describe "should satisfy { block }" do
   it "should pass if block returns true" do

data/spec/rspec/matchers/throw_symbol_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 
 module Rspec
   module Matchers

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '../../core/lib'))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '../../mocks/lib'))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.expand_path('../../../core/lib', __FILE__))
+$LOAD_PATH.unshift(File.expand_path('../../../mocks/lib', __FILE__))
+$LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__))
 require 'rspec/expectations'
 require 'rspec/mocks'
 require 'rspec/core'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-expectations
 version: !ruby/object:Gem::Version 
-  version: 2.0.0.a2
+  version: 2.0.0.a3
 platform: ruby
 authors: 
 - David Chelimsky
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-24 00:00:00 -06:00
+date: 2010-02-03 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,7 +21,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.0.a2
+        version: 2.0.0.a3
     version: 
 - !ruby/object:Gem::Dependency 
   name: rspec-mocks
@@ -31,7 +31,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.0.a2
+        version: 2.0.0.a3
     version: 
 description: 
 email: dchelimsky@gmail.com;chad.humphries@gmail.com
@@ -66,6 +66,7 @@ files:
 - lib/rspec/matchers/change.rb
 - lib/rspec/matchers/compatibility.rb
 - lib/rspec/matchers/dsl.rb
+- lib/rspec/matchers/eq.rb
 - lib/rspec/matchers/eql.rb
 - lib/rspec/matchers/equal.rb
 - lib/rspec/matchers/errors.rb
@@ -98,6 +99,7 @@ files:
 - spec/rspec/matchers/compatibility_spec.rb
 - spec/rspec/matchers/description_generation_spec.rb
 - spec/rspec/matchers/dsl_spec.rb
+- spec/rspec/matchers/eq_spec.rb
 - spec/rspec/matchers/eql_spec.rb
 - spec/rspec/matchers/equal_spec.rb
 - spec/rspec/matchers/exist_spec.rb
@@ -106,7 +108,6 @@ files:
 - spec/rspec/matchers/include_spec.rb
 - spec/rspec/matchers/match_array_spec.rb
 - spec/rspec/matchers/match_spec.rb
-- spec/rspec/matchers/matcher_methods_spec.rb
 - spec/rspec/matchers/matcher_spec.rb
 - spec/rspec/matchers/matchers_spec.rb
 - spec/rspec/matchers/operator_matcher_spec.rb
@@ -114,7 +115,6 @@ files:
 - spec/rspec/matchers/respond_to_spec.rb
 - spec/rspec/matchers/satisfy_spec.rb
 - spec/rspec/matchers/throw_symbol_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 - spec/suite.rb
 - spec/support/classes.rb
@@ -159,6 +159,7 @@ test_files:
 - spec/rspec/matchers/compatibility_spec.rb
 - spec/rspec/matchers/description_generation_spec.rb
 - spec/rspec/matchers/dsl_spec.rb
+- spec/rspec/matchers/eq_spec.rb
 - spec/rspec/matchers/eql_spec.rb
 - spec/rspec/matchers/equal_spec.rb
 - spec/rspec/matchers/exist_spec.rb
@@ -167,7 +168,6 @@ test_files:
 - spec/rspec/matchers/include_spec.rb
 - spec/rspec/matchers/match_array_spec.rb
 - spec/rspec/matchers/match_spec.rb
-- spec/rspec/matchers/matcher_methods_spec.rb
 - spec/rspec/matchers/matcher_spec.rb
 - spec/rspec/matchers/matchers_spec.rb
 - spec/rspec/matchers/operator_matcher_spec.rb

data/spec/rspec/matchers/matcher_methods_spec.rb

@@ -1,63 +0,0 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
-
-module Rspec
-  module Matchers
-    context %Q{The Rspec::Matchers module gets included in the execution context of every spec.
-This module should provide the following methods, each of which returns a Matcher object.} do
-      it "be_true" do
-        be_true.should be_an_instance_of(Be)
-      end
-      it "be_false" do
-        be_false.should be_an_instance_of(Be)
-      end
-      it "be_nil" do
-        be_nil.should be_an_instance_of(Be)
-      end
-      it "be_arbitrary_predicate" do
-        be_arbitrary_predicate.should be_an_instance_of(Be)
-      end
-      it "change" do
-        change("target", :message).should be_an_instance_of(Change)
-      end
-      it "have" do
-        have(0).should be_an_instance_of(Have)
-      end
-      it "have_exactly" do
-        have_exactly(0).should be_an_instance_of(Have)
-      end
-      it "have_at_least" do
-        have_at_least(0).should be_an_instance_of(Have)
-      end
-      it "have_at_most" do
-        have_at_most(0).should be_an_instance_of(Have)
-      end
-      it "raise_error" do
-        raise_error.should be_an_instance_of(RaiseError)
-        raise_error(NoMethodError).should be_an_instance_of(RaiseError)
-        raise_error(NoMethodError, "message").should be_an_instance_of(RaiseError)
-      end
-      it "satisfy" do
-        satisfy{}.should be_an_instance_of(Satisfy)
-      end
-      it "throw_symbol" do
-        throw_symbol.should be_an_instance_of(ThrowSymbol)
-        throw_symbol(:sym).should be_an_instance_of(ThrowSymbol)
-      end
-      it "respond_to" do
-        respond_to(:sym).should be_an_instance_of(RespondTo)
-      end
-    end
-    
-    describe "Rspec::Matchers#method_missing" do
-      it "should convert be_xyz to Be(:be_xyz)" do
-        Be.should_receive(:new).with(:be_whatever)
-        be_whatever
-      end
-
-      it "should convert have_xyz to Has(:have_xyz)" do
-        Has.should_receive(:new).with(:have_whatever)
-        have_whatever
-      end
-    end
-  end
-end

data/spec/spec.opts

@@ -1,6 +0,0 @@
---colour
---format
-profile
---timeout
-20
---diff