wycats-merb-core 0.9.8 → 0.9.9

data/lib/merb-core/test/helpers/route_helper.rb

@@ -12,13 +12,21 @@ module Merb
       # ==== Returns
       # String:: The generated URL.
       def url(*args)
-        name = args.first.is_a?(Symbol) ? args.shift : :default
-        
-        unless route = Merb::Router.named_routes[name]
-          raise Merb::Router::GenerationError, "Named route not found: #{name}"
-        end
-
-        route.generate(args, @request_params || {})
+        args << (@request_params || {})
+        Merb::Router.url(*args)
+      end
+      
+      # Mimics the resource method available to controllers
+      #
+      # ==== Paramaters
+      # resources<Object>:: The resources to generate URLs from
+      # params<Hash>:: Any extra parameters that are required.
+      #
+      # ==== Returns
+      # String:: The generated URL.
+      def resource(*args)
+        args << @request_params || {}
+        Merb::Router.resource(*args)
       end
       
       # ==== Parameters

data/lib/merb-core/test/matchers.rb

@@ -3,6 +3,7 @@ module Merb::Test::Rspec; end
 require "merb-core/test/matchers/controller_matchers"
 require "merb-core/test/matchers/route_matchers"
 require "merb-core/test/matchers/view_matchers"
+require "merb-core/test/matchers/request_matchers"
 
 Merb::Test::ControllerHelper.send(:include, Merb::Test::Rspec::ControllerMatchers)
 Merb::Test::RouteHelper.send(:include, Merb::Test::Rspec::RouteMatchers)

data/lib/merb-core/test/matchers/controller_matchers.rb

@@ -31,140 +31,6 @@ module Merb::Test::Rspec::ControllerMatchers
     end
   end
 
-  class RedirectTo
-
-    # === Parameters
-    # String:: The expected location
-    # Hash:: Optional hash of options (currently only :message)
-    def initialize(expected, options = {})
-      @expected = expected
-      @options  = options
-    end
-
-    # ==== Parameters
-    # target<Merb::Controller>:: The controller to match
-    #
-    # ==== Returns
-    # Boolean::
-    #   True if the controller status is redirect and the locations match.
-    def matches?(target)
-      @target, @location = target, target.headers['Location']
-      @redirected = BeRedirect.new.matches?(target.status)
-
-      if @options[:message]
-        msg = Merb::Request.escape([Marshal.dump(@options[:message])].pack("m"))
-        @expected << "?_message=#{msg}"
-      end
-      
-      @location == @expected && @redirected
-    end
-
-    # ==== Returns
-    # String:: The failure message.
-    def failure_message
-      msg = "expected #{inspect_target} to redirect to <#{@expected}>, but "
-      if @redirected
-        msg << "was <#{target_location}>"
-      else
-        msg << "there was no redirection"
-      end
-    end
-
-    # ==== Returns
-    # String:: The failure message to be displayed in negative matches.
-    def negative_failure_message
-      "expected #{inspect_target} not to redirect to <#{@expected}>, but did anyway"
-    end
-
-    # ==== Returns
-    # String:: The controller and action name.
-    def inspect_target
-      "#{@target.controller_name}##{@target.action_name}"
-    end
-
-    # ==== Returns
-    # String:: Either the target's location header or the target itself.
-    def target_location
-      @target.respond_to?(:headers) ? @target.headers['Location'] : @target
-    end
-  end
-
-  class BeSuccess
-
-    # ==== Parameters
-    # target<Fixnum, ~status>::
-    #   Either the status code or a controller with a status code.
-    #
-    # ==== Returns
-    # Boolean:: True if the status code is in the range 200..207.
-    def matches?(target)
-      @target = target
-      (200..207).include?(status_code)
-    end
-
-    # ==== Returns
-    # String:: The failure message.
-    def failure_message
-      "expected#{inspect_target} to be successful but was #{status_code}"
-    end
-
-    # ==== Returns
-    # String:: The failure message to be displayed in negative matches.
-    def negative_failure_message
-      "expected#{inspect_target} not to be successful but it was #{status_code}"
-    end
-
-    # ==== Returns
-    # String:: The controller and action name.
-    def inspect_target
-      " #{@target.controller_name}##{@target.action_name}" if @target.respond_to?(:controller_name) && @target.respond_to?(:action_name)
-    end
-
-    # ==== Returns
-    # Fixnum:: Either the target's status or the target itself.
-    def status_code
-      @target.respond_to?(:status) ? @target.status : @target
-    end
-  end
-
-  class BeMissing
-
-    # ==== Parameters
-    # target<Fixnum, ~status>::
-    #   Either the status code or a controller with a status code.
-    #
-    # ==== Returns
-    # Boolean:: True if the status code is in the range 400..417.
-    def matches?(target)
-      @target = target
-      (400..417).include?(status_code)
-    end
-
-    # ==== Returns
-    # String:: The failure message.
-    def failure_message
-      "expected#{inspect_target} to be missing but was #{status_code}"
-    end
-
-    # ==== Returns
-    # String:: The failure message to be displayed in negative matches.
-    def negative_failure_message
-      "expected#{inspect_target} not to be missing but it was #{status_code}"
-    end
-
-    # ==== Returns
-    # String:: The controller and action name.
-    def inspect_target
-      " #{@target.controller_name}##{@target.action_name}" if @target.respond_to?(:controller_name) && @target.respond_to?(:action_name)
-    end
-
-    # ==== Returns
-    # Fixnum:: Either the target's status or the target itself.
-    def status_code
-      @target.respond_to?(:status) ? @target.status : @target
-    end
-  end
-
   class BeError
     def initialize(expected)
       @expected = expected
