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

data/README.markdown

@@ -1,7 +1,7 @@
 # RSpec Expectations
 
 rspec-expectations adds `should` and `should_not` to every object and includes
-Rspec::Matchers, a library of standard matchers.
+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

data/Rakefile

@@ -6,17 +6,18 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "rspec-expectations"
-    gem.version = Rspec::Expectations::Version::STRING
-    gem.summary = "rspec-expectations-#{Rspec::Expectations::Version::STRING}"
+    gem.version = RSpec::Expectations::Version::STRING
+    gem.summary = "rspec-expectations-#{RSpec::Expectations::Version::STRING}"
     gem.description = "rspec expectations (should[_not] and matchers)"
     gem.rubyforge_project = "rspec"
     gem.email = "dchelimsky@gmail.com;chad.humphries@gmail.com"
     gem.homepage = "http://github.com/rspec/expectations"
     gem.authors = ["David Chelimsky", "Chad Humphries"]    
+    gem.add_dependency('diff-lcs', ">= 1.1.2")
     gem.add_development_dependency('cucumber', ">= 0.6.2")
     gem.add_development_dependency('aruba', ">= 0.1.1")
-    gem.add_development_dependency('rspec-core', ">= #{Rspec::Expectations::Version::STRING}")
-    gem.add_development_dependency('rspec-mocks', ">= #{Rspec::Expectations::Version::STRING}")
+    gem.add_development_dependency('rspec-core', ">= #{RSpec::Expectations::Version::STRING}")
+    gem.add_development_dependency('rspec-mocks', ">= #{RSpec::Expectations::Version::STRING}")
     gem.post_install_message = <<-EOM
 #{"*"*50}
 
@@ -36,15 +37,15 @@ end
 namespace :gem do
   desc "push to gemcutter"
   task :push => :build do
-    system "gem push pkg/rspec-expectations-#{Rspec::Expectations::Version::STRING}.gem"
+    system "gem push pkg/rspec-expectations-#{RSpec::Expectations::Version::STRING}.gem"
   end
 end
 
 begin
   require 'rspec/core/rake_task'
-  Rspec::Core::RakeTask.new(:spec)
+  RSpec::Core::RakeTask.new(:spec)
 rescue LoadError
-  puts "Rspec core or one of its dependencies is not installed. Install it with: gem install rspec-core"
+  puts "RSpec core or one of its dependencies is not installed. Install it with: gem install rspec-core"
 end
 
 begin

data/Upgrade.markdown

@@ -4,7 +4,7 @@
 
 ### New `eq` matcher.
 
-`Rspec::Matchers` now offers you two approaches to differentiating between
+`RSpec::Matchers` now offers you two approaches to differentiating between
 object identity. You can use the rspec-1 approach:
 
     actual.should == expected     # object equality
@@ -19,7 +19,7 @@ object identity. You can use the rspec-1 approach:
 
 ### simple_matcher
 
-Use Rspec::Matchers.define instead. For example, if you had:
+Use RSpec::Matchers.define instead. For example, if you had:
 
     def eat_cheese
       simple_matcher("eat cheese") do |actual|
@@ -29,7 +29,7 @@ Use Rspec::Matchers.define instead. For example, if you had:
 
 Change it to:
 
-    Rspec::Matchers.define :eat_cheese do
+    RSpec::Matchers.define :eat_cheese do
       match do |actual|
         actual.eat?(:cheese)
       end
@@ -37,15 +37,15 @@ Change it to:
 
 ### wrap_expectation
 
-Use Rspec::Matchers.define instead.
+Use RSpec::Matchers.define instead.
 
-    Rspec::Matchers.define :eat_cheese do
+    RSpec::Matchers.define :eat_cheese do
       match do |actual|
         actual.should eat?(:cheese)
       end
     end
 
-    Rspec::Matchers.define :eat_cheese do
+    RSpec::Matchers.define :eat_cheese do
       include MyCheesyAssertions
       match_unless_raises Test::Unit::AssertionFailedError do |actual|
         assert_eats_chesse actual

data/VERSION

@@ -1 +1 @@
-2.0.0.beta.8
+2.0.0.beta.9

data/features/expectations/customized_message.feature

@@ -45,7 +45,7 @@ Feature: customized message
       end
 
       """
-    When I run "rspec node_spec.rb --format documentation"
+    When I run "rspec ./node_spec.rb --format documentation"
     Then I should see "3 examples, 3 failures"
     And  I should not see "to return true, got false"
     And  I should not see "to return false, got true"

data/features/expectations/implicit_docstrings.feature

@@ -18,7 +18,7 @@ Feature: implicit docstrings
     end
     """
 
