rind 0.1.4 → 0.1.5

data/CHANGELOG.rdoc

@@ -1,3 +1,9 @@
+== 0.1.5 - 2010.06.27
+* Xpath query parser was not matching leading '//axis::node' correctly. The axis was being parsed as '/axis'.
+* The <tt>parent</tt> axis was not being handled correctly for the root node.
+* Xpath queries were returning node-sets that contained duplicate nodes.
+* The Manipulate::remove function was not removing only the selected node. All nodes that matched <tt>==</tt> were being returned.
+
 == 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>.

data/lib/rind/manipulate.rb

@@ -18,11 +18,12 @@ module Manipulate
 		children.insert(children.exact_index(self), *nodes)
 	end
 
-	# Calls Rind::Children::delete on <tt>self</tt>.
+	# Removes <tt>self</tt> from siblings and returns it.
 	# === Example
 	#  nodes = ['a', 'b', 'c']
-	#  nodes[1].delete => 'b'
+	#  nodes[1].remove => 'b'
+	#  nodes => ['a', 'c']
 	def remove
-		self.parent.children.delete(self)
+		self.parent.children.delete_at(self.parent.children.exact_index(self))
 	end
 end

data/lib/rind/xpath.rb

@@ -19,9 +19,9 @@ module Xpath
 		# node check
 		nodes = [node]
 		path.scan(%r{(?:^\/?|\/)
-							(?:(.*?)::)?   # axis
-							([^\/\[]+)?    # node test
-							((?:\[.+?\])*) # predicates
+							(?:([^\/]*?)::)? # axis
+							([^\/\[]+)?      # node test
+							((?:\[.+?\])*)   # predicates
 		}x) do |axis, node_test, predicates|
 			case node_test
 			when nil
@@ -41,7 +41,7 @@ module Xpath
 			predicates.gsub!(/^@/, 'attribute::')
 
 			# find matching nodes
-			nodes = nodes.collect{|node| node.find_matching_nodes(axis, node_test)}.flatten.compact
+			nodes = nodes.collect{|node| node.find_matching_nodes(axis, node_test)}.flatten.compact.uniq
 
 			# check predicates
 			if not predicates.nil?
@@ -94,7 +94,7 @@ module Xpath
 		when 'following-sibling'
 			self.next_siblings.find_all{|node| node.is_matching_node?(node_test)}
 		when 'parent'
-			self.parent.is_matching_node?(node_test) ? [self.parent] : []
+			(not self.parent.nil? and self.parent.is_matching_node?(node_test)) ? [self.parent] : []
 		when 'preceding-sibling'
 			self.prev_siblings.find_all{|node| node.is_matching_node?(node_test)}
 		when 'self'

data/test/manipulate_test.rb

@@ -19,6 +19,6 @@ class ManipulateTest < Test::Unit::TestCase
 
 	def test_remove
 		assert_equal(@a.children[1].remove, @b2)
-		assert(@a.children.empty?)
+		assert_equal(@a.children, [@b1])
 	end
 end

data/test/xpath_test.rb

@@ -23,6 +23,7 @@ class XpathTest < Test::Unit::TestCase
 		assert_equal(@c1.s('/a'), [@a])
 
 		assert_equal(@a.s('//c'), [@c1, @c2, @c3])
+		assert_equal(@a.s('//parent::b/c'), [@c1, @c2, @c3])
 
 		assert_equal(@c2.s('..'), [@b2] )
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rind
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Aaron Lasseigne
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-26 00:00:00 -05:00
+date: 2010-06-27 00:00:00 -05:00
 default_executable: 
 dependencies: []