glog 0.0.8 → 0.1.0

data/lib/glog/template.rb

@@ -12,8 +12,8 @@ module Glog
     end
 
     def initialize(page, locals = nil)
-      @page      = page
-      @locals    = locals
+      @page   = page
+      @locals = locals
       if page.template
         @template = File.read(build_template_path(page.template))
       else
@@ -21,15 +21,17 @@ module Glog
       end
     end
 
-    def render(path = nil, locals = {})
+    def render(path = nil, locals = {}, &block)
       template = path ? File.read("templates" + File::SEPARATOR + path + '.haml') : @template
-      render_string(template, locals)
+      inner_html = block_given? ? yield : ''
+      inner_html = inner_html == 0 ? '' : inner_html
+      render_string(template, locals, inner_html)
     end
 
-    private
-
-    def render_string(string, locals = {})
-      Engine.new(string).render(self, @locals.merge(locals))
+    def render_string(string, locals = {}, inner_html = '')
+      Engine.new(string).render(self, @locals.merge(locals)) do
+        render_string(inner_html)
+      end
     end
 
     def find_for(page_path)
@@ -37,6 +39,8 @@ module Glog
       File.read template_path || 'templates/default.haml'
     end
 
+    private
+
     def possible_paths_for(page_path)
       return [] if page_path.nil?
       segments = page_path.split(File::SEPARATOR)

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 8
-  version: 0.0.8
+  version: 0.1.0
 platform: ruby
 authors: 
 - Antono Vasiljev