actionpack 3.1.12 → 3.2.0.rc1

data/lib/action_dispatch/testing/integration.rb

@@ -62,7 +62,7 @@ module ActionDispatch
       #
       # The request_method is +:get+, +:post+, +:put+, +:delete+ or +:head+; the
       # parameters are +nil+, a hash, or a url-encoded or multipart string;
-      # the headers are a hash.  Keys are automatically upcased and prefixed
+      # the headers are a hash. Keys are automatically upcased and prefixed
       # with 'HTTP_' if not already.
       def xml_http_request(request_method, path, parameters = nil, headers = nil)
         headers ||= {}
@@ -184,16 +184,9 @@ module ActionDispatch
         reset!
       end
 
-      def url_options
-        @url_options ||= default_url_options.dup.tap do |url_options|
-          url_options.reverse_merge!(controller.url_options) if controller
-
-          if @app.respond_to?(:routes) && @app.routes.respond_to?(:default_url_options)
-            url_options.reverse_merge!(@app.routes.default_url_options)
-          end
-
-          url_options.reverse_merge!(:host => host, :protocol => https? ? "https" : "http")
-        end
+      remove_method :default_url_options
+      def default_url_options
+        { :host => host, :protocol => https? ? "https" : "http" }
       end
 
       # Resets the instance. This can be used to reset the state information
@@ -206,7 +199,6 @@ module ActionDispatch
         @controller = @request = @response = nil
         @_mock_session = nil
         @request_count = 0
-        @url_options = nil
 
         self.host        = DEFAULT_HOST
         self.remote_addr = "127.0.0.1"
@@ -301,7 +293,6 @@ module ActionDispatch
           response = _mock_session.last_response
           @response = ActionDispatch::TestResponse.new(response.status, response.headers, response.body)
           @html_document = nil
-          @url_options = nil
 
           @controller = session.last_request.env['action_controller.instance']
 
@@ -359,14 +350,12 @@ module ActionDispatch
         end
       end
 
-      def default_url_options
-        reset! unless integration_session
-        integration_session.default_url_options
-      end
+      extend ActiveSupport::Concern
+      include ActionDispatch::Routing::UrlFor
 
-      def default_url_options=(options)
+      def url_options
         reset! unless integration_session
-        integration_session.default_url_options = options
+        integration_session.url_options
       end
 
       def respond_to?(method, include_private = false)
@@ -470,7 +459,6 @@ module ActionDispatch
   class IntegrationTest < ActiveSupport::TestCase
     include Integration::Runner
     include ActionController::TemplateAssertions
-    include ActionDispatch::Routing::UrlFor
 
     @@app = nil
 
@@ -487,10 +475,5 @@ module ActionDispatch
     def app
       super || self.class.app
     end
-
-    def url_options
-      reset! unless integration_session
-      integration_session.url_options
-    end
   end
 end

data/lib/action_dispatch/testing/test_process.rb

@@ -1,3 +1,4 @@
+require 'action_dispatch/middleware/cookies'
 require 'action_dispatch/middleware/flash'
 require 'active_support/core_ext/hash/indifferent_access'
 
@@ -17,7 +18,7 @@ module ActionDispatch
     end
 
     def cookies
-      @request.cookies.merge(@response.cookies).with_indifferent_access
+      @request.cookie_jar
     end
 
     def redirect_to_url
@@ -33,7 +34,7 @@ module ActionDispatch
     #
     #   post :change_avatar, :avatar => fixture_file_upload('/files/spongebob.png', 'image/png', :binary)
     def fixture_file_upload(path, mime_type = nil, binary = false)
-      fixture_path = ActionController::TestCase.send(:fixture_path) if ActionController::TestCase.respond_to?(:fixture_path)
+      fixture_path = self.class.fixture_path if self.class.respond_to?(:fixture_path)
       Rack::Test::UploadedFile.new("#{fixture_path}#{path}", mime_type, binary)
     end
   end

data/lib/action_dispatch/testing/test_request.rb

@@ -1,4 +1,5 @@
 require 'active_support/core_ext/object/blank'
