ruhl 0.26.1 → 1.0.0

data/VERSION

@@ -1 +1 @@
-0.26.1
+1.0.0

data/lib/ruhl/engine.rb

@@ -6,11 +6,9 @@ module Ruhl
     def initialize(html, options = {})
       @local_object   = options[:local_object] || options[:object]
       @block_object   = options[:block_object]
+      @layout         = options[:layout]
       @layout_source  = options[:layout_source]
 
-      if @layout = options[:layout]
-        raise LayoutNotFoundError.new(@layout) unless File.exists?(@layout)
-      end
 
       if @layout || @local_object || @block_object
         @document = Nokogiri::HTML.fragment(html)
@@ -44,6 +42,8 @@ module Ruhl
     private
 
     def render_with_layout
+      raise LayoutNotFoundError.new(@layout) unless File.exists?(@layout)
+
       render_nodes Nokogiri::HTML( @layout_source || File.read(@layout) )
     end
 

data/lib/ruhl/sinatra.rb

@@ -30,8 +30,21 @@ end
 
 module Ruhl
   class Engine
+
     private
 
+    def render_with_layout
+      if @layout_source
+       data = @layout_source
+      else
+        views = scope.class.views || "./views"
+        data, filename, line = scope.send(:lookup_template, :ruhl, @layout.to_sym, views)
+      end
+
+     render_nodes Nokogiri::HTML(data)
+    end
+
+
     def render_partial
       views = scope.class.views || "./views"
 

data/ruhl.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruhl}
-  s.version = "0.26.1"
+  s.version = "1.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Stone"]
-  s.date = %q{2010-01-14}
+  s.date = %q{2010-01-21}
   s.description = %q{Make your HTML dynamic with the addition of a data-ruhl attribute.}
   s.email = %q{andy@stonean.com}
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruhl
 version: !ruby/object:Gem::Version 
-  version: 0.26.1
+  version: 1.0.0
 platform: ruby
 authors: 
 - Andrew Stone
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-14 00:00:00 -05:00
+date: 2010-01-21 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency