ruhl 1.0.0 → 1.1.0

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

data/lib/ruhl/rails.rb

@@ -9,11 +9,11 @@ module Ruhl
     end
     
     def render(template, options = {})
-      layout = @action_view.controller.send(:active_layout)
+      layout_template = @action_view.controller.active_layout(options[:layout])
 
-      if layout
-        options[:layout]        = layout.filename 
-        options[:layout_source] = layout.source
+      if layout_template
+        options[:layout]        = layout_template.filename 
+        options[:layout_source] = layout_template.source
       end
 
       Ruhl::Engine.new(template.source, options).render(@action_view)

data/lib/ruhl/rails/ruhl_presenter.rb

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

data/ruhl.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruhl}
-  s.version = "1.0.0"
+  s.version = "1.1.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-21}
+  s.date = %q{2010-01-30}
   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: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Andrew Stone
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-21 00:00:00 -05:00
+date: 2010-01-30 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency