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

data/spec/rspec/matchers/operator_matcher_spec.rb

@@ -15,7 +15,7 @@ describe "should ==" do
   
   it "should fail when target.==(actual) returns false" do
     subject = "apple"
-    Rspec::Expectations.should_receive(:fail_with).with(%[expected: "orange",\n     got: "apple" (using ==)], "orange", "apple")
+    RSpec::Expectations.should_receive(:fail_with).with(%[expected: "orange",\n     got: "apple" (using ==)], "orange", "apple")
     subject.should == "orange"
   end
   
@@ -36,7 +36,7 @@ describe "should_not ==" do
 
   it "should fail when target.==(actual) returns false" do
     subject = "apple"
-    Rspec::Expectations.should_receive(:fail_with).with(%[expected not: == "apple",\n         got:    "apple"], "apple", "apple")
+    RSpec::Expectations.should_receive(:fail_with).with(%[expected not: == "apple",\n         got:    "apple"], "apple", "apple")
     subject.should_not == "apple"
   end
   
@@ -53,7 +53,7 @@ describe "should ===" do
   it "should fail when target.===(actual) returns false" do
     subject = "apple"
     subject.should_receive(:===).with("orange").and_return(false)
-    Rspec::Expectations.should_receive(:fail_with).with(%[expected: "orange",\n     got: "apple" (using ===)], "orange", "apple")
+    RSpec::Expectations.should_receive(:fail_with).with(%[expected: "orange",\n     got: "apple" (using ===)], "orange", "apple")
     subject.should === "orange"
   end
   
@@ -70,7 +70,7 @@ describe "should_not ===" do
   it "should fail when target.===(actual) returns false" do
     subject = "apple"
     subject.should_receive(:===).with("apple").and_return(true)
-    Rspec::Expectations.should_receive(:fail_with).with(%[expected not: === "apple",\n         got:     "apple"], "apple", "apple")
+    RSpec::Expectations.should_receive(:fail_with).with(%[expected not: === "apple",\n         got:     "apple"], "apple", "apple")
     subject.should_not === "apple"
   end
 
@@ -87,7 +87,7 @@ describe "should =~" do
   it "should fail when target.=~(actual) returns false" do
     subject = "fu"
     subject.should_receive(:=~).with(/oo/).and_return(false)
-    Rspec::Expectations.should_receive(:fail_with).with(%[expected: /oo/,\n     got: "fu" (using =~)], /oo/, "fu")
+    RSpec::Expectations.should_receive(:fail_with).with(%[expected: /oo/,\n     got: "fu" (using =~)], /oo/, "fu")
     subject.should =~ /oo/
   end
 
@@ -104,7 +104,7 @@ describe "should_not =~" do
   it "should fail when target.=~(actual) returns false" do
     subject = "foo"
     subject.should_receive(:=~).with(/oo/).and_return(true)
-    Rspec::Expectations.should_receive(:fail_with).with(%[expected not: =~ /oo/,\n         got:    "foo"], /oo/, "foo")
+    RSpec::Expectations.should_receive(:fail_with).with(%[expected not: =~ /oo/,\n         got:    "foo"], /oo/, "foo")
     subject.should_not =~ /oo/
   end
 
@@ -117,7 +117,7 @@ describe "should >" do
   end
 
   it "should fail if > fails" do
-    Rspec::Expectations.should_receive(:fail_with).with(%[expected: > 5,\n     got:   4], 5, 4)
+    RSpec::Expectations.should_receive(:fail_with).with(%[expected: > 5,\n     got:   4], 5, 4)
     4.should > 5
   end
 
@@ -131,7 +131,7 @@ describe "should >=" do
   end
 
   it "should fail if > fails" do
-    Rspec::Expectations.should_receive(:fail_with).with(%[expected: >= 5,\n     got:    4], 5, 4)
+    RSpec::Expectations.should_receive(:fail_with).with(%[expected: >= 5,\n     got:    4], 5, 4)
     4.should >= 5
   end
 
@@ -144,7 +144,7 @@ describe "should <" do
   end
 
   it "should fail if > fails" do
-    Rspec::Expectations.should_receive(:fail_with).with(%[expected: < 3,\n     got:   4], 3, 4)
+    RSpec::Expectations.should_receive(:fail_with).with(%[expected: < 3,\n     got:   4], 3, 4)
     4.should < 3
   end
 
@@ -158,13 +158,13 @@ describe "should <=" do
   end
 
   it "should fail if > fails" do
-    Rspec::Expectations.should_receive(:fail_with).with(%[expected: <= 3,\n     got:    4], 3, 4)
+    RSpec::Expectations.should_receive(:fail_with).with(%[expected: <= 3,\n     got:    4], 3, 4)
     4.should <= 3
   end
 
 end
 
