rspec-expectations 2.0.0.beta.11 → 2.0.0.beta.12

data/Rakefile

@@ -23,10 +23,6 @@ begin
 
   Thank you for installing #{gem.summary}
 
-  This is beta software. If you are looking
-  for a supported production release, please
-  "gem install rspec" (without --pre).
-  
 #{"*"*50}
 EOM
   end
@@ -75,6 +71,7 @@ Rake::RDocTask.new do |rdoc|
 end
 
 task :clobber do
+  rm_rf 'doc'
   rm_rf 'pkg'
   rm_rf 'tmp'
   rm_rf 'coverage'

data/VERSION

@@ -1 +1 @@
-2.0.0.beta.11
+2.0.0.beta.12

data/cucumber.yml

@@ -1,7 +1,3 @@
-<%
-rerun = File.file?('rerun.txt') ? IO.read('rerun.txt') : ""
-rerun_opts = rerun.to_s.strip.empty? ? "--format progress features" : "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} #{rerun}"
-std_opts = "#{rerun_opts} --require features --format rerun --out rerun.txt --strict --tags ~@wip"
-%>
-default: <%= std_opts %>
+default: --require features --tags ~@wip --format progress
 wip: --require features --tags @wip:3 --wip features
+

data/features/matchers/define_matcher.feature

@@ -191,3 +191,32 @@ Feature: define matcher
     Then the exit status should be 0
     And the stdout should contain "1 example, 0 failures"
 
+  Scenario: scoped
+    Given a file named "scoped_matcher_spec.rb" with:
+      """
+      require 'rspec/expectations'
+
+      module MyHelpers
+        extend RSpec::Matchers::DSL
+
+        matcher :be_just_like do |expected|
+          match {|actual| actual == expected}
+        end
+      end
+
+      describe "group with MyHelpers" do
+        include MyHelpers
+        it "has access to the defined matcher" do
+          self.should respond_to(:be_just_like)
+        end
+      end
+
+      describe "group without MyHelpers" do
+        it "does not have access to the defined matcher" do
+          self.should_not respond_to(:be_just_like)
+        end
+      end
+      """
+
+    When I run "rspec ./scoped_matcher_spec.rb"
+    Then the stdout should contain "1 failure"

data/lib/rspec/expectations/differ.rb

@@ -19,8 +19,9 @@ module RSpec
         file_length_difference = 0
         diffs.each do |piece|
           begin
-            hunk = Diff::LCS::Hunk.new(data_old, data_new, piece, context_lines,
-                                       file_length_difference)
+            hunk = Diff::LCS::Hunk.new(
+              data_old, data_new, piece, context_lines, file_length_difference
+            )
             file_length_difference = hunk.file_length_difference      
             next unless oldhunk      
             # Hunks may overlap, which is why we need to be careful when our
@@ -44,7 +45,8 @@ module RSpec
         diff_as_string(PP.pp(target,""), PP.pp(expected,""))
       end
 
-      protected
+    protected
+
       def format
         :unified
       end

data/lib/rspec/expectations/fail_with.rb

@@ -8,21 +8,39 @@ module RSpec
       # raises a RSpec::Expectations::ExpectationNotMetError with message
       #
       # When a differ has been assigned and fail_with is passed
-      # <code>expected</code> and <code>target</code>, passes them
+      # <code>expected</code> and <code>actual</code>, passes them
       # to the differ to append a diff message to the failure message.
-      def fail_with(message, expected=nil, target=nil) # :nodoc:
-        if message.nil?
+      def fail_with(message, expected=nil, actual=nil) # :nodoc:
+        if !message
           raise ArgumentError, "Failure message is nil. Does your matcher define the " +
                                "appropriate failure_message_for_* method to return a string?"
         end
