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

data/lib/rspec/expectations/errors.rb

@@ -1,4 +1,4 @@
-module Rspec
+module RSpec
   module Expectations
     # If Test::Unit is loaed, we'll use its error as baseclass, so that Test::Unit
     # will report unmet RSpec expectations as failures rather than errors.

data/lib/rspec/expectations/extensions/kernel.rb

@@ -17,14 +17,14 @@ module Kernel
   #   receiver.should =~ regexp
   #     => Passes if (receiver =~ regexp)
   #
-  # See Rspec::Matchers for more information about matchers
+  # See RSpec::Matchers for more information about matchers
   #
   # == Warning
   #
   # NOTE that this does NOT support receiver.should != expected.
   # Instead, use receiver.should_not == expected
   def should(matcher=nil, message=nil, &block)
-    Rspec::Expectations::PositiveExpectationHandler.handle_matcher(self, matcher, message, &block)
+    RSpec::Expectations::PositiveExpectationHandler.handle_matcher(self, matcher, message, &block)
   end
   
   # :call-seq:
@@ -45,8 +45,8 @@ module Kernel
   #   receiver.should_not =~ regexp
   #     => Passes unless (receiver =~ regexp)
   #
-  # See Rspec::Matchers for more information about matchers
+  # See RSpec::Matchers for more information about matchers
   def should_not(matcher=nil, message=nil, &block)
-    Rspec::Expectations::NegativeExpectationHandler.handle_matcher(self, matcher, message, &block)
+    RSpec::Expectations::NegativeExpectationHandler.handle_matcher(self, matcher, message, &block)
   end
 end

data/lib/rspec/expectations/extensions/rspec/core/example_group.rb

@@ -1,4 +1,4 @@
-module Rspec
+module RSpec
   module Core
     class ExampleGroup
       module BlockAliases

data/lib/rspec/expectations/fail_with.rb

@@ -1,9 +1,11 @@
-module Rspec
+module RSpec
   module Expectations
     class << self
-      attr_accessor :differ
+      def differ
+        @differ ||= Differ.new
+      end
       
-      # raises a Rspec::Expectations::ExpectationNotMetError with message
+      # 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
@@ -20,7 +22,7 @@ module Rspec
             message << "\nDiff:" << self.differ.diff_as_object(target, expected)
           end
         end
-        Kernel::raise(Rspec::Expectations::ExpectationNotMetError.new(message))
+        Kernel::raise(RSpec::Expectations::ExpectationNotMetError.new(message))
       end
     end
   end

data/lib/rspec/expectations/handler.rb

@@ -1,12 +1,12 @@
-module Rspec
+module RSpec
   module Expectations
     class InvalidMatcherError < ArgumentError; end        
     
     class PositiveExpectationHandler        
       def self.handle_matcher(actual, matcher, message=nil, &block)
-        ::Rspec::Matchers.last_should = :should
-        ::Rspec::Matchers.last_matcher = matcher
-        return ::Rspec::Matchers::PositiveOperatorMatcher.new(actual) if matcher.nil?
+        ::RSpec::Matchers.last_should = :should
+        ::RSpec::Matchers.last_matcher = matcher
+        return ::RSpec::Matchers::PositiveOperatorMatcher.new(actual) if matcher.nil?
 
         match = matcher.matches?(actual, &block)
         return match if match
@@ -16,18 +16,18 @@ module Rspec
                     matcher.failure_message
         
         if matcher.respond_to?(:diffable?) && matcher.diffable?
-          ::Rspec::Expectations.fail_with message, matcher.expected.first, matcher.actual
+          ::RSpec::Expectations.fail_with message, matcher.expected.first, matcher.actual
         else
-          ::Rspec::Expectations.fail_with message
+          ::RSpec::Expectations.fail_with message
         end
       end
     end
 
     class NegativeExpectationHandler
       def self.handle_matcher(actual, matcher, message=nil, &block)
