Changeset 7661

Timestamp:

09/28/07 01:23:20 (1 year ago)

Author:

david

Message:

Fixed the layout defaults (closes #9564) [lifo]

Files:

• trunk/actionpack/lib/action_controller/layout.rb (modified) (7 diffs)
• trunk/actionpack/test/controller/mime_responds_test.rb (modified) (1 diff)
• trunk/actionpack/test/fixtures/post_test (added)
• trunk/actionpack/test/fixtures/post_test/layouts (added)
• trunk/actionpack/test/fixtures/post_test/layouts/post.html.erb (added)
• trunk/actionpack/test/fixtures/post_test/layouts/super_post.iphone.erb (added)
• trunk/actionpack/test/fixtures/post_test/post (added)
• trunk/actionpack/test/fixtures/post_test/post/index.html.erb (added)
• trunk/actionpack/test/fixtures/post_test/post/index.iphone.erb (added)
• trunk/actionpack/test/fixtures/post_test/super_post (added)
• trunk/actionpack/test/fixtures/post_test/super_post/index.html.erb (added)
• trunk/actionpack/test/fixtures/post_test/super_post/index.iphone.erb (added)

trunk/actionpack/lib/action_controller/layout.rb

@@ -168 +168 @@
-      # when the layout<tt>yield</tt>'s. This layout can itself depend on instance variables assigned during action
-      # performance and have access to them as any normal template would.
-
+, auto = false
-        add_layout_conditions(conditions)
-        write_inheritable_attribute "layout", template_name
+        write_inheritable_attribute "auto_layout", auto
-      end
-
@@ -177 +178 @@
-      end
-      
-
-
+
+
+
+
+
+
-      end
-      
@@ -191 +196 @@
-          inherited_without_layout(child)
-          layout_match = child.name.underscore.sub(/_controller$/, '').sub(/^controllers\//, '')
-
+, {}, true
-        end
-
@@ -207 +212 @@
-          end
-        end
+        
+        def default_layout_with_format(format, layout)
+          list = layout_list
+          if list.grep(%r{layouts/#{layout}\.#{format}(\.[a-z][0-9a-z]*)+$}).empty?
+            (!list.grep(%r{layouts/#{layout}\.([a-z][0-9a-z]*)+$}).empty? && format == :html) ? layout : nil
+          else
+            layout
+          end
+        end
-    end
-
@@ -214 +228 @@
-    # weblog/standard, but <tt>layout "standard"</tt> will return layouts/standard.
-    def active_layout(passed_layout = nil)
-
+(response.template.template_format)
-      active_layout = case layout
-        when String then layout
@@ -236 +250 @@
-      def render_with_a_layout(options = nil, &block) #:nodoc:
-        template_with_options = options.is_a?(Hash)
-        set_template_format(options)
-        
-        if apply_layout?(template_with_options, options) && (layout = pick_layout(template_with_options, options))
@@ -307 +320 @@
-        end
-      end
-      
-      def set_template_format(options)
-        if options.is_a?(Hash) && options[:content_type]
-          response.template.template_format = options[:content_type].to_sym 
-        elsif params[:format]
-          response.template.template_format = Mime::Type.lookup(Mime::Type.lookup_by_extension(params[:format]).to_s).to_sym
-        end
-      end
-  end
-end

trunk/actionpack/test/controller/mime_responds_test.rb

@@ -430 +430 @@
-
-    @request.env["HTTP_ACCEPT"] = "text/iphone"
-
-
-
+
-  end 
-end
+
+class AbstractPostController < ActionController::Base
+  class << self
+    def view_paths
+      [ File.dirname(__FILE__) + "/../fixtures/post_test/" ]
+    end
+  end
+end
+
+# For testing layouts which are set automatically
+class PostController < AbstractPostController
+  around_filter :with_iphone
+  
+  def index
+    respond_to do |type|
+      type.html
+      type.iphone
+    end
+  end
+  
+  protected
+  
+  def with_iphone
+    Mime::Type.register_alias("text/html", :iphone)
+    request.format = "iphone" if request.env["HTTP_ACCEPT"] == "text/iphone"
+    yield
+    Mime.send :remove_const, :IPHONE    
+  end
+  
+end                                               
+
+class SuperPostController < PostController  
+  def index
+    respond_to do |type|
+      type.html
+      type.iphone
+    end
+  end
+end
+
+class MimeControllerLayoutsTest < Test::Unit::TestCase
+  def setup
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+
+    @controller   = PostController.new
+    @request.host = "www.example.com"
+  end
+  
+  def test_missing_layout_renders_properly
+    get :index
+    assert_equal '<html><div id="html">Hello Firefox</div></html>', @response.body 
+
+    @request.env["HTTP_ACCEPT"] = "text/iphone"
+    get :index
+    assert_equal 'Hello iPhone', @response.body
+  end
+  
+  def test_format_with_inherited_layouts
+    @controller = SuperPostController.new
+    
+    get :index
+    assert_equal 'Super Firefox', @response.body
+    
+    @request.env["HTTP_ACCEPT"] = "text/iphone"
+    get :index
+    assert_equal '<html><div id="super_iphone">Super iPhone</div></html>', @response.body
+  end
+end
+