liquidizer 0.5.0 → 0.5.1

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.1

data/lib/liquidizer/controller_extensions.rb

@@ -70,6 +70,8 @@ module Liquidizer
     end
 
     def liquid_template_for_layout(options)
+      options ||= {}
+
       if liquify_layout?(options)
         name = liquid_template_name_for_layout(options)
         name && find_and_parse_liquid_template(name)
@@ -79,13 +81,16 @@ module Liquidizer
     end
     
     def liquify_layout?(options)
-      options ||= {}
-
-      return false unless self.class.liquidizer_options[:layout]
-      return true  if     options[:layout].nil? && liquifiable_options?(options)
-      return true  if     options[:layout] == true
-
-      false
+      if self.class.liquidizer_options[:layout]
+        case options[:layout]
+        when nil   then liquifiable_options?(options)
+        when false then false
+        else
+          true
+        end
+      else
+        false
+      end
     end
     
     def extract_action_for_render(options)
@@ -122,11 +127,11 @@ module Liquidizer
     end
 
     def liquid_template_name_for_layout(options)
-      case layout = self.class.read_inheritable_attribute(:layout)
-        when Symbol then __send__(layout)
-        when Proc   then layout.call(self)
-        else layout
-      end
+      options[:layout] || case layout = self.class.read_inheritable_attribute(:layout)
+                          when Symbol then __send__(layout)
+                          when Proc   then layout.call(self)
+                          else layout
+                          end
     end
 
     def find_liquid_template(name)

data/liquidizer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{liquidizer}
-  s.version = "0.5.0"
+  s.version = "0.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Adam Cig\303\241nek"]
-  s.date = %q{2010-03-09}
+  s.date = %q{2010-03-10}
   s.description = %q{WIth this gem, you can render your Ruby on Rails views with liquid templates that are loaded from database. This way, the look and feel of your site can be safely configured by it's users.
 }
   s.email = %q{adam.ciganek@gmail.com}

data/test/controller_extensions_test.rb

@@ -196,21 +196,24 @@ class ControllerExtensionsTest < ActionController::TestCase
     assert_select '#layout p', 'This is not liquid template'
   end
 
-  # TODO: make this pass
-  # test 'renders with overriden liquid layout' do
-  #   setup_controller(PostsController)
+  test 'renders with overriden liquid layout' do
+    setup_controller(PostsController)
+
+    LiquidTemplate.create!(
+      :name => 'awesome_layout',
+      :content => '<div id="awesome_layout">{{ content_for_layout }}</div>')
 
-  #   LiquidTemplate.create!(
-  #     :name => 'awesome_layout',
-  #     :content => '<div id="awesome_layout">{{ content_for_layout }}</div>')
+    LiquidTemplate.create!(
+      :name => 'layout',
+      :content => '<div id="layout">{{ content_for_layout }}</div>')
 
-  #   LiquidTemplate.create!(
-  #     :name => 'layout',
-  #     :content => '<div id="layout">{{ content_for_layout }}</div>')
+    LiquidTemplate.create!(
+      :name => 'posts/edit',
+      :content => '<p>Awesome liquid template</p>')
 
-  #   get :edit
-  #   assert_select '#awesome_layout p'
-  # end
+    get :edit
+    assert_select '#awesome_layout p'
+  end
   
   test 'does not render liquid layout if disabled' do
     setup_controller(RatingsController)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 0
-  version: 0.5.0
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - "Adam Cig\xC3\xA1nek"
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-09 00:00:00 +01:00
+date: 2010-03-10 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency