.gitignore test/log/.gitignore @@ -6,9 +6,9 @@ module SimplesIdeias base.send :extend, ClassMethods # setting attribute - base.write_inheritable_attribute :has_layout_options, [] - base.class_inheritable_reader :has_layout_options - + base.class_inheritable_accessor :has_layout_options + base.has_layout_options = [] + # define plugin before_filter base.before_filter :choose_layout end @@ -26,6 +26,9 @@ module SimplesIdeias module InstanceMethods private def choose_layout + # set default layout to application + self.class.write_inheritable_attribute("layout", "application") + # set class attribute as local has_layout_options = self.class.has_layout_options @@ -36,8 +39,7 @@ module SimplesIdeias name, options = config # just process options if is not nil; - # maybe somebody used has_layout method instead of - # layout + # maybe somebody used has_layout method instead of layout unless options.nil? # process :except and :only options if actions = options[:only] @@ -74,10 +76,11 @@ module SimplesIdeias self.class.layout(layout_name) if layout_name - # if options hasn't been set, continue to the - # next rule + # if options hasn't been set, continue to the next rule break if layout_name && !options.nil? end + + self.class.write_inheritable_attribute("layout", "application") unless self.class.read_inheritable_attribute("layout") end def has_layout_execute_callback(callback) lib/has_layout.rb @@ -1,7 +1,7 @@ class PostsController < ApplicationController - has_layout 'special', :only => %w(index) - has_layout 'admin', :only => :edit, :if => proc{|c| c.action_name == 'edit' } - has_layout 'site', :except => %w(index), :unless => :action_name_is_follow? + has_layout "special", :only => %w(index) + has_layout "admin", :only => :edit, :if => proc{|c| c.action_name == "edit" } + has_layout "site", :except => %w(index), :unless => :action_name_is_follow? def index end @@ -20,6 +20,6 @@ class PostsController < ApplicationController private def action_name_is_follow? - action_name != 'follow' + action_name != "follow" end end test/app/controllers/posts_controller.rb @@ -1,24 +1,24 @@ -require 'test_helper' - +require "test_helper" +RAILS_DEFAULT_LOGGER = Logger.new(STDOUT) class PostsControllerTest < ActionController::TestCase def test_should_use_special_layout_with_only_option get :index - assert_layout 'special' + assert_layout "special" end def test_should_use_admin_layout_with_only_option_and_if_using_proc get :edit - assert_layout 'admin' + assert_layout "admin" end def test_should_use_site_layout_with_except_option_and_unless_using_symbol get :follow - assert_layout 'site' + assert_layout "site" end def test_should_use_application_layout get :comments - assert_layout 'application' + assert_layout "application" end private test/test/functional/posts_controller_test.rb @@ -1,6 +1,6 @@ ENV["RAILS_ENV"] = "test" require File.expand_path(File.dirname(__FILE__) + "/../config/environment") -require 'test_help' +require "test_help" class Test::Unit::TestCase # Transactional fixtures accelerate your tests by wrapping each test method test/test/test_helper.rb test/log/development.log test/log/production.log test/log/server.log test/log/test.log 2646b4d02c4d61b4b0c1a873fbb19b475770abb4 Nando Vieira fnando.vieira@gmail.com http://github.com/fnando/has_layout/commit/e03ada8f08a4a4216e32cd91f06eab7cc7d104f4 e03ada8f08a4a4216e32cd91f06eab7cc7d104f4 2009-03-18T12:32:35-07:00 2009-03-18T12:32:35-07:00 Bug fix: an action without configuration was inheriting the last applied layout. 106b0ee45f117c7e8f6dd89b38715df8d377ad29 Nando Vieira fnando.vieira@gmail.com