rspec 1.1.5 → 1.1.6

data/lib/spec/matchers/has.rb

@@ -7,8 +7,8 @@ module Spec
         @args = args
       end
       
-      def matches?(target)
-        target.__send__(predicate, *@args)
+      def matches?(given)
+        given.__send__(predicate, *@args)
       end
       
       def failure_message

data/lib/spec/matchers/have.rb

@@ -24,12 +24,12 @@ module Spec
         else
           collection_owner.__send__(@collection_name, *@args, &@block)
         end
-        @actual = collection.size if collection.respond_to?(:size)
-        @actual = collection.length if collection.respond_to?(:length)
-        raise not_a_collection if @actual.nil?
-        return @actual >= @expected if @relativity == :at_least
-        return @actual <= @expected if @relativity == :at_most
-        return @actual == @expected
+        @given = collection.size if collection.respond_to?(:size)
+        @given = collection.length if collection.respond_to?(:length)
+        raise not_a_collection if @given.nil?
+        return @given >= @expected if @relativity == :at_least
+        return @given <= @expected if @relativity == :at_most
+        return @given == @expected
       end
       
       def not_a_collection
@@ -37,12 +37,12 @@ module Spec
       end
     
       def failure_message
-        "expected #{relative_expectation} #{@collection_name}, got #{@actual}"
+        "expected #{relative_expectation} #{@collection_name}, got #{@given}"
       end
 
       def negative_failure_message
         if @relativity == :exactly
-          return "expected target not to have #{@expected} #{@collection_name}, got #{@actual}"
+          return "expected target not to have #{@expected} #{@collection_name}, got #{@given}"
         elsif @relativity == :at_most
           return <<-EOF
 Isn't life confusing enough?

data/lib/spec/matchers/include.rb

@@ -7,10 +7,10 @@ module Spec
         @expecteds = expecteds
       end
       
-      def matches?(actual)
-        @actual = actual
+      def matches?(given)
+        @given = given
         @expecteds.each do |expected|
-          return false unless actual.include?(expected)
+          return false unless given.include?(expected)
         end
         true
       end
@@ -29,7 +29,7 @@ module Spec
       
       private
         def _message(maybe_not="")
-          "expected #{@actual.inspect} #{maybe_not}to include #{_pretty_print(@expecteds)}"
+          "expected #{@given.inspect} #{maybe_not}to include #{_pretty_print(@expecteds)}"
         end
         
         def _pretty_print(array)
@@ -51,7 +51,7 @@ module Spec
     #   should include(expected)
     #   should_not include(expected)
     #
-    # Passes if actual includes expected. This works for
+    # Passes if given includes expected. This works for
     # collections and Strings. You can also pass in multiple args
     # and it will only pass if all args are found in collection.
     #

data/lib/spec/matchers/match.rb

@@ -2,26 +2,26 @@ module Spec
   module Matchers
     
     class Match #:nodoc:
-      def initialize(expected)
-        @expected = expected
+      def initialize(regexp)
+        @regexp = regexp
       end
       
-      def matches?(actual)
-        @actual = actual
-        return true if actual =~ @expected
+      def matches?(given)
+        @given = given
+        return true if given =~ @regexp
         return false
       end
       
       def failure_message
-        return "expected #{@actual.inspect} to match #{@expected.inspect}", @expected, @actual
+        return "expected #{@given.inspect} to match #{@regexp.inspect}", @regexp, @given
       end
       
       def negative_failure_message
-        return "expected #{@actual.inspect} not to match #{@expected.inspect}", @expected, @actual
+        return "expected #{@given.inspect} not to match #{@regexp.inspect}", @regexp, @given
       end
       
       def description
-        "match #{@expected.inspect}"
+        "match #{@regexp.inspect}"
       end
     end
     
@@ -29,7 +29,7 @@ module Spec
     #   should match(regexp)
     #   should_not match(regexp)
     #
-    # Given a Regexp, passes if actual =~ regexp
+    # Given a Regexp, passes if given =~ regexp
     #
     # == Examples
     #

data/lib/spec/matchers/operator_matcher.rb

@@ -3,47 +3,47 @@ module Spec
     class BaseOperatorMatcher
       attr_reader :generated_description
       
