rspec-expectations 2.0.0.beta.8 → 2.0.0.beta.9

data/lib/rspec/matchers/method_missing.rb

@@ -1,4 +1,4 @@
-module Rspec
+module RSpec
   module Matchers
     def method_missing(sym, *args, &block) # :nodoc:
       return Matchers::BePredicate.new(sym, *args, &block) if sym.to_s =~ /^be_/

data/lib/rspec/matchers/operator_matcher.rb

@@ -1,4 +1,4 @@
-module Rspec
+module RSpec
   module Matchers
 
     class OperatorMatcher
@@ -24,7 +24,7 @@ module Rspec
       def self.use_custom_matcher_or_delegate(operator)
         define_method(operator) do |expected|
           if matcher = OperatorMatcher.get(@actual.class, operator)
-            @actual.send(::Rspec::Matchers.last_should, matcher.new(expected))
+            @actual.send(::RSpec::Matchers.last_should, matcher.new(expected))
           else
             eval_match(@actual, operator, expected)
           end
@@ -36,7 +36,7 @@ module Rspec
       end
 
       def fail_with_message(message)
-        Rspec::Expectations.fail_with(message, @expected, @actual)
+        RSpec::Expectations.fail_with(message, @expected, @actual)
       end
 
       def description
@@ -46,7 +46,7 @@ module Rspec
     private
       
       def eval_match(actual, operator, expected)
-        ::Rspec::Matchers.last_matcher = self
+        ::RSpec::Matchers.last_matcher = self
         @operator, @expected = operator, expected
         __delegate_operator(actual, operator, expected)
       end

data/lib/rspec/matchers/pretty.rb

@@ -1,4 +1,4 @@
-module Rspec
+module RSpec
   module Matchers
     module Pretty
       def split_words(sym)

data/lib/rspec/matchers/raise_error.rb

@@ -1,4 +1,4 @@
-module Rspec
+module RSpec
   module Matchers
     class RaiseError #:nodoc:
       def initialize(expected_error_or_message=Exception, expected_message=nil, &block)

data/lib/rspec/matchers/respond_to.rb

@@ -1,4 +1,4 @@
-module Rspec
+module RSpec
   module Matchers
     
     class RespondTo #:nodoc:

data/lib/rspec/matchers/satisfy.rb

@@ -1,4 +1,4 @@
-module Rspec
+module RSpec
   module Matchers
     
     class Satisfy #:nodoc:

data/lib/rspec/matchers/throw_symbol.rb

@@ -1,4 +1,4 @@
-module Rspec
+module RSpec
   module Matchers
     
     class ThrowSymbol #:nodoc:

data/rspec-expectations.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-expectations}
-  s.version = "2.0.0.beta.8"
+  s.version = "2.0.0.beta.9"
 
   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-04-27}
+  s.date = %q{2010-05-27}
   s.description = %q{rspec expectations (should[_not] and matchers)}
   s.email = %q{dchelimsky@gmail.com;chad.humphries@gmail.com}
   s.extra_rdoc_files = [
@@ -35,8 +35,8 @@ Gem::Specification.new do |s|
      "features/matchers/expect_error.feature",
      "features/support/env.rb",
      "lib/rspec/expectations.rb",
-     "lib/rspec/expectations/differs/default.rb",
-     "lib/rspec/expectations/differs/load-diff-lcs.rb",
+     "lib/rspec/expectations/backward_compatibility.rb",
+     "lib/rspec/expectations/differ.rb",
      "lib/rspec/expectations/errors.rb",
      "lib/rspec/expectations/extensions.rb",
      "lib/rspec/expectations/extensions/kernel.rb",
@@ -73,7 +73,7 @@ Gem::Specification.new do |s|
      "lib/rspec/matchers/satisfy.rb",
      "lib/rspec/matchers/throw_symbol.rb",
      "rspec-expectations.gemspec",
-     "spec/rspec/expectations/differs/default_spec.rb",
+     "spec/rspec/expectations/differ_spec.rb",
      "spec/rspec/expectations/extensions/kernel_spec.rb",
      "spec/rspec/expectations/fail_with_spec.rb",
      "spec/rspec/expectations/handler_spec.rb",
@@ -109,7 +109,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/rspec/expectations}
   s.post_install_message = %q{**************************************************
 
-  Thank you for installing rspec-expectations-2.0.0.beta.8
+  Thank you for installing rspec-expectations-2.0.0.beta.9
 
   This is beta software. If you are looking
   for a supported production release, please
@@ -121,9 +121,9 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rspec}
   s.rubygems_version = %q{1.3.6}
-  s.summary = %q{rspec-expectations-2.0.0.beta.8}
+  s.summary = %q{rspec-expectations-2.0.0.beta.9}
   s.test_files = [
-    "spec/rspec/expectations/differs/default_spec.rb",
+    "spec/rspec/expectations/differ_spec.rb",
      "spec/rspec/expectations/extensions/kernel_spec.rb",
      "spec/rspec/expectations/fail_with_spec.rb",
      "spec/rspec/expectations/handler_spec.rb",
@@ -161,21 +161,24 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<diff-lcs>, [">= 1.1.2"])
       s.add_development_dependency(%q<cucumber>, [">= 0.6.2"])
       s.add_development_dependency(%q<aruba>, [">= 0.1.1"])
-      s.add_development_dependency(%q<rspec-core>, [">= 2.0.0.beta.8"])
-      s.add_development_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.8"])
+      s.add_development_dependency(%q<rspec-core>, [">= 2.0.0.beta.9"])
+      s.add_development_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.9"])
     else
+      s.add_dependency(%q<diff-lcs>, [">= 1.1.2"])
       s.add_dependency(%q<cucumber>, [">= 0.6.2"])
       s.add_dependency(%q<aruba>, [">= 0.1.1"])
-      s.add_dependency(%q<rspec-core>, [">= 2.0.0.beta.8"])
-      s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.8"])
+      s.add_dependency(%q<rspec-core>, [">= 2.0.0.beta.9"])
+      s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.9"])
     end
   else
+    s.add_dependency(%q<diff-lcs>, [">= 1.1.2"])
     s.add_dependency(%q<cucumber>, [">= 0.6.2"])
     s.add_dependency(%q<aruba>, [">= 0.1.1"])
-    s.add_dependency(%q<rspec-core>, [">= 2.0.0.beta.8"])
-    s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.8"])
+    s.add_dependency(%q<rspec-core>, [">= 2.0.0.beta.9"])
+    s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.9"])
   end
 end
 

data/spec/rspec/expectations/{differs/default_spec.rb → differ_spec.rb}

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'ostruct'
 
-module Rspec
+module RSpec
   module Fixtures
     class Animal
       def initialize(name,species)
@@ -23,7 +23,7 @@ end
 describe "Diff" do
   before(:each) do
     @options = OpenStruct.new(:diff_format => :unified, :context_lines => 3)
-    @differ = Rspec::Expectations::Differs::Default.new(@options)
+    @differ = RSpec::Expectations::Differ.new(@options)
   end
 
   it "should output unified diff of two strings" do
@@ -76,8 +76,8 @@ EOD
   end
 
   it "should output unified diff message of two objects" do
-    expected = Rspec::Fixtures::Animal.new "bob", "giraffe"
-    actual   = Rspec::Fixtures::Animal.new "bob", "tortoise"
+    expected = RSpec::Fixtures::Animal.new "bob", "giraffe"
+    actual   = RSpec::Fixtures::Animal.new "bob", "tortoise"
 
     expected_diff = <<'EOD'
 
@@ -94,35 +94,3 @@ EOD
   end
 
 end
-
-
-describe "Diff in context format" do
-  before(:each) do
-    @options = OpenStruct.new(:diff_format => :unified, :context_lines => 3)
-    @options.diff_format = :context
-    @differ = Rspec::Expectations::Differs::Default.new(@options)
-  end
-
-  it "should output unified diff message of two objects" do
-    expected = Rspec::Fixtures::Animal.new "bob", "giraffe"
-    actual   = Rspec::Fixtures::Animal.new "bob", "tortoise"
-
-    expected_diff = <<'EOD'
-
-***************
-*** 1,5 ****
-  <Animal
-    name=bob,
-!   species=tortoise
-  >
---- 1,5 ----
-  <Animal
-    name=bob,
-!   species=giraffe
-  >
-EOD
-
-    diff = @differ.diff_as_object(expected,actual)
-    diff.should == expected_diff
-  end
-end

data/spec/rspec/expectations/fail_with_spec.rb

@@ -1,52 +1,28 @@
 require 'spec_helper'
 
-describe Rspec::Expectations, "#fail_with with no diff" do
+describe RSpec::Expectations, "#fail_with with diff" do
   before(:each) do
-    @old_differ = Rspec::Expectations.differ
-    Rspec::Expectations.differ = nil
-  end
-  
-  it "should handle just a message" do
-    lambda {
-      Rspec::Expectations.fail_with "the message"
-    }.should fail_with("the message")
-  end
-  
-  after(:each) do
-    Rspec::Expectations.differ = @old_differ
-  end
-end
-
-describe Rspec::Expectations, "#fail_with with Array" do
-  before(:each) do
-    Rspec::Core.stub!(:warn)
-  end
-end
-
-describe Rspec::Expectations, "#fail_with with diff" do
-  before(:each) do
-    @old_differ = Rspec::Expectations.differ
     @differ = mock("differ")
-    Rspec::Expectations.differ = @differ
+    RSpec::Expectations.stub(:differ) { @differ }
   end
   
   it "should not call differ if no expected/actual" do
     lambda {
-      Rspec::Expectations.fail_with "the message"
+      RSpec::Expectations.fail_with "the message"
     }.should fail_with("the message")
   end
   
   it "should call differ if expected/actual are presented separately" do
     @differ.should_receive(:diff_as_string).and_return("diff")
     lambda {
-      Rspec::Expectations.fail_with "the message", "expected", "actual"
+      RSpec::Expectations.fail_with "the message", "expected", "actual"
     }.should fail_with("the message\nDiff:diff")
   end
   
   it "should call differ if expected/actual are not strings" do
     @differ.should_receive(:diff_as_object).and_return("diff")
     lambda {
-      Rspec::Expectations.fail_with "the message", :expected, :actual
+      RSpec::Expectations.fail_with "the message", :expected, :actual
     }.should fail_with("the message\nDiff:diff")
   end
   
@@ -54,28 +30,8 @@ describe Rspec::Expectations, "#fail_with with diff" do
     @differ.should_not_receive(:diff_as_string)
     @differ.should_not_receive(:diff_as_object)
     lambda {
-      Rspec::Expectations.fail_with "the message", lambda {}, lambda {}
+      RSpec::Expectations.fail_with "the message", lambda {}, lambda {}
     }.should fail_with("the message")
   end
-
-  after(:each) do
-    Rspec::Expectations.differ = @old_differ
-  end
 end
 
-describe Rspec::Expectations, "#fail_with with a nil message" do
-  before(:each) do
-    @old_differ = Rspec::Expectations.differ
-    Rspec::Expectations.differ = nil
-  end
-
-  it "should handle just a message" do
-    lambda {
-      Rspec::Expectations.fail_with nil
-    }.should raise_error(ArgumentError, /Failure message is nil\. Does your matcher define the appropriate failure_message_for_\* method to return a string\?/)
-  end
-
-  after(:each) do
-    Rspec::Expectations.differ = @old_differ
-  end
-end

data/spec/rspec/expectations/handler_spec.rb

@@ -44,7 +44,7 @@ module ExampleExpectations
   
 end
 
-module Rspec
+module RSpec
   module Expectations
     describe PositiveExpectationHandler do
       describe "#handle_matcher" do
@@ -52,23 +52,23 @@ module Rspec
           matcher = mock("matcher")
           actual = Object.new
           matcher.should_receive(:matches?).with(actual).and_return(true)
-          Rspec::Expectations::PositiveExpectationHandler.handle_matcher(actual, matcher)
+          RSpec::Expectations::PositiveExpectationHandler.handle_matcher(actual, matcher)
         end
       
         it "returns the match value" do
           matcher = mock("matcher")
           actual = Object.new
           matcher.should_receive(:matches?).with(actual).and_return(:this_value)
-          Rspec::Expectations::PositiveExpectationHandler.handle_matcher(actual, matcher).should == :this_value
+          RSpec::Expectations::PositiveExpectationHandler.handle_matcher(actual, matcher).should == :this_value
         end
         
         it "calls failure_message_for_should if the matcher implements it" do
           matcher = mock("matcher", :failure_message_for_should => "message", :matches? => false)
           actual = Object.new
           
-          ::Rspec::Expectations.should_receive(:fail_with).with("message")
+          ::RSpec::Expectations.should_receive(:fail_with).with("message")
           
-          Rspec::Expectations::PositiveExpectationHandler.handle_matcher(actual, matcher)
+          RSpec::Expectations::PositiveExpectationHandler.handle_matcher(actual, matcher)
         end
         
         it "calls fail if matcher.diffable?" do
@@ -81,18 +81,18 @@ module Rspec
           )
           actual = Object.new
           
-          ::Rspec::Expectations.should_receive(:fail_with).with("message", 1, 2)
+          ::RSpec::Expectations.should_receive(:fail_with).with("message", 1, 2)
           
-          Rspec::Expectations::PositiveExpectationHandler.handle_matcher(actual, matcher)
+          RSpec::Expectations::PositiveExpectationHandler.handle_matcher(actual, matcher)
         end
         
         it "calls failure_message if the matcher does not implement failure_message_for_should" do
           matcher = mock("matcher", :failure_message => "message", :matches? => false)
           actual = Object.new
           
-          ::Rspec::Expectations.should_receive(:fail_with).with("message")
+          ::RSpec::Expectations.should_receive(:fail_with).with("message")
           
-          Rspec::Expectations::PositiveExpectationHandler.handle_matcher(actual, matcher)
+          RSpec::Expectations::PositiveExpectationHandler.handle_matcher(actual, matcher)
           
         end
         
@@ -100,9 +100,9 @@ module Rspec
           matcher = mock("matcher", :failure_message_for_should => "message", :matches? => false)
           actual = Object.new
           
-          ::Rspec::Expectations.should_receive(:fail_with).with("custom")
+          ::RSpec::Expectations.should_receive(:fail_with).with("custom")
           
-          Rspec::Expectations::PositiveExpectationHandler.handle_matcher(actual, matcher, "custom")
+          RSpec::Expectations::PositiveExpectationHandler.handle_matcher(actual, matcher, "custom")
         end
       end
     end
@@ -113,7 +113,7 @@ module Rspec
           matcher = mock("matcher", :does_not_match? => true, :negative_failure_message => nil)
           actual = Object.new
           matcher.should_receive(:does_not_match?).with(actual).and_return(true)
-          Rspec::Expectations::NegativeExpectationHandler.handle_matcher(actual, matcher)
+          RSpec::Expectations::NegativeExpectationHandler.handle_matcher(actual, matcher)
         end
 
         it "asks the matcher if it matches when the matcher doesn't respond to #does_not_match?" do
@@ -121,7 +121,7 @@ module Rspec
           actual = Object.new
           matcher.stub!(:negative_failure_message)
           matcher.should_receive(:matches?).with(actual).and_return(false)
-          Rspec::Expectations::NegativeExpectationHandler.handle_matcher(actual, matcher)
+          RSpec::Expectations::NegativeExpectationHandler.handle_matcher(actual, matcher)
         end
       
         it "returns the match value" do
@@ -129,7 +129,7 @@ module Rspec
           actual = Object.new
           matcher.should_receive(:matches?).with(actual).and_return(false)
           matcher.stub!(:negative_failure_message).and_return("ignore")
-          Rspec::Expectations::NegativeExpectationHandler.handle_matcher(actual, matcher).should be_false
+          RSpec::Expectations::NegativeExpectationHandler.handle_matcher(actual, matcher).should be_false
         end
 
         
@@ -137,9 +137,9 @@ module Rspec
           matcher = mock("matcher", :failure_message_for_should_not => "message", :matches? => true)
           actual = Object.new
           
-          ::Rspec::Expectations.should_receive(:fail_with).with("message")
+          ::RSpec::Expectations.should_receive(:fail_with).with("message")
           
-          Rspec::Expectations::NegativeExpectationHandler.handle_matcher(actual, matcher)
+          RSpec::Expectations::NegativeExpectationHandler.handle_matcher(actual, matcher)
           
         end
         
@@ -147,9 +147,9 @@ module Rspec
           matcher = mock("matcher", :negative_failure_message => "message", :matches? => true)
           actual = Object.new
           
-          ::Rspec::Expectations.should_receive(:fail_with).with("message")
+          ::RSpec::Expectations.should_receive(:fail_with).with("message")
           
-          Rspec::Expectations::NegativeExpectationHandler.handle_matcher(actual, matcher)
+          RSpec::Expectations::NegativeExpectationHandler.handle_matcher(actual, matcher)
           
         end
 
@@ -164,18 +164,18 @@ module Rspec
           )
           actual = Object.new
           
-          ::Rspec::Expectations.should_receive(:fail_with).with("message", 1, 2)
+          ::RSpec::Expectations.should_receive(:fail_with).with("message", 1, 2)
           
-          Rspec::Expectations::NegativeExpectationHandler.handle_matcher(actual, matcher)
+          RSpec::Expectations::NegativeExpectationHandler.handle_matcher(actual, matcher)
         end
 
         it "appends the :or message in the options hash passed to should" do
           matcher = mock("matcher", :failure_message_for_should_not => "message", :matches? => true)
           actual = Object.new
           
-          ::Rspec::Expectations.should_receive(:fail_with).with("custom")
+          ::RSpec::Expectations.should_receive(:fail_with).with("custom")
           
-          Rspec::Expectations::NegativeExpectationHandler.handle_matcher(actual, matcher, "custom")
+          RSpec::Expectations::NegativeExpectationHandler.handle_matcher(actual, matcher, "custom")
         end
 
       end