rind 0.1.2 → 0.1.3

data/CHANGELOG.rdoc

@@ -1,3 +1,10 @@
+== 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)
+
 == 0.1.2 - 2010.06.17
 * When parsing HTML, script and style tags will not break because of a "<" in their content.
 * Tag names can now have numbers. Previously heading tags would not parse correctly.

data/lib/rind/nodes.rb

@@ -1,12 +1,20 @@
 module Rind
 	class Nodes < Array
+		# Returns the index of the first object in +self+ such that it is equal? to the node.
+		def exact_index(node)
+			self.each_index do |index|
+				return index if self[index].equal?(node)
+			end
+			nil
+		end
+
 		# Return only the nodes that match the Xpath provided.
 		def filter(path)
 			# if the path doesn't have an axis then default to "self"
 			if path !~ /^([.\/]|(.+?::))/
 				path = "self::#{path}"
 			end
-			Nodes.new(self.find_all{|node| node.s(path)})
+			Nodes.new(self.find_all{|node| not node.s(path).empty?})
 		end
 	end
 
@@ -45,6 +53,8 @@ module Rind
 	end
 
 	class DocType
+		include Equality
+
 		# Create a Document Type Declaration with
 		# +content+ holding the DTD identifiers.
 		def initialize(content)
@@ -57,6 +67,11 @@ module Rind
 	end
 
 	class ProcessingInstruction
+		include Equality
+		include Manipulate
+		include Traverse
+		include Xpath
+
 		# Create a processing instruction with
 		# +content+ holding the character data.
 		def initialize(content)

data/lib/rind/traverse.rb

@@ -49,7 +49,7 @@ module Traverse
 	# it will only return the nodes that match.
 	def next_siblings(path = nil)
 		children = self.parent.children
-		siblings = Rind::Nodes.new(children[children.index(self)+1..children.length-1])
+		siblings = Rind::Nodes.new(children[children.exact_index(self)+1..children.length-1])
 		path.nil? ? siblings : siblings.filter(path)
 	end
 
@@ -66,7 +66,7 @@ module Traverse
 	# it will only return the nodes that match.
 	def prev_siblings(path = nil)
 		children = self.parent.children
-		siblings = Rind::Nodes.new(children[0...children.index(self)])
+		siblings = Rind::Nodes.new(children[0...children.exact_index(self)])
 		path.nil? ? siblings : siblings.filter(path)
 	end
 

data/lib/rind/xpath.rb

@@ -56,7 +56,7 @@ module Xpath
 				end
 			end
 
-			return nil if nodes.empty?
+			return Rind::Nodes.new if nodes.empty?
 		end
 
 		Rind::Nodes.new(nodes)
@@ -64,8 +64,7 @@ module Xpath
 
 	# Xpath search returning only the first matching node in the list.
 	def sf(path)
-		nodes = self.s(path)
-		nodes.nil? ? nil : nodes.first
+		self.s(path).first
 	end
 
 	def find_matching_nodes(axis, node_test) # :nodoc:

data/test/nodes_test.rb

@@ -10,7 +10,15 @@ class NodesTest < Test::Unit::TestCase
 		@nodes = Rind::Nodes.new([@p_one, @p_two, @br_one, @br_two])
 	end
 
+	def test_exact_index
+		foo = Rind::Html::Foo.new
+
+		assert_equal(@nodes.exact_index(@p_two), 1)
+		assert_nil(@nodes.exact_index(foo))
+	end
+
 	def test_filter
 		assert_equal(@nodes.filter('br'), [@br_one, @br_two])
+		assert_equal(@nodes.filter('a'), [])
 	end
 end

data/test/xpath_test.rb

@@ -19,9 +19,12 @@ class XpathTest < Test::Unit::TestCase
 		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(@p_one.s('a'), [])
   end
 
 	def test_sf
 		assert_same(@p_one.sf('br'), @br_one)
+		assert_nil(@p_one.sf('a'))
 	end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rind
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Aaron Lasseigne
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-17 00:00:00 -05:00
+date: 2010-06-20 00:00:00 -05:00
 default_executable: 
 dependencies: []