rind 0.1.0 → 0.1.1

data/CHANGELOG.rdoc

@@ -0,0 +1,5 @@
+== 0.1.1 - 2010.06.14
+* Attributes without a value or with a value containing a space broke the parser.
+
+== 0.1.0 - 2010.06.12
+* Initial release.

data/README.rdoc

@@ -7,9 +7,13 @@ app devs as an object. This project is just getting started so watch
 out for sharp corners and unfinished rooms. Enough of that, let's talk
 about what's done.
 
+== Installation
+  gem install rind
+
 == Come say "Hello".
 
   # example.rb
+  require 'rubygems'
   require 'rind'
 
   # Create a new document and load your template.

data/lib/rind/nodes.rb

@@ -103,9 +103,9 @@ module Rind
 					@attributes[k.to_s] = v
 				end
 			elsif options[:attributes].is_a? String
-				options[:attributes].split(/\s+/).each do |attribute|
-					name, value = attribute.split(/=/)
-					@attributes[name] = value.scan(/\"(.*?)\"/).to_s
+				# scan for attr=value|"value1 'value2'"|'"value1" value2' or attr by itself
+				options[:attributes].scan(/([\w-]+)(?:=(\w+|"[^"]+?"|'[^']+?'))?/) do |name, value|
+					@attributes[name] = value.nil? ? '' : value.sub(/\A(["'])([^\1]+)\1\z/, '\2')
 				end
 			end
 

data/lib/rind/parser.rb

@@ -36,7 +36,7 @@ module Rind
 			text_end = match.begin(0)
 			if text_start < text_end
 				text = content[text_start...text_end]
-				tokens.push([TEXT, text]) if text !~ /^\s*$/
+				tokens.push([TEXT, text]) if text !~ /\A\s*\z/
 			end
 			text_start = match.end(0)
 

data/lib/rind/xpath.rb

@@ -4,7 +4,7 @@
 module Xpath
 	# Xpath search of a node that returns a list of matching nodes.
 	def s(path)
-		node = self.clone;
+		node = self;
 
 		# absolute paths to the top
 		if '/' == path[0,1]

data/test/element_test.rb

@@ -6,15 +6,26 @@ class ElementTest < Test::Unit::TestCase
     @element = Rind::Element.new(
 			:attributes => {:class => "foo", :id => 'bar'},
 			:children   => ['This is some text!', Rind::Element.new()]
-		);
+		)
   end
 
 	def test_attribute_parsing
     element2 = Rind::Element.new(
 			:attributes => 'class="foo" id="bar"',
 			:children   => ['This is some text!', Rind::Element.new()]
-		);
+		)
 		assert_equal(element2, @element)
+
+		element3 = Rind::Element.new(
+			:attributes => 'id=foo class="hi bye" selected one=\'1\' other="\'first\' second" http-equiv="boo" type="text/css"'
+		)
+		assert_equal(element3[:id], 'foo')
+		assert_equal(element3[:class], 'hi bye')
+		assert_equal(element3[:selected], '')
+		assert_equal(element3[:one], '1')
+		assert_equal(element3[:other], "'first' second")
+		assert_equal(element3['http-equiv'], "boo")
+		assert_equal(element3[:type], "text/css")
 	end
 
   def test_accessor

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rind
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Aaron Lasseigne
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-12 00:00:00 -05:00
+date: 2010-06-14 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -40,6 +40,7 @@ files:
 - lib/rind.rb
 - README.rdoc
 - LICENSE
+- CHANGELOG.rdoc
 - test/children_test.rb
 - test/xml_test.rb
 - test/traverse_test.rb