@@ -185,6 +51,10 @@ module Merb::Test::Rspec::ControllerMatchers
       "expected #{@target} not to be a #{@expected} error, but it was"
     end
   end
+  
+  def be_error(expected)
+    BeError.new(expected)
+  end
 
   class Provide
 
@@ -223,120 +93,7 @@ module Merb::Test::Rspec::ControllerMatchers
       @target.class_provided_formats
     end
   end
-
-  # Passes if the target was redirected, or the target is a redirection (300
-  # level) response code.
-  #
-  # ==== Examples
-  #   # Passes if the controller was redirected
-  #   controller.should redirect
-  #
-  #   # Also works if the target is the response code
-  #   controller.status.should redirect
-  #
-  # ==== Notes
-  # valid HTTP Redirection codes:
-  # * 300: Multiple Choices
-  # * 301: Moved Permanently
-  # * 302: Moved Temporarily (HTTP/1.0)
-  # * 302: Found (HTTP/1.1)
-  # * 303: See Other (HTTP/1.1)
-  # * 304: Not Modified
-  # * 305: Use Proxy
-  # * 307: Temporary Redirect
-  #--
-  # status codes based on: http://cheat.errtheblog.com/s/http_status_codes/
-  def redirect
-    BeRedirect.new
-  end
-
-  alias_method :be_redirection, :redirect
-
-  # Passes if the target was redirected to the expected location.
-  #
-  # ==== Paramters
-  # expected<String>:: A relative or absolute url.
-  #
-  # ==== Examples
-  #   # Passes if the controller was redirected to http://example.com/
-  #   controller.should redirect_to('http://example.com/')
-  def redirect_to(expected, options = {})
-    RedirectTo.new(expected, options)
-  end
-
-  alias_method :be_redirection_to, :redirect_to
-
-  # Passes if the request that generated the target was successful, or the
-  # target is a success (200 level) response code.
-  #
-  # ==== Examples
-  #   # Passes if the controller call was successful
-  #   controller.should respond_successfully
-  #
-  #   # Also works if the target is the response code
-  #   controller.status.should respond_successfully
-  #
-  # ==== Notes
-  # valid HTTP Success codes:
-  # * 200: OK
-  # * 201: Created
-  # * 202: Accepted
-  # * 203: Non-Authoritative Information
-  # * 204: No Content
-  # * 205: Reset Content
-  # * 206: Partial Content
-  # * 207: Multi-Status
-  #--
-  # status codes based on: http://cheat.errtheblog.com/s/http_status_codes/
-  def respond_successfully
-    BeSuccess.new
-  end
-
-  alias_method :be_successful, :respond_successfully
-
-  # Passes if the request that generated the target was missing, or the target
-  # is a client-side error (400 level) response code.
-  #
-  # ==== Examples
-  #   # Passes if the controller call was unknown or not understood
-  #   controller.should be_missing
-  #
-  #   # Also passes if the target is a response code
-  #   controller.status.should be_missing
-  #
-  # ==== Notes
-  # valid HTTP Client Error codes:
-  # * 400: Bad Request
-  # * 401: Unauthorized
-  # * 402: Payment Required
-  # * 403: Forbidden
-  # * 404: Not Found
-  # * 405: Method Not Allowed
-  # * 406: Not Acceptable
-  # * 407: Proxy Authentication Required
-  # * 408: Request Timeout
-  # * 409: Conflict
-  # * 410: Gone
-  # * 411: Length Required
-  # * 412: Precondition Failed
-  # * 413: Request Entity Too Large
-  # * 414: Request-URI Too Long
-  # * 415: Unsupported Media Type
-  # * 416: Requested Range Not Satisfiable
-  # * 417: Expectation Failed
-  # * 422: Unprocessable Entity
-  #--
-  # status codes based on: http://cheat.errtheblog.com/s/http_status_codes/
-  def be_missing
-    BeMissing.new
-  end
   
-  def be_error(expected)
-    BeError.new(expected)
-  end
-
-  alias_method :be_client_error, :be_missing
-
   # Passes if the controller actually provides the target format
   #
   # === Parameters

data/lib/merb-core/test/matchers/view_matchers.rb

@@ -1,10 +1,26 @@
 module Merb::Test::Rspec::ViewMatchers
   class HaveXpath
-    def initialize(expected)
-      @expected = expected
+    def initialize(expected, type)
+      @expected, @type = expected, type
     end
     
     def matches?(stringlike)
+      send("matches_#{@type}?", stringlike)
+    end
+    
+    def matches_rexml?(stringlike)
+      @document = case stringlike
+      when REXML::Document
+        stringlike.root
+      when REXML::Node
+        stringlike
+      when StringIO, String
+        REXML::Document.new(stringlike).root
+      end
+      !REXML::XPath.match(@document, @expected).empty?
+    end
+    
+    def matches_libxml?(stringlike)
       @document = case stringlike
       when LibXML::XML::Document, LibXML::XML::Node
         stringlike
@@ -335,10 +351,12 @@ module Merb::Test::Rspec::ViewMatchers
   def have_xpath(expected)
     begin
       require "libxml"
+      type = "libxml"
     rescue LoadError => e
-      puts "To use have_xpath helper you need to install libxml-ruby gem"
+      require "rexml/document"
+      type = "rexml"
     end
-    HaveXpath.new(expected)
+    HaveXpath.new(expected, type)
   end
   alias_method :match_xpath, :have_xpath
 

data/lib/merb-core/test/run_specs.rb

@@ -1,6 +1,94 @@
 require 'rubygems'
-require 'open3'
 require 'benchmark'
+require 'drb'
+require 'spec'
+require 'spec/runner/formatter/base_text_formatter'
+require 'spec/spec_helper.rb'
+
+# Load this stuff so it only has to be loaded once for the entire suite
+require 'spec/mocks'
+require 'spec/mocks/extensions'
+require 'spec/runner/formatter/specdoc_formatter'
+require 'base64'
+require 'nkf'
+require 'kconv'
+require 'rack'
+
+begin
+  require 'json'
+rescue
+  require 'json/pure'
+end
+
+Merb::Dispatcher
+
+module Spec
+  module Runner
+    module Formatter
+      class BaseTextFormatter
+        def dump_failure(counter, failure)
+          output = @options.error_stream
+          output.puts
+          output.puts "#{counter.to_s})"
+          output.puts colourise("#{failure.header}\n#{failure.exception.message}", failure)
+          output.puts format_backtrace(failure.exception.backtrace)
+          output.flush
+        end
+      end
+    end
+  end
+end
+
+module Merb
+  class Counter
+    include DRb::DRbUndumped
+
+    attr_accessor :time
+    def initialize
+      @examples, @failures, @errors, @pending, @total_time = 0, 0, 0, 0, 0
+      @err = ""
+      @mutex = Mutex.new
+    end
+  
+    def add(spec, out, err)
+      @mutex.synchronize do
+        puts
+        puts "Running #{spec}."
+        STDOUT.puts out
+        STDOUT.flush
+        match = out.match(/(\d+) examples?, (\d+) failures?(?:, (\d+) errors?)?(?:, (\d+) pending?)?/m)
+        time = out.match(/Finished in (\d+\.\d+) seconds/)
+        @total_time += time[1].to_f if time
+        if match
+          e, f, errors, pending = match[1..-1]
+          @examples += e.to_i
+          @failures += f.to_i
+          @errors += errors.to_i
+          @pending += pending.to_i
+        end
+        unless err.chomp.empty?
+          @err << err.chomp << "\n"
+        end
+      end
+    end
+
+    def report
+      puts @err
+      puts
+      if @failures != 0 || @errors != 0
+        print "\e[31m" # Red
+      elsif @pending != 0
+        print "\e[33m" # Yellow
+      else
+        print "\e[32m" # Green
+      end
+      puts "Total actual time: #{@total_time}"
+      puts "#{@examples} examples, #{@failures} failures, #{@errors} errors, #{@pending} pending, #{sprintf("suite run in %3.3f seconds", @time.real)}"
+      # TODO: we need to report pending examples all together
+       puts "\e[0m"    
+    end  
+  end
+end
 
 # Runs specs in all files matching the file pattern.
 #
@@ -14,36 +102,40 @@ def run_specs(globs, spec_cmd='spec', run_opts = "-c", except = [])
   require "optparse"
   require "spec"
   globs = globs.is_a?(Array) ? globs : [globs]
-  examples, failures, errors, pending = 0, 0, 0, 0
+  
+  counter = Merb::Counter.new
+  forks = 0
 
   time = Benchmark.measure do
+    pid = nil
     globs.each do |glob|
-      (Dir[glob] - except).each do |spec|
-        STDOUT.puts "\n\nRunning #{spec}...\n"
-        response = Open3.popen3("#{spec_cmd} #{File.expand_path(spec)} #{run_opts}") do |i,o,e|
-          while out = o.gets
-            STDOUT.puts out
-            #STDOUT.flush
-            if out =~ /\d+ example/
-              e, f, p = out.match(/(\d+) examples?, (\d+) failures?(?:, (\d+) pending?)?/)[1..-1]
-              examples += e.to_i; failures += f.to_i; pending += p.to_i
-            end
+      Dir[glob].each do |spec|
+        drb_uri = DRb.start_service(nil, counter).uri
+        Kernel.fork do
+          $VERBOSE = nil
+          DRb.stop_service
+          DRb.start_service
+          counter_client = DRbObject.new_with_uri(drb_uri)
+          err, out = StringIO.new, StringIO.new
+          def out.tty?() true end
+          options = Spec::Runner::OptionParser.parse(%W(#{spec} -fs --color), err, out)
+          options.filename_pattern = File.expand_path(spec)
+          Spec::Runner::CommandLine.run(options)
+          begin
+            counter_client.add(spec, out.string, err.string)
+          rescue DRb::DRbConnError => e
+            puts "#{Process.pid}: Exception caught"
+            puts "#{e.class}: #{e.message}"
+            retry
           end
-          errors += 1 if e.is_a?(IO)
-          STDOUT.puts e.read if e.is_a?(IO)
+          exit
         end
       end
+      Process.waitall
     end
   end
-
-  puts
-  puts "*** TOTALS ***"
-  if failures == 0
-    print "\e[32m"
-  else
-    print "\e[31m"
-  end
-  puts "#{examples} examples, #{failures} failures, #{errors} errors, #{pending} pending, #{sprintf("suite run in %3.3f seconds", time.real)}"
-  # TODO: we need to report pending examples all together
-  print "\e[0m"
+  
+  counter.time = time
+  counter.report
+  exit!
 end