merb-core 0.9.12 → 0.9.13

data/lib/merb-core/bootloader.rb

@@ -322,6 +322,7 @@ class Merb::BootLoader::BuildFramework < Merb::BootLoader
     # ==== Returns
     # nil
     def run
+      $:.push Merb.root unless Merb.root == File.expand_path(Dir.pwd)
       build_framework
       nil
     end

data/lib/merb-core/controller/merb_controller.rb

@@ -283,6 +283,7 @@ class Merb::Controller < Merb::AbstractController
   # @api public
   def url(name, *args)
     args << params
+    name = request.route if name == :this
     Merb::Router.url(name, *args)
   end
   

data/lib/merb-core/dispatch/router.rb

@@ -219,13 +219,17 @@ module Merb
       # ---
       # @api plugin
       def url(name, *args)
-        unless name.is_a?(Symbol)
-          args.unshift(name)
-          name = :default
-        end
-        
-        unless route = Merb::Router.named_routes[name]
-          raise Merb::Router::GenerationError, "Named route not found: #{name}"
+        if name.is_a?(Route)
+          route = name
+        else
+          unless name.is_a?(Symbol)
+            args.unshift(name)
+            name = :default
+          end
+
+          unless route = Merb::Router.named_routes[name]
+            raise Merb::Router::GenerationError, "Named route not found: #{name}"
+          end
         end
         
         defaults = args.pop
@@ -263,13 +267,13 @@ module Merb
           end
         end
         
-        params << options
-        
         unless route = Merb::Router.resource_routes[key]
           raise Merb::Router::GenerationError, "Resource route not found: #{args.inspect}"
         end
+
+        params << options
         
-        route.generate(params, defaults)
+        route.generate(params, defaults, true)
       end
       
       # Add functionality to the router. This can be in the form of

data/lib/merb-core/dispatch/router/behavior.rb

@@ -586,6 +586,8 @@ module Merb
       # 
       # @api private
       def full_name(name)
+        raise Error, ":this is reserved. Please pick another name." if name == :this
+        
         if @route
           @route.name = name
           self

data/lib/merb-core/dispatch/router/resources.rb

@@ -124,13 +124,13 @@ module Merb
 
           # => show
           resource.match("/#{root_keys}(.:format)", match_opts.merge(:method => :get)).to(:action => "show").
-            name(singular).register_resource(klass_name)
+            name(singular).register_resource(klass_name, :identifiers => keys)
 
           # => user defined member routes
           member.each_pair do |action, method|
             action = action.to_s
             resource.match("/#{root_keys}/#{action}(.:format)", match_opts.merge(:method => method)).
-              to(:action => "#{action}").name(action, singular).register_resource(klass_name, action)
+              to(:action => "#{action}").name(action, singular).register_resource(klass_name, action, :identifiers => keys)
           end
 
           # => update
@@ -142,9 +142,11 @@ module Merb
             to(:action => "destroy")
 
           if block_given?
-            nested_keys = keys.map do |k|
-              k.to_s == "id" ? ":#{singular}_id" : ":#{k}"
-            end.join("/")
+            parent_keys = keys.map do |k|
+              k == :id ? "#{singular}_id".to_sym : k
+            end
+            
+            nested_keys = parent_keys.map { |k| ":#{k}" }.join("/")
 
             nested_match_opts = match_opts.except(:id)
             nested_match_opts["#{singular}_id".to_sym] = match_opts[:id] if match_opts[:id]
@@ -160,10 +162,10 @@ module Merb
             
             builders[:member] = lambda do |action, to, method|
               resource.match("/#{root_keys}/#{action}(.:format)", match_opts.merge(:method => method)).
-                to(:action => to).name(action, singular).register_resource(klass_name, action)
+                to(:action => to).name(action, singular).register_resource(klass_name, action, :identifiers => keys)
             end
             
-            resource.options(:name_prefix => singular, :resource_prefix => klass_name).
+            resource.options(:name_prefix => singular, :resource_prefix => klass_name, :parent_keys => parent_keys).
               match("/#{nested_keys}", nested_match_opts).resource_block(builders, &block)
           end
         end # namespace
@@ -271,8 +273,11 @@ module Merb
     
       #api private
       def register_resource(*key)
