webrat 0.3.1 → 0.3.2

data/History.txt

@@ -1,4 +1,10 @@
-== Trunk
+== 0.3.2 / 2008-11-08
+
+* Minor enhancements
+
+  * Fixes behavior or have_tag when a block is passed. It passes the matched node(s) to the block for further specs again. (Carl Lerche)
+  
+== 0.3.1 / 2008-11-07
 
   * Minor enhancements
 

data/lib/webrat.rb

@@ -3,7 +3,7 @@ require "rubygems"
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__))) unless $LOAD_PATH.include?(File.expand_path(File.dirname(__FILE__)))
 
 module Webrat
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
   
   def self.root #:nodoc:
     defined?(RAILS_ROOT) ? RAILS_ROOT : Merb.root

data/lib/webrat/core/matchers/have_selector.rb

@@ -30,8 +30,8 @@ module Webrat
     # HaveSelector:: A new have selector matcher.
     # ---
     # @api public
-    def have_selector(expected)
-      HaveSelector.new(expected)
+    def have_selector(expected, &block)
+      HaveSelector.new(expected, &block)
     end
     alias_method :match_selector, :have_selector
     

data/lib/webrat/core/matchers/have_tag.rb

@@ -49,8 +49,8 @@ module Webrat
 
     end
 
-    def have_tag(name, attributes = {})
-      HaveTag.new([name, attributes])
+    def have_tag(name, attributes = {}, &block)
+      HaveTag.new([name, attributes], &block)
     end
     alias_method :match_tag, :have_tag
 

data/lib/webrat/core/matchers/have_xpath.rb

@@ -16,17 +16,31 @@ module Webrat
       end
     
       def matches_rexml?(stringlike)
+        @query = query
+
         @document = rexml_document(stringlike)
-      
-        query.all? do |q|
-          matched = REXML::XPath.match(@document, q)
-          matched.any? && (!block_given? || matched.all?(&@block))
-        end
+
+        matched = @query.map do |q|
+          if @document.is_a?(Array)
+            @document.map { |d| REXML::XPath.match(d, q) }
+          else
+            REXML::XPath.match(@document, q)
+          end
+        end.flatten.compact
+
+        matched.any? && (!@block || @block.call(matched))
       end
     
       def matches_nokogiri?(stringlike)
+        if Nokogiri::XML::NodeSet === stringlike
+          @query = query.map { |q| q.gsub(%r'//', './') }
+        else
+          @query = query
+        end
+        
         @document = Webrat.nokogiri_document(stringlike)
-        @document.xpath(*query).any?
+        matched = @document.xpath(*@query)
+        matched.any? && (!@block || @block.call(matched))
       end
     
       def rexml_document(stringlike)
@@ -35,9 +49,10 @@ module Webrat
         case stringlike
         when REXML::Document
           stringlike.root
-        when REXML::Node
+        when REXML::Node, Array
+          @query = query.map { |q| q.gsub(%r'//', './') }
           stringlike
-        when StringIO, String
+        else
           begin
             REXML::Document.new(stringlike.to_s).root
           rescue REXML::ParseException => e
@@ -76,8 +91,8 @@ module Webrat
     # HaveXpath:: A new have xpath matcher.
     # ---
     # @api public
-    def have_xpath(expected)
-      HaveXpath.new(expected)
+    def have_xpath(expected, &block)
+      HaveXpath.new(expected, &block)
     end
     alias_method :match_xpath, :have_xpath
     

data/lib/webrat/core/nokogiri.rb

@@ -5,9 +5,11 @@ module Webrat
   def self.nokogiri_document(stringlike) #:nodoc:
     return stringlike.dom if stringlike.respond_to?(:dom)
     
-    if stringlike === Nokogiri::HTML::Document || stringlike === Nokogiri::XML::NodeSet
+    if Nokogiri::HTML::Document === stringlike
       stringlike
-    elsif stringlike === StringIO
+    elsif Nokogiri::XML::NodeSet === stringlike
+      stringlike
+    elsif StringIO === stringlike
       Nokogiri::HTML(stringlike.string)
     elsif stringlike.respond_to?(:body)
       Nokogiri::HTML(stringlike.body.to_s)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: webrat
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - Bryan Helmkamp
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-07 00:00:00 -05:00
+date: 2008-11-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -110,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.1
+rubygems_version: 1.3.0
 signing_key: 
 specification_version: 2
 summary: Webrat. Ruby Acceptance Testing for Web applications