ruhl 0.9.5 → 0.9.6

data/VERSION

@@ -1 +1 @@
-0.9.5
+0.9.6

data/lib/ruhl/engine.rb

@@ -42,14 +42,14 @@ module Ruhl
     private
 
     def render_with_layout
-      render_file( @layout_source || File.read(@layout) ) 
+      render_nodes Nokogiri::HTML( @layout_source || File.read(@layout) )
     end
 
     def render_partial(tag, code)
       file = execute_ruby(tag, code)
       raise PartialNotFoundError.new(file) unless File.exists?(file)
 
-      render_file( File.read(file) )
+      render_nodes Nokogiri::HTML.fragment( File.read(file) )
     end
 
     def render_collection(tag, code, actions = nil)
@@ -79,10 +79,9 @@ module Ruhl
       Ruhl::Engine.new(tag.inner_html, :block_object => bo).render(scope)
     end
 
-    def render_file(contents)
-      doc = Nokogiri::HTML( contents ) 
-      parse_doc(doc)
-      doc.to_s
+    def render_nodes(nodes)
+      parse_doc(nodes)
+      nodes.to_s
     end
 
     def parse_doc(doc)

data/lib/ruhl/rails.rb

@@ -34,7 +34,7 @@ module Ruhl
 
       raise PartialNotFoundError.new(file) unless template
 
-      render_file( template.source )
+      render_nodes Nokogiri::HTML.fragment( template.source )
     end
 
   end

data/ruhl.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruhl}
-  s.version = "0.9.5"
+  s.version = "0.9.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Stone"]

data/spec/html/sidebar.html

@@ -1,7 +1,9 @@
-<h3>Real Sidebarlinks</h3>
-<ul>
-  <li><a href="#">Real Link 1</a></li>
-  <li><a href="#">Real Link 2</a></li>
-  <li><a href="#">Real Link 3</a></li>
-  <li><a href="#">Real Link 4</a></li>
-</ul>
+<div>
+  <h3>Real Sidebarlinks</h3>
+  <ul>
+    <li><a href="#">Real Link 1</a></li>
+    <li><a href="#">Real Link 2</a></li>
+    <li><a href="#">Real Link 3</a></li>
+    <li><a href="#">Real Link 4</a></li>
+  </ul>
+</div>

data/spec/ruhl_spec.rb

@@ -74,16 +74,11 @@ describe Ruhl do
 
     it "should replace sidebar with partial contents" do
       doc = create_doc
-      html = %{<div id="sidebar">
-<h3>Real Sidebarlinks</h3>
-<ul>
-<li><a href="#">Real Link 1</a></li>
-  <li><a href="#">Real Link 2</a></li>
-  <li><a href="#">Real Link 3</a></li>
-  <li><a href="#">Real Link 4</a></li>
-</ul>
-</div>}
-      doc.xpath('//div[@id="sidebar"]').to_s.should == html
+      doc.xpath('/html/body/div/div/div//h3')[0].inner_html.
+        should == "Real Sidebarlinks"
+
+      doc.xpath('/html/body/div/div/div/ul/li//a')[0].inner_html.
+        should == "Real Link 1"
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruhl
 version: !ruby/object:Gem::Version 
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors: 
 - Andrew Stone