dchelimsky-rspec 1.1.11 → 1.1.11.1

data/lib/spec/matchers/generated_descriptions.rb

@@ -0,0 +1,48 @@
+module Spec
+  module Matchers
+    def self.last_matcher
+      @last_matcher
+    end
+
+    def self.last_matcher=(last_matcher)
+      @last_matcher = last_matcher
+    end
+
+    def self.last_should
+      @last_should
+    end
+
+    def self.last_should=(last_should)
+      @last_should = last_should
+    end
+
+    def self.clear_generated_description
+      self.last_matcher = nil
+      self.last_should = nil
+    end
+
+    def self.generated_description
+      return nil if last_should.nil?
+      "#{last_should} #{last_description}"
+    end
+    
+    private
+    
+    def self.last_description
+      last_matcher.respond_to?(:description) ? last_matcher.description : <<-MESSAGE
+When you call a matcher in an example without a String, like this:
+
+specify { object.should matcher }
+
+or this:
+
+it { should matcher }
+
+the runner expects the matcher to have a #describe method. You should either
+add a String to the example this matcher is being used in, or give it a
+description method. Then you won't have to suffer this lengthy warning again.
+MESSAGE
+    end
+  end
+end
+      

data/lib/spec/matchers/has.rb

@@ -1,34 +1,18 @@
 module Spec
   module Matchers
-    
-    class Has #:nodoc:
-      def initialize(sym, *args)
-        @sym = sym
-        @args = args
-      end
-      
-      def matches?(given)
-        given.__send__(predicate, *@args)
-      end
-      
-      def failure_message
-        "expected ##{predicate}(#{@args[0].inspect}) to return true, got false"
-      end
-      
-      def negative_failure_message
-        "expected ##{predicate}(#{@args[0].inspect}) to return false, got true"
+    def has(sym, *args) # :nodoc:
+      simple_matcher do |actual, matcher|
+        matcher.failure_message          = "expected ##{predicate(sym)}(#{args[0].inspect}) to return true, got false"
+        matcher.negative_failure_message = "expected ##{predicate(sym)}(#{args[0].inspect}) to return false, got true"
+        matcher.description              = "have key #{args[0].inspect}"
+        actual.__send__(predicate(sym), *args)
       end
-      
-      def description
-        "have key #{@args[0].inspect}"
-      end
-      
-      private
-        def predicate
-          "#{@sym.to_s.sub("have_","has_")}?".to_sym
-        end
-        
     end
- 
+    
+  private
+    def predicate(sym)
+      "#{sym.to_s.sub("have_","has_")}?".to_sym
+    end
+
   end
 end

data/lib/spec/matchers/include.rb

@@ -7,16 +7,19 @@ module Spec
         @expecteds = expecteds
       end
       
-      def matches?(given)
-        @given = given
+      def matches?(actual)
+        @actual = actual
         @expecteds.each do |expected|
-          case given
-          when Hash
-            expected.each_pair do |k,v|
-              return false unless given[k] == v
+          if actual.is_a?(Hash)
+            if expected.is_a?(Hash)
+              expected.each_pair do |k,v|
+                return false unless actual[k] == v
+              end
+            else
+              return false unless actual.has_key?(expected)
             end
           else
-            return false unless given.include?(expected)
+            return false unless actual.include?(expected)
           end
         end
         true
@@ -36,7 +39,7 @@ module Spec
       
       private
         def _message(maybe_not="")
-          "expected #{@given.inspect} #{maybe_not}to include #{_pretty_print(@expecteds)}"
+          "expected #{@actual.inspect} #{maybe_not}to include #{_pretty_print(@expecteds)}"
         end
         
         def _pretty_print(array)
@@ -58,7 +61,7 @@ module Spec
     #   should include(expected)
     #   should_not include(expected)
     #
-    # Passes if given includes expected. This works for
+    # Passes if actual 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

@@ -1,41 +1,22 @@
 module Spec
   module Matchers
     