-describe Rspec::Matchers::PositiveOperatorMatcher do
+describe RSpec::Matchers::PositiveOperatorMatcher do
 
   it "should work when the target has implemented #send" do
     o = Object.new
@@ -176,7 +176,7 @@ describe Rspec::Matchers::PositiveOperatorMatcher do
 
 end
 
-describe Rspec::Matchers::NegativeOperatorMatcher do
+describe RSpec::Matchers::NegativeOperatorMatcher do
 
   it "should work when the target has implemented #send" do
     o = Object.new

data/spec/rspec/matchers/throw_symbol_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-module Rspec
+module RSpec
   module Matchers
     describe ThrowSymbol do
       describe "with no args" do

data/spec/spec_helper.rb

@@ -13,7 +13,6 @@ add_to_load_path("../../rspec-mocks/lib")
 
 require 'rspec/core'
 require 'rspec/mocks'
-require 'rspec/expectations/differs/default'
 
 Dir['./spec/support/**/*'].each do |f|
   require f
@@ -23,7 +22,7 @@ def with_ruby(version)
   yield if RUBY_PLATFORM =~ Regexp.compile("^#{version}")
 end
 
-module Rspec
+module RSpec
   module Ruby
     class << self
       def version
@@ -33,20 +32,20 @@ module Rspec
   end
 end
 
-module Rspec  
+module RSpec  
   module Matchers
     def fail
-      raise_error(Rspec::Expectations::ExpectationNotMetError)
+      raise_error(RSpec::Expectations::ExpectationNotMetError)
     end
 
     def fail_with(message)
-      raise_error(Rspec::Expectations::ExpectationNotMetError, message)
+      raise_error(RSpec::Expectations::ExpectationNotMetError, message)
     end
   end
 end
 
-Rspec::configure do |config|
+RSpec::configure do |config|
   config.mock_with(:rspec)
-  config.include Rspec::Mocks::Methods
+  config.include RSpec::Mocks::Methods
   config.color_enabled = true
 end

data/spec/support/classes.rb

@@ -1,5 +1,5 @@
 # This file contains various classes used by the specs.
-module Rspec
+module RSpec
   module Expectations
     module Helper
       class CollectionWithSizeMethod

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - beta
-  - 8
-  version: 2.0.0.beta.8
+  - 9
+  version: 2.0.0.beta.9
 platform: ruby
 authors: 
 - David Chelimsky
@@ -17,13 +17,27 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-27 00:00:00 -05:00
+date: 2010-05-27 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: cucumber
+  name: diff-lcs
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
+        - 2
+        version: 1.1.2
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: cucumber
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -33,11 +47,11 @@ dependencies:
         - 2
         version: 0.6.2
   type: :development
-  version_requirements: *id001
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: aruba
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -47,11 +61,11 @@ dependencies:
         - 1
         version: 0.1.1
   type: :development
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rspec-core
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -60,14 +74,14 @@ dependencies:
         - 0
         - 0
         - beta
-        - 8
-        version: 2.0.0.beta.8
+        - 9
+        version: 2.0.0.beta.9
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rspec-mocks
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -76,10 +90,10 @@ dependencies:
         - 0
         - 0
         - beta
-        - 8
-        version: 2.0.0.beta.8
+        - 9
+        version: 2.0.0.beta.9
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 description: rspec expectations (should[_not] and matchers)
 email: dchelimsky@gmail.com;chad.humphries@gmail.com
 executables: []
@@ -108,8 +122,8 @@ files:
 - 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
@@ -146,7 +160,7 @@ files:
 - 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
@@ -185,7 +199,7 @@ licenses: []
 post_install_message: |
   **************************************************
   
-    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
@@ -219,9 +233,9 @@ rubyforge_project: rspec
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: rspec-expectations-2.0.0.beta.8
+summary: rspec-expectations-2.0.0.beta.9
 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

data/lib/rspec/expectations/differs/default.rb

@@ -1,62 +0,0 @@
-require File.join(File.dirname(__FILE__), "/load-diff-lcs")
-require 'pp'
-
-module Rspec
-  module Expectations
-    module Differs
-      unless defined?(Default)
-        class Default
-          def initialize(options)
-            @options = options
-          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
-            @options.diff_format
-          end
-
-          def context_lines
-            @options.context_lines
-          end
-        end
-
-      end
-    end
-  end
-end

data/lib/rspec/expectations/differs/load-diff-lcs.rb

@@ -1,7 +0,0 @@
-begin
-  require 'diff/lcs'
-rescue LoadError
-  raise "You must gem install diff-lcs to use diffing"
-end
-
-require 'diff/lcs/hunk'