ruhl 1.1.0 → 1.1.1

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.1.1

data/lib/ruhl/rails/ruhl_presenter.rb

@@ -50,12 +50,9 @@ module ActionController
       action_sym = options[:action] || action_name
       object_sym = options[:object] || controller_name.singularize
 
-      params = { :template => "#{controller_name}/#{action_sym}", 
-                 :locals => {:object => presenter_for(object_sym) } }
 
-      params[:layout] = options[:layout] if options.has_key?(:layout)
-
-      render params
+      render :template => "#{controller_name}/#{action_sym}", 
+                 :locals => {:object => presenter_for(object_sym), :layout => options[:layout] } 
     end
 
     def presenter_for(object)

data/lib/ruhl/rails.rb

@@ -9,7 +9,12 @@ module Ruhl
     end
     
     def render(template, options = {})
-      layout_template = @action_view.controller.active_layout(options[:layout])
+      if layout = options[:layout]
+        layout_template = @action_view.controller.send(:find_layout, layout, 
+                                                        @action_view.controller.send(:default_template_format) )
+      else
+        layout_template = @action_view.controller.active_layout
+      end
 
       if layout_template
         options[:layout]        = layout_template.filename 

data/ruhl.gemspec

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

metadata

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