-        ::Rspec::Matchers.last_should = :should_not
-        ::Rspec::Matchers.last_matcher = matcher
-        return ::Rspec::Matchers::NegativeOperatorMatcher.new(actual) if matcher.nil?
+        ::RSpec::Matchers.last_should = :should_not
+        ::RSpec::Matchers.last_matcher = matcher
+        return ::RSpec::Matchers::NegativeOperatorMatcher.new(actual) if matcher.nil?
         
         match = matcher.respond_to?(:does_not_match?) ?
                 !matcher.does_not_match?(actual, &block) :
@@ -39,9 +39,9 @@ module Rspec
                     matcher.negative_failure_message
 
         if matcher.respond_to?(:diffable?) && matcher.diffable?
-          ::Rspec::Expectations.fail_with message, matcher.expected.first, matcher.actual
+          ::RSpec::Expectations.fail_with message, matcher.expected.first, matcher.actual
         else
-          ::Rspec::Expectations.fail_with message
+          ::RSpec::Expectations.fail_with message
         end
       end
     end

data/lib/rspec/expectations/version.rb

@@ -1,4 +1,4 @@
-module Rspec # :nodoc:
+module RSpec # :nodoc:
   module Expectations # :nodoc:
     module Version # :nodoc:
       STRING = File.readlines(File.expand_path('../../../../VERSION', __FILE__)).first

data/lib/rspec/matchers.rb

@@ -1,4 +1,4 @@
-module Rspec
+module RSpec
   # RSpec ships with a number of useful Expression Matchers. An Expression Matcher
   # is any object that responds to the following methods:
   #
@@ -17,7 +17,7 @@ module Rspec
   #   failure_message          (use failure_message_for_should instead)
   #   negative_failure_message (use failure_message_for_should_not instead)
   #
-  # See Rspec::Expectations to learn how to use these as Expectation Matchers.
+  # See RSpec::Expectations to learn how to use these as Expectation Matchers.
   #
   # == Predicates
   #
@@ -78,7 +78,7 @@ module Rspec
   #
   # You can create such a matcher like so:
   #
-  #   Rspec::Matchers.define :be_in_zone do |zone|
+  #   RSpec::Matchers.define :be_in_zone do |zone|
   #     match do |player|
   #       player.in_zone?(zone)
   #     end
@@ -88,7 +88,7 @@ module Rspec
   # with logical default messages for failures. You can override the failure
   # messages and the generated description as follows:
   #
-  #   Rspec::Matchers.define :be_in_zone do |zone|
+  #   RSpec::Matchers.define :be_in_zone do |zone|
   #     match do |player|
   #       player.in_zone?(zone)
   #     end
@@ -157,13 +157,13 @@ module Rspec
   # or you can include in globally in a spec_helper.rb file <tt>require</tt>d
   # from your spec file(s):
   #
-  #   Rspec::Runner.configure do |config|
+  #   RSpec::Runner.configure do |config|
   #     config.include(CustomGameMatchers)
   #   end
   #
   module Matchers
-    if Rspec.respond_to?(:configure)
-      Rspec.configure {|c| c.include self}
+    if RSpec.respond_to?(:configure)
+      RSpec.configure {|c| c.include self}
     end
   end
 end
@@ -195,4 +195,3 @@ require 'rspec/matchers/satisfy'
 require 'rspec/matchers/throw_symbol'
 require 'rspec/matchers/compatibility'
 require 'rspec/matchers/dsl'
-

data/lib/rspec/matchers/be.rb

@@ -1,18 +1,18 @@
 require 'rspec/matchers/dsl'
 
-Rspec::Matchers.define :be_true do
+RSpec::Matchers.define :be_true do
   match do |actual|
     !!actual
   end
 end
 
-Rspec::Matchers.define :be_false do
+RSpec::Matchers.define :be_false do
   match do |actual|
     !actual
   end
 end
 
