Ruby 1.9 compat: encoding and multibyte test fixes

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9194 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 20 insertions, 22 deletions

diff --git a/actionpack/lib/action_controller/layout.rb b/actionpack/lib/action_controller/layout.rb
index e1853ad131..5484add3b5 100644
--- a/actionpack/lib/action_controller/layout.rb
+++ b/actionpack/lib/action_controller/layout.rb
@@ -65,15 +65,15 @@ module ActionController #:nodoc:
     # == Automatic layout assignment
     #
     # If there is a template in <tt>app/views/layouts/</tt> with the same name as the current controller then it will be automatically
-    # set as that controller's layout unless explicitly told otherwise. Say you have a WeblogController, for example. If a template named 
+    # set as that controller's layout unless explicitly told otherwise. Say you have a WeblogController, for example. If a template named
     # <tt>app/views/layouts/weblog.erb</tt> or <tt>app/views/layouts/weblog.builder</tt> exists then it will be automatically set as
     # the layout for your WeblogController. You can create a layout with the name <tt>application.erb</tt> or <tt>application.builder</tt>
-    # and this will be set as the default controller if there is no layout with the same name as the current controller and there is 
+    # and this will be set as the default controller if there is no layout with the same name as the current controller and there is
     # no layout explicitly assigned with the +layout+ method. Nested controllers use the same folder structure for automatic layout.
     # assignment. So an Admin::WeblogController will look for a template named <tt>app/views/layouts/admin/weblog.erb</tt>.
     # Setting a layout explicitly will always override the automatic behaviour for the controller where the layout is set.
     # Explicitly setting the layout in a parent class, though, will not override the child class's layout assignment if the child
-    # class has a layout with the same name. 
+    # class has a layout with the same name.
     #
     # == Inheritance for layouts
     #
@@ -113,7 +113,7 @@ module ActionController #:nodoc:
     #         logged_in? ? "writer_layout" : "reader_layout"
     #       end
     #
-    # Now when a new request for the index action is processed, the layout will vary depending on whether the person accessing 
+    # Now when a new request for the index action is processed, the layout will vary depending on whether the person accessing
     # is logged in or not.
     #
     # If you want to use an inline method, such as a proc, do something like this:
@@ -132,24 +132,24 @@ module ActionController #:nodoc:
     # == Conditional layouts
     #
     # If you have a layout that by default is applied to all the actions of a controller, you still have the option of rendering
-    # a given action or set of actions without a layout, or restricting a layout to only a single action or a set of actions. The 
+    # a given action or set of actions without a layout, or restricting a layout to only a single action or a set of actions. The
     # <tt>:only</tt> and <tt>:except</tt> options can be passed to the layout call. For example:
     #
     #   class WeblogController < ActionController::Base
     #     layout "weblog_standard", :except => :rss
-    # 
+    #
     #     # ...
     #
     #   end
     #
-    # This will assign "weblog_standard" as the WeblogController's layout  except for the +rss+ action, which will not wrap a layout 
+    # This will assign "weblog_standard" as the WeblogController's layout  except for the +rss+ action, which will not wrap a layout
     # around the rendered view.
     #
-    # Both the <tt>:only</tt> and <tt>:except</tt> condition can accept an arbitrary number of method references, so 
+    # Both the <tt>:only</tt> and <tt>:except</tt> condition can accept an arbitrary number of method references, so
     # #<tt>:except => [ :rss, :text_only ]</tt> is valid, as is <tt>:except => :rss</tt>.
     #
     # == Using a different layout in the action render call
-    # 
+    #
     # If most of your actions use the same layout, it makes perfect sense to define a controller-wide layout as described above.
     # Sometimes you'll have exceptions where one action wants to use a different layout than the rest of the controller.
     # You can do this by passing a <tt>:layout</tt> option to the <tt>render</tt> call. For example:
@@ -176,21 +176,19 @@ module ActionController #:nodoc:
       def layout_conditions #:nodoc:
         @layout_conditions ||= read_inheritable_attribute("layout_conditions")
       end
-      
+
       def default_layout(format) #:nodoc:
-        layout = read_inheritable_attribute("layout")                 
+        layout = read_inheritable_attribute("layout")
         return layout unless read_inheritable_attribute("auto_layout")
         @default_layout ||= {}
         @default_layout[format] ||= default_layout_with_format(format, layout)
         @default_layout[format]
       end
-      
+
       def layout_list #:nodoc:
-        view_paths.collect do |path|
-          Dir["#{path}/layouts/**/*"]
-        end.flatten
+        Array(view_paths).sum([]) { |path| Dir["#{path}/layouts/**/*"] }
       end
-      
+
       private
         def inherited_with_layout(child)
           inherited_without_layout(child)
@@ -207,7 +205,7 @@ module ActionController #:nodoc:
         def normalize_conditions(conditions)
           conditions.inject({}) {|hash, (key, value)| hash.merge(key => [value].flatten.map {|action| action.to_s})}
         end
-        
+
         def default_layout_with_format(format, layout)
           list = layout_list
           if list.grep(%r{layouts/#{layout}\.#{format}(\.[a-z][0-9a-z]*)+$}).empty?
@@ -229,7 +227,7 @@ module ActionController #:nodoc:
         when Symbol then send!(layout)
         when Proc   then layout.call(self)
       end
-      
+
       # Explicitly passed layout names with slashes are looked up relative to the template root,
       # but auto-discovered layouts derived from a nested controller will contain a slash, though be relative
       # to the 'layouts' directory so we have to check the file system to infer which case the layout name came from.
@@ -245,7 +243,7 @@ module ActionController #:nodoc:
     protected
       def render_with_a_layout(options = nil, extra_options = {}, &block) #:nodoc:
         template_with_options = options.is_a?(Hash)
-        
+
         if apply_layout?(template_with_options, options) && (layout = pick_layout(template_with_options, options))
           assert_existence_of_template_file(layout)
 
@@ -272,7 +270,7 @@ module ActionController #:nodoc:
       end
 
       def candidate_for_layout?(options)
-        (options.has_key?(:layout) && options[:layout] != false) || 
+        (options.has_key?(:layout) && options[:layout] != false) ||
           options.values_at(:text, :xml, :json, :file, :inline, :partial, :nothing).compact.empty? &&
           !template_exempt_from_layout?(options[:template] || default_template_name(options[:action]))
       end
@@ -298,7 +296,7 @@ module ActionController #:nodoc:
             when only = conditions[:only]
               only.include?(action_name)
             when except = conditions[:except]
-              !except.include?(action_name) 
+              !except.include?(action_name)
             else
               true
           end
@@ -306,7 +304,7 @@ module ActionController #:nodoc:
           true
         end
       end
-      
+
       def layout_directory?(layout_name)
         @template.finder.find_template_extension_from_handler(File.join('layouts', layout_name))
       end