+require 'active_support/core_ext/hash/indifferent_access'
 require 'active_support/core_ext/hash/reverse_merge'
 require 'rack/utils'
 
@@ -14,18 +15,11 @@ module ActionDispatch
       env = Rails.application.env_config.merge(env) if defined?(Rails.application)
       super(DEFAULT_ENV.merge(env))
 
-      @cookies = nil
       self.host        = 'test.host'
       self.remote_addr = '0.0.0.0'
       self.user_agent  = 'Rails Testing'
     end
 
-    def env
-      write_cookies!
-      delete_nil_values!
-      super
-    end
-
     def request_method=(method)
       @env['REQUEST_METHOD'] = method.to_s.upcase
     end
@@ -71,23 +65,10 @@ module ActionDispatch
       @env['HTTP_ACCEPT'] = Array(mime_types).collect { |mime_type| mime_type.to_s }.join(",")
     end
 
+    alias :rack_cookies :cookies
+
     def cookies
-      @cookies ||= super
+      @cookies ||= {}.with_indifferent_access
     end
-
-    private
-      def write_cookies!
-        unless @cookies.blank?
-          @env['HTTP_COOKIE'] = @cookies.map { |name, value| escape_cookie(name, value) }.join('; ')
-        end
-      end
-
-      def escape_cookie(name, value)
-        "#{Rack::Utils.escape(name)}=#{Rack::Utils.escape(value.to_s)}"
-      end
-
-      def delete_nil_values!
-        @env.delete_if { |k, v| v.nil? }
-      end
   end
 end

data/lib/action_pack/version.rb

@@ -1,9 +1,9 @@
 module ActionPack
   module VERSION #:nodoc:
     MAJOR = 3
-    MINOR = 1
-    TINY  = 12
-    PRE   = nil
+    MINOR = 2
+    TINY  = 0
+    PRE   = "rc1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

data/lib/action_view.rb

@@ -33,6 +33,7 @@ module ActionView
     autoload :AssetPaths
     autoload :Base
     autoload :Context
+    autoload :CompiledTemplates, "action_view/context"
     autoload :Helpers
     autoload :LookupContext
     autoload :PathSet
@@ -72,11 +73,6 @@ module ActionView
       autoload :TemplateError
       autoload :WrongEncodingError
     end
-
-    autoload_at "action_view/template" do
-      autoload :TemplateHandler
-      autoload :TemplateHandlers
-    end
   end
 
   ENCODING_FLAG = '#.*coding[:=]\s*(\S+)[ \t]*'

data/lib/action_view/asset_paths.rb

@@ -1,8 +1,8 @@
 require 'zlib'
 require 'active_support/core_ext/file'
+require 'action_controller/metal/exceptions'
 
 module ActionView
-
   class AssetPaths #:nodoc:
     attr_reader :config, :controller
 
@@ -37,7 +37,7 @@ module ActionView
     end
 
     def is_uri?(path)