-    class Match #:nodoc:
-      def initialize(regexp)
-        @regexp = regexp
-      end
-      
-      def matches?(given)
-        @given = given
-        return true if given =~ @regexp
-        return false
-      end
-      
-      def failure_message
-        return "expected #{@given.inspect} to match #{@regexp.inspect}", @regexp, @given
-      end
-      
-      def negative_failure_message
-        return "expected #{@given.inspect} not to match #{@regexp.inspect}", @regexp, @given
-      end
-      
-      def description
-        "match #{@regexp.inspect}"
-      end
-    end
-    
     # :call-seq:
     #   should match(regexp)
     #   should_not match(regexp)
     #
-    # Given a Regexp, passes if given =~ regexp
+    # Given a Regexp, passes if actual =~ regexp
     #
     # == Examples
     #
-    #   email.should match(/^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i)
+    #   email.should match(/^([^\s]+)((?:[-a-z0-9]+\.)+[a-z]{2,})$/i)
     def match(regexp)
-      Matchers::Match.new(regexp)
+      simple_matcher do |actual, matcher|
+        matcher.failure_message          = "expected #{actual.inspect} to match #{regexp.inspect}", regexp, actual
+        matcher.negative_failure_message = "expected #{actual.inspect} not to match #{regexp.inspect}", regexp, actual
+        matcher.description              = "match #{regexp.inspect}"
+        actual =~ regexp
+      end
     end
   end
 end

data/lib/spec/matchers/method_missing.rb

@@ -0,0 +1,9 @@
+module Spec
+  module Matchers
+    def method_missing(sym, *args, &block) # :nodoc:
+      return Matchers::Be.new(sym, *args) if sym.starts_with?("be_")
+      return has(sym, *args) if sym.starts_with?("have_")
+      super
+    end
+  end
+end

data/lib/spec/matchers/operator_matcher.rb

@@ -1,40 +1,20 @@
 module Spec
   module Matchers
-    class BaseOperatorMatcher
-      def initialize(given)
-        @given = given
+    class OperatorMatcher
+      def initialize(actual)
+        @actual = actual
       end
-
-      def ==(expected)
-        __delegate_method_missing_to_given("==", expected)
-      end
-
-      def ===(expected)
-        __delegate_method_missing_to_given("===", expected)
-      end
-
-      def =~(expected)
-        __delegate_method_missing_to_given("=~", expected)
-      end
-
-      def >(expected)
-        __delegate_method_missing_to_given(">", expected)
-      end
-
-      def >=(expected)
-        __delegate_method_missing_to_given(">=", expected)
-      end
-
-      def <(expected)
-        __delegate_method_missing_to_given("<", expected)
-      end
-
-      def <=(expected)
-        __delegate_method_missing_to_given("<=", expected)
+      
+      ['==','===','<','<=','>=','>','=~'].each do |operator|
+        define_method operator do |expected|
+          ::Spec::Matchers.last_matcher = self
+          @operator, @expected = operator, expected
+          __delegate_operator(@actual, operator, expected)
+        end
       end
 
       def fail_with_message(message)
-        Spec::Expectations.fail_with(message, @expected, @given)
+        Spec::Expectations.fail_with(message, @expected, @actual)
       end
       
       def description
@@ -43,27 +23,24 @@ module Spec
 
     end
 
-    class PositiveOperatorMatcher < BaseOperatorMatcher #:nodoc:
+    class PositiveOperatorMatcher < OperatorMatcher #:nodoc:
 
-      def __delegate_method_missing_to_given(operator, expected)
-        @expected = expected
-        @operator = operator
-        ::Spec::Matchers.last_matcher = self
-        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}")
+      def __delegate_operator(actual, operator, expected)
+        return true if actual.__send__(operator, expected)
+        if ['==','===', '=~'].include?(operator)
+          fail_with_message("expected: #{expected.inspect},\n     got: #{actual.inspect} (using #{operator})") 
+        else
+          fail_with_message("expected: #{operator} #{expected.inspect},\n     got: #{operator.gsub(/./, ' ')} #{actual.inspect}")
+        end
       end
 
     end
 
-    class NegativeOperatorMatcher < BaseOperatorMatcher #:nodoc:
+    class NegativeOperatorMatcher < OperatorMatcher #:nodoc:
 