-        unless (differ.nil? || expected.nil? || target.nil?)
-          if expected.is_a?(String)
-            message << "\nDiff:" << self.differ.diff_as_string(target.to_s, expected)
-          elsif !target.is_a?(Proc)
-            message << "\nDiff:" << self.differ.diff_as_object(target, expected)
+
+        if actual && expected
+          if all_strings?(actual, expected)
+            if any_multiline_strings?(actual, expected)
+              message << "\nDiff:" << self.differ.diff_as_string(actual, expected)
+            end
+          elsif no_procs?(actual, expected)
+            message << "\nDiff:" << self.differ.diff_as_object(actual, expected)
           end
         end
-        Kernel::raise(RSpec::Expectations::ExpectationNotMetError.new(message))
+
+        raise(RSpec::Expectations::ExpectationNotMetError.new(message))
+      end
+
+    private
+
+      def no_procs?(*args)
+        args.none? {|a| Proc === a}
+      end
+
+      def all_strings?(*args)
+        args.all? {|a| String === a}
+      end
+
+      def any_multiline_strings?(*args)
+        all_strings?(*args) && args.any? {|a| a =~ /\n/}
       end
     end
   end

data/lib/rspec/matchers/dsl.rb

@@ -8,6 +8,8 @@ module RSpec
           RSpec::Matchers::Matcher.new name, *expected, &declarations
         end
       end
+
+      alias_method :matcher, :define
     end
   end
 end

data/lib/rspec/matchers/matcher.rb

@@ -5,13 +5,13 @@ module RSpec
       include RSpec::Matchers::Pretty
       include RSpec::Matchers
 
-      attr_reader :expected, :actual
+      attr_reader :expected, :actual, :rescued_exception
       def initialize(name, *expected, &declarations)
         @name     = name
         @expected = expected
         @actual   = nil
         @diffable = false
-        @expected_exception = nil
+        @expected_exception, @rescued_exception = nil
         @messages = {
           :description => lambda {"#{name_to_sentence}#{expected_to_sentence}"},
           :failure_message_for_should => lambda {|actual| "expected #{actual.inspect} to #{name_to_sentence}#{expected_to_sentence}"},
@@ -29,7 +29,7 @@ module RSpec
           begin
             instance_exec(actual, &@match_block)
             true
-          rescue @expected_exception
+          rescue @expected_exception => @rescued_exception
             false
           end
         else

data/rspec-expectations.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-expectations}
-  s.version = "2.0.0.beta.11"
+  s.version = "2.0.0.beta.12"
 
   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-06-06}
+  s.date = %q{2010-06-14}
   s.description = %q{rspec expectations (should[_not] and matchers)}
   s.email = %q{dchelimsky@gmail.com;chad.humphries@gmail.com}
   s.extra_rdoc_files = [
@@ -110,19 +110,15 @@ 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.11
+  Thank you for installing rspec-expectations-2.0.0.beta.12
 
-  This is beta software. If you are looking
-  for a supported production release, please
-  "gem install rspec" (without --pre).
-  
 **************************************************
 }
   s.rdoc_options = ["--charset=UTF-8"]
   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.11}
+  s.summary = %q{rspec-expectations-2.0.0.beta.12}
   s.test_files = [
     "spec/rspec/expectations/differ_spec.rb",
      "spec/rspec/expectations/extensions/kernel_spec.rb",
@@ -165,21 +161,21 @@ Gem::Specification.new do |s|
       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.11"])
-      s.add_development_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.11"])
+      s.add_development_dependency(%q<rspec-core>, [">= 2.0.0.beta.12"])
+      s.add_development_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.12"])
     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.11"])
-      s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.11"])
+      s.add_dependency(%q<rspec-core>, [">= 2.0.0.beta.12"])
+      s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.12"])
     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.11"])
-    s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.11"])
+    s.add_dependency(%q<rspec-core>, [">= 2.0.0.beta.12"])
+    s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.12"])
   end
 end
 

data/spec/rspec/expectations/fail_with_spec.rb

@@ -1,34 +1,40 @@
 require 'spec_helper'
 
 describe RSpec::Expectations, "#fail_with with diff" do
+  let(:differ) { double("differ") }
+
   before(:each) do
-    @differ = mock("differ")
-    RSpec::Expectations.stub(:differ) { @differ }
+    RSpec::Expectations.stub(:differ) { differ }
   end
   
-  it "should not call differ if no expected/actual" do
+  it "does not call differ if no expected/actual" do
     lambda {
       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")
+  it "calls 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\nthis", "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")
+  it "does not call differ if expected/actual are single line strings" do
+    differ.should_not_receive(:diff_as_string)
+    RSpec::Expectations.fail_with ("the message", "expected", "actual") rescue nil
+  end
+  
+  it "calls 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", Object.new, Object.new
     }.should fail_with("the message\nDiff:diff")
   end
   
-  it "should not call differ if expected or actual are procs" do
-    @differ.should_not_receive(:diff_as_string)
-    @differ.should_not_receive(:diff_as_object)
+  it "does not call differ if expected or actual are procs" do
+    differ.should_not_receive(:diff_as_string)
+    differ.should_not_receive(:diff_as_object)
     lambda {
       RSpec::Expectations.fail_with "the message", lambda {}, lambda {}
     }.should fail_with("the message")

data/spec/rspec/matchers/matcher_spec.rb

@@ -230,11 +230,11 @@ module RSpec
       end
 
       describe "#match_unless_raises" do
-        context "with a passing assertion" do
+        context "with an assertion" do
           let(:mod) do
             Module.new do
               def assert_equal(a,b)
-                a == b ? nil : (raise UnexpectedError.new("#{a} does not equal #{b}"))
+                a == b ? nil : (raise UnexpectedError.new("#{b} does not equal #{a}"))
               end
             end
           end
@@ -247,11 +247,23 @@ module RSpec
               end
             end
           end
-          it "passes as you would expect" do
-            matcher.matches?(4).should be_true
+
+          context "with passing assertion" do
+            it "passes" do
+              matcher.matches?(4).should be_true
+            end
           end
-          it "fails as you would expect" do
-            matcher.matches?(5).should be_false
+
+          context "with failing assertion" do
+            it "fails" do
+              matcher.matches?(5).should be_false
+            end
+
+            it "provides the raised exception" do
+              matcher.matches?(5)
+              matcher.rescued_exception.message.
+                should eq("5 does not equal 4")
+            end
           end
         end
 

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - beta
-  - 11
-  version: 2.0.0.beta.11
+  - 12
+  version: 2.0.0.beta.12
 platform: ruby
 authors: 
 - David Chelimsky
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-06 00:00:00 -04:00
+date: 2010-06-14 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -74,8 +74,8 @@ dependencies:
         - 0
         - 0
         - beta
-        - 11
-        version: 2.0.0.beta.11
+        - 12
+        version: 2.0.0.beta.12
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -90,8 +90,8 @@ dependencies:
         - 0
         - 0
         - beta
-        - 11
-        version: 2.0.0.beta.11
+        - 12
+        version: 2.0.0.beta.12
   type: :development
   version_requirements: *id005
 description: rspec expectations (should[_not] and matchers)
@@ -200,12 +200,8 @@ licenses: []
 post_install_message: |
   **************************************************
   
-    Thank you for installing rspec-expectations-2.0.0.beta.11
+    Thank you for installing rspec-expectations-2.0.0.beta.12
   
-    This is beta software. If you are looking
-    for a supported production release, please
-    "gem install rspec" (without --pre).
-    
   **************************************************
 
 rdoc_options: 
@@ -234,7 +230,7 @@ rubyforge_project: rspec
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: rspec-expectations-2.0.0.beta.11
+summary: rspec-expectations-2.0.0.beta.12
 test_files: 
 - spec/rspec/expectations/differ_spec.rb
 - spec/rspec/expectations/extensions/kernel_spec.rb