-      path =~ %r{^[-a-z]+://|^(?:cid|data):|^//}
+      path =~ %r{^[-a-z]+://|^cid:|^//}
     end
 
   private
@@ -67,7 +67,7 @@ module ActionView
           host = "#{compute_protocol(protocol)}#{host}"
         end
       end
-      host.nil? ? source : "#{host}#{source}"
+      host ? "#{host}#{source}" : source
     end
 
     def compute_protocol(protocol)
@@ -96,15 +96,15 @@ module ActionView
     # Pick an asset host for this source. Returns +nil+ if no host is set,
     # the host if no wildcard is set, the host interpolated with the
     # numbers 0-3 if it contains <tt>%d</tt> (the number is the source hash mod 4),
-    # or the value returned from invoking the proc if it's a proc or the value from
-    # invoking call if it's an object responding to call.
+    # or the value returned from invoking call on an object responding to call
+    # (proc or otherwise).
     def compute_asset_host(source)
       if host = asset_host_config
         if host.respond_to?(:call)
           args = [source]
           arity = arity_of(host)
-          if arity > 1 && !has_request?
-            invalid_asset_host!("Remove the second argument to your asset_host Proc if you do not need the request.")
+          if (arity > 1 || arity < -2) && !has_request?
+            invalid_asset_host!("Remove the second argument to your asset_host Proc if you do not need the request, or make it optional.")
           end
           args << current_request if (arity > 1 || arity < 0) && has_request?
           host.call(*args)
@@ -133,5 +133,4 @@ module ActionView
     end
 
   end
-
 end

data/lib/action_view/base.rb

@@ -4,12 +4,13 @@ require 'active_support/core_ext/class/attribute'
 require 'active_support/core_ext/array/wrap'
 require 'active_support/ordered_options'
 require 'action_view/log_subscriber'
+require 'active_support/core_ext/module/deprecation'
 
 module ActionView #:nodoc:
   # = Action View Base
   #
-  # Action View templates can be written in several ways. If the template file has a <tt>.erb</tt> (or <tt>.rhtml</tt>) extension then it uses a mixture of ERb
-  # (included in Ruby) and HTML. If the template file has a <tt>.builder</tt> (or <tt>.rxml</tt>) extension then Jim Weirich's Builder::XmlMarkup library is used.
+  # Action View templates can be written in several ways. If the template file has a <tt>.erb</tt> extension then it uses a mixture of ERb
+  # (included in Ruby) and HTML. If the template file has a <tt>.builder</tt> extension then Jim Weirich's Builder::XmlMarkup library is used.
   #
   # == ERB
   #
@@ -93,10 +94,10 @@ module ActionView #:nodoc:
   #
   # Any method with a block will be treated as an XML markup tag with nested markup in the block. For example, the following:
   #
-  #   xml.div {
+  #   xml.div do
   #     xml.h1(@person.name)
   #     xml.p(@person.bio)
-  #   }
+  #   end
   #
   # would produce something like:
   #
@@ -115,7 +116,7 @@ module ActionView #:nodoc:
   #       xml.language "en-us"
   #       xml.ttl "40"
   #
-  #       for item in @recent_items
+  #       @recent_items.each do |item|
   #         xml.item do
   #           xml.title(item_title(item))
   #           xml.description(item_description(item)) if item_description(item)
@@ -161,6 +162,7 @@ module ActionView #:nodoc:
         value.is_a?(PathSet) ?
           value.dup : ActionView::PathSet.new(Array.wrap(value))
       end
+      deprecate :process_view_paths
 
       def xss_safe? #:nodoc:
         true

data/lib/action_view/helpers/asset_paths.rb

@@ -4,4 +4,4 @@ module ActionView
   module Helpers
     AssetPaths = ::ActionView::AssetPaths
   end
-end
+end

data/lib/action_view/helpers/asset_tag_helper.rb

@@ -228,23 +228,19 @@ module ActionView
         )
       end
 
-      # Web browsers cache favicons. If you just throw a <tt>favicon.ico</tt> into the document
-      # root of your application and it changes later, clients that have it in their cache
-      # won't see the update. Using this helper prevents that because it appends an asset ID:
-      #
       #   <%= favicon_link_tag %>
       #
       # generates
       #
-      #   <link href="/favicon.ico?4649789979" rel="shortcut icon" type="image/vnd.microsoft.icon" />
+      #   <link href="/favicon.ico" rel="shortcut icon" type="image/vnd.microsoft.icon" />
       #
       # You may specify a different file in the first argument:
       #
-      #   <%= favicon_link_tag 'favicon.ico' %>
+      #   <%= favicon_link_tag '/myicon.ico' %>
       #
       # That's passed to +path_to_image+ as is, so it gives
       #
-      #   <link href="/images/favicon.ico?4649789979" rel="shortcut icon" type="image/vnd.microsoft.icon" />
+      #   <link href="/myicon.ico" rel="shortcut icon" type="image/vnd.microsoft.icon" />
       #
       # The helper accepts an additional options hash where you can override "rel" and "type".
       #
@@ -348,7 +344,7 @@ module ActionView
 
         src = options[:src] = path_to_image(source)
 
-        unless src =~ /^(?:cid|data):/
+        unless src =~ /^cid:/
           options[:alt] = options.fetch(:alt){ image_alt(src) }
         end
 

data/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb

@@ -68,6 +68,9 @@ module ActionView
         # Returns a stylesheet link tag for the sources specified as arguments. If
         # you don't specify an extension, <tt>.css</tt> will be appended automatically.
         # You can modify the link attributes by passing a hash as the last argument.
+        # For historical reasons, the 'media' attribute will always be present and defaults
+        # to "screen", so you must explicitely set it to "all" for the stylesheet(s) to
+        # apply to all media types.
         #
         # ==== Examples
         #   stylesheet_link_tag "style" # =>

data/lib/action_view/helpers/atom_feed_helper.rb

@@ -20,7 +20,7 @@ module ActionView
       #       # GET /posts.html
       #       # GET /posts.atom
       #       def index
-      #         @posts = Post.find(:all)
+      #         @posts = Post.all
       #
       #         respond_to do |format|
       #           format.html
@@ -32,7 +32,7 @@ module ActionView
       #   app/views/posts/index.atom.builder:
       #     atom_feed do |feed|
       #       feed.title("My great blog!")
-      #       feed.updated(@posts.first.created_at)
+      #       feed.updated(@posts[0].created_at) if @posts.length > 0
       #
       #       @posts.each do |post|
       #         feed.entry(post) do |entry|

data/lib/action_view/helpers/capture_helper.rb

@@ -27,7 +27,7 @@ module ActionView
       #     "The current timestamp is #{Time.now}."
       #   end
       #
-      # You can then use that variable anywhere else.  For example:
+      # You can then use that variable anywhere else. For example:
       #
       #   <html>
       #   <head><title><%= @greeting %></title></head>
@@ -76,7 +76,7 @@ module ActionView
       #
       #   <%= stored_content %>
       #
-      # You can use the <tt>yield</tt> syntax alongside an existing call to <tt>yield</tt> in a layout.  For example:
+      # 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">
@@ -194,7 +194,7 @@ module ActionView
       def flush_output_buffer #:nodoc:
         if output_buffer && !output_buffer.empty?
           response.body_parts << output_buffer
-          self.output_buffer = output_buffer.respond_to?(:clone_empty) ? output_buffer.clone_empty : output_buffer[0, 0]
+          self.output_buffer = output_buffer[0,0]
           nil
         end
       end

data/lib/action_view/helpers/controller_helper.rb

@@ -20,4 +20,4 @@ module ActionView
       end
     end
   end
-end
+end

data/lib/action_view/helpers/date_helper.rb

@@ -290,7 +290,7 @@ module ActionView
         InstanceTag.new(object_name, method, self, options.delete(:object)).to_datetime_select_tag(options, html_options)
       end
 
-      # Returns a set of html select-tags (one for year, month, day, hour, minute and second) pre-selected with the
+      # Returns a set of html select-tags (one for year, month, day, hour, minute, and second) pre-selected with the
       # +datetime+. It's also possible to explicitly set the order of the tags using the <tt>:order</tt> option with
       # an array of symbols <tt>:year</tt>, <tt>:month</tt> and <tt>:day</tt> in the desired order. If you do not
       # supply a Symbol, it will be appended onto the <tt>:order</tt> passed in. You can also add
@@ -517,7 +517,7 @@ module ActionView
       #   # that is named 'due' rather than 'day'.
       #   select_day(my_time, :field_name => 'due')
       #
-      #   # Generates a select field for days with a custom prompt.  Use <tt>:prompt => true</tt> for a
+      #   # Generates a select field for days with a custom prompt. Use <tt>:prompt => true</tt> for a
       #   # generic prompt.
       #   select_day(5, :prompt => 'Choose day')
       #
@@ -621,7 +621,6 @@ module ActionView
     end
 
     class DateTimeSelector #:nodoc:
-      extend ActiveSupport::Memoizable
       include ActionView::Helpers::TagHelper
 
       DEFAULT_PREFIX = 'date'.freeze
@@ -737,7 +736,7 @@ module ActionView
         if @options[:use_hidden] || @options[:discard_day]
           build_hidden(:day, day)
         else
-          build_options_and_select(:day, day, :start => 1, :end => 31, :leading_zeros => false)
+          build_options_and_select(:day, day, :start => 1, :end => 31, :leading_zeros => false, :use_two_digit_numbers => @options[:use_two_digit_numbers])
         end
       end
 
@@ -766,11 +765,16 @@ module ActionView
         if @options[:use_hidden] || @options[:discard_year]
           build_hidden(:year, val)
         else
-          options                 = {}
-          options[:start]         = @options[:start_year] || middle_year - 5
-          options[:end]           = @options[:end_year] || middle_year + 5
-          options[:step]          = options[:start] < options[:end] ? 1 : -1
-          options[:leading_zeros] = false
+          options                     = {}
+          options[:start]             = @options[:start_year] || middle_year - 5
+          options[:end]               = @options[:end_year] || middle_year + 5
+          options[:step]              = options[:start] < options[:end] ? 1 : -1
+          options[:leading_zeros]     = false
+          options[:max_years_allowed] = @options[:max_years_allowed] || 1000
+
+          if (options[:end] - options[:start]).abs > options[:max_years_allowed]
+            raise ArgumentError,  "There're too many years options to be built. Are you sure you haven't mistyped something? You can provide the :max_years_allowed parameter"
+          end
 
           build_options_and_select(:year, val, options)
         end
@@ -786,11 +790,12 @@ module ActionView
         # Returns translated month names, but also ensures that a custom month
         # name array has a leading nil element.
         def month_names
-          month_names = @options[:use_month_names] || translated_month_names
-          month_names.unshift(nil) if month_names.size < 13
-          month_names
+          @month_names ||= begin
+            month_names = @options[:use_month_names] || translated_month_names
+            month_names.unshift(nil) if month_names.size < 13
+            month_names
+          end
         end
-        memoize :month_names
 
         # Returns translated month names.
         #  => [nil, "January", "February", "March",
@@ -817,6 +822,8 @@ module ActionView
         def month_name(number)
           if @options[:use_month_numbers]
             number
+          elsif @options[:use_two_digit_numbers]
+            sprintf "%02d", number
           elsif @options[:add_month_numbers]
             "#{number} - #{month_names[number]}"
           else
@@ -825,9 +832,8 @@ module ActionView
         end
 
         def date_order
-          @options[:order] || translated_date_order
+          @date_order ||= @options[:order] || translated_date_order
         end
-        memoize :date_order
 
         def translated_date_order
           I18n.translate(:'date.order', :locale => @options[:locale]) || []
@@ -853,7 +859,7 @@ module ActionView
           start         = options.delete(:start) || 0
           stop          = options.delete(:end) || 59
           step          = options.delete(:step) || 1
-          options.reverse_merge!({:leading_zeros => true, :ampm => false})
+          options.reverse_merge!({:leading_zeros => true, :ampm => false, :use_two_digit_numbers => false})
           leading_zeros = options.delete(:leading_zeros)
 
           select_options = []
@@ -861,7 +867,8 @@ module ActionView
             value = leading_zeros ? sprintf("%02d", i) : i
             tag_options = { :value => value }
             tag_options[:selected] = "selected" if selected == i
-            text = options[:ampm] ? AMPM_TRANSLATION[i] : value
+            text = options[:use_two_digit_numbers] ? sprintf("%02d", i) : value
+            text = options[:ampm] ? AMPM_TRANSLATION[i] : text            
             select_options << content_tag(:option, text, tag_options)
           end
           (select_options.join("\n") + "\n").html_safe
@@ -940,8 +947,9 @@ module ActionView
         # and join them with their appropriate separators.
         def build_selects_from_types(order)
           select = ''
+          first_visible = order.find { |type| !@options[:"discard_#{type}"] }
           order.reverse.each do |type|
-            separator = separator(type) unless type == order.first # don't add on last field
+            separator = separator(type) unless type == first_visible # don't add before first visible field
             select.insert(0, separator.to_s + send("select_#{type}").to_s)
           end
           select.html_safe