actionpack 3.0.0.beta3 → 3.0.0.beta4

data/lib/action_dispatch/routing/route_set.rb

@@ -1,20 +1,18 @@
 require 'rack/mount'
 require 'forwardable'
+require 'active_support/core_ext/object/to_query'
 require 'action_dispatch/routing/deprecated_mapper'
 
 module ActionDispatch
   module Routing
     class RouteSet #:nodoc:
-      NotFound = lambda { |env|
-        raise ActionController::RoutingError, "No route matches #{env['PATH_INFO'].inspect}"
-      }
-
       PARAMETERS_KEY = 'action_dispatch.request.path_parameters'
 
       class Dispatcher #:nodoc:
         def initialize(options={})
           @defaults = options[:defaults]
           @glob_param = options.delete(:glob)
+          @controllers = {}
         end
 
         def call(env)
@@ -32,19 +30,18 @@ module ActionDispatch
         def prepare_params!(params)
           merge_default_action!(params)
           split_glob_param!(params) if @glob_param
-
-          params.each do |key, value|
-            if value.is_a?(String)
-              value = value.dup.force_encoding(Encoding::BINARY) if value.respond_to?(:force_encoding)
-              params[key] = URI.unescape(value)
-            end
-          end
         end
 
         def controller(params, raise_error=true)
-          if params && params.has_key?(:controller)
-            controller = "#{params[:controller].camelize}Controller"
-            ActiveSupport::Inflector.constantize(controller)
+          if params && params.key?(:controller)
+            controller_param = params[:controller]
+            unless controller = @controllers[controller_param]
+              controller_name = "#{controller_param.camelize}Controller"
+              controller = @controllers[controller_param] =
+                ActiveSupport::Dependencies.ref(controller_name)
+            end
+
+            controller.get
           end
         rescue NameError => e
           raise ActionController::RoutingError, e.message, e.backtrace if raise_error
@@ -71,6 +68,10 @@ module ActionDispatch
           clear!
         end
 
+        def helper_names
+          self.module.instance_methods.map(&:to_s)
+        end
+
         def clear!
           @routes = {}
           @helpers = []
@@ -179,7 +180,6 @@ module ActionDispatch
 
                 url_for(options)
               end
-              protected :#{selector}
             END_EVAL
             helpers << selector
           end
@@ -223,7 +223,6 @@ module ActionDispatch
       def finalize!
         return if @finalized
         @finalized = true
-        @set.add_route(NotFound)
         @set.freeze
       end
 
@@ -470,6 +469,13 @@ module ActionDispatch
 
         req = Rack::Request.new(env)
         @set.recognize(req) do |route, matches, params|
+          params.each do |key, value|
+            if value.is_a?(String)
+              value = value.dup.force_encoding(Encoding::BINARY) if value.encoding_aware?
+              params[key] = URI.unescape(value)
+            end
+          end
+
           dispatcher = route.app
           if dispatcher.is_a?(Dispatcher) && dispatcher.controller(params, false)
             dispatcher.prepare_params!(params)

data/lib/action_dispatch/routing/url_for.rb

@@ -128,7 +128,7 @@ module ActionDispatch
         when String
           options
         when nil, Hash
-          _router.url_for(url_options.merge(options || {}))
+          _router.url_for(url_options.merge((options || {}).symbolize_keys))
         else
           polymorphic_url(options)
         end

data/lib/action_dispatch/testing/assertions/routing.rb

@@ -1,4 +1,5 @@
 require 'active_support/core_ext/hash/diff'
+require 'active_support/core_ext/hash/indifferent_access'
 
 module ActionDispatch
   module Assertions

data/lib/action_dispatch/testing/assertions/selector.rb

@@ -267,14 +267,12 @@ module ActionDispatch
         if match_with = equals[:text]
           matches.delete_if do |match|
             text = ""
-            text.force_encoding(match_with.encoding) if text.respond_to?(:force_encoding)
             stack = match.children.reverse
             while node = stack.pop
               if node.tag?
                 stack.concat node.children.reverse
               else
                 content = node.content
-                content.force_encoding(match_with.encoding) if content.respond_to?(:force_encoding)
                 text << content
               end
             end
@@ -298,10 +296,14 @@ module ActionDispatch
         # found one but expecting two.
         message ||= content_mismatch if matches.empty?
         # Test minimum/maximum occurrence.
