rind 0.1.3 → 0.1.4

data/CHANGELOG.rdoc

@@ -1,9 +1,13 @@
+== 0.1.4 - 2010.06.26
+* Xpath searches with attribute values containing a <tt>/</tt>, like <tt>style[@type="text/css"]</tt>, broke the query parser.
+* The Manipulate::insert_after and Manipulate::insert_before functions and Xpath positions were not returning the correct nodes when other available nodes matched <tt>==</tt>.
+
 == 0.1.3 - 2010.06.20
 * The Xpath function 's' will return an empty Rind::Node rather than +nil+.
 * Processing instructions were not being treated as nodes.
 * DocType nodes were lacking proper equality checks.
-* The +next+, +next_sibling+, +prev+ and +prev_sibling+ functions were not returning the correct nodes when other available nodes matched <tt>==</tt>.
-* Adding +exact_index+ function to Rind::Nodes. (used in previous bug fix)
+* The Traverse::next, Traverse::next_sibling, Traverse::prev and Traverse::prev_sibling functions were not returning the correct nodes when other available nodes matched <tt>==</tt>.
+* Adding exact_index function to Rind::Nodes. (used in previous bug fix)
 
 == 0.1.2 - 2010.06.17
 * When parsing HTML, script and style tags will not break because of a "<" in their content.

data/lib/rind/manipulate.rb

@@ -1,27 +1,24 @@
 # Note: These functions are not available for the root node in a tree.
 module Manipulate
-	# Calls {Rind::Children::insert}[link:classes/Rind/Children.html#insert]
-	# to add nodes after <tt>self</tt>.
+	# Calls Rind::Children::insert to add nodes after <tt>self</tt>.
 	# === Example
 	#  nodes = ['a', 'b', 'c']
 	#  nodes[0].insert_after('d', 'e') => ['a', 'd', 'e', 'b', 'c']
 	def insert_after(*nodes)
 		children = self.parent.children
-		children.insert(children.index(self)+1, *nodes)
+		children.insert(children.exact_index(self)+1, *nodes)
 	end
 
-	# Calls {Rind::Children::insert}[link:classes/Rind/Children.html#insert]
-	# to add nodes before <tt>self</tt>.
+	# Calls Rind::Children::insert to add nodes before <tt>self</tt>.
 	# === Example
 	#  nodes = ['a', 'b', 'c']
 	#  nodes[2].insert_after('d', 'e') => ['a', 'b', 'd', 'e', 'c']
 	def insert_before(*nodes)
 		children = self.parent.children
-		children.insert(children.index(self), *nodes)
+		children.insert(children.exact_index(self), *nodes)
 	end
 
-	# Calls {Rind::Children::delete}[link:classes/Rind/Children.html#delete]
-	# on <tt>self</tt>.
+	# Calls Rind::Children::delete on <tt>self</tt>.
 	# === Example
 	#  nodes = ['a', 'b', 'c']
 	#  nodes[1].delete => 'b'

data/lib/rind/xpath.rb

@@ -4,38 +4,42 @@
 module Xpath
 	# Xpath search of a node that returns a list of matching nodes.
 	def s(path)
-		node = self;
+		node = self
 
 		# absolute paths to the top
 		if '/' == path[0,1]
 			while not node.parent.nil?
 				node = node.parent
 			end
-			if 1 < path.length and '/' == path[1,1]
-				path[0] = ''
-			else
+			if '/' != path[1,1]
 				path[0] = 'self::'
 			end
 		end
 
 		# node check
 		nodes = [node]