-        key = [@options[:resource_prefix], key].flatten.compact
+        options     = extract_options_from_args!(key) || {}
+        key         = [ @options[:resource_prefix], key ].flatten.compact
+        identifiers = [ @options[:parent_keys], options[:identifiers] ]
         @route.resource = key
+        @route.resource_identifiers = identifiers.flatten.compact.map { |id| id.to_sym }
         self
       end
 

data/lib/merb-core/dispatch/router/route.rb

@@ -12,7 +12,7 @@ module Merb
 
       attr_reader :conditions, :params, :segments
       attr_reader :index, :variables, :name
-      attr_accessor :fixation
+      attr_accessor :fixation, :resource_identifiers
 
       def initialize(conditions, params, deferred_procs, options = {})
         @conditions, @params = conditions, params
@@ -23,11 +23,10 @@ module Merb
           @redirect_url      = @params[:url]
           @defaults          = {}
         else
+          @generatable       = true
           @defaults          = options[:defaults] || {}
         end
         
-        # @conditional_block = conditional_block
-
         @identifiers       = options[:identifiers]
         @deferred_procs    = deferred_procs
         @segments          = []
@@ -39,6 +38,10 @@ module Merb
       def regexp?
         @regexp
       end
+      
+      def generatable?
+        @generatable && !regexp?
+      end
 
       def allow_fixation?
         @fixation
@@ -99,8 +102,11 @@ module Merb
       #
       # ==== Returns
       # String:: The generated URL.
-      def generate(args = [], defaults = {})
-        raise GenerationError, "Cannot generate regexp Routes" if regexp?
+      def generate(args = [], defaults = {}, resource = false)
+        unless generatable?
+          raise GenerationError, "Cannot generate regexp Routes" if regexp?
+          raise GenerationError, "Cannot generate this route"
+        end
         
         params = extract_options_from_args!(args) || { }
         
@@ -111,7 +117,7 @@ module Merb
         # Support for anonymous params
         unless args.empty?
           # First, let's determine which variables are missing
-          variables = @variables - params.keys
+          variables = (resource ? @resource_identifiers : @variables) - params.keys
           
           args.each do |param|
             raise GenerationError, "The route has #{@variables.length} variables: #{@variables.inspect}" if variables.empty?
@@ -336,14 +342,17 @@ module Merb
 
       def compile_conditions
         @original_conditions = conditions.dup
-
-        if path = conditions[:path]
-          path = [path].flatten.compact
+        
+        if conditions[:path] && !conditions[:path].empty?
+          path = conditions[:path].flatten.compact
           if path = compile_path(path)
             conditions[:path] = Regexp.new("^#{path}$")
           else
             conditions.delete(:path)
           end
+        else
+          # If there is no path, we can't generate it
+          @generatable = false
         end
       end
 

data/lib/merb-core/rack/adapter/abstract.rb

@@ -253,7 +253,7 @@ module Merb
         app  = "merb#{" : #{name}" if (name && name != "merb")}"
         max_port  = Merb::Config[:cluster] ? (Merb::Config[:cluster] - 1) : 0
         numbers   = ((whoami != :worker) && (max_port > 0)) ? "#{port}..#{port + max_port}" : port
-        file      = Merb::Config[:socket_file]
+        file      = Merb::Config[:socket_file] % port if Merb::Config[:socket_file]
         
         listening_on = if Merb::Config[:socket]
           "socket#{'s' if max_port > 0 && whoami != :worker} #{numbers} "\

data/lib/merb-core/rack/adapter/mongrel.rb

@@ -1,5 +1,13 @@
-require 'mongrel'
+begin
+  require 'mongrel'
+rescue LoadError => e
+  Merb.fatal! "Mongrel is not installed, but you are trying to use it. " \
+              "You need to either install mongrel or a different Ruby web " \
+              "server, like thin."
+end
+
 require 'merb-core/rack/handler/mongrel'
+
 module Merb
 
   module Rack

data/lib/merb-core/tasks/gem_management.rb

@@ -83,6 +83,7 @@ module GemManagement
       if installer.installed_gems.empty? && exception
         error "Failed to install gem '#{gem} (#{version || 'any version'})' (#{exception.message})"
       end
+      ensure_bin_wrapper_for_installed_gems(installer.installed_gems, options)
       installer.installed_gems.each do |spec|
         success "Successfully installed #{spec.full_name}"
       end
