typo 5.1.3 → 5.1.98

data/vendor/plugins/rspec/lib/spec/example/example_methods.rb

@@ -1,13 +1,9 @@
 module Spec
   module Example
     module ExampleMethods
-      extend ExampleGroupMethods
+      
       extend ModuleReopeningFix
-
-      PENDING_EXAMPLE_BLOCK = lambda {
-        raise Spec::Example::ExamplePendingError.new("Not Yet Implemented")
-      }
-
+      
       def execute(options, instance_variables)
         options.reporter.example_started(self)
         set_instance_variables_from_hash(instance_variables)
@@ -15,13 +11,13 @@ module Spec
         execution_error = nil
         Timeout.timeout(options.timeout) do
           begin
-            before_example
-            run_with_description_capturing
+            before_each_example
+            eval_block
           rescue Exception => e
             execution_error ||= e
           end
           begin
-            after_example
+            after_each_example
           rescue Exception => e
             execution_error ||= e
           end
@@ -61,7 +57,15 @@ module Spec
       end
 
       def description
-        @_defined_description || @_matcher_description || "NO NAME"
+        @_defined_description || ::Spec::Matchers.generated_description || "NO NAME"
+      end
+      
+      def options
+        @_options
+      end
+
+      def __full_description
+        "#{self.class.description} #{self.description}"
       end
       
       def set_instance_variables_from_hash(ivars)
@@ -73,13 +77,8 @@ module Spec
         end
       end
 
-      def run_with_description_capturing
-        begin
-          return instance_eval(&(@_implementation || PENDING_EXAMPLE_BLOCK))
-        ensure
-          @_matcher_description = Spec::Matchers.generated_description
-          Spec::Matchers.clear_generated_description
-        end
+      def eval_block
+        instance_eval(&@_implementation)
       end
 
       def implementation_backtrace
@@ -90,12 +89,12 @@ module Spec
       include Matchers
       include Pending
       
-      def before_example
+      def before_each_example
         setup_mocks_for_rspec
         self.class.run_before_each(self)
       end
 
-      def after_example
+      def after_each_example
         self.class.run_after_each(self)
         verify_mocks_for_rspec
       ensure
@@ -103,4 +102,4 @@ module Spec
       end
     end
   end
-end
+end

data/vendor/plugins/rspec/lib/spec/example/shared_example_group.rb

@@ -1,7 +1,7 @@
 module Spec
   module Example
     class SharedExampleGroup < Module
-      class << self
+      module ClassMethods
         def add_shared_example_group(new_example_group)
           guard_against_redefining_existing_example_group(new_example_group)
           shared_example_groups << new_example_group
@@ -14,10 +14,7 @@ module Spec
         end
 
         def shared_example_groups
-          # TODO - this needs to be global, or at least accessible from
-          # from subclasses of Example in a centralized place. I'm not loving
-          # this as a solution, but it works for now.
-          $shared_example_groups ||= []
+          @shared_example_groups ||= []
         end
 
         private
@@ -33,8 +30,9 @@ module Spec
           File.expand_path(example_group.spec_path)
         end
       end
+
+      extend ClassMethods
       include ExampleGroupMethods
-      public :include
 
       def initialize(*args, &example_group_block)
         describe(*args)
@@ -46,12 +44,8 @@ module Spec
         mod.module_eval(&@example_group_block)
       end
 
-      def execute_in_class_hierarchy(superclass_last=false)
-        classes = [self]
-        superclass_last ? classes << ExampleMethods : classes.unshift(ExampleMethods)
-        classes.each do |example_group|
-          yield example_group
-        end
+      def each_ancestor_example_group_class(superclass_last=false)
+        yield self
       end
     end
   end

data/vendor/plugins/rspec/lib/spec/example.rb

@@ -1,5 +1,5 @@
 require 'timeout'
-require 'forwardable'
+require 'spec/example/before_and_after_hooks'
 require 'spec/example/pending'
 require 'spec/example/module_reopening_fix'
 require 'spec/example/example_group_methods'

data/vendor/plugins/rspec/lib/spec/expectations/differs/default.rb

@@ -17,7 +17,7 @@ module Spec
         end
 
         # This is snagged from diff/lcs/ldiff.rb (which is a commandline tool)
-        def diff_as_string(data_old, data_new)
+        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 = ""

data/vendor/plugins/rspec/lib/spec/expectations/extensions/object.rb

@@ -27,12 +27,8 @@ module Spec
       #
       # NOTE that this does NOT support receiver.should != expected.
       # Instead, use receiver.should_not == expected
-      def should(matcher = :default_parameter, &block)
-        if :default_parameter == matcher
-          Spec::Matchers::PositiveOperatorMatcher.new(self)
-        else
-          ExpectationMatcherHandler.handle_matcher(self, matcher, &block)
-        end
+      def should(matcher=nil, &block)
+        ExpectationMatcherHandler.handle_matcher(self, matcher, &block)
       end
 
       # :call-seq:
@@ -54,12 +50,8 @@ module Spec
       #     => Passes unless (receiver =~ regexp)
       #
       # See Spec::Matchers for more information about matchers
-      def should_not(matcher = :default_parameter, &block)
-        if :default_parameter == matcher
-          Spec::Matchers::NegativeOperatorMatcher.new(self)
-        else
-          NegativeExpectationMatcherHandler.handle_matcher(self, matcher, &block)
-        end
+      def should_not(matcher=nil, &block)
+        NegativeExpectationMatcherHandler.handle_matcher(self, matcher, &block)
       end
 
     end

data/vendor/plugins/rspec/lib/spec/expectations/handler.rb

@@ -2,31 +2,30 @@ module Spec
   module Expectations
     class InvalidMatcherError < ArgumentError; end        
     
-    module MatcherHandlerHelper
-      def describe_matcher(matcher)
-        matcher.respond_to?(:description) ? matcher.description : "[#{matcher.class.name} does not provide a description]"
-      end
-    end
-    
     class ExpectationMatcherHandler        
       class << self
-        include MatcherHandlerHelper
         def handle_matcher(actual, matcher, &block)
+          ::Spec::Matchers.last_should = "should"
+          return Spec::Matchers::PositiveOperatorMatcher.new(actual) if matcher.nil?
+
           unless matcher.respond_to?(:matches?)
             raise InvalidMatcherError, "Expected a matcher, got #{matcher.inspect}."
           end
           
           match = matcher.matches?(actual, &block)
-          ::Spec::Matchers.generated_description = "should #{describe_matcher(matcher)}"
+          ::Spec::Matchers.last_matcher = matcher
           Spec::Expectations.fail_with(matcher.failure_message) unless match
+          match
         end
       end
     end
 
     class NegativeExpectationMatcherHandler
       class << self
-        include MatcherHandlerHelper
         def handle_matcher(actual, matcher, &block)
+          ::Spec::Matchers.last_should = "should not"
+          return Spec::Matchers::NegativeOperatorMatcher.new(actual) if matcher.nil?
+          
           unless matcher.respond_to?(:matches?)
             raise InvalidMatcherError, "Expected a matcher, got #{matcher.inspect}."
           end
@@ -41,8 +40,9 @@ EOF
 )
           end
           match = matcher.matches?(actual, &block)
-          ::Spec::Matchers.generated_description = "should not #{describe_matcher(matcher)}"
+          ::Spec::Matchers.last_matcher = matcher
           Spec::Expectations.fail_with(matcher.negative_failure_message) if match
+          match
         end
       end
     end

data/vendor/plugins/rspec/lib/spec/extensions/main.rb

@@ -16,14 +16,14 @@ module Spec
       # The reason for using different behaviour classes is to have different
       # matcher methods available from within the <tt>describe</tt> block.
       #
-      # See Spec::Example::ExampleFactory#register for details about how to
+      # See Spec::Example::ExampleGroupFactory#register for details about how to
       # register special implementations.
       #
       def describe(*args, &block)
         raise ArgumentError if args.empty?
         raise ArgumentError unless block
         args << {} unless Hash === args.last
-        args.last[:spec_path] = caller(0)[1]
+        args.last[:spec_path] = File.expand_path(caller(0)[1])
         Spec::Example::ExampleGroupFactory.create_example_group(*args, &block)
       end
       alias :context :describe
@@ -80,23 +80,8 @@ module Spec
           raise NameError.new(e.message + "\nThe first argument to share_as must be a legal name for a constant\n")
         end
       end
-
-    private
-    
-      def rspec_options
-        $rspec_options ||= begin; \
-          parser = ::Spec::Runner::OptionParser.new(STDERR, STDOUT); \
-          parser.order!(ARGV); \
-          $rspec_options = parser.options; \
-        end
-        $rspec_options
-      end
-      
-      def init_rspec_options(options)
-        $rspec_options = options if $rspec_options.nil?
-      end
     end
   end
 end
 
-include Spec::Extensions::Main
+include Spec::Extensions::Main

data/vendor/plugins/rspec/lib/spec/extensions/metaclass.rb

@@ -0,0 +1,7 @@
+module Spec
+  module MetaClass
+    def metaclass
+      class << self; self; end
+    end
+  end
+end

