merb-core 0.9.8 → 0.9.9

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

@@ -36,7 +36,7 @@ module Merb
         end
 
         if env[:params]
-          uri << "&#{Merb::Request.params_to_query_string(env.delete(:body_params))}"
+          uri << "?#{Merb::Request.params_to_query_string(env.delete(:params))}"
         end
 
         if @__cookie__

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

@@ -3,14 +3,60 @@ module Merb
     module RouteHelper
       include RequestHelper
       
-      # Mimics the url method available to controllers.
+      # There are three possible ways to use this method.  First, if you have a named route, 
+      # you can specify the route as the first parameter as a symbol and any paramters in a 
+      # hash.  Second, you can generate the default route by just passing the params hash, 
+      # just passing the params hash.  Finally, you can use the anonymous parameters.  This 
+      # allows you to specify the parameters to a named route in the order they appear in the 
+      # router.  
       #
-      # ==== Parameters
-      # name<~to_sym>:: The name of the URL to generate.
-      # params<Hash>:: Parameters for the route generation.
+      # ==== Parameters(Named Route)
+      # name<Symbol>:: 
+      #   The name of the route. 
+      # args<Hash>:: 
+      #   Parameters for the route generation.
+      #
+      # ==== Parameters(Default Route)
+      # args<Hash>:: 
+      #   Parameters for the route generation.  This route will use the default route. 
+      #
+      # ==== Parameters(Anonymous Parameters)
+      # name<Symbol>::
+      #   The name of the route.  
+      # args<Array>:: 
+      #   An array of anonymous parameters to generate the route
+      #   with. These parameters are assigned to the route parameters
+      #   in the order that they are passed.
       #
       # ==== Returns
       # String:: The generated URL.
+      #
+      # ==== Examples
+      # Named Route
+      #
+      # Merb::Router.prepare do
+      #   match("/articles/:title").to(:controller => :articles, :action => :show).name("articles")
+      # end
+      #
+      # url(:articles, :title => "new_article")
+      #
+      # Default Route
+      #
+      # Merb::Router.prepare do
+      #   default_routes
+      # end
+      #
+      # url(:controller => "articles", :action => "new")
+      #
+      # Anonymous Paramters
+      #
+      # Merb::Router.prepare do
+      #   match("/articles/:year/:month/:title").to(:controller => :articles, :action => :show).name("articles")
+      # end
+      #
+      # url(:articles, 2008, 10, "test_article")
+      #
+      # @api public
       def url(*args)
         args << (@request_params || {})
         Merb::Router.url(*args)

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

@@ -62,42 +62,6 @@ Spec::Matchers.create(:have_content_type) do
   end
 end
 
-Spec::Matchers.create(:have_xpath) do
-  matches do |rack, xpath|
-    document = rack.body
-    
-    if rack.status < 200 || rack.status >= 300
-      @error_text = rack.body
-      false
-    else
-      @document = case document
-      when LibXML::XML::Document, LibXML::XML::Node
-        document
-      when StringIO
-        LibXML::XML::HTMLParser.string(document.string).parse
-      else
-        LibXML::XML::HTMLParser.string(document).parse
-      end
-      begin
-        !@document.find(xpath).empty?
-      rescue LibXML::XML::XPath::InvalidPath
-        @bad_xpath = true
-        false
-      end
-    end
-  end
-  
-  message do |not_string, rack, xpath|
-    if @bad_xpath
-      "the XPath '#{xpath}' was invalid"
-    elsif @error_text
-      "there was an error on your page:\n#{@error_text}"
-    else
-      "expected the following text #{not_string}to match the xpath '#{xpath}':\n\n#{@document}"
-    end
-  end
-end
-
 Spec::Matchers.create(:redirect) do
   matches do |rack|
     @inspect = describe_input(rack)
@@ -118,6 +82,8 @@ Spec::Matchers.create(:redirect_to) do
   
   matches do |rack, location|
     @inspect = describe_input(rack)
+    
+    return false unless rack.headers["Location"]
     @location, @query = rack.headers["Location"].split("?")
     @status_code = status_code(rack)
     @status_code.in?(300..399) && @location == location

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

@@ -9,6 +9,8 @@ module Merb::Test::Rspec::ViewMatchers
     end
     
     def matches_rexml?(stringlike)
+      stringlike = stringlike.body.to_s if stringlike.respond_to?(:body)
+      
       @document = case stringlike
       when REXML::Document
         stringlike.root
@@ -21,6 +23,8 @@ module Merb::Test::Rspec::ViewMatchers
     end
     
     def matches_libxml?(stringlike)
+      stringlike = stringlike.body.to_s if stringlike.respond_to?(:body)
+      
       @document = case stringlike
       when LibXML::XML::Document, LibXML::XML::Node
         stringlike
@@ -164,6 +168,8 @@ module Merb::Test::Rspec::ViewMatchers
   
   class HasTag
     
+    attr_accessor :outer_has_tag, :inner_has_tag
+
     # ==== Parameters
     # tag<~to_s>:: The tag to look for.
     # attributes<Hash>:: Attributes for the tag (see below).
@@ -193,8 +199,13 @@ module Merb::Test::Rspec::ViewMatchers
 
       unless @blk.nil?
         !@document.search(selector).select do |ele|
-          @blk.call ele
-          true
+          begin
+            @blk.call ele
+            true
+          rescue Spec::Expectations::ExpectationNotMetError
+            @error_message = "#{tag_for_error}:\n" + $!.message
+            false
+          end
         end.empty?
       else
         !@document.search(selector).empty?
@@ -204,12 +215,10 @@ module Merb::Test::Rspec::ViewMatchers
     # ==== Returns
     # String:: The complete selector for element queries.
     def selector
-      @selector = "//#{@tag}#{id_selector}#{class_selector}"
-      @selector << @attributes.map{|a, v| "[@#{a}=\"#{v}\"]"}.join
-
-      @selector << @inner_has_tag.selector unless @inner_has_tag.nil?
+      @selector = @outer_has_tag ? @outer_has_tag.selector : ''
 
-      @selector
+      @selector << "//#{@tag}#{id_selector}#{class_selector}"
+      @selector << @attributes.map{|a, v| "[@#{a}=\"#{v}\"]"}.join
     end
 
     # ==== Returns
@@ -227,45 +236,38 @@ module Merb::Test::Rspec::ViewMatchers
     # ==== Returns
     # String:: The failure message.
     def failure_message
-      "expected following output to contain a #{tag_for_error} tag:\n#{@document}"
+      @error_message || "expected following output to contain a #{tag_for_error} tag:\n#{@document}"
     end
 
     # ==== Returns
     # String:: The failure message to be displayed in negative matches.
     def negative_failure_message
-      "expected following output to omit a #{tag_for_error} tag:\n#{@document}"
+      @error_message || "expected following output to omit a #{tag_for_error} tag:\n#{@document}"
     end
     
     # ==== Returns
     # String:: The tag used in failure messages.
     def tag_for_error
-      "#{inner_failure_message}<#{@tag}#{id_for_error}#{class_for_error}#{attributes_for_error}>"
-    end
-
-    # ==== Returns
-    # String::
-    #   The failure message to be displayed in negative matches within the
-    #   have_tag block.
-    def inner_failure_message
-      "#{@inner_has_tag.tag_for_error} tag within a " unless @inner_has_tag.nil?
+      result = "#{@tag}#{id_for_error}#{class_for_error}#{attributes_for_error}"
+      inner_has_tag ? result << " > #{inner_has_tag.tag_for_error}" : result
     end
 
     # ==== Returns
     # String:: ID for the error tag.
     def id_for_error
-      " id=\"#{@id}\"" unless @id.nil?
+      "##{@id}" unless @id.nil?
     end
 
     # ==== Returns
     # String:: Class for the error tag.
     def class_for_error
-      " class=\"#{@class}\"" unless @class.nil?
+      ".#{@class}" unless @class.nil?
     end
 
     # ==== Returns
     # String:: Class for the error tag.
     def attributes_for_error
-      @attributes.map{|a,v| " #{a}=\"#{v}\""}.join
+      @attributes.map{|a,v| "[#{a}=\"#{v}\"]"}.join
     end
 
     # Search for a child tag within a have_tag block.
@@ -275,6 +277,9 @@ module Merb::Test::Rspec::ViewMatchers
     # attributes<Hash>:: Attributes for the tag (see below).
     def with_tag(name, attrs={})
       @inner_has_tag = HasTag.new(name, attrs)
