edifice 1.1.1 → 1.2.0

data/README.md

@@ -79,4 +79,4 @@ Alternatively you could define `onLoad` (which fires on `window.load`), or nothi
 License
 -------
 
-Edifice is crafted by [Percolate Studio](http://percolatestudio.com) and released under the [MIT license](www.opensource.org/licenses/MIT)
+[Edifice](http://edifice-rails.com) is crafted by [Percolate Studio](http://percolatestudio.com) and released under the [MIT license](www.opensource.org/licenses/MIT)

data/lib/edifice/renderer.rb

@@ -11,10 +11,13 @@ module Edifice
 
   class TemplateRenderer < ActionView::TemplateRenderer
     def render_template(template, layout_name = nil, locals = {})
+      layout_name = layout_name.call if layout_name.is_a? Proc
+      layout = if layout_name.is_a? String then layout_name.split('/').last else '' end
+      
       # ensure we aren't rendering e.g. text
       if template.respond_to?(:virtual_path) and @view.controller and @view.controller.respond_to?(:set_edifice_names)
         @view.controller.set_edifice_names(template.virtual_path.name, 
-          template.virtual_path.prefix, (layout_name.nil? ? '' : layout_name.split('/').last))
+          template.virtual_path.prefix, layout)
       end
       
       super(template, layout_name, locals)

data/lib/edifice/version.rb

@@ -1,3 +1,3 @@
 module Edifice
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: edifice
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: 
   segments: 
   - 1
-  - 1
-  - 1
-  version: 1.1.1
+  - 2
+  - 0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Tom Coleman
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-22 00:00:00 Z
+date: 2012-06-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake