rspec 0.5.0 → 0.5.1

data/doc/src/documentation/specs.page

@@ -0,0 +1,20 @@
+---
+title: Writing Specifications
+inMenu: true
+ordering: 2
+---
+h2. Writing Specifications
+
+An RSpec specification is a Ruby file with a context and one or more specifications. Example:
+
+  context "Stack" do
+    specify "should return top when sent top" do
+      stack = Stack.new
+      stack.push 3
+      stack.top.should.be 3
+    end
+  end
+
+A context represents a collection of specifications and must be defined with a name and a block (do-end).
+A specification is defined with the *specify* keyword and a sentence describing what's being specified.
+It is highly recommended to include

data/doc/src/download.page

@@ -0,0 +1,8 @@
+---
+title: Download
+inMenu: true
+ordering: 5
+---
+h2. Download
+
+Bla

data/doc/src/examples.page

@@ -0,0 +1,9 @@
+---
+title: Examples
+inMenu: true
+ordering: 5
+---
+h2. Examples
+
+Here is an example of an RSpec spec:
+{ruby_inline: {filename: ../examples/spec_framework_spec.rb}}

data/doc/src/index.page

@@ -0,0 +1,8 @@
+---
+title: Overview
+inMenu: true
+ordering: 1
+---
+h2. RSpec
+
+bla bla bla

data/doc/src/tools/index.page

@@ -0,0 +1,8 @@
+---
+title: Tools
+inMenu: true
+ordering: 1
+---
+h2. Tools
+
+Look at my tools

data/doc/src/tools/rails.page

@@ -0,0 +1,8 @@
+---
+title: Rails Integration
+inMenu: true
+ordering: 5
+---
+h2. Rails Integration
+
+Bla bla bla

data/doc/src/tools/rake.page

@@ -0,0 +1,8 @@
+---
+title: Rake Integration
+inMenu: true
+ordering: 5
+---
+h2. Rake Integration
+
+Bla bla bla Bla bla bla

data/doc/src/tools/rcov.page

@@ -0,0 +1,8 @@
+---
+title: Code Coverage
+inMenu: true
+ordering: 5
+---
+h2. Code Coverage
+
+RCove bla bla

data/doc/src/tools/spec_runner.page

@@ -0,0 +1,8 @@
+---
+title: Running Specifications
+inMenu: true
+ordering: 5
+---
+h2. Running Specifications
+
+Bla bla bla

data/doc/src/tools/specdoc.page

@@ -0,0 +1,8 @@
+---
+title: Specdoc
+inMenu: true
+ordering: 5
+---
+h2. Specdoc
+
+Bla bla

data/doc/src/tools/test2rspec.page

@@ -0,0 +1,8 @@
+---
+title: Test::Unit migration
+inMenu: true
+ordering: 5
+---
+h2. Test::Unit migration
+
+lalalala

data/doc/src/why_rspec.page

@@ -0,0 +1,8 @@
+---
+title: Why RSpec
+inMenu: true
+ordering: 2
+---
+h2. Why RSpec
+
+Bla bla bla

data/examples/mocking_spec.rb

@@ -4,13 +4,13 @@ context "Mocker" do
 
   specify "should be able to call mock()" do
     mock = mock("poke me")
-    mock.should_receive(:poke)
+    mock.should.receive(:poke)
     mock.poke
   end
 
   specify "should fail when expected message not received" do
     mock = mock("poke me")
-    mock.should_receive(:poke)
+    mock.should.receive(:poke)
   end
 
 end

data/examples/spec_framework_spec.rb

@@ -15,14 +15,14 @@ context "Spec framework" do
   setup do
     @spec_framework = SpecFramework.new
   end
-  
-  specify "should be intuitive" do
-    @spec_framework.should.be.intuitive
-  end
 
   specify "should be adopted quickly" do
     #this will fail
     @spec_framework.should.be.adopted_quickly
   end
+  
+  specify "should be intuitive" do
+    @spec_framework.should.be.intuitive
+  end
 
 end

data/lib/spec/api/helper/have_helper.rb

@@ -1,56 +1,56 @@
-module Spec
-
-  class HaveHelper < ShouldBase
-
-    def initialize(target, expected=nil)
-      @target = target
-      @expected = expected == :no ? 0 : expected
-      @min = false
-      @max = false
-    end
-    
-    def method_missing(sym, *args)
-      fail_with_message(build_message(sym)) unless as_specified?(sym)
-    end
-    
-    def collection(sym)
-      @target.send(sym)
-    end
-    
-    def actual_size(collection)
-      return collection.length if collection.respond_to? :length
-      return collection.size if collection.respond_to? :size
-    end
-    
-    def build_message(sym)
-      message = "<#{@target.class.to_s}> should have"
-      message += " at least" if @min
-      message += " at most" if @max
-      message += " #{@expected} #{sym} (has #{actual_size(collection(sym))})"
-    end
-    
-    def as_specified?(sym)
-      return actual_size(collection(sym)) >= @expected if @min
-      return actual_size(collection(sym)) <= @expected if @max
-      return actual_size(collection(sym)) == @expected
-    end
-
-    def at
-      self
-    end
-    
-    def least(min)
-      @expected = min
-      @min = true
-      self
-    end
-    
-    def most(max)
-      @expected = max
-      @max = true
-      self
-    end
-
-  end
-
+module Spec
+
+  class HaveHelper < ShouldBase
+
+    def initialize(target, expected=nil)
+      @target = target
+      @expected = expected == :no ? 0 : expected
+      @min = false
+      @max = false
+    end
+    
+    def method_missing(sym, *args)
+      fail_with_message(build_message(sym)) unless as_specified?(sym)
+    end
+    
+    def collection(sym)
+      @target.send(sym)
+    end
+    
+    def actual_size(collection)
+      return collection.length if collection.respond_to? :length
+      return collection.size if collection.respond_to? :size
+    end
+    
+    def build_message(sym)
+      message = "<#{@target.class.to_s}> should have"
+      message += " at least" if @min
+      message += " at most" if @max
+      message += " #{@expected} #{sym} (has #{actual_size(collection(sym))})"
+    end
+    
+    def as_specified?(sym)
+      return actual_size(collection(sym)) >= @expected if @min
+      return actual_size(collection(sym)) <= @expected if @max
+      return actual_size(collection(sym)) == @expected
+    end
+
+    def at
+      self
+    end
+    
+    def least(min)
+      @expected = min
+      @min = true
+      self
+    end
+    
+    def most(max)
+      @expected = max
+      @max = true
+      self
+    end
+
+  end
+
 end

data/lib/spec/api/mock.rb

@@ -13,8 +13,12 @@ module Spec
         @options = DEFAULT_OPTIONS.dup.merge(options)
         @expectations = []
       end
+      
+      def should
+        self
+      end
 
-      def should_receive(sym, &block)
+      def receive(sym, &block)
         expected_from = caller(1)[0]
         expectation = MessageExpectation.new(@name, expected_from, sym, block_given? ? block : nil)
         @expectations << expectation
@@ -36,7 +40,10 @@ module Spec
             # act as null object if method is missing and we ignore them. return value too!
             @options[:null_object] ? self : super(sym, *args, &block)
           rescue NoMethodError
-            raise Spec::Api::MockExpectationError, "Mock '#{@name}' received unexpected message '#{sym.to_s}' with " + (args.collect{|arg| "<#{arg}:#{arg.class.name}>"}.join(", "))
+            
+            arg_message = args.collect{|arg| "<#{arg}:#{arg.class.name}>"}.join(", ")
+            
+            Kernel::raise Spec::Api::MockExpectationError, "Mock '#{@name}' received unexpected message '#{sym.to_s}' with [#{arg_message}]"
           end
         end
       end
@@ -62,10 +69,39 @@ module Spec
         @expected_received_count = 1
         @expected_params = nil
         @consecutive = false
+        @exception_to_raise = nil
+        @symbol_to_throw = nil
+        @any_seen = false
+        @at_seen = false
+        @and_seen = false
       end
   
       def matches(sym, args)
-        @sym == sym and (@expected_params.nil? or @expected_params == args)
+        @sym == sym and (@expected_params.nil? or @expected_params == args or constraints_match?(args))
+      end
+      
+      def constraints_match?(args)
+        return false if args.length != @expected_params.length
+        for i in 0...@expected_params.length
+          next if @expected_params[i] == :anything
+          next if @expected_params[i] == :numeric and args[i].is_a?Numeric
+          next if @expected_params[i] == :boolean and args[i].is_a?TrueClass or args[i].is_a?FalseClass
+          next if @expected_params[i] == :string and args[i].is_a?String
+          return false unless args[i] == @expected_params[i]
+        end
+        return true
+      end
+      
+      def make_count_message(count)
+        return "at least #{pretty_print(count.abs)}" if count < 0
+        return pretty_print(count) if count > 0
+        return "never"
+      end
+      
+      def pretty_print(count)
+        return "once" if count == 1
+        return "twice" if count == 2
+        return "#{count} times"
       end
 
       # This method is called at the end of a spec, after teardown.
@@ -73,8 +109,8 @@ module Spec
         # TODO: this doesn't provide good enough error messages to fix the error.
         # Error msg should tell exactly what went wrong. (AH).
     
-        return if @expected_received_count == -2
-        return if (@expected_received_count == -1) && (@received_count > 0)
+        return if @expected_received_count == :any
+        return if (@expected_received_count < 0) && (@received_count >= @expected_received_count.abs)
         return if @expected_received_count == @received_count
     
         expected_signature = nil
@@ -85,18 +121,14 @@ module Spec
           expected_signature = "#{@sym}(#{params})"
         end
     
-        count_message = "{@expected_received_count} times"
-        count_message = "at least once" if (@expected_received_count == -1)
-        count_message = "never" if (@expected_received_count == 0)
-        count_message = "once" if (@expected_received_count == 1)
-        count_message = "twice" if (@expected_received_count == 2)
+        count_message = make_count_message(@expected_received_count)
 
         message = "Mock '#{@mock_name}' expected #{expected_signature} #{count_message}, but received it #{@received_count} times"
         begin
-          raise Spec::Api::MockExpectationError, message
+          Kernel::raise Spec::Api::MockExpectationError, message
         rescue => error
           error.backtrace.insert(0, @expected_from)
-          raise error
+          Kernel::raise error
         end
       end
 
@@ -106,18 +138,22 @@ module Spec
           begin
             result = @method_block.call(*args)
           rescue Spec::Api::ExpectationNotMetError => detail
-            raise Spec::Api::MockExpectationError, "Call expectation violated with: " + $!
+            Kernel::raise Spec::Api::MockExpectationError, "Call expectation violated with: " + $!
           end
           @received_count += 1
           return result
         end
     
-        unless @expected_params.nil? or @expected_params == args
-          raise Spec::Api::MockExpectationError,
+        unless @expected_params.nil? or @expected_params == args or constraints_match?(args)
+          Kernel::raise Spec::Api::MockExpectationError,
             "#{@sym}: Parameter mismatch: Expected <#{@expected_params}>, got <#{args}>" 
         end
         args << block unless block.nil?
         @received_count += 1
+        
+        Kernel::raise @exception_to_raise.new unless @exception_to_raise.nil?
+        Kernel::throw @symbol_to_throw unless @symbol_to_throw.nil?
+        
         value = @block.call(*args)
     
         return value unless @consecutive
@@ -126,29 +162,56 @@ module Spec
       end
 
       def with(*args)
-        @expected_params = args
+        if args == [:anything] then @expected_params = nil
+        elsif args == [:nothing] then @expected_params = []
+        else @expected_params = args
+        end
+
         self
       end
-
-      def with_no_args
-        @expected_params = []
+      
+      def at
+        @at_seen = true
         self
       end
-  
-      def with_any_args
-        @expected_params = nil
+      
+      def exactly(n)
+        @expected_received_count = n
         self
       end
-  
-      def at_least_once
-        @expected_received_count = -1
+      
+      def least(arg)
+        if @at_seen
+          @expected_received_count = -1 if arg == :once
+          @expected_received_count = -2 if arg == :twice
+          @expected_received_count = -arg if arg.kind_of? Numeric
+        end
+        @at_seen = false
         self
       end
 
-       def any_number_of_times
-         @expected_received_count = -2
-         self
-       end
+      def any
+        @any_seen = true
+        self
+      end
+      
+      def number
+        @number_seen = @any_seen
+        @any_seen = false
+        self
+      end
+      
+      def of
+        @of_seen = @number_seen
+        @number_seen = false
+        self
+      end
+      
+      def times
+        @expected_received_count = :any if @of_seen
+        @of_seen = false
+        self
+      end
   
       def never
         @expected_received_count = 0
@@ -165,19 +228,29 @@ module Spec
         self
       end
   
-      def returns(value=nil,&block)
-        @block = block_given? ? block : proc { value }
+      def and
+        @and_seen = true
+        self
       end
 
-      def returns_consecutively(value=[nil],&block)
-        @consecutive = true
+      def return(value=nil,&block)
+        return self unless @and_seen
+        @and_seen = false
+        @consecutive = value.instance_of? Array
         @block = block_given? ? block : proc { value }
       end
-  
-      # this reads better in English IMHO: (AH)
-      # uri_specs.should_receive(:[]).with(:overview).and_return("http://some.host/look_here/\#{path}")
-      alias :and_return :returns
-      alias :and_return_consecutively :returns_consecutively
+      
+      def raise(exception=Exception)
+        return self unless @and_seen
+        @and_seen = false
+        @exception_to_raise = exception
+      end
+      
+      def throw(symbol)
+        return self unless @and_seen
+        @and_seen = false
+        @symbol_to_throw = symbol
+      end
   
     end
   end