-Rspec::Matchers.define :be_nil do
+RSpec::Matchers.define :be_nil do
   match do |actual|
     actual.nil?
   end
@@ -26,11 +26,11 @@ Rspec::Matchers.define :be_nil do
   end
 end
 
-module Rspec
+module RSpec
   module Matchers
 
     class Be #:nodoc:
-      include Rspec::Matchers::Pretty
+      include RSpec::Matchers::Pretty
       
       def initialize(*args, &block)
         @args = args
@@ -216,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

data/lib/rspec/matchers/be_close.rb

@@ -1,4 +1,4 @@
-module Rspec
+module RSpec
   module Matchers
     # :call-seq:
     #   should be_close(expected, delta)

data/lib/rspec/matchers/be_instance_of.rb

@@ -1,4 +1,4 @@
-module Rspec
+module RSpec
   module Matchers
     # :call-seq:
     #   should be_instance_of(expected)

data/lib/rspec/matchers/be_kind_of.rb

@@ -1,4 +1,4 @@
-module Rspec
+module RSpec
   module Matchers
     # :call-seq:
     #   should be_kind_of(expected)

data/lib/rspec/matchers/change.rb

@@ -1,4 +1,4 @@
-module Rspec
+module RSpec
   module Matchers
     
     #Based on patch from Wilson Bilkovich

data/lib/rspec/matchers/compatibility.rb

@@ -1,5 +1,5 @@
-Rspec::Matchers.constants.each do |c|
-  if Class === (klass = Rspec::Matchers.const_get(c))
+RSpec::Matchers.constants.each do |c|
+  if Class === (klass = RSpec::Matchers.const_get(c))
     if klass.public_instance_methods.any? {|m| ['failure_message_for_should',:failure_message_for_should].include?(m)}
       klass.class_eval do
         alias_method :failure_message, :failure_message_for_should

data/lib/rspec/matchers/dsl.rb

@@ -1,15 +1,15 @@
-module Rspec
+module RSpec
   module Matchers
     module DSL
-      # See Rspec::Matchers
+      # See RSpec::Matchers
       def define(name, &declarations)
         define_method name do |*expected|
           $matcher_execution_context = self
-          Rspec::Matchers::Matcher.new name, *expected, &declarations
+          RSpec::Matchers::Matcher.new name, *expected, &declarations
         end
       end
     end
   end
 end
 
-Rspec::Matchers.extend Rspec::Matchers::DSL
+RSpec::Matchers.extend RSpec::Matchers::DSL

data/lib/rspec/matchers/eq.rb

@@ -1,4 +1,4 @@
-module Rspec
+module RSpec
   module Matchers
     # :call-seq:
     #   should eq(expected)

data/lib/rspec/matchers/eql.rb

@@ -1,4 +1,4 @@
-module Rspec
+module RSpec
   module Matchers
     # :call-seq:
     #   should eql(expected)

data/lib/rspec/matchers/equal.rb

@@ -1,4 +1,4 @@
-module Rspec
+module RSpec
   module Matchers
 
     # :call-seq:

data/lib/rspec/matchers/errors.rb

@@ -1,4 +1,4 @@
-module Rspec
+module RSpec
   module Matchers
     class MatcherError < StandardError; end
   end

data/lib/rspec/matchers/exist.rb

@@ -1,4 +1,4 @@
-module Rspec
+module RSpec
   module Matchers
     # :call-seq:
     #   should exist

data/lib/rspec/matchers/extensions/instance_exec.rb

@@ -1,4 +1,4 @@
-module Rspec
+module RSpec
   module Matchers
     module InstanceExec
       unless respond_to?(:instance_exec)

data/lib/rspec/matchers/generated_descriptions.rb

@@ -1,4 +1,4 @@
-module Rspec
+module RSpec
   module Matchers
     class << self
       attr_accessor :last_matcher, :last_should # :nodoc:

data/lib/rspec/matchers/has.rb