-		path.split('/').each do |step|
-			case step
-			when ''
-				step = 'descendant-or-self::node()'
+		path.scan(%r{(?:^\/?|\/)
+							(?:(.*?)::)?   # axis
+							([^\/\[]+)?    # node test
+							((?:\[.+?\])*) # predicates
+		}x) do |axis, node_test, predicates|
+			case node_test
+			when nil
+				axis = 'descendant-or-self'
+				node_test = 'node()'
 			when '.'
-				step = 'self::node()'
+				axis = 'self'
+				node_test = 'node()'
 			when '..'
-				step = 'parent::node()'
+				axis = 'parent'
+				node_test = 'node()'
 			end
 
-			step.gsub!(/^@/, 'attribute::')
-
-			step =~ /^(?:(.*?)::)?(.+?)(\[.*?)?$/
-			axis, node_test, predicates = $1, $2, $3
 			axis = 'child' if axis.nil?
 
+			node_test.gsub!(/^@/, 'attribute::')
+			predicates.gsub!(/^@/, 'attribute::')
+
 			# find matching nodes
 			nodes = nodes.collect{|node| node.find_matching_nodes(axis, node_test)}.flatten.compact
 
@@ -51,7 +55,9 @@ module Xpath
 					# last()
 					predicate.gsub!(/last\(\)/, nodes.length.to_s)
 
-					nodes = nodes.find_all{|node| node.validate_predicate(predicate.clone, nodes.index(node)+1)}
+					nodes = nodes.find_all do |node|
+						node.validate_predicate(predicate.clone, Rind::Nodes[*nodes].exact_index(node)+1)
+					end
 					break if nodes.empty?
 				end
 			end

data/test/manipulate_test.rb

@@ -3,21 +3,22 @@ require 'rind'
 
 class ManipulateTest < Test::Unit::TestCase
 	def setup
-		@p = Rind::Html::P.new(:children => ['This is some text!'])
-		@br = Rind::Html::Br.new()
-		@hr = Rind::Html::Hr.new()
+		@a = Rind::Html::A.new()
+		@b1 = Rind::Html::B.new()
+		@b2 = Rind::Html::B.new()
+		@a.children.push(@b1, @b2)
 	end
 
 	def test_insert_after
-		assert_equal(@p.children.first.insert_after(@br, @hr), ['This is some text!', @br, @hr])
+		assert_equal(@a.children[1].insert_after('foo'), [@b1, @b2, 'foo'])
 	end
 
 	def test_insert_before
-		assert_equal(@p.children.first.insert_before(@br, @hr), [@br, @hr, 'This is some text!'])
+		assert_equal(@a.children[1].insert_before('foo'), [@b1, 'foo', @b2])
 	end
 
 	def test_remove
-		assert_equal(@p.children.first.remove, 'This is some text!')
-		assert(@p.children.empty?)
+		assert_equal(@a.children[1].remove, @b2)
+		assert(@a.children.empty?)
 	end
 end

data/test/xml_test.rb

@@ -4,11 +4,11 @@ require 'rind'
 class XmlTest < Test::Unit::TestCase
   def test_to_s
 		# no children
-    a_tag = Rind::Xml::A.new();
+    a_tag = Rind::Xml::A.new()
     assert_equal(a_tag.to_s, '<a />')
 
 		# with children
-    b_tag = Rind::Xml::B.new(:children => a_tag);
+    b_tag = Rind::Xml::B.new(:children => a_tag)
     assert_equal(b_tag.to_s, '<b><a /></b>')
   end
 end

data/test/xpath_test.rb

@@ -3,28 +3,84 @@ require 'rind'
 
 class XpathTest < Test::Unit::TestCase
 	def setup
-		@br_one = Rind::Html::Br.new(:attributes => {:id => 'br_one', :class => '1'})
-		@br_two = Rind::Html::Br.new(:attributes => {:id => 'br_two', :class => '2'})
-		@br_three = Rind::Html::Br.new()
-		@p_one = Rind::Html::P.new(:attributes => {:class => '1'}, :children => [@br_one, @br_two, @br_three])
+		@a = Rind::Html::A.new
+		@b1 = Rind::Html::B.new(:attributes => {:id => '1', :class => '1'})
+		@b2 = Rind::Html::B.new(:attributes => {:id => '2', :class => '2'})
+		@b3 = Rind::Html::B.new(:attributes => {:id => '3', :type => 'text/css'})
+		@c1 = Rind::Html::C.new()
+		@c2 = Rind::Html::C.new()
+		@c3 = Rind::Html::C.new()
+		@comment = Rind::Comment.new('comment')
+		@pi = Rind::ProcessingInstruction.new('pi')
+		@text = Rind::Text.new('text')
+		@b1.children.push(@c1)
+		@b2.children.push(@c2, @c3)
+		@b3.children.push(@comment, @pi, @text)
+		@a.children.push(@b1, @b2, @b3)
 	end
 
   def test_s
-		assert_equal(@p_one.s('br'), [@br_one, @br_two, @br_three])
+		assert_equal(@c1.s('/a'), [@a])
 
-		# attribute tests
-		assert_equal(@p_one.s('br[@class="1"]'), [@br_one])
+		assert_equal(@a.s('//c'), [@c1, @c2, @c3])
 
-		# position tests
-		assert_equal(@p_one.s('br[2]'), [@br_two])
-		assert_equal(@p_one.s('br[position()=1]'), [@br_one])
-		assert_equal(@p_one.s('br[last()]'), [@br_three])
+		assert_equal(@c2.s('..'), [@b2] )
 
-		assert_equal(@p_one.s('a'), [])
+		assert_equal(@c2.s('.'), [@c2] )
+
+		assert_equal(@a.s('foo'), [])
   end
 
+	def test_s_axis
+		assert_equal(@c1.s('ancestor::*'), [@b1, @a])
+
+		assert_equal(@c1.s('ancestor-or-self::*'), [@c1, @b1, @a])
+
+		assert_equal(@a.s('child::*'), [@b1, @b2, @b3])
+
+		assert_equal(@a.s('descendant::*'), [@b1, @b2, @b3, @c1, @c2, @c3, @comment, @pi])
+
+		assert_equal(@a.s('descendant-or-self::*'), [@a, @b1, @b2, @b3, @c1, @c2, @c3, @comment, @pi])
+
+		assert_equal(@b2.s('following-sibling::*'), [@b3])
+
+		assert_equal(@b3.s('parent::*'), [@a])
+
+		assert_equal(@b2.s('preceding-sibling::*'), [@b1])
+
+		assert_equal(@a.s('self::*'), [@a])
+	end
+
+	def test_s_node_test
+		assert_equal(@a.s('//*'), [@b1, @b2, @b3, @c1, @c2, @c3, @comment, @pi])
+
+		assert_equal(@a.s('//comment()'), [@comment])
+
+		assert_equal(@a.s('//node()'), [@b1, @b2, @b3, @c1, @c2, @c3, @comment, @pi, @text])
+
+		assert_equal(@a.s('//processing-instruction()'), [@pi])
+
+		assert_equal(@a.s('//text()'), [@text])
+
+		assert_equal(@a.s('b'), [@b1, @b2, @b3])
+	end
+
+	def test_s_attribute
+		assert_equal(@a.s('b[@class="1"]'), [@b1])
+
+		assert_equal(@a.s('//b[@type="text/css"]'), [@b3])
+	end
+
+	def test_s_position
+		assert_equal(@b2.s('c[2]'), [@c3])
+
+		assert_equal(@a.s('b[position()=1]'), [@b1])
+
+		assert_equal(@a.s('b[last()]'), [@b3])
+	end
+
 	def test_sf
-		assert_same(@p_one.sf('br'), @br_one)
-		assert_nil(@p_one.sf('a'))
+		assert_same(@a.sf('b'), @b1)
+		assert_nil(@a.sf('foo'))
 	end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rind
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Aaron Lasseigne
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-20 00:00:00 -05:00
+date: 2010-06-26 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -25,8 +25,9 @@ executables: []
 
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- LICENSE
+- CHANGELOG.rdoc
 files: 
 - lib/rind/document.rb
 - lib/rind/html.rb