-      def initialize(target)
-        @target = target
+      def initialize(given)
+        @given = given
       end
 
       def ==(expected)
         @expected = expected
-        __delegate_method_missing_to_target("==", expected)
+        __delegate_method_missing_to_given("==", expected)
       end
 
       def ===(expected)
         @expected = expected
-        __delegate_method_missing_to_target("===", expected)
+        __delegate_method_missing_to_given("===", expected)
       end
 
       def =~(expected)
         @expected = expected
-        __delegate_method_missing_to_target("=~", expected)
+        __delegate_method_missing_to_given("=~", expected)
       end
 
       def >(expected)
         @expected = expected
-        __delegate_method_missing_to_target(">", expected)
+        __delegate_method_missing_to_given(">", expected)
       end
 
       def >=(expected)
         @expected = expected
-        __delegate_method_missing_to_target(">=", expected)
+        __delegate_method_missing_to_given(">=", expected)
       end
 
       def <(expected)
         @expected = expected
-        __delegate_method_missing_to_target("<", expected)
+        __delegate_method_missing_to_given("<", expected)
       end
 
       def <=(expected)
         @expected = expected
-        __delegate_method_missing_to_target("<=", expected)
+        __delegate_method_missing_to_given("<=", expected)
       end
 
       def fail_with_message(message)
-        Spec::Expectations.fail_with(message, @expected, @target)
+        Spec::Expectations.fail_with(message, @expected, @given)
       end
       
       def description
@@ -54,23 +54,23 @@ module Spec
 
     class PositiveOperatorMatcher < BaseOperatorMatcher #:nodoc:
 
-      def __delegate_method_missing_to_target(operator, expected)
+      def __delegate_method_missing_to_given(operator, expected)
         @operator = operator
         ::Spec::Matchers.last_matcher = self
-        return true if @target.__send__(operator, expected)
-        return fail_with_message("expected: #{expected.inspect},\n     got: #{@target.inspect} (using #{operator})") if ['==','===', '=~'].include?(operator)
-        return fail_with_message("expected: #{operator} #{expected.inspect},\n     got: #{operator.gsub(/./, ' ')} #{@target.inspect}")
+        return true if @given.__send__(operator, expected)
+        return fail_with_message("expected: #{expected.inspect},\n     got: #{@given.inspect} (using #{operator})") if ['==','===', '=~'].include?(operator)
+        return fail_with_message("expected: #{operator} #{expected.inspect},\n     got: #{operator.gsub(/./, ' ')} #{@given.inspect}")
       end
 
     end
 
     class NegativeOperatorMatcher < BaseOperatorMatcher #:nodoc:
 
-      def __delegate_method_missing_to_target(operator, expected)
+      def __delegate_method_missing_to_given(operator, expected)
         @operator = operator
         ::Spec::Matchers.last_matcher = self
-        return true unless @target.__send__(operator, expected)
-        return fail_with_message("expected not: #{operator} #{expected.inspect},\n         got: #{operator.gsub(/./, ' ')} #{@target.inspect}")
+        return true unless @given.__send__(operator, expected)
+        return fail_with_message("expected not: #{operator} #{expected.inspect},\n         got: #{operator.gsub(/./, ' ')} #{@given.inspect}")
       end
 
     end

data/lib/spec/matchers/raise_error.rb

@@ -1,27 +1,27 @@
 module Spec
   module Matchers
     class RaiseError #:nodoc:
-      def initialize(error_or_message=Exception, message=nil, &block)
+      def initialize(expected_error_or_message=Exception, expected_message=nil, &block)
         @block = block
-        case error_or_message
+        case expected_error_or_message
         when String, Regexp
-          @expected_error, @expected_message = Exception, error_or_message
+          @expected_error, @expected_message = Exception, expected_error_or_message
         else
-          @expected_error, @expected_message = error_or_message, message
+          @expected_error, @expected_message = expected_error_or_message, expected_message
         end
       end
 
-      def matches?(proc)
+      def matches?(given_proc)
         @raised_expected_error = false
         @with_expected_message = false
         @eval_block = false
         @eval_block_passed = false
         begin
-          proc.call
-        rescue @expected_error => @actual_error
+          given_proc.call
+        rescue @expected_error => @given_error
           @raised_expected_error = true
           @with_expected_message = verify_message
-        rescue Exception => @actual_error
+        rescue Exception => @given_error
           # This clause should be empty, but rcov will not report it as covered
           # unless something (anything) is executed within the clause
           rcov_error_report = "http://eigenclass.org/hiki.rb?rcov-0.8.0"
@@ -37,10 +37,10 @@ module Spec
       def eval_block
         @eval_block = true
         begin
-          @block[@actual_error]
+          @block[@given_error]
           @eval_block_passed = true
         rescue Exception => err
-          @actual_error = err
+          @given_error = err
         end
       end
 
@@ -49,22 +49,22 @@ module Spec
         when nil
           return true
         when Regexp
-          return @expected_message =~ @actual_error.message
+          return @expected_message =~ @given_error.message
         else
-          return @expected_message == @actual_error.message
+          return @expected_message == @given_error.message
         end
       end
       
       def failure_message
         if @eval_block
-          return @actual_error.message
+          return @given_error.message
         else
-          return "expected #{expected_error}#{actual_error}"
+          return "expected #{expected_error}#{given_error}"
         end
       end
 
       def negative_failure_message
-        "expected no #{expected_error}#{actual_error}"
+        "expected no #{expected_error}#{given_error}"
       end
       
       def description
@@ -83,8 +83,8 @@ module Spec
           end
         end
 
-        def actual_error
-          @actual_error.nil? ? " but nothing was raised" : ", got #{@actual_error.inspect}"
+        def given_error
+          @given_error.nil? ? " but nothing was raised" : ", got #{@given_error.inspect}"
         end
         
         def negative_expectation?

data/lib/spec/matchers/respond_to.rb

@@ -7,9 +7,10 @@ module Spec
         @names_not_responded_to = []
       end
       
-      def matches?(target)
+      def matches?(given)
+        @given = given
         @names.each do |name|
-          unless target.respond_to?(name)
+          unless given.respond_to?(name)
             @names_not_responded_to << name
           end
         end
@@ -17,11 +18,11 @@ module Spec
       end
       
       def failure_message
-        "expected target to respond to #{@names_not_responded_to.collect {|name| name.inspect }.join(', ')}"
+        "expected #{@given.inspect} to respond to #{@names_not_responded_to.collect {|name| name.inspect }.join(', ')}"
       end
       
       def negative_failure_message
-        "expected target not to respond to #{@names.collect {|name| name.inspect }.join(', ')}"
+        "expected #{@given.inspect} not to respond to #{@names.collect {|name| name.inspect }.join(', ')}"
       end
       
       def description

data/lib/spec/matchers/satisfy.rb

@@ -6,18 +6,18 @@ module Spec
         @block = block
       end
       
-      def matches?(actual, &block)
+      def matches?(given, &block)
         @block = block if block
-        @actual = actual
-        @block.call(actual)
+        @given = given
+        @block.call(given)
       end
       
       def failure_message
-        "expected #{@actual} to satisfy block"
+        "expected #{@given} to satisfy block"
       end
 
       def negative_failure_message
-        "expected #{@actual} not to satisfy block"
+        "expected #{@given} not to satisfy block"
       end
     end
     

data/lib/spec/matchers/simple_matcher.rb

@@ -8,13 +8,13 @@ module Spec
         @match_block = match_block
       end
 
-      def matches?(actual)
-        @actual = actual
+      def matches?(given)
+        @given = given
         case @match_block.arity
         when 2
-          @match_block.call(@actual, self)
+          @match_block.call(@given, self)
         else
-          @match_block.call(@actual)
+          @match_block.call(@given)
         end
       end
       
@@ -23,11 +23,11 @@ module Spec
       end
 
       def failure_message