-        min, max = equals[:minimum], equals[:maximum]
-        message = message || %(Expected #{count_description(min, max)} matching "#{selector.to_s}", found #{matches.size}.)
-        assert matches.size >= min, message if min
-        assert matches.size <= max, message if max
+        min, max, count = equals[:minimum], equals[:maximum], equals[:count]
+        message = message || %(Expected #{count_description(min, max, count)} matching "#{selector.to_s}", found #{matches.size}.)
+        if count
+          assert matches.size == count, message
+        else
+          assert matches.size >= min, message if min
+          assert matches.size <= max, message if max
+        end
 
         # If a block is given call that block. Set @selected to allow
         # nested assert_select, which can be nested several levels deep.
@@ -318,11 +320,13 @@ module ActionDispatch
         matches
       end
 
-      def count_description(min, max) #:nodoc:
+      def count_description(min, max, count) #:nodoc:
         pluralize = lambda {|word, quantity| word << (quantity == 1 ? '' : 's')}
 
         if min && max && (max != min)
           "between #{min} and #{max} elements"
+        elsif min && max && max == min && count
+          "exactly #{count} #{pluralize['element', min]}"
         elsif min && !(min == 1 && max == 1)
           "at least #{min} #{pluralize['element', min]}"
         elsif max

data/lib/action_dispatch/testing/test_process.rb

@@ -1,15 +1,16 @@
 require 'action_dispatch/middleware/flash'
+require 'active_support/core_ext/hash/indifferent_access'
 
 module ActionDispatch
   module TestProcess
     def assigns(key = nil)
-      assigns = {}
+      assigns = {}.with_indifferent_access
       @controller.instance_variable_names.each do |ivar|
         next if ActionController::Base.protected_instance_variables.include?(ivar)
         assigns[ivar[1..-1]] = @controller.instance_variable_get(ivar)
       end
 
-      key.nil? ? assigns : assigns[key.to_s]
+      key.nil? ? assigns : assigns[key]
     end
 
     def session

data/lib/action_pack/version.rb

@@ -3,7 +3,7 @@ module ActionPack
     MAJOR = 3
     MINOR = 0
     TINY  = 0
-    BUILD = "beta3"
+    BUILD = "beta4"
 
     STRING = [MAJOR, MINOR, TINY, BUILD].join('.')
   end

data/lib/action_view.rb

@@ -51,13 +51,17 @@ module ActionView
 
     autoload :MissingTemplate,    'action_view/template/error'
     autoload :ActionViewError,    'action_view/template/error'
-    autoload :TemplateError,     'action_view/template/error'
+    autoload :EncodingError,      'action_view/template/error'
+    autoload :TemplateError,      'action_view/template/error'
+    autoload :WrongEncodingError, 'action_view/template/error'
 
     autoload :TemplateHandler,   'action_view/template'
     autoload :TemplateHandlers,  'action_view/template'
   end
 
   autoload :TestCase, 'action_view/test_case'
+
+  ENCODING_FLAG = '#.*coding[:=]\s*(\S+)[ \t]*'
 end
 
 require 'active_support/i18n'

data/lib/action_view/base.rb

@@ -165,6 +165,10 @@ module ActionView #:nodoc:
     cattr_accessor :debug_rjs
     @@debug_rjs = false
 
+    # Specify the proc used to decorate input tags that refer to attributes with errors.
+    cattr_accessor :field_error_proc
+    @@field_error_proc = Proc.new{ |html_tag, instance| "<div class=\"field_with_errors\">#{html_tag}</div>".html_safe }
+
     class_attribute :helpers
     remove_method :helpers
     attr_reader :helpers
@@ -176,13 +180,11 @@ module ActionView #:nodoc:
       delegate :logger, :to => 'ActionController::Base', :allow_nil => true
     end
 
-    ActiveSupport.run_load_hooks(:action_view, self)
-
     attr_accessor :base_path, :assigns, :template_extension, :lookup_context
     attr_internal :captures, :request, :controller, :template, :config
 
     delegate :find_template, :template_exists?, :formats, :formats=, :locale, :locale=,
-             :view_paths, :view_paths=, :with_fallbacks, :update_details, :to => :lookup_context
+             :view_paths, :view_paths=, :with_fallbacks, :update_details, :with_layout_format, :to => :lookup_context
 
     delegate :request_forgery_protection_token, :template, :params, :session, :cookies, :response, :headers,
              :flash, :action_name, :controller_name, :to => :controller
@@ -199,11 +201,12 @@ module ActionView #:nodoc:
     end
 
     def self.process_view_paths(value)
+      return value.dup if value.is_a?(PathSet)
       ActionView::PathSet.new(Array.wrap(value))
     end
 
     def initialize(lookup_context = nil, assigns_for_first_render = {}, controller = nil, formats = nil) #:nodoc:
-      @config = nil
+      @config  = nil
       @assigns = assigns_for_first_render.each { |key, value| instance_variable_set("@#{key}", value) }
       @helpers = self.class.helpers || Module.new
 
@@ -214,6 +217,7 @@ module ActionView #:nodoc:
       @_config       = ActiveSupport::InheritableOptions.new(controller.config) if controller && controller.respond_to?(:config)
       @_content_for  = Hash.new { |h,k| h[k] = ActiveSupport::SafeBuffer.new }
       @_virtual_path = nil
+      @output_buffer = nil
 
       @lookup_context = lookup_context.is_a?(ActionView::LookupContext) ?
         lookup_context : ActionView::LookupContext.new(lookup_context)
@@ -229,5 +233,7 @@ module ActionView #:nodoc:
       response.body_parts << part
       nil
     end
+
+    ActiveSupport.run_load_hooks(:action_view, self)
   end
 end

data/lib/action_view/helpers/active_model_helper.rb

@@ -4,13 +4,6 @@ require 'active_support/core_ext/enumerable'
 require 'active_support/core_ext/object/blank'
 
 module ActionView
-  ActiveSupport.on_load(:action_view) do
-    class ActionView::Base
-      @@field_error_proc = Proc.new{ |html_tag, instance| "<div class=\"fieldWithErrors\">#{html_tag}</div>".html_safe }
-      cattr_accessor :field_error_proc
-    end
-  end
-
   module Helpers
     module ActiveModelHelper
       %w(input form error_messages_for error_message_on).each do |method|
@@ -43,7 +36,7 @@ module ActionView
       end
 
       %w(tag content_tag to_date_select_tag to_datetime_select_tag to_time_select_tag).each do |meth|
-        module_eval "def #{meth}(*) error_wrapping(super) end"
+        module_eval "def #{meth}(*) error_wrapping(super) end", __FILE__, __LINE__
       end
 
       def error_wrapping(html_tag)

data/lib/action_view/helpers/asset_tag_helper.rb

@@ -62,9 +62,9 @@ module ActionView
     #     "http://assets#{source.hash % 2 + 1}.example.com"
     #   }
     #   image_tag("rails.png")
-    #   # => <img alt="Rails" src="http://assets0.example.com/images/rails.png?1230601161" />
+    #   # => <img alt="Rails" src="http://assets1.example.com/images/rails.png?1230601161" />
     #   stylesheet_link_tag("application")
-    #   # => <link href="http://assets1.example.com/stylesheets/application.css?1232285206" media="screen" rel="stylesheet" type="text/css" />
+    #   # => <link href="http://assets2.example.com/stylesheets/application.css?1232285206" media="screen" rel="stylesheet" type="text/css" />
     #
     # The example above generates "http://assets1.example.com" and
     # "http://assets2.example.com". This option is useful for example if
@@ -620,7 +620,10 @@ module ActionView
         options.symbolize_keys!
 
         src = options[:src] = path_to_image(source)
-        options[:alt]     ||= File.basename(src, '.*').capitalize
+
+        unless src =~ /^cid:/
+          options[:alt] = options.fetch(:alt){ File.basename(src, '.*').capitalize }
+        end
 
         if size = options.delete(:size)
           options[:width], options[:height] = size.split("x") if size =~ %r{^\d+x\d+$}
@@ -754,7 +757,7 @@ module ActionView
         end
 
         def is_uri?(path)
-          path =~ %r{^[-a-z]+://}
+          path =~ %r{^[-a-z]+://|^cid:}
         end
 
         # Pick an asset host for this source. Returns +nil+ if no host is set,

data/lib/action_view/helpers/cache_helper.rb

@@ -32,27 +32,27 @@ module ActionView
       #      <i>Topics listed alphabetically</i>
       #    <% end %>
       def cache(name = {}, options = nil, &block)
-        safe_concat fragment_for(name, options, &block)
+        if controller.perform_caching
+          safe_concat(fragment_for(name, options, &block))
+        else
+          yield
+        end
+
         nil
       end
 
     private
       # TODO: Create an object that has caching read/write on it
       def fragment_for(name = {}, options = nil, &block) #:nodoc:
-        if controller.perform_caching
-          if controller.fragment_exist?(name, options)
-            controller.read_fragment(name, options)
-          else
-            # VIEW TODO: Make #capture usable outside of ERB
-            # This dance is needed because Builder can't use capture
-            pos = output_buffer.length
-            yield
-            fragment = output_buffer.slice!(pos..-1)
-            controller.write_fragment(name, fragment, options)
-          end
+        if controller.fragment_exist?(name, options)
+          controller.read_fragment(name, options)
         else
-          ret = yield
-          ActiveSupport::SafeBuffer.new(ret) if ret.is_a?(String)
+          # VIEW TODO: Make #capture usable outside of ERB
+          # This dance is needed because Builder can't use capture
+          pos = output_buffer.length
+          yield
+          fragment = output_buffer.slice!(pos..-1)
+          controller.write_fragment(name, fragment, options)
         end
       end
     end

data/lib/action_view/helpers/capture_helper.rb

@@ -41,8 +41,11 @@ module ActionView
       end
 
       # Calling content_for stores a block of markup in an identifier for later use.
-      # You can make subsequent calls to the stored content in other templates or the layout
-      # by passing the identifier as an argument to <tt>yield</tt>.
+      # You can make subsequent calls to the stored content in other templates, helper modules
+      # or the layout by passing the identifier as an argument to <tt>content_for</tt>.
+      #
+      # Note: <tt>yield</tt> can still be used to retrieve the stored content, but calling
+      # <tt>yield</tt> doesn't work in helper modules, while <tt>content_for</tt> does.
       #
       # ==== Examples
       #
@@ -50,11 +53,27 @@ module ActionView
       #     alert('You are not authorized to do that!')
       #   <% end %>
       #
-      # You can then use <tt>yield :not_authorized</tt> anywhere in your templates.
+      # You can then use <tt>content_for :not_authorized</tt> anywhere in your templates.
+      #
+      #   <%= content_for :not_authorized if current_user.nil? %>
+      #
+      # This is equivalent to:
       #
       #   <%= yield :not_authorized if current_user.nil? %>
       #
-      # You can also use this syntax alongside an existing call to <tt>yield</tt> in a layout.  For example:
+      # <tt>content_for</tt>, however, can also be used in helper modules.
+      #
+      #   module StorageHelper
+      #     def stored_content
+      #       content_for(:storage) || "Your storage is empty"
+      #     end
+      #   end
+      #
+      # This helper works just like normal helpers.
+      #
+      #   <%= stored_content %>
+      #
+      # You can use the <tt>yield</tt> syntax alongside an existing call to <tt>yield</tt> in a layout.  For example:
       #
       #   <%# This is the layout %>
       #   <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
@@ -67,7 +86,7 @@ module ActionView
       #   </body>
       #   </html>
       #
-      # And now, we'll create a view that has a content_for call that
+      # And now, we'll create a view that has a <tt>content_for</tt> call that
       # creates the <tt>script</tt> identifier.
       #
       #   <%# This is our view %>
@@ -103,7 +122,7 @@ module ActionView
       #
       # Then, in another template or layout, this code would render both links in order:
       #
-      #   <ul><%= yield :navigation %></ul>
+      #   <ul><%= content_for :navigation %></ul>
       #
       # Lastly, simple content can be passed as a parameter:
       #

data/lib/action_view/helpers/date_helper.rb

@@ -589,56 +589,50 @@ module ActionView
         @options      = options.dup
         @html_options = html_options.dup
         @datetime     = datetime
+        @options[:datetime_separator] ||= ' — '
+        @options[:time_separator]     ||= ' : '
       end
 
       def select_datetime
-        # TODO: Remove tag conditional
-        # Ideally we could just join select_date and select_date for the tag case
+        order = date_order.dup
+        order -= [:hour, :minute, :second]
+        @options[:discard_year]   ||= true unless order.include?(:year)
+        @options[:discard_month]  ||= true unless order.include?(:month)
+        @options[:discard_day]    ||= true if @options[:discard_month] || !order.include?(:day)
+        @options[:discard_minute] ||= true if @options[:discard_hour]
+        @options[:discard_second] ||= true unless @options[:include_seconds] && !@options[:discard_minute]
+
+        # If the day is hidden and the month is visible, the day should be set to the 1st so all month choices are
+        # valid (otherwise it could be 31 and february wouldn't be a valid date)
+        if @datetime && @options[:discard_day] && !@options[:discard_month]
+          @datetime = @datetime.change(:day => 1)
+        end
+
         if @options[:tag] && @options[:ignore_date]
           select_time
-        elsif @options[:tag]
-          order = date_order.dup
-          order -= [:hour, :minute, :second]
-
-          @options[:discard_year]   ||= true unless order.include?(:year)
-          @options[:discard_month]  ||= true unless order.include?(:month)
-          @options[:discard_day]    ||= true if @options[:discard_month] || !order.include?(:day)
-          @options[:discard_minute] ||= true if @options[:discard_hour]
-          @options[:discard_second] ||= true unless @options[:include_seconds] && !@options[:discard_minute]
-
-          # If the day is hidden and the month is visible, the day should be set to the 1st so all month choices are
-          # valid (otherwise it could be 31 and february wouldn't be a valid date)
-          if @datetime && @options[:discard_day] && !@options[:discard_month]
-            @datetime = @datetime.change(:day => 1)
-          end
-
+        else
           [:day, :month, :year].each { |o| order.unshift(o) unless order.include?(o) }
           order += [:hour, :minute, :second] unless @options[:discard_hour]
 
           build_selects_from_types(order)
-        else
-          "#{select_date}#{@options[:datetime_separator]}#{select_time}".html_safe
         end
       end
 
       def select_date
         order = date_order.dup
 
-        # TODO: Remove tag conditional
-        if @options[:tag]
-          @options[:discard_hour]     = true
-          @options[:discard_minute]   = true
-          @options[:discard_second]   = true
+        @options[:discard_hour]     = true
+        @options[:discard_minute]   = true
+        @options[:discard_second]   = true
 
-          @options[:discard_year]   ||= true unless order.include?(:year)
-          @options[:discard_month]  ||= true unless order.include?(:month)
-          @options[:discard_day]    ||= true if @options[:discard_month] || !order.include?(:day)
+        @options[:discard_year]   ||= true unless order.include?(:year)
+        @options[:discard_month]  ||= true unless order.include?(:month)
+        @options[:discard_day]    ||= true if @options[:discard_month] || !order.include?(:day)
 
-          # If the day is hidden and the month is visible, the day should be set to the 1st so all month choices are
-          # valid (otherwise it could be 31 and february wouldn't be a valid date)
-          if @datetime && @options[:discard_day] && !@options[:discard_month]
-            @datetime = @datetime.change(:day => 1)
-          end
+        # If the day is hidden and the month is visible, the day should be set to the 1st so all month choices are
+        # valid (otherwise it could be 31 and february wouldn't be a valid date)
+        if @datetime && @options[:discard_day] && !@options[:discard_month]
+          @datetime = @datetime.change(:day => 1)
         end
 
         [:day, :month, :year].each { |o| order.unshift(o) unless order.include?(o) }
@@ -649,15 +643,12 @@ module ActionView
       def select_time
         order = []
 
-        # TODO: Remove tag conditional
-        if @options[:tag]
-          @options[:discard_month]    = true
-          @options[:discard_year]     = true
-          @options[:discard_day]      = true
-          @options[:discard_second] ||= true unless @options[:include_seconds]
+        @options[:discard_month]    = true
+        @options[:discard_year]     = true
+        @options[:discard_day]      = true
+        @options[:discard_second] ||= true unless @options[:include_seconds]
 
-          order += [:year, :month, :day] unless @options[:ignore_date]
-        end
+        order += [:year, :month, :day] unless @options[:ignore_date]
 
         order += [:hour, :minute]
         order << :second if @options[:include_seconds]
@@ -937,10 +928,8 @@ module ActionView
           options[:include_position]     = true
           options[:prefix]             ||= @object_name
           options[:index]                = @auto_index if @auto_index && !options.has_key?(:index)
-          options[:datetime_separator] ||= ' &mdash; '
-          options[:time_separator]     ||= ' : '
 
-          DateTimeSelector.new(datetime, options.merge(:tag => true), html_options)
+          DateTimeSelector.new(datetime, options, html_options)
         end
 
         def default_datetime(options)