@@ -110,6 +111,7 @@ module GemManagement
     if installer.installed_gems.empty? && exception
       error "Failed to install gem '#{gem}' (#{e.message})"
     end
+    ensure_bin_wrapper_for_installed_gems(installer.installed_gems, options)
     installer.installed_gems.each do |spec|
       success "Successfully installed #{spec.full_name}"
     end
@@ -123,8 +125,8 @@ module GemManagement
   # install_gem_from_source(source_dir, :skip => [...])
   def install_gem_from_source(source_dir, *args)
     installed_gems = []
-    Dir.chdir(source_dir) do
-      opts = args.last.is_a?(Hash) ? args.pop : {}
+    opts = args.last.is_a?(Hash) ? args.pop : {}
+    Dir.chdir(source_dir) do      
       gem_name     = args[0] || File.basename(source_dir)
       gem_pkg_dir  = File.join(source_dir, 'pkg')
       gem_pkg_glob = File.join(gem_pkg_dir, "#{gem_name}-*.gem")
@@ -164,6 +166,8 @@ module GemManagement
         end
       end
       
+      ensure_bin_wrapper_for(opts[:install_dir], opts[:bin_dir], *installed_gems)
+      
       # Finally install the main gem
       if install_pkg(Dir[gem_pkg_glob][0], opts.merge(:refresh => refresh))
         installed_gems = refresh
@@ -293,6 +297,13 @@ module GemManagement
     end
   end
   
+  def ensure_bin_wrapper_for_installed_gems(gemspecs, options)
+    if options[:install_dir] && options[:bin_dir]
+      gems = gemspecs.map { |spec| spec.name }
+      ensure_bin_wrapper_for(options[:install_dir], options[:bin_dir], *gems)
+    end
+  end
+  
   private
 
   def executable_wrapper(spec, bin_file_name, minigems = true)
@@ -313,9 +324,9 @@ rescue LoadError
   require '#{then_req}'
 end
 
-if File.directory?(gems_dir = File.join(Dir.pwd, 'gems')) ||
-   File.directory?(gems_dir = File.join(File.dirname(__FILE__), '..', 'gems'))
-  $BUNDLE = true; Gem.clear_paths; Gem.path.unshift(gems_dir)
+# use gems dir if ../gems exists - eg. only for ./bin/#{bin_file_name}
+if File.directory?(gems_dir = File.join(File.dirname(__FILE__), '..', 'gems'))
+  $BUNDLE = true; Gem.clear_paths; Gem.path.replace([gems_dir])
   ENV["PATH"] = "\#{File.dirname(__FILE__)}:\#{gems_dir}/bin:\#{ENV["PATH"]}"
   if (local_gem = Dir[File.join(gems_dir, "specifications", "#{spec.name}-*.gemspec")].last)
     version = File.basename(local_gem)[/-([\\.\\d]+)\\.gemspec$/, 1]

data/lib/merb-core/test.rb

@@ -1,8 +1,8 @@
-begin
-  require "hpricot"
-  require 'merb-core/test/test_ext/hpricot'
-rescue
-end
+# begin
+#   require "hpricot"
+#   require 'merb-core/test/test_ext/hpricot'
+# rescue
+# end
 
 require 'merb-core/test/test_ext/object'
 require 'merb-core/test/test_ext/string'
@@ -10,8 +10,9 @@ require 'merb-core/test/test_ext/string'
 module Merb; module Test; end; end
 
 require 'merb-core/test/helpers'
+require 'merb-core/test/webrat'
 
 if Merb.test_framework.to_s == "rspec"
   require 'merb-core/test/test_ext/rspec'
   require 'merb-core/test/matchers'
-end
+end

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

@@ -7,5 +7,4 @@ require "merb-core/test/helpers/mock_request_helper"
 require "merb-core/test/helpers/route_helper"
 require "merb-core/test/helpers/request_helper"
 require "merb-core/test/helpers/multipart_request_helper"
-require "merb-core/test/helpers/controller_helper"
-require "merb-core/test/helpers/view_helper"
+require "merb-core/test/helpers/controller_helper"

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

@@ -7,4 +7,7 @@ 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)
-Merb::Test::ViewHelper.send(:include, Merb::Test::Rspec::ViewMatchers)
+
+module Merb::Test::ViewHelper
+  include Merb::Test::Rspec::ViewMatchers
+end

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

@@ -1,11 +1,27 @@
 module Merb::Test::Rspec::ViewMatchers
+  
   class HaveXpath
-    def initialize(expected, type)
-      @expected, @type = expected, type
+    def initialize(expected, &block)
+      # Require nokogiri and fall back on rexml
+      begin
+        require "nokogiri"
+      rescue LoadError => e
+        if require "rexml/document"
+          require "merb-core/vendor/nokogiri/css"
+          warn("Standard REXML library is slow. Please consider installing nokogiri.\nUse \"sudo gem install nokogiri\"")
+        end
+      end
+      
+      @expected = expected
+      @block    = block
     end
     
     def matches?(stringlike)
-      send("matches_#{@type}?", stringlike)
+      if defined?(Nokogiri::XML)
+        matches_nokogiri?(stringlike)
+      else
+        matches_rexml?(stringlike)
+      end
     end
     
     def matches_rexml?(stringlike)
@@ -17,23 +33,39 @@ module Merb::Test::Rspec::ViewMatchers
       when REXML::Node
         stringlike
       when StringIO, String
-        REXML::Document.new(stringlike).root
+        begin
+          REXML::Document.new(stringlike.to_s).root
+        rescue REXML::ParseException => e
+          if e.message.include?("second root element")
+            REXML::Document.new("<fake-root-element>#{stringlike}</fake-root-element>").root
+          else
+            raise e
+          end
+        end
+      end
+      
+      query.all? do |q|
+        matched = REXML::XPath.match(@document, q)
+        matched.any? && (!block_given? || matched.all?(&@block))
       end
-      !REXML::XPath.match(@document, @expected).empty?
     end
     
-    def matches_libxml?(stringlike)
+    def matches_nokogiri?(stringlike)
       stringlike = stringlike.body.to_s if stringlike.respond_to?(:body)
       
       @document = case stringlike
-      when LibXML::XML::Document, LibXML::XML::Node
+      when Nokogiri::HTML::Document, Nokogiri::XML::NodeSet
         stringlike
       when StringIO
-        LibXML::XML::HTMLParser.string(stringlike.string).parse
+        Nokogiri::HTML(stringlike.string)
       else
-        LibXML::XML::HTMLParser.string(stringlike).parse
+        Nokogiri::HTML(stringlike.to_s)
       end
-      !@document.find(@expected).empty?
+      @document.xpath(*query).any?
+    end
+    
+    def query
+      [@expected].flatten.compact
     end
     
     # ==== Returns
@@ -49,238 +81,71 @@ module Merb::Test::Rspec::ViewMatchers
     end    
   end
   
-  class HaveSelector
-
-    # ==== Parameters
-    # expected<String>:: The string to look for.
-    def initialize(expected)
-      @expected = expected
-    end
-
-    # ==== Parameters
-    # stringlike<Hpricot::Elem, StringIO, String>:: The thing to search in.
-    #
-    # ==== Returns
-    # Boolean:: True if there was at least one match.
-    def matches?(stringlike)
-      @document = case stringlike
-      when Hpricot::Elem
-        stringlike
-      when StringIO
-        Hpricot.parse(stringlike.string)
-      else
-        Hpricot.parse(stringlike)
-      end
-      !@document.search(@expected).empty?
-    end
+  class HaveSelector < HaveXpath
 
     # ==== Returns
     # String:: The failure message.
     def failure_message
       "expected following text to match selector #{@expected}:\n#{@document}"
     end
-
+    
     # ==== Returns
     # String:: The failure message to be displayed in negative matches.
     def negative_failure_message
       "expected following text to not match selector #{@expected}:\n#{@document}"
     end
-  end
-
-  class MatchTag
-
-    # ==== Parameters
-    # name<~to_s>:: The name of the tag to look for.
-    # attrs<Hash>:: Attributes to look for in the tag (see below).
-    #
-    # ==== Options (attrs)
-    # :content<String>:: Optional content to match.
-    def initialize(name, attrs)
-      @name, @attrs = name, attrs
-      @content = @attrs.delete(:content)
-    end
-
-    # ==== Parameters
-    # target<String>:: The string to look for the tag in.
-    #
-    # ==== Returns
-    # Boolean:: True if the tag matched.
-    def matches?(target)
-      @errors = []
-      unless target.include?("<#{@name}")
-        @errors << "Expected a <#{@name}>, but was #{target}"
-      end
-      @attrs.each do |attr, val|
-        unless target.include?("#{attr}=\"#{val}\"")
-          @errors << "Expected #{attr}=\"#{val}\", but was #{target}"
-        end
-      end
-      if @content
-        unless target.include?(">#{@content}<")
-          @errors << "Expected #{target} to include #{@content}"
-        end
-      end
-      @errors.size == 0
+    
+    def query
+      Nokogiri::CSS::Parser.parse(*super).map { |ast| ast.to_xpath }
     end
-
+  
+  end
+  
+  class HaveTag < HaveSelector
+    
     # ==== Returns
     # String:: The failure message.
     def failure_message
-      @errors[0]
+      "expected following output to contain a #{tag_inspect} tag:\n#{@document}"
     end
-
+    
     # ==== Returns
     # String:: The failure message to be displayed in negative matches.
     def negative_failure_message
-      "Expected not to match against <#{@name} #{@attrs.map{ |a,v| "#{a}=\"#{v}\"" }.join(" ")}> tag, but it matched"
-    end
-  end
-
-  class NotMatchTag
-
-    # === Parameters
-    # attrs<Hash>:: A set of attributes that must not be matched.
-    def initialize(attrs)
-      @attrs = attrs
-    end
-
-    # ==== Parameters
-    # target<String>:: The target to look for the match in.
-    #
-    # ==== Returns
-    # Boolean:: True if none of the attributes were matched.
-    def matches?(target)
-      @errors = []
-      @attrs.each do |attr, val|
-        if target.include?("#{attr}=\"#{val}\"")
-          @errors << "Should not include #{attr}=\"#{val}\", but was #{target}"
-        end
-      end
-      @errors.size == 0
-    end
-
-    # ==== Returns
-    # String:: The failure message.
-    def failure_message
-      @errors[0]
+      "expected following output to omit a #{tag_inspect}:\n#{@document}"
     end
-  end
-  
-  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).
-    def initialize(tag, attributes = {}, &blk)
-      @tag, @attributes = tag, attributes
-      @id, @class = @attributes.delete(:id), @attributes.delete(:class)
-      @blk = blk
-    end
-
-    # ==== Parameters
-    # stringlike<Hpricot::Elem, StringIO, String>:: The thing to search in.
-    # &blk:: An optional block for searching in child elements using with_tag.
-    #
-    # ==== Returns
-    # Boolean:: True if there was at least one match.
-    def matches?(stringlike, &blk)
-      @document = case stringlike
-      when Hpricot::Elem
-        stringlike
-      when StringIO
-        Hpricot.parse(stringlike.string)
-      else
-        Hpricot.parse(stringlike)
+    def tag_inspect
+      options = @expected.last.dup
+      content = options.delete(:content)
+      
+      html = "<#{@expected.first}"
+      options.each do |k,v|
+        html << " #{k}='#{v}'"
       end
       
-      @blk = blk unless blk.nil?
-
-      unless @blk.nil?
-        !@document.search(selector).select do |ele|
-          begin
-            @blk.call ele
-            true
-          rescue Spec::Expectations::ExpectationNotMetError
-            @error_message = "#{tag_for_error}:\n" + $!.message
-            false
-          end
-        end.empty?
+      if content
+        html << ">#{content}</#{@expected.first}>"
       else
-        !@document.search(selector).empty?
+        html << "/>"
       end
-    end
-
-    # ==== Returns
-    # String:: The complete selector for element queries.
-    def selector
-      @selector = @outer_has_tag ? @outer_has_tag.selector : ''
-
-      @selector << "//#{@tag}#{id_selector}#{class_selector}"
-      @selector << @attributes.map{|a, v| "[@#{a}=\"#{v}\"]"}.join
-    end
-
-    # ==== Returns
-    # String:: ID selector for use in element queries.
-    def id_selector
-      "##{@id}" if @id
-    end
-
-    # ==== Returns
-    # String:: Class selector for use in element queries.
-    def class_selector
-      ".#{@class}" if @class
-    end
-
-    # ==== Returns
-    # String:: The failure message.
-    def failure_message
-      @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
-      @error_message || "expected following output to omit a #{tag_for_error} tag:\n#{@document}"
+      
+      html
     end
     
-    # ==== Returns
-    # String:: The tag used in failure messages.
-    def tag_for_error
-      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}" unless @id.nil?
-    end
-
-    # ==== Returns
-    # String:: Class for the error tag.
-    def class_for_error
-      ".#{@class}" unless @class.nil?
-    end
-
-    # ==== Returns
-    # String:: Class for the error tag.
-    def attributes_for_error
-      @attributes.map{|a,v| "[#{a}=\"#{v}\"]"}.join
-    end
-
-    # Search for a child tag within a have_tag block.
-    #
-    # ==== Parameters
-    # tag<~to_s>:: The tag to look for.
-    # 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
+    def query
+      options  = @expected.last.dup
+      selector = @expected.first.to_s
+      
+      selector << ":contains('#{options.delete(:content)}')" if options[:content]
       
-      @inner_has_tag
+      options.each do |key, value|
+        selector << "[#{key}='#{value}']"
+      end
+      
+      Nokogiri::CSS::Parser.parse(selector).map { |ast| ast.to_xpath }
     end
+    
   end
 
   class HasContent
@@ -289,6 +154,7 @@ module Merb::Test::Rspec::ViewMatchers
     end
 
     def matches?(element)
+      element = element.body.to_s if element.respond_to?(:body)
       @element = element
       
       case @content
@@ -320,83 +186,45 @@ module Merb::Test::Rspec::ViewMatchers
       end
     end
   end
-  
-  # ==== Parameters
-  # name<~to_s>:: The name of the tag to look for.
-  # attrs<Hash>:: Attributes to look for in the tag (see below).
-  #
-  # ==== Options (attrs)
-  # :content<String>:: Optional content to match.
-  #
-  # ==== Returns
-  # MatchTag:: A new match tag matcher.
-  def match_tag(name, attrs={})
-    MatchTag.new(name, attrs)
-  end
 
-  # ==== Parameters
-  # attrs<Hash>:: A set of attributes that must not be matched.
+  # Matches HTML content against a CSS 3 selector.
   #
-  # ==== Returns
-  # NotMatchTag:: A new not match tag matcher.
-  def not_match_tag(attrs)
-    NotMatchTag.new(attrs)
-  end
-
   # ==== Parameters
-  # expected<String>:: The string to look for.
+  # expected<String>:: The CSS selector to look for.
   #
   # ==== Returns
   # HaveSelector:: A new have selector matcher.
+  # ---
+  # @api public
   def have_selector(expected)
     HaveSelector.new(expected)
   end
   alias_method :match_selector, :have_selector
 
-  def have_xpath(expected)
-    begin
-      require "libxml"
-      type = "libxml"
-    rescue LoadError => e
-      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)
-  end
-  alias_method :match_xpath, :have_xpath
-
-  # RSpec matcher to test for the presence of tags.
+  # Matches HTML content against an XPath query
   #
   # ==== Parameters
-  # tag<~to_s>:: The name of the tag.
-  # attributes<Hash>:: Tag attributes.
+  # expected<String>:: The XPath query to look for.
   #
   # ==== Returns
-  # HasTag:: A new has tag matcher.
-  #
-  # ==== Examples
-  #   # Check for <div>
-  #   body.should have_tag("div")
-  #
-  #   # Check for <span id="notice">
-  #   body.should have_tag("span", :id => :notice)
-  #
-  #   # Check for <h1 id="foo" class="bar">
-  #   body.should have_tag(:h2, :class => "bar", :id => "foo")
-  #
-  #   # Check for <div attr="val">
-  #   body.should have_tag(:div, :attr => :val)
-  def have_tag(tag, attributes = {}, &blk)
-    HasTag.new(tag, attributes, &blk)
+  # HaveXpath:: A new have xpath matcher.
+  # ---
+  # @api public
+  def have_xpath(expected)
+    HaveXpath.new(expected)
   end
-
-  alias_method :with_tag, :have_tag
+  alias_method :match_xpath, :have_xpath
+  
+  def have_tag(name, attributes = {})
+    HaveTag.new([name, attributes])
+  end
+  alias_method :match_tag, :have_tag
   
+  # Matches the contents of an HTML document with
+  # whatever string is supplied
+  #
+  # ---
+  # @api public
   def contain(content)
     HasContent.new(content)
   end