-        @failure_message || (@description.nil? ? explanation : %[expected #{@description.inspect} but got #{@actual.inspect}])
+        @failure_message || (@description.nil? ? explanation : %[expected #{@description.inspect} but got #{@given.inspect}])
       end
 
       def negative_failure_message
-        @negative_failure_message || (@description.nil? ? explanation : %[expected not to get #{@description.inspect}, but got #{@actual.inspect}])
+        @negative_failure_message || (@description.nil? ? explanation : %[expected not to get #{@description.inspect}, but got #{@given.inspect}])
       end
 
       def explanation
@@ -81,7 +81,7 @@ module Spec
     #     simple_matcher("rhyme with #{expected.inspect}") do |given, matcher|
     #       matcher.failure_message = "expected #{given.inspect} to rhyme with #{expected.inspect}"
     #       matcher.negative_failure_message = "expected #{given.inspect} not to rhyme with #{expected.inspect}"
-    #       actual.rhymes_with? expected
+    #       given.rhymes_with? expected
     #     end
     #   end
     #
@@ -92,7 +92,7 @@ module Spec
     #       matcher.description = "rhyme with #{expected.inspect}"
     #       matcher.failure_message = "expected #{given.inspect} to rhyme with #{expected.inspect}"
     #       matcher.negative_failure_message = "expected #{given.inspect} not to rhyme with #{expected.inspect}"
-    #       actual.rhymes_with? expected
+    #       given.rhymes_with? expected
     #     end
     #   end
     #

data/lib/spec/matchers/throw_symbol.rb

@@ -7,9 +7,9 @@ module Spec
         @actual = nil
       end
       
-      def matches?(proc)
+      def matches?(given_proc)
         begin
-          proc.call
+          given_proc.call
         rescue NameError => e
           raise e unless e.message =~ /uncaught throw/
           @actual = e.name.to_sym
@@ -56,7 +56,7 @@ module Spec
     #   should_not throw_symbol()
     #   should_not throw_symbol(:sym)
     #
-    # Given a Symbol argument, matches if a proc throws the specified Symbol.
+    # Given a Symbol argument, matches if the given proc throws the specified Symbol.
     #
     # Given no argument, matches if a proc throws any Symbol.
     #

data/lib/spec/mocks.rb

@@ -1,16 +1,5 @@
 require 'spec/mocks/framework'
-require 'spec/mocks/methods'
-require 'spec/mocks/argument_constraints'
-require 'spec/mocks/spec_methods'
-require 'spec/mocks/proxy'
-require 'spec/mocks/mock'
-require 'spec/mocks/argument_expectation'
-require 'spec/mocks/message_expectation'
-require 'spec/mocks/order_group'
-require 'spec/mocks/errors'
-require 'spec/mocks/error_generator'
 require 'spec/mocks/extensions/object'
-require 'spec/mocks/space'
 
 module Spec
   # == Mocks and Stubs

data/lib/spec/mocks/argument_constraints.rb

@@ -34,7 +34,7 @@ module Spec
         end
       end
 
-      class RegexpArgConstraint
+      class RegexpConstraint
         def initialize(regexp)
           @regexp = regexp
         end
@@ -45,7 +45,7 @@ module Spec
         end
       end
 
-      class BooleanArgConstraint
+      class BooleanConstraint
         def initialize(ignore)
         end
 
@@ -73,7 +73,7 @@ module Spec
         end
       end
       
-      class DuckTypeArgConstraint
+      class DuckTypeConstraint
         def initialize(*methods_to_respond_to)
           @methods_to_respond_to = methods_to_respond_to
         end
@@ -103,26 +103,6 @@ module Spec
         end
       end
 
-      module Deprecated
-        class NumericArgConstraint
-          def initialize(ignore)
-          end
-
-          def ==(value)
-            value.is_a?(Numeric)
-          end
-        end
-
-        class StringArgConstraint
-          def initialize(ignore)
-          end
-
-          def ==(value)
-            String === value
-          end
-        end
-      end
-
       # :call-seq:
       #   object.should_receive(:message).with(any_args())
       #
@@ -161,7 +141,7 @@ module Spec
       #   display.should_receive(:present_names).with(duck_type(:length, :each))
       #   => passes
       def duck_type(*args)
-        DuckTypeArgConstraint.new(*args)
+        DuckTypeConstraint.new(*args)
       end
 
       # :call-seq:
@@ -169,7 +149,7 @@ module Spec
       #
       # Passes if the argument is boolean.
       def boolean
-        BooleanArgConstraint.new(nil)
+        BooleanConstraint.new(nil)
       end
       
       # :call-seq: