Merge branch 'treat_dot_as_xpath'

sparklemotion · Jun 7, 2012 · 1558c97 · 1558c97
2 parents 00bd62d + 6038226
commit 1558c97
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 deletions.
diff --git a/lib/nokogiri/xml/node.rb b/lib/nokogiri/xml/node.rb
@@ -103,7 +103,7 @@ def search *paths
 
         xpath(*(paths.map { |path|
           path = path.to_s
-          path =~ /^(\.\/|\/|\.\.)/ ? path : CSS.xpath_for(
+          path =~ /^(\.\/|\/|\.\.|\.$)/ ? path : CSS.xpath_for(
             path,
             :prefix => prefix,
             :ns     => ns

diff --git a/lib/nokogiri/xml/node_set.rb b/lib/nokogiri/xml/node_set.rb
@@ -79,7 +79,7 @@ def search *paths
 
         paths.each do |path|
           sub_set += send(
-            path =~ /^(\.\/|\/)/ ? :xpath : :css,
+            path =~ /^(\.\/|\/|\.\.|\.$)/ ? :xpath : :css,
             *(paths + [ns, handler]).compact
           )
         end

diff --git a/test/xml/test_node.rb b/test/xml/test_node.rb
@@ -454,6 +454,11 @@ def test_at
         assert_equal node, @xml.xpath('//address').first
       end
 
+      def test_at_self
+        node = @xml.at('address')
+        assert_equal node, node.at('.')
+      end
+
       def test_at_xpath
         node = @xml.at_xpath('//address')
         nodes = @xml.xpath('//address')
@@ -740,6 +745,11 @@ def test_parent_xpath
         assert_equal node.parent, parent_node
       end
 
+      def test_search_self
+        node = @xml.at('//employee')
+        assert_equal node.search('.').to_a, [node]
+      end
+
       def test_search_by_symbol
         assert set = @xml.search(:employee)
         assert 5, set.length

diff --git a/test/xml/test_node_set.rb b/test/xml/test_node_set.rb
@@ -146,6 +146,11 @@ def awesome ns
         assert_equal @xml.xpath('//employee'), custom_employees
       end
 
+      def test_search_self
+        set = @xml.xpath('//staff')
+        assert_equal set.to_a, set.search('.').to_a
+      end
+
       def test_search_with_custom_object
         set = @xml.xpath('//staff')
         custom_employees = set.search('//*[awesome(.)]', Class.new {