jarrett-quarto 1.4.0 → 1.4.1

data/VERSION

@@ -1 +1 @@
-1.4.0
+1.4.1

data/lib/quarto/transformer.rb

@@ -47,7 +47,13 @@ module Quarto
 		# on the rules you've set up, the result may
 		# be XML or something else altogether.
 		#
-		# +element+ must be a <tt>REXML::Element</tt>.
+		# +element+ must be a <tt>REXML::Element</tt>
+		# or a subclass thereof. If +element+ is a
+		# <tt>REXML::Document</tt>, the document root and all
+		# its children will be transformed. If +element+
+		# is a <tt>REXML::Element</tt>, only the element's
+		# descendents will be tranformed; +element+ itself
+		# will not be used.
 		#
 		# By default, unrecognized elements (and all their
 		# descendants) will be ommited from the result tree.
@@ -60,7 +66,11 @@ module Quarto
 			if element.is_a?(REXML::Document)
 				recursive_transform(element.root, raise_on_unrecognized_element)
 			else
-				recursive_transform(element, raise_on_unrecognized_element)
+				result = ''
+				element.children.each do |child|
+					result << recursive_transform(child, raise_on_unrecognized_element)
+				end
+				result
 			end
 		end
 		

data/quarto.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{quarto}
-  s.version = "1.4.0"
+  s.version = "1.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jarrett Colby"]
@@ -45,6 +45,7 @@ Gem::Specification.new do |s|
     "spec/children_spec.rb",
      "spec/element_wrapper_spec.rb",
      "spec/generator_spec.rb",
+     "spec/html_tranformer_spec.rb",
      "spec/init_project_spec.rb",
      "spec/matchers/file_matchers.rb",
      "spec/matchers/rexml_matchers.rb",

data/spec/element_wrapper_spec.rb

@@ -22,9 +22,10 @@ describe Quarto::ElementWrapper::Base do
 			@company.name.should == '37Signals'
 		end
 		
-		it 'should return a REXML::Element if an elemement_attr contains markup' do
+		it 'should return the attribute\'s REXML::Element if an element_attr contains markup' do
 			company = Company.find(:first, :xpath => "//company[name='Mega-lo-Mart']")
 			company.description.should be_a(REXML::Element)
+			company.description.name.should == 'description'
 		end
 		
 		it 'should define methods from XML attributes by default' do

data/spec/html_tranformer_spec.rb

@@ -0,0 +1,29 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe Quarto::HtmlTransformer do
+	include Quarto::REXMLMatchers
+	
+	context '#transform' do
+		before :each do
+			@html = REXML::Document.new(%Q(
+				<description>
+					<p id="first_paragraph">Mega-lo-Mart is a parody of big-box stores featured in <cite>King of the Hill</cite>.</p>
+				
+					<p id="second_paragraph">It is featured in Wikipedia's
+						<a href="http://en.wikipedia.org/wiki/List_of_fictional_companies">List&nbsp;of&nbsp;Fictional&nbsp;Companies.</a>
+					</p>
+				</description>
+			))
+			@t = Quarto::HtmlTransformer.new
+		end
+		
+		it 'should return valid HTML verbatim, even if the root element is not a valid HTML element' do
+			output = @t.transform(@html.root)
+			output = REXML::Document.new('<description>' + output + '</description>')
+			output.should have_element('p', :attributes => {'id' => 'first_paragraph'})
+			output.should have_element('cite', :text => 'King of the Hill')
+			output.should have_element('p', :attributes => {'id' => 'second_paragraph'})
+			output.should have_element('a', :attributes => {'href' => 'http://en.wikipedia.org/wiki/List_of_fictional_companies'})
+		end
+	end
+end

data/spec/transformation_helper_spec.rb

@@ -9,6 +9,7 @@ describe Quarto::TransformationHelper do
 				<div>
 					<p>Foo</p>
 					<p><a href="http://example.com">Bar</a></p>
+					<p>Baz&mdash;Baz</p>
 				</div>
 			))
 		end
@@ -29,6 +30,10 @@ describe Quarto::TransformationHelper do
 				Quarto::HtmlTransformer.should_receive(:new).and_return(t)
 				transform_xml(@html)
 			end
+			
+			it 'should return the original HTML' do
+				REXML::Document.new(transform_xml(@html)).to_s.should == @html.to_s.strip
+			end
 		end
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jarrett-quarto
 version: !ruby/object:Gem::Version 
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors: 
 - Jarrett Colby
@@ -80,6 +80,7 @@ test_files:
 - spec/children_spec.rb
 - spec/element_wrapper_spec.rb
 - spec/generator_spec.rb
+- spec/html_tranformer_spec.rb
 - spec/init_project_spec.rb
 - spec/matchers/file_matchers.rb
 - spec/matchers/rexml_matchers.rb