@@ -1,4 +1,4 @@
-module Rspec
+module RSpec
   module Matchers
     
     class Has

data/lib/rspec/matchers/have.rb

@@ -1,4 +1,4 @@
-module Rspec
+module RSpec
   module Matchers
     class Have #:nodoc:
       def initialize(expected, relativity=:exactly)

data/lib/rspec/matchers/include.rb

@@ -1,4 +1,4 @@
-module Rspec
+module RSpec
   module Matchers
     # :call-seq:
     #   should include(expected)

data/lib/rspec/matchers/match.rb

@@ -1,4 +1,4 @@
-module Rspec
+module RSpec
   module Matchers
     # :call-seq:
     #   should match(pattern)

data/lib/rspec/matchers/match_array.rb

@@ -1,8 +1,8 @@
-module Rspec
+module RSpec
   module Matchers
 
     class MatchArray #:nodoc:
-      include Rspec::Matchers::Pretty
+      include RSpec::Matchers::Pretty
       
       def initialize(expected)
         @expected = expected
@@ -66,6 +66,6 @@ module Rspec
     #   [1,2,3,4].should =~ [1,2,3]   # => would fail
     #   [1,2,2,3].should =~ [1,2,3]   # => would fail
     #   [1,2,3].should   =~ [1,2,3,4] # => would fail
-    OperatorMatcher.register(Array, '=~', Rspec::Matchers::MatchArray)
+    OperatorMatcher.register(Array, '=~', RSpec::Matchers::MatchArray)
   end
 end

data/lib/rspec/matchers/matcher.rb

@@ -1,9 +1,9 @@
-module Rspec
+module RSpec
   module Matchers
     class Matcher
-      include Rspec::Matchers::InstanceExec
-      include Rspec::Matchers::Pretty
-      include Rspec::Matchers
+      include RSpec::Matchers::InstanceExec
+      include RSpec::Matchers::Pretty
+      include RSpec::Matchers
 
       attr_reader :expected, :actual
       def initialize(name, *expected, &declarations)
@@ -35,34 +35,34 @@ module Rspec
         else
           begin
             instance_exec(actual, &@match_block)
-          rescue Rspec::Expectations::ExpectationNotMetError
+          rescue RSpec::Expectations::ExpectationNotMetError
             false
           end
         end
       end
 
-      # See Rspec::Matchers
+      # See RSpec::Matchers
       def match(&block)
         @match_block = block
       end
 
-      # See Rspec::Matchers
+      # See RSpec::Matchers
       def match_unless_raises(exception=Exception, &block)
         @expected_exception = exception
         match(&block)
       end
 
-      # See Rspec::Matchers
+      # See RSpec::Matchers
       def failure_message_for_should(&block)
         cache_or_call_cached(:failure_message_for_should, &block)
       end
 
-      # See Rspec::Matchers
+      # See RSpec::Matchers
       def failure_message_for_should_not(&block)
         cache_or_call_cached(:failure_message_for_should_not, &block)
       end
 
-      # See Rspec::Matchers
+      # See RSpec::Matchers
       def description(&block)
         cache_or_call_cached(:description, &block)
       end
@@ -72,12 +72,12 @@ module Rspec
         @diffable
       end
 
-      # See Rspec::Matchers
+      # See RSpec::Matchers
       def diffable
         @diffable = true
       end
       
-      # See Rspec::Matchers
+      # See RSpec::Matchers
       def chain(method, &block)
         self.class.class_eval do
           define_method method do |*args|
@@ -105,7 +105,7 @@ module Rspec
         #
         # Also, due some crazy scoping that I don't understand, these methods
         # are actually available in the specs (something about the matcher being
-        # defined in the scope of Rspec::Matchers or within an example), so not
+        # defined in the scope of RSpec::Matchers or within an example), so not
         # doing the following will not cause specs to fail, but they *will*
         # cause features to fail and that will make users unhappy. So don't.
         orig_private_methods = private_methods