data/vendor/plugins/rspec/lib/spec/extensions/object.rb

@@ -3,8 +3,4 @@ class Object
     options = Hash === args.last ? args.pop : {}
     return args, options
   end
-
-  def metaclass
-    class << self; self; end
-  end
 end

data/vendor/plugins/rspec/lib/spec/extensions.rb

@@ -1,3 +1,4 @@
 require 'spec/extensions/object'
 require 'spec/extensions/class'
 require 'spec/extensions/main'
+require 'spec/extensions/metaclass'

data/vendor/plugins/rspec/lib/spec/interop/test/unit/testcase.rb

@@ -43,9 +43,12 @@ module Test
         end
       end
 
-      def initialize(defined_description, &implementation)
+      def initialize(defined_description, options={}, &implementation)
         @_defined_description = defined_description
-        @_implementation = implementation
+        
+        # TODO - examples fail in rspec-rails if we remove "|| pending_implementation"
+        #      - find a way to fail without it in rspec's code examples
+        @_implementation = implementation || pending_implementation
 
         @_result = ::Test::Unit::TestResult.new
         # @method_name is important to set here because it "complies" with Test::Unit's interface.
@@ -56,6 +59,13 @@ module Test
       def run(ignore_this_argument=nil)
         super()
       end
+
+    private
+
+      def pending_implementation
+        error = Spec::Example::NotYetImplementedError.new(caller)
+        lambda { raise(error) }
+      end
     end
   end
 end

data/vendor/plugins/rspec/lib/spec/matchers/be.rb

@@ -12,22 +12,19 @@ module Spec
         @comparison = ""
       end
       
-      def matches?(actual)
-        @actual = actual
+      def matches?(given)
+        @given = given
         if handling_predicate?
           begin
-            return @result = actual.__send__(predicate, *@args)
+            return @result = given.__send__(predicate, *@args)
           rescue => predicate_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"
           end
 
-          # This supports should_exist > target.exists? in the old world.
-          # We should consider deprecating that ability as in the new world
-          # you can't write "should exist" unless you have your own custom matcher.
           begin
-            return @result = actual.__send__(present_tense_predicate, *@args)
+            return @result = given.__send__(present_tense_predicate, *@args)
           rescue
             raise predicate_error
           end
@@ -37,12 +34,12 @@ module Spec
       end
       
       def failure_message
-        return "expected #{@comparison}#{expected}, got #{@actual.inspect}" unless handling_predicate?
+        return "expected #{@comparison}#{expected}, got #{@given.inspect}" unless handling_predicate?
         return "expected #{predicate}#{args_to_s} to return true, got #{@result.inspect}"
       end
       
       def negative_failure_message
-        return "expected not #{expected}, got #{@actual.inspect}" unless handling_predicate?
+        return "expected not #{expected}, got #{@given.inspect}" unless handling_predicate?
         return "expected #{predicate}#{args_to_s} to return false, got #{@result.inspect}"
       end
       
@@ -55,17 +52,17 @@ module Spec
       end
       
       def match_or_compare
-        return @actual ? true : false if @expected == :satisfy_if
-        return @actual == true if @expected == :true
-        return @actual == false if @expected == :false
-        return @actual.nil? if @expected == :nil
-        return @actual < @expected if @less_than
-        return @actual <= @expected if @less_than_or_equal
-        return @actual >= @expected if @greater_than_or_equal
-        return @actual > @expected if @greater_than
-        return @actual == @expected if @double_equal
-        return @actual === @expected if @triple_equal
-        return @actual.equal?(@expected)
+        return @given ? true : false if @expected == :satisfy_if
+        return @given == true if @expected == :true
+        return @given == false if @expected == :false
+        return @given.nil? if @expected == :nil
+        return @given < @expected if @less_than
+        return @given <= @expected if @less_than_or_equal
+        return @given >= @expected if @greater_than_or_equal
+        return @given > @expected if @greater_than
+        return @given == @expected if @double_equal
+        return @given === @expected if @triple_equal
+        return @given.equal?(@expected)
       end
       
       def ==(expected)
@@ -192,7 +189,7 @@ module Spec
     #   should_not be_nil
     #   should_not be_arbitrary_predicate(*args)
     #
-    # Given true, false, or nil, will pass if actual is
+    # Given true, false, or nil, will pass if given value is
     # true, false or nil (respectively). Given no args means
     # the caller should satisfy an if condition (to be or not to be). 
     #

data/vendor/plugins/rspec/lib/spec/matchers/be_close.rb

@@ -7,13 +7,13 @@ module Spec
         @delta = delta
       end
       