-      def __delegate_method_missing_to_given(operator, expected)
-        @expected = expected
-        @operator = operator
-        ::Spec::Matchers.last_matcher = self
-        return true unless @given.__send__(operator, expected)
-        return fail_with_message("expected not: #{operator} #{expected.inspect},\n         got: #{operator.gsub(/./, ' ')} #{@given.inspect}")
+      def __delegate_operator(actual, operator, expected)
+        return true unless actual.__send__(operator, expected)
+        return fail_with_message("expected not: #{operator} #{expected.inspect},\n         got: #{operator.gsub(/./, ' ')} #{actual.inspect}")
       end
 
     end

data/lib/spec/matchers/raise_error.rb

@@ -47,20 +47,16 @@ module Spec
       def verify_message
         case @expected_message
         when nil
-          return true
+          true
         when Regexp
-          return @expected_message =~ @given_error.message
+          @expected_message =~ @given_error.message
         else
-          return @expected_message == @given_error.message
+          @expected_message == @given_error.message
         end
       end
       
       def failure_message
-        if @eval_block
-          return @given_error.message
-        else
-          return "expected #{expected_error}#{given_error}"
-        end
+        @eval_block ? @given_error.message : "expected #{expected_error}#{given_error}"
       end
 
       def negative_failure_message

data/lib/spec/matchers/respond_to.rb

@@ -26,7 +26,8 @@ module Spec
       end
       
       def description
-        "respond to ##{@names.to_s}"
+        # Ruby 1.9 returns the same thing for array.to_s as array.inspect, so just use array.inspect here
+        "respond to #{@names.inspect}"
       end
     end
     

data/lib/spec/matchers/throw_symbol.rb

@@ -21,9 +21,13 @@ module Spec
             end
             @caught_symbol = @expected_symbol unless @caught_arg == :nothing_thrown
           end
-        rescue NameError => e
-          raise e unless e.message =~ /uncaught throw/
-          @caught_symbol = e.name.to_sym
+
+        # Ruby 1.8 uses NameError with `symbol'
+        # Ruby 1.9 uses ArgumentError with :symbol
+        rescue NameError, ArgumentError => e
+          raise e unless e.message =~ /uncaught throw (`|\:)([a-zA-Z0-9_]*)(')?/
+          @caught_symbol = $2.to_sym
+
         ensure
           if @expected_symbol.nil?
             return !@caught_symbol.nil?
@@ -31,6 +35,8 @@ module Spec
             if @expected_arg.nil?
               return @caught_symbol == @expected_symbol
             else
+              # puts [@caught_symbol, @expected_symbol].inspect
+              # puts [@caught_arg, @expected_arg].inspect
               return @caught_symbol == @expected_symbol && @caught_arg == @expected_arg
             end
           end

data/lib/spec/mocks/message_expectation.rb

@@ -39,11 +39,6 @@ module Spec
         child
       end
       
-      def error_generator_opts=(opts={})
-        @error_generator.opts = opts
-      end
-      protected :error_generator_opts=
-      
       def expected_args
         @args_expectation.args
       end

data/lib/spec/mocks/proxy.rb

@@ -98,7 +98,7 @@ module Spec
           expectation.advise(args, block) if null_object? unless expectation.expected_messages_received?
           raise_unexpected_message_args_error(expectation, *args) unless (has_negative_expectation?(sym) or null_object?)
         else
-          @target.send :method_missing, sym, *args, &block
+          @target.__send__ :method_missing, sym, *args, &block
         end
       end
 
@@ -125,14 +125,16 @@ module Spec
       
       def define_expected_method(sym)
         visibility_string = "#{visibility(sym)} :#{sym}"
-        if target_responds_to?(sym) && !target_metaclass.method_defined?(munge(sym))
-          munged_sym = munge(sym)
-          target_metaclass.instance_eval do
-            alias_method munged_sym, sym if method_defined?(sym.to_s)
+        unless @proxied_methods.include?(sym)
+          if target_responds_to?(sym)
+            munged_sym = munge(sym)
+            target_metaclass.instance_eval do
+              alias_method munged_sym, sym if method_defined?(sym.to_s)
+            end
+            @proxied_methods << sym
           end
-          @proxied_methods << sym
         end
-        
+
         target_metaclass.class_eval(<<-EOF, __FILE__, __LINE__)
           def #{sym}(*args, &block)
             __mock_proxy.message_received :#{sym}, *args, &block
@@ -142,9 +144,9 @@ module Spec
       end
 
       def target_responds_to?(sym)
-        return @target.send(munge(:respond_to?),sym) if @already_proxied_respond_to
+        return @target.__send__(munge(:respond_to?),sym) if @already_proxied_respond_to
         return @already_proxied_respond_to = true if sym == :respond_to?
-        return @target.respond_to?(sym)
+        return @target.respond_to?(sym, true)
       end
 
       def visibility(sym)
@@ -193,7 +195,7 @@ module Spec
               alias_method sym, munged_sym
               undef_method munged_sym
             else
-              undef_method sym
+              remove_method sym
             end
           end
         end

data/lib/spec/rake/spectask.rb

@@ -56,12 +56,10 @@ module Spec
     #   end
     #
     class SpecTask < ::Rake::TaskLib
-      class << self
-        def attr_accessor(*names)
-          super(*names)
-          names.each do |name|
-            module_eval "def #{name}() evaluate(@#{name}) end" # Allows use of procs
-          end
+      def self.attr_accessor(*names)
+        super(*names)
+        names.each do |name|
+          module_eval "def #{name}() evaluate(@#{name}) end" # Allows use of procs
         end
       end
 

data/lib/spec/runner/class_and_arguments_parser.rb

@@ -1,16 +1,14 @@
 module Spec
   module Runner
     class ClassAndArgumentsParser
-      class << self
-        def parse(s)
-          if s =~ /([a-zA-Z_]+(?:::[a-zA-Z_]+)*):?(.*)/
-            arg = $2 == "" ? nil : $2
-            [$1, arg]
-          else
-            raise "Couldn't parse #{s.inspect}"
-          end
+      def self.parse(s)
+        if s =~ /([a-zA-Z_]+(?:::[a-zA-Z_]+)*):?(.*)/
+          arg = $2 == "" ? nil : $2
+          [$1, arg]
+        else
+          raise "Couldn't parse #{s.inspect}"
         end
       end
     end
   end
-end
+end

data/lib/spec/runner/command_line.rb

@@ -3,14 +3,12 @@ require 'spec/runner/option_parser'
 module Spec
   module Runner
     class CommandLine
-      class << self
-        def run(tmp_options=Spec::Runner.options)
-          orig_options = Spec::Runner.options
-          Spec::Runner.use tmp_options
-          tmp_options.run_examples
-        ensure
-          Spec::Runner.use orig_options
-        end
+      def self.run(tmp_options=Spec::Runner.options)
+        orig_options = Spec::Runner.options
+        Spec::Runner.use tmp_options
+        tmp_options.run_examples
+      ensure
+        Spec::Runner.use orig_options
       end
     end
   end

data/lib/spec/runner/formatter/base_text_formatter.rb

@@ -14,6 +14,7 @@ module Spec
         def initialize(options, where)
           super
           if where.is_a?(String)
+            FileUtils.mkdir_p(File.dirname(where))
             @output = File.open(where, 'w')
           else
             @output = where
@@ -69,8 +70,8 @@ module Spec
             @output.puts
             @output.puts "Pending:"
             @pending_examples.each do |pending_example|
-              @output.puts "#{pending_example[0]} (#{pending_example[1]})" 
-              @output.puts "  Called from #{pending_example[2]}"
+              @output.puts "\n#{pending_example[0]} (#{pending_example[1]})"
+              @output.puts "#{pending_example[2]}\n"
             end
           end
           @output.flush

data/lib/spec/runner/option_parser.rb

@@ -4,12 +4,10 @@ require 'stringio'
 module Spec
   module Runner
     class OptionParser < ::OptionParser
-      class << self
-        def parse(args, err, out)
-          parser = new(err, out)
-          parser.parse(args)
-          parser.options
-        end
+      def self.parse(args, err, out)
+        parser = new(err, out)
+        parser.parse(args)
+        parser.options
       end
 
       attr_reader :options

data/lib/spec/runner/spec_parser.rb

@@ -12,7 +12,7 @@ module Spec
         best_match.clear
         file = File.expand_path(file)
         Spec::Runner.options.example_groups.each do |example_group|
-          consider_example_groups_for_best_match example_group, file, line_number
+          consider_example_group_for_best_match example_group, file, line_number
 
           example_group.examples.each do |example|
             consider_example_for_best_match example, example_group, file, line_number
@@ -31,8 +31,8 @@ module Spec
 
     protected
 
-      def consider_example_groups_for_best_match(example_group, file, line_number)
-        parsed_backtrace = parse_backtrace(example_group.registration_backtrace)
+      def consider_example_group_for_best_match(example_group, file, line_number)
+        parsed_backtrace = parse_backtrace(example_group.backtrace)
         parsed_backtrace.each do |example_file, example_line|
           if is_best_match?(file, line_number, example_file, example_line)
             best_match.clear
@@ -43,7 +43,7 @@ module Spec
       end
 
       def consider_example_for_best_match(example, example_group, file, line_number)
-        parsed_backtrace = parse_backtrace(example.implementation_backtrace)
+        parsed_backtrace = parse_backtrace(example.backtrace)
         parsed_backtrace.each do |example_file, example_line|
           if is_best_match?(file, line_number, example_file, example_line)
             best_match.clear
@@ -61,7 +61,7 @@ module Spec
       end
 
       def parse_backtrace(backtrace)
-        backtrace.collect do |trace_line|
+        Array(backtrace).collect do |trace_line|
           split_line = trace_line.split(':')
           [split_line[0], Integer(split_line[1])]
         end

data/lib/spec/runner.rb

@@ -164,50 +164,48 @@ module Spec
   #    end
   #  end
   module Runner
-    class << self
-      def configuration # :nodoc:
-        @configuration ||= Spec::Example::Configuration.new
-      end
-      
-      # Use this to configure various configurable aspects of
-      # RSpec:
-      #
-      #   Spec::Runner.configure do |configuration|
-      #     # Configure RSpec here
-      #   end
-      #
-      # The yielded <tt>configuration</tt> object is a
-      # Spec::Example::Configuration instance. See its RDoc
-      # for details about what you can do with it.
-      #
-      def configure
-        yield configuration
-      end
-      
-      def register_at_exit_hook # :nodoc:
-        unless @already_registered_at_exit_hook
-          at_exit do
-            unless $! || Spec.run? || Spec::Example::ExampleGroupFactory.registered_or_ancestor_of_registered?(options.example_groups)
-              success = Spec.run
-              exit success if Spec.exit?
-            end
+    def self.configuration # :nodoc:
+      @configuration ||= Spec::Example::Configuration.new
+    end
+
+    # Use this to configure various configurable aspects of
+    # RSpec:
+    #
+    #   Spec::Runner.configure do |configuration|
+    #     # Configure RSpec here
+    #   end
+    #
+    # The yielded <tt>configuration</tt> object is a
+    # Spec::Example::Configuration instance. See its RDoc
+    # for details about what you can do with it.
+    #
+    def self.configure
+      yield configuration
+    end
+    
+    def self.register_at_exit_hook # :nodoc:
+      unless @already_registered_at_exit_hook
+        at_exit do
+          unless $! || Spec.run? || Spec::Example::ExampleGroupFactory.registered_or_ancestor_of_registered?(options.example_groups)
+            success = Spec.run
+            exit success if Spec.exit?
           end
-          @already_registered_at_exit_hook = true
         end
+        @already_registered_at_exit_hook = true
       end
+    end
 
-      def options # :nodoc:
-        @options ||= begin
-          parser = ::Spec::Runner::OptionParser.new($stderr, $stdout)
-          parser.order!(ARGV)
-          parser.options
-        end
-      end
-      
-      def use options
-        @options = options
+    def self.options # :nodoc:
+      @options ||= begin
+        parser = ::Spec::Runner::OptionParser.new($stderr, $stdout)
+        parser.order!(ARGV)
+        parser.options
       end
-
     end
+    
+    def self.use options
+      @options = options
+    end
+
   end
 end