jarrett-quarto 1.6.1 → 1.6.2

data/VERSION

@@ -1 +1 @@
-1.6.1
+1.6.2

data/lib/quarto/generator.rb

@@ -25,7 +25,7 @@ module Quarto
 			raise ArgumentError, 'project_path is required when Quarto.generate is called from any file other than generate.rb'
 		end
 		Dir.glob(project_path + '/models/*.rb').each do |model_file|
-			require model_file
+			require File.expand_path(model_file)
 		end
 		Dir.glob(project_path + '/transformers/*.rb').each do |transformer_file|
 			require transformer_file

data/lib/quarto/transformer.rb

@@ -42,11 +42,9 @@ module Quarto
 			if element.is_a?(REXML::Document)
 				recursive_transform(element.root, raise_on_unrecognized_element)
 			else
-				result = ''
-				element.children.each do |child|
-					result << recursive_transform(child, raise_on_unrecognized_element)
+				element.children.to_a.inject('') do |result, child|
+					result + recursive_transform(child, raise_on_unrecognized_element)
 				end
-				result
 			end
 		end
 		
@@ -154,6 +152,8 @@ module Quarto
 				else
 					''
 				end
+			elsif element.is_a?(REXML::Comment)
+				''
 			else
 				element.to_s
 			end

data/quarto.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{quarto}
-  s.version = "1.6.1"
+  s.version = "1.6.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jarrett Colby"]
-  s.date = %q{2009-06-22}
+  s.date = %q{2009-06-23}
   s.default_executable = %q{quarto}
   s.description = %q{Quarto is a Ruby framework for generating collections of documents from XML. It steps in where XSLT just won't cut it. Potential applications include web sites and e-books. It's built on top of ERB and REXML.}
   s.email = %q{jarrett@uchicago.edu}

data/spec/transformer_spec.rb

@@ -48,7 +48,7 @@ describe Quarto::Transformer do
 		end
 		
 		it 'should not transform elements that lack custom transform methods and for which literal? returns true' do
-			result = REXML::Document.new(@t.transform(@doc))
+			result = REXML::Document.new(@t.transform(@doc, false))
 			result.should have_element('doc')
 			result.should have_element('div')
 			result.should have_element('p', :text => 'Foo')
@@ -107,6 +107,20 @@ describe Quarto::Transformer do
 				end
 			end				
 		end
+		
+		it 'should ignore comments' do
+			doc = REXML::Document.new(%q(
+				<div>
+					<div>
+						<!-- this is a comment -->
+					</div>
+				</div>
+			))
+			
+			t = Quarto::HtmlTransformer.new
+			result = t.transform(doc, true)
+			result.should_not include('this is a comment')
+		end
 	end
 	
 	context '.literals' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jarrett-quarto
 version: !ruby/object:Gem::Version 
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors: 
 - Jarrett Colby
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-22 00:00:00 -07:00
+date: 2009-06-23 00:00:00 -07:00
 default_executable: quarto
 dependencies: 
 - !ruby/object:Gem::Dependency