-    When I run "rspec implicit_docstrings_spec.rb -fdoc"
+    When I run "rspec ./implicit_docstrings_spec.rb -fdoc"
 
     Then I should see "should be < 5"
     And I should see "should include 2"
@@ -44,7 +44,7 @@ Feature: implicit docstrings
     end
     """
 
-    When I run "rspec failing_implicit_docstrings_spec.rb -fdoc"
+    When I run "rspec ./failing_implicit_docstrings_spec.rb -fdoc"
 
     Then I should see "should equal 2"
     And I should see "should be > 5"

data/features/matchers/access_running_example.feature

@@ -12,7 +12,7 @@ Feature: access running example
   Scenario: call method defined on example from matcher
     Given a file named "example_spec.rb" with:
       """
-      Rspec::Matchers.define :bar do
+      RSpec::Matchers.define :bar do
         match do |_|
           foo == "foo"
         end
@@ -28,13 +28,13 @@ Feature: access running example
         end
       end
       """
-    When I run "rspec example_spec.rb"
+    When I run "rspec ./example_spec.rb"
     Then I should see "1 example, 0 failures"
 
   Scenario: call method _not_ defined on example from matcher
     Given a file named "example_spec.rb" with:
       """
-      Rspec::Matchers.define :bar do
+      RSpec::Matchers.define :bar do
         match do |_|
           foo == "foo"
         end
@@ -46,8 +46,8 @@ Feature: access running example
         end
       end
       """
-    When I run "rspec example_spec.rb"
+    When I run "rspec ./example_spec.rb"
     Then I should see "1 example, 1 failure"
     And I should see "undefined local variable"
-    And I should see "Rspec::Matchers::Matcher"
+    And I should see "RSpec::Matchers::Matcher"
     And I should not see "ExampleGroup"

data/features/matchers/define_diffable_matcher.feature

@@ -8,7 +8,7 @@ Feature: define diffable matcher
   Scenario: define a diffable matcher
     Given a file named "diffable_matcher_spec.rb" with:
       """
-      Rspec::Matchers.define :be_just_like do |expected|
+      RSpec::Matchers.define :be_just_like do |expected|
         match do |actual|
           actual == expected
         end
@@ -20,7 +20,7 @@ Feature: define diffable matcher
         it {should be_just_like("that")}
       end
       """
-    When I run "rspec diffable_matcher_spec.rb --diff"
+    When I run "rspec ./diffable_matcher_spec.rb --diff"
     Then the exit status should not be 0
 
     And I should see "should be just like that"

data/features/matchers/define_matcher.feature

@@ -9,7 +9,7 @@ Feature: define matcher
       """
       require 'rspec/expectations'
 
-      Rspec::Matchers.define :be_a_multiple_of do |expected|
+      RSpec::Matchers.define :be_a_multiple_of do |expected|
         match do |actual|
           actual % expected == 0
         end
@@ -34,7 +34,7 @@ Feature: define matcher
       end
 
       """
-    When I run "rspec matcher_with_default_message_spec.rb --format documentation"
+    When I run "rspec ./matcher_with_default_message_spec.rb --format documentation"
     Then the exit status should not be 0
 
     And I should see "should be a multiple of 3"
@@ -51,7 +51,7 @@ Feature: define matcher
       """
       require 'rspec/expectations'
 
-      Rspec::Matchers.define :be_a_multiple_of do |expected|
+      RSpec::Matchers.define :be_a_multiple_of do |expected|
         match do |actual|
           actual % expected == 0
         end
@@ -65,7 +65,7 @@ Feature: define matcher
         it {should be_a_multiple_of(4)}
       end
       """
-    When I run "rspec matcher_with_failure_message_spec.rb"
+    When I run "rspec ./matcher_with_failure_message_spec.rb"
     Then the exit status should not be 0
     And the stdout should contain "1 example, 1 failure"
     And the stdout should contain "expected that 9 would be a multiple of 4"
@@ -75,7 +75,7 @@ Feature: define matcher
       """
       require 'rspec/expectations'
 
-      Rspec::Matchers.define :be_a_multiple_of do |expected|
+      RSpec::Matchers.define :be_a_multiple_of do |expected|
         match do |actual|
           actual % expected == 0
         end
@@ -89,7 +89,7 @@ Feature: define matcher
         it {should_not be_a_multiple_of(3)}
       end
       """
-    When I run "rspec matcher_with_failure_for_message_spec.rb"
+    When I run "rspec ./matcher_with_failure_for_message_spec.rb"
     Then the exit status should not be 0
     And the stdout should contain "1 example, 1 failure"
     And the stdout should contain "expected that 9 would not be a multiple of 3"
@@ -99,7 +99,7 @@ Feature: define matcher
       """
       require 'rspec/expectations'
 
-      Rspec::Matchers.define :be_a_multiple_of do |expected|
+      RSpec::Matchers.define :be_a_multiple_of do |expected|
         match do |actual|
           actual % expected == 0
         end
@@ -116,7 +116,7 @@ Feature: define matcher
         it {should_not be_a_multiple_of(4)}
       end
       """
-    When I run "rspec matcher_overriding_description_spec.rb --format documentation"
+    When I run "rspec ./matcher_overriding_description_spec.rb --format documentation"
     Then the exit status should be 0
     And the stdout should contain "2 examples, 0 failures"
     And the stdout should contain "should be multiple of 3"
@@ -127,7 +127,7 @@ Feature: define matcher
       """
       require 'rspec/expectations'
 
-      Rspec::Matchers.define :have_7_fingers do
+      RSpec::Matchers.define :have_7_fingers do
         match do |thing|
           thing.fingers.length == 7
         end
@@ -141,7 +141,7 @@ Feature: define matcher
         it {should have_7_fingers}
       end
       """
-    When I run "rspec matcher_with_no_args_spec.rb --format documentation"
+    When I run "rspec ./matcher_with_no_args_spec.rb --format documentation"
     Then the exit status should be 0
     And the stdout should contain "1 example, 0 failures"
     And the stdout should contain "should have 7 fingers"
@@ -151,7 +151,7 @@ Feature: define matcher
       """
       require 'rspec/expectations'
 
-      Rspec::Matchers.define :be_the_sum_of do |a,b,c,d|
+      RSpec::Matchers.define :be_the_sum_of do |a,b,c,d|
         match do |sum|
           a + b + c + d == sum
         end
@@ -161,7 +161,7 @@ Feature: define matcher
         it {should be_the_sum_of(1,2,3,4)}
       end
       """
-    When I run "rspec matcher_with_multiple_args_spec.rb --format documentation"
+    When I run "rspec ./matcher_with_multiple_args_spec.rb --format documentation"
     Then the exit status should be 0
     And the stdout should contain "1 example, 0 failures"
     And the stdout should contain "should be the sum of 1, 2, 3, and 4"
@@ -171,7 +171,7 @@ Feature: define matcher
       """
       require 'rspec/expectations'
 
-      Rspec::Matchers.define :have_same_elements_as do |sample|
+      RSpec::Matchers.define :have_same_elements_as do |sample|
         match do |actual|
           similar?(sample, actual)
         end
@@ -187,7 +187,7 @@ Feature: define matcher
         end
       end
       """
-    When I run "rspec matcher_with_internal_helper_spec.rb"
+    When I run "rspec ./matcher_with_internal_helper_spec.rb"
     Then the exit status should be 0
     And the stdout should contain "1 example, 0 failures"
 

data/features/matchers/define_matcher_outside_rspec.feature

@@ -10,14 +10,14 @@ Feature: define matcher outside rspec
       require "rspec/expectations"
       require "test/unit"
       
-      Rspec::Matchers.define :be_a_multiple_of do |expected|
+      RSpec::Matchers.define :be_a_multiple_of do |expected|
         match do |actual|
           actual % expected == 0
         end
       end
       
       class Test::Unit::TestCase
-        include Rspec::Matchers
+        include RSpec::Matchers
       end
       
       class TestMultiples < Test::Unit::TestCase

data/features/matchers/define_matcher_with_fluent_interface.feature

@@ -7,7 +7,7 @@ Feature: define matcher
   Scenario: one additional method
     Given a file named "between_spec.rb" with:
       """
-      Rspec::Matchers.define :be_bigger_than do |first|
+      RSpec::Matchers.define :be_bigger_than do |first|
         def but_smaller_than(second)
           @second = second
           self
@@ -22,6 +22,6 @@ Feature: define matcher
         it { should be_bigger_than(4).but_smaller_than(6) }
       end
       """
-    When I run "rspec between_spec.rb --format documentation"
+    When I run "rspec ./between_spec.rb --format documentation"
     Then I should see "1 example, 0 failures"
     And  I should see "should be bigger than 4"

data/features/matchers/expect_change.feature

@@ -29,7 +29,7 @@ Feature: expect change
         end
       end
       """
-    When I run "rspec expect_change_spec.rb"
+    When I run "rspec ./expect_change_spec.rb"
     Then I should see "2 examples, 1 failure"
     Then I should see "should have been changed by 2, but was changed by 1"
 