+      @inner_has_tag.outer_has_tag = self
+      
+      @inner_has_tag
     end
   end
 
@@ -353,7 +358,12 @@ module Merb::Test::Rspec::ViewMatchers
       require "libxml"
       type = "libxml"
     rescue LoadError => e
-      require "rexml/document"
+      if require "rexml/document" # show warning only once
+        warn(<<-WARN_TEXT)
+Standard REXML library is slow. Please consider to install libxml-ruby.
+Use "sudo gem install libxml-ruby"
+WARN_TEXT
+      end
       type = "rexml"
     end
     HaveXpath.new(expected, type)

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

@@ -104,7 +104,8 @@ def run_specs(globs, spec_cmd='spec', run_opts = "-c", except = [])
   globs = globs.is_a?(Array) ? globs : [globs]
   
   counter = Merb::Counter.new
-  forks = 0
+  forks   = 0
+  failure = false
 
   time = Benchmark.measure do
     pid = nil
@@ -120,7 +121,7 @@ def run_specs(globs, spec_cmd='spec', run_opts = "-c", except = [])
           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)
+          failure = ! Spec::Runner::CommandLine.run(options)
           begin
             counter_client.add(spec, out.string, err.string)
           rescue DRb::DRbConnError => e
@@ -128,14 +129,14 @@ def run_specs(globs, spec_cmd='spec', run_opts = "-c", except = [])
             puts "#{e.class}: #{e.message}"
             retry
           end
-          exit
+          exit(failure ? -1 : 0)
         end
       end
-      Process.waitall
+      failure = Process.waitall.any? { |pid, s| !s.success? }
     end
   end
   
   counter.time = time
   counter.report
-  exit!
+  exit!(failure ? -1 : 0)
 end

data/lib/merb-core/test/test_ext/rspec.rb

@@ -7,7 +7,7 @@ module Kernel
     params[:shared] = true
     
     describe(*args) do
-      before(:each) do
+      prepend_before(:each) do
         self.instance_eval(&example_group_block)
       end
     end
@@ -51,25 +51,12 @@ module Merb
         # This is a copy of the method in rspec, so we can have
         # describe "...", :when => "logged in", and the like
         def describe(*args, &example_group_block)
-          args << {} unless Hash === args.last
+          ret = super
+          
+          params = args.last.is_a?(Hash) ? args.last : {}
           if example_group_block
-            params = args.last
-            params[:spec_path] = eval("caller(0)[1]", example_group_block) unless params[:spec_path]
-            if params[:shared]
-              ::Spec::Example::SharedExampleGroup.new(*args, &example_group_block)
-            else
-              self.subclass("Subclass") do
-                describe(*args)
-                if params[:when] || (params[:when] = params[:given])
-                  module_eval %{it_should_behave_like "#{params[:when]}"}
-                end
-                module_eval(&example_group_block)
-              end
-            end
-          else
-            set_description(*args)
-            before_eval
-            self
+            params[:when] = params[:when] || params[:given]
+            ret.module_eval %{it_should_behave_like "#{params[:when]}"} if params[:when]
           end
         end
         alias context describe

data/lib/merb-core/version.rb

@@ -1,3 +1,3 @@
 module Merb
-  VERSION = '0.9.8' unless defined?(Merb::VERSION)
+  VERSION = '0.9.9' unless defined?(Merb::VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-core
 version: !ruby/object:Gem::Version 
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors: 
 - Ezra Zygmuntowicz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-06 00:00:00 +03:00
+date: 2008-10-13 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.7
+        version: 0.9.8
     version: 
 - !ruby/object:Gem::Dependency 
   name: erubis
@@ -100,7 +100,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.6
+        version: 0.9.7
     version: 
 description: Merb. Pocket rocket web framework.
 email: ez@engineyard.com
@@ -188,6 +188,7 @@ files:
 - lib/merb-core/rack/application.rb
 - lib/merb-core/rack/handler
 - lib/merb-core/rack/handler/mongrel.rb
+- lib/merb-core/rack/helpers.rb
 - lib/merb-core/rack/middleware
 - lib/merb-core/rack/middleware/conditional_get.rb
 - lib/merb-core/rack/middleware/content_length.rb