-      def matches?(actual)
-        @actual = actual
-        (@actual - @expected).abs < @delta
+      def matches?(given)
+        @given = given
+        (@given - @expected).abs < @delta
       end
       
       def failure_message
-        "expected #{@expected} +/- (< #{@delta}), got #{@actual}"
+        "expected #{@expected} +/- (< #{@delta}), got #{@given}"
       end
       
       def description
@@ -25,7 +25,7 @@ module Spec
     #   should be_close(expected, delta)
     #   should_not be_close(expected, delta)
     #
-    # Passes if actual == expected +/- delta
+    # Passes if given == expected +/- delta
     #
     # == Example
     #

data/vendor/plugins/rspec/lib/spec/matchers/change.rb

@@ -4,60 +4,60 @@ module Spec
     #Based on patch from Wilson Bilkovich
     class Change #:nodoc:
       def initialize(receiver=nil, message=nil, &block)
-        @receiver = receiver
-        @message = message
-        @block = block
+        @message = message || "result"
+        @value_proc = block || lambda {
+          receiver.__send__(message)
+        }
       end
       
-      def matches?(target, &block)
-        if block
-          raise MatcherError.new(<<-EOF
-block passed to should or should_not change must use {} instead of do/end
-EOF
-)
-        end
-        @target = target
-        execute_change
-        return false if @from && (@from != @before)
-        return false if @to && (@to != @after)
+      def matches?(event_proc)
+        raise_block_syntax_error if block_given?
+        
+        @before = evaluate_value_proc
+        event_proc.call
+        @after = evaluate_value_proc
+        
+        return false if @from unless @from == @before
+        return false if @to unless @to == @after
         return (@before + @amount == @after) if @amount
         return ((@after - @before) >= @minimum) if @minimum
         return ((@after - @before) <= @maximum) if @maximum        
         return @before != @after
       end
       
-      def execute_change
-        @before = @block.nil? ? @receiver.send(@message) : @block.call
-        @target.call
-        @after = @block.nil? ? @receiver.send(@message) : @block.call
+      def raise_block_syntax_error
+        raise MatcherError.new(<<-MESSAGE
+block passed to should or should_not change must use {} instead of do/end
+MESSAGE
+        )
+      end
+      
+      def evaluate_value_proc
+        @value_proc.call
       end
       
       def failure_message
         if @to
-          "#{result} should have been changed to #{@to.inspect}, but is now #{@after.inspect}"
+          "#{@message} should have been changed to #{@to.inspect}, but is now #{@after.inspect}"
         elsif @from
-          "#{result} should have initially been #{@from.inspect}, but was #{@before.inspect}"
+          "#{@message} should have initially been #{@from.inspect}, but was #{@before.inspect}"
         elsif @amount
-          "#{result} should have been changed by #{@amount.inspect}, but was changed by #{actual_delta.inspect}"
+          "#{@message} should have been changed by #{@amount.inspect}, but was changed by #{actual_delta.inspect}"
         elsif @minimum
-          "#{result} should have been changed by at least #{@minimum.inspect}, but was changed by #{actual_delta.inspect}"
+          "#{@message} should have been changed by at least #{@minimum.inspect}, but was changed by #{actual_delta.inspect}"
         elsif @maximum
-          "#{result} should have been changed by at most #{@maximum.inspect}, but was changed by #{actual_delta.inspect}"
+          "#{@message} should have been changed by at most #{@maximum.inspect}, but was changed by #{actual_delta.inspect}"
         else
-          "#{result} should have changed, but is still #{@before.inspect}"
+          "#{@message} should have changed, but is still #{@before.inspect}"
         end
       end
       
-      def result
-        @message || "result"
-      end
-      
       def actual_delta
         @after - @before
       end
       
       def negative_failure_message
-        "#{result} should not have changed, but did change from #{@before.inspect} to #{@after.inspect}"
+        "#{@message} should not have changed, but did change from #{@before.inspect} to #{@after.inspect}"
       end
       
       def by(amount)
@@ -114,7 +114,7 @@ EOF
     #
     #   string = "string"
     #   lambda {
-    #     string.reverse
+    #     string.reverse!
     #   }.should change { string }.from("string").to("gnirts")
     #
     #   lambda {
@@ -125,20 +125,24 @@ EOF
     #     employee.develop_great_new_social_networking_app
     #   }.should change(employee, :title).from("Mail Clerk").to("CEO")
     #
-    # Evaluates +receiver.message+ or +block+ before and
-    # after it evaluates the c object (generated by the lambdas in the examples above).
+    # Evaluates <tt>receiver.message</tt> or <tt>block</tt> before and after
+    # it evaluates the c object (generated by the lambdas in the examples
+    # above).
+    #
+    # Then compares the values before and after the <tt>receiver.message</tt>
+    # and evaluates the difference compared to the expected difference.
     #
-    # Then compares the values before and after the +receiver.message+ and
-    # evaluates the difference compared to the expected difference.
+    # == WARNING
+    # <tt>should_not change</tt> only supports the form with no
+    # subsequent calls to <tt>by</tt>, <tt>by_at_least</tt>,
+    # <tt>by_at_most</tt>, <tt>to</tt> or <tt>from</tt>.
     #
-    # == Warning
-    # +should_not+ +change+ only supports the form with no subsequent calls to
-    # +by+, +by_at_least+, +by_at_most+, +to+ or +from+.
+    # blocks passed to <tt>should</tt> <tt>change</tt> and <tt>should_not</tt>
+    # <tt>change</tt> must use the <tt>{}</tt> form (<tt>do/end</tt> is not
+    # supported).
     #
-    # blocks passed to +should+ +change+ and +should_not+ +change+
-    # must use the <tt>{}</tt> form (<tt>do/end</tt> is not supported)
-    def change(target=nil, message=nil, &block)
-      Matchers::Change.new(target, message, &block)
+    def change(receiver=nil, message=nil, &block)
+      Matchers::Change.new(receiver, message, &block)
     end
   end
 end

data/vendor/plugins/rspec/lib/spec/matchers/eql.rb

@@ -6,17 +6,17 @@ module Spec
         @expected = expected
       end
   
-      def matches?(actual)
-        @actual = actual
-        @actual.eql?(@expected)
+      def matches?(given)
+        @given = given
+        @given.eql?(@expected)
       end
 
       def failure_message
-        return "expected #{@expected.inspect}, got #{@actual.inspect} (using .eql?)", @expected, @actual
+        return "expected #{@expected.inspect}, got #{@given.inspect} (using .eql?)", @expected, @given
       end
       
       def negative_failure_message
-        return "expected #{@actual.inspect} not to equal #{@expected.inspect} (using .eql?)", @expected, @actual
+        return "expected #{@given.inspect} not to equal #{@expected.inspect} (using .eql?)", @expected, @given
       end
 
       def description
@@ -28,7 +28,7 @@ module Spec
     #   should eql(expected)
     #   should_not eql(expected)
     #
-    # Passes if actual and expected are of equal value, but not necessarily the same object.
+    # Passes if given and expected are of equal value, but not necessarily the same object.
     #
     # See http://www.ruby-doc.org/core/classes/Object.html#M001057 for more information about equality in Ruby.
     #

data/vendor/plugins/rspec/lib/spec/matchers/equal.rb

@@ -6,17 +6,17 @@ module Spec
         @expected = expected
       end
   
-      def matches?(actual)
-        @actual = actual
-        @actual.equal?(@expected)
+      def matches?(given)
+        @given = given
+        @given.equal?(@expected)
       end
 
       def failure_message
-        return "expected #{@expected.inspect}, got #{@actual.inspect} (using .equal?)", @expected, @actual
+        return "expected #{@expected.inspect}, got #{@given.inspect} (using .equal?)", @expected, @given
       end
 
       def negative_failure_message
-        return "expected #{@actual.inspect} not to equal #{@expected.inspect} (using .equal?)", @expected, @actual
+        return "expected #{@given.inspect} not to equal #{@expected.inspect} (using .equal?)", @expected, @given
       end
       
       def description
@@ -28,7 +28,7 @@ module Spec
     #   should equal(expected)
     #   should_not equal(expected)
     #
-    # Passes if actual and expected are the same object (object identity).
+    # Passes if given and expected are the same object (object identity).
     #
     # See http://www.ruby-doc.org/core/classes/Object.html#M001057 for more information about equality in Ruby.
     #

data/vendor/plugins/rspec/lib/spec/matchers/exist.rb

@@ -1,17 +1,22 @@
 module Spec
   module Matchers
     class Exist
-      def matches? actual
-        @actual = actual
-        @actual.exist?
+      def matches?(given)
+        @given = given
+        @given.exist?
       end
       def failure_message
-        "expected #{@actual.inspect} to exist, but it doesn't."
+        "expected #{@given.inspect} to exist, but it doesn't."
       end
       def negative_failure_message
-        "expected #{@actual.inspect} to not exist, but it does."
+        "expected #{@given.inspect} to not exist, but it does."
       end
     end
+    # :call-seq:
+    #   should exist
+    #   should_not exist
+    #
+    # Passes if given.exist?
     def exist; Exist.new; end
   end
 end