@@ -60,6 +60,6 @@ Feature: expect change
         end
       end
       """
-    When I run "rspec expect_no_change_spec.rb"
+    When I run "rspec ./expect_no_change_spec.rb"
     Then I should see "2 examples, 1 failure"
     Then I should see "should not have changed, but did change from 1 to 2"

data/features/matchers/expect_error.feature

@@ -18,7 +18,7 @@ Feature: expect error
         end
       end
       """
-    When I run "rspec expect_error_spec.rb"
+    When I run "rspec ./expect_error_spec.rb"
     Then I should see "2 examples, 1 failure"
     Then I should see "expected NameError but nothing was raised"
 
@@ -38,7 +38,7 @@ Feature: expect error
         end
       end
       """
-    When I run "rspec expect_no_error_spec.rb"
+    When I run "rspec ./expect_no_error_spec.rb"
     Then I should see "2 examples, 1 failure"
     Then I should see "undefined method `non_existent_message'"
 

data/lib/rspec/expectations.rb

@@ -4,22 +4,24 @@ require 'rspec/expectations/errors'
 require 'rspec/expectations/extensions'
 require 'rspec/expectations/handler'
 require 'rspec/expectations/version'
+require 'rspec/expectations/backward_compatibility'
+require 'rspec/expectations/differ'
 
-module Rspec
+module RSpec
   
-  # Rspec::Expectations lets you set expectations on your objects.
+  # RSpec::Expectations lets you set expectations on your objects.
   #
   #   result.should == 37
   #   team.should have(11).players_on_the_field
   #
   # == How Expectations work.
   #
-  # Rspec::Expectations adds two methods to Object:
+  # RSpec::Expectations adds two methods to Object:
   #
   #   should(matcher=nil)
   #   should_not(matcher=nil)
   #
-  # Both methods take an optional Expression Matcher (See Rspec::Matchers).
+  # Both methods take an optional Expression Matcher (See RSpec::Matchers).
   #
   # When +should+ receives an Expression Matcher, it calls <tt>matches?(self)</tt>. If
   # it returns +true+, the spec passes and execution continues. If it returns
@@ -30,7 +32,7 @@ module Rspec
   # +true+, then the spec fails with the message returned by <tt>matcher.negative_failure_message</tt>.
   #
   # RSpec ships with a standard set of useful matchers, and writing your own
-  # matchers is quite simple. See Rspec::Matchers for details.
+  # matchers is quite simple. See RSpec::Matchers for details.
   module Expectations
   end
 end

data/lib/rspec/expectations/backward_compatibility.rb

@@ -0,0 +1,16 @@
+# Cucumber 0.7 includes Rspec::Expectations
+module RSpec
+  module Expectations
+    module ConstMissing
+      def const_missing(name)
+        name == :Rspec ? RSpec : super(name)
+      end
+    end
+
+    def differ=(ignore)
+      RSpec.deprecate("RSpec::Expectations.differ=(differ)", "nothing at all (diffing is now automatic and no longer configurable)")
+    end
+  end
+end
+
+Object.extend(RSpec::Expectations::ConstMissing)

data/lib/rspec/expectations/differ.rb

@@ -0,0 +1,58 @@
+require 'diff/lcs'
+require 'diff/lcs/hunk'
+require 'pp'
+
+module RSpec
+  module Expectations
+    class Differ
+      def initialize(ignore=nil)
+      end
+
+      # This is snagged from diff/lcs/ldiff.rb (which is a commandline tool)
+      def diff_as_string(data_new, data_old)
+        data_old = data_old.split(/\n/).map! { |e| e.chomp }
+        data_new = data_new.split(/\n/).map! { |e| e.chomp }
+        output = ""
+        diffs = Diff::LCS.diff(data_old, data_new)
+        return output if diffs.empty?
+        oldhunk = hunk = nil  
+        file_length_difference = 0
+        diffs.each do |piece|
+          begin
+            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
+            # diff includes lines of context. Otherwise, we might print
+            # redundant lines.
+            if (context_lines > 0) and hunk.overlaps?(oldhunk)
+              hunk.unshift(oldhunk)
+            else
+              output << oldhunk.diff(format)
+            end
+          ensure
+            oldhunk = hunk
+            output << "\n"
+          end
+        end  
+        #Handle the last remaining hunk
+        output << oldhunk.diff(format) << "\n"
+      end  
+
+      def diff_as_object(target,expected)
+        diff_as_string(PP.pp(target,""), PP.pp(expected,""))
+      end
+
+      protected
+      def format
+        :unified
+      end
+
+      def context_lines
+        3
+      end
+    end
+
+  end
+end