actionpack 4.0.13 → 4.1.0.beta1

data/lib/action_dispatch/journey/formatter.rb

@@ -3,7 +3,7 @@ require 'action_controller/metal/exceptions'
 module ActionDispatch
   module Journey
     # The Formatter class is used for formatting URLs. For example, parameters
-    # passed to +url_for+ in rails will eventually call Formatter#generate.
+    # passed to +url_for+ in Rails will eventually call Formatter#generate.
     class Formatter # :nodoc:
       attr_reader :routes
 
@@ -33,8 +33,8 @@ module ActionDispatch
           return [route.format(parameterized_parts), params]
         end
 
-        message = "No route matches #{Hash[constraints.sort].inspect}"
-        message << " missing required keys: #{missing_keys.sort.inspect}" unless missing_keys.empty?
+        message = "No route matches #{constraints.inspect}"
+        message << " missing required keys: #{missing_keys.inspect}" if name
 
         raise ActionController::UrlGenerationError, message
       end

data/lib/action_dispatch/journey/gtg/transition_table.rb

@@ -43,9 +43,7 @@ module ActionDispatch
           move_string(t, a).concat(move_regexp(t, a))
         end
 
-        def to_json
-          require 'json'
-
+        def as_json(options = nil)
           simple_regexp = Hash.new { |h,k| h[k] = {} }
 
           @regexp_states.each do |from, hash|
@@ -54,11 +52,11 @@ module ActionDispatch
             end
           end
 
-          JSON.dump({
+          {
             regexp_states: simple_regexp,
             string_states: @string_states,
             accepting:     @accepting
-          })
+          }
         end
 
         def to_svg

data/lib/action_dispatch/journey/parser.rb

@@ -1,7 +1,7 @@
 #
 # DO NOT MODIFY!!!!
 # This file is automatically generated by Racc 1.4.9
-# from Racc grammer file "".
+# from Racc grammar file "".
 #
 
 require 'racc/parser.rb'

data/lib/action_dispatch/journey/parser.y

@@ -36,6 +36,7 @@ rule
     ;
   literal
     : LITERAL            { result = Literal.new(val.first) }
+    ;
   dot
     : DOT                { result = Dot.new(val.first) }
     ;

data/lib/action_dispatch/journey/router.rb

@@ -54,7 +54,7 @@ module ActionDispatch
       end
 
       def call(env)
-        env['PATH_INFO'] = Utils.normalize_path(env['PATH_INFO'])
+        env['PATH_INFO'] = normalize_path(env['PATH_INFO'])
 
         find_routes(env).each do |match, parameters, route|
           script_name, path_info, set_params = env.values_at('SCRIPT_NAME',
@@ -103,6 +103,12 @@ module ActionDispatch
 
       private
 
+        def normalize_path(path)
+          path = "/#{path}"
+          path.squeeze!('/')
+          path
+        end
+
         def partitioned_routes
           routes.partitioned_routes
         end

data/lib/action_dispatch/journey/router/utils.rb

@@ -38,7 +38,7 @@ module ActionDispatch
           UNSAFE_FRAGMENT = Regexp.new("[^#{safe_fragment}]", false).freeze
         end
 
-        Parser = URI.const_defined?(:Parser) ? URI::Parser.new : URI
+        Parser = URI::Parser.new
 
         def self.escape_path(path)
           Parser.escape(path.to_s, UriEscape::UNSAFE_SEGMENT)

data/lib/action_dispatch/journey/visitors.rb

@@ -77,74 +77,53 @@ module ActionDispatch
         end
       end
 
-      class OptimizedPath < Visitor # :nodoc:
-        def accept(node)
-          Array(visit(node))
-        end
-
+      class OptimizedPath < String # :nodoc:
         private
 
-          def visit_CAT(node)
-            [visit(node.left), visit(node.right)].flatten
-          end
-
-          def visit_SYMBOL(node)
-            node.left[1..-1].to_sym
-          end
-
-          def visit_STAR(node)
-            visit(node.left)
-          end
-
-          def visit_GROUP(node)
-            []
-          end
-
-          %w{ LITERAL SLASH DOT }.each do |t|
-            class_eval %{ def visit_#{t}(n); n.left; end }, __FILE__, __LINE__
-          end
+        def visit_GROUP(node)
+          ""
+        end
       end
 
       # Used for formatting urls (url_for)
       class Formatter < Visitor # :nodoc:
-        attr_reader :options, :consumed
+        attr_reader :options
 
         def initialize(options)
           @options  = options
-          @consumed = {}
         end
 
         private
 
-          def visit_GROUP(node)
-            if consumed == options
-              nil
-            else
-              route = visit(node.left)
-              route.include?("\0") ? nil : route
+          def visit(node, optional = false)
+            case node.type
+            when :LITERAL, :SLASH, :DOT
+              node.left
+            when :STAR
+              visit(node.left)
+            when :GROUP
+              visit(node.left, true)
+            when :CAT
+              visit_CAT(node, optional)
+            when :SYMBOL
+              visit_SYMBOL(node)
             end
           end
 
-          def terminal(node)
-            node.left
-          end
+          def visit_CAT(node, optional)
+            left = visit(node.left, optional)
+            right = visit(node.right, optional)
 
-          def binary(node)
-            [visit(node.left), visit(node.right)].join
-          end
-
-          def nary(node)
-            node.children.map { |c| visit(c) }.join
+            if optional && !(right && left)
+              ""
+            else
+              [left, right].join
+            end
           end
 
           def visit_SYMBOL(node)
-            key = node.to_sym
-
-            if value = options[key]
-              consumed[key] = value
+            if value = options[node.to_sym]
               Router::Utils.escape_path(value)
-            else
-              "\0"
             end
           end
       end

data/lib/action_dispatch/middleware/callbacks.rb

@@ -8,14 +8,14 @@ module ActionDispatch
 
     class << self
       delegate :to_prepare, :to_cleanup, :to => "ActionDispatch::Reloader"
-    end
 
-    def self.before(*args, &block)
-      set_callback(:call, :before, *args, &block)
-    end
+      def before(*args, &block)
+        set_callback(:call, :before, *args, &block)
+      end
 
-    def self.after(*args, &block)
-      set_callback(:call, :after, *args, &block)
+      def after(*args, &block)
+        set_callback(:call, :after, *args, &block)
+      end
     end
 
     def initialize(app)

data/lib/action_dispatch/middleware/cookies.rb

@@ -23,14 +23,14 @@ module ActionDispatch
   #   # This cookie will be deleted when the user's browser is closed.
   #   cookies[:user_name] = "david"
   #
-  #   # Cookie values are String based. Other data types need to be serialized.
-  #   cookies[:lat_lon] = JSON.generate([47.68, -122.37])
+  #   # Assign an array of values to a cookie.
+  #   cookies[:lat_lon] = [47.68, -122.37]
   #
   #   # Sets a cookie that expires in 1 hour.
   #   cookies[:login] = { value: "XJ-122", expires: 1.hour.from_now }
   #
   #   # Sets a signed cookie, which prevents users from tampering with its value.
-  #   # The cookie is signed by your app's <tt>config.secret_key_base</tt> value.
+  #   # The cookie is signed by your app's <tt>secrets.secret_key_base</tt> value.
   #   # It can be read using the signed method <tt>cookies.signed[:name]</tt>
   #   cookies.signed[:user_id] = current_user.id
   #
@@ -42,10 +42,10 @@ module ActionDispatch
   #
   # Examples of reading:
   #
-  #   cookies[:user_name]           # => "david"
-  #   cookies.size                  # => 2
-  #   JSON.parse(cookies[:lat_lon]) # => [47.68, -122.37]
-  #   cookies.signed[:login]        # => "XJ-122"
+  #   cookies[:user_name]    # => "david"
+  #   cookies.size           # => 2
+  #   cookies[:lat_lon]      # => [47.68, -122.37]
+  #   cookies.signed[:login] # => "XJ-122"
   #
   # Example for deleting:
   #
@@ -63,7 +63,7 @@ module ActionDispatch
   #
   # The option symbols for setting cookies are:
   #
-  # * <tt>:value</tt> - The cookie's value.
+  # * <tt>:value</tt> - The cookie's value or list of values (as an array).
   # * <tt>:path</tt> - The path for which this cookie applies. Defaults to the root
   #   of the application.
   # * <tt>:domain</tt> - The domain for which this cookie applies so you can
@@ -117,10 +117,10 @@ module ActionDispatch
       # the cookie again. This is useful for creating cookies with values that the user is not supposed to change. If a signed
       # cookie was tampered with by the user (or a 3rd party), nil will be returned.
       #
-      # If +config.secret_key_base+ and +config.secret_token+ (deprecated) are both set,
+      # If +secrets.secret_key_base+ and +config.secret_token+ (deprecated) are both set,
       # legacy cookies signed with the old key generator will be transparently upgraded.
       #
-      # This jar requires that you set a suitable secret for the verification on your app's +config.secret_key_base+.
+      # This jar requires that you set a suitable secret for the verification on your app's +secrets.secret_key_base+.
       #
       # Example:
       #
@@ -140,10 +140,10 @@ module ActionDispatch
       # Returns a jar that'll automatically encrypt cookie values before sending them to the client and will decrypt them for read.
       # If the cookie was tampered with by the user (or a 3rd party), nil will be returned.
       #
-      # If +config.secret_key_base+ and +config.secret_token+ (deprecated) are both set,
+      # If +secrets.secret_key_base+ and +config.secret_token+ (deprecated) are both set,
       # legacy cookies signed with the old key generator will be transparently upgraded.
       #
-      # This jar requires that you set a suitable secret for the verification on your app's +config.secret_key_base+.
+      # This jar requires that you set a suitable secret for the verification on your app's +secrets.secret_key_base+.
       #
       # Example:
       #
@@ -409,7 +409,7 @@ module ActionDispatch
     end
 
     # UpgradeLegacySignedCookieJar is used instead of SignedCookieJar if
-    # config.secret_token and config.secret_key_base are both set. It reads
+    # config.secret_token and secrets.secret_key_base are both set. It reads
     # legacy cookies signed with the old dummy key generator and re-saves
     # them using the new key generator to provide a smooth upgrade path.
     class UpgradeLegacySignedCookieJar < SignedCookieJar #:nodoc:
@@ -427,7 +427,7 @@ module ActionDispatch
 
       def initialize(parent_jar, key_generator, options = {})
         if ActiveSupport::LegacyKeyGenerator === key_generator
-          raise "You didn't set config.secret_key_base, which is required for this cookie jar. " +
+          raise "You didn't set secrets.secret_key_base, which is required for this cookie jar. " +
             "Read the upgrade documentation to learn more about this new config option."
         end
 
@@ -465,7 +465,7 @@ module ActionDispatch
     end
 
     # UpgradeLegacyEncryptedCookieJar is used by ActionDispatch::Session::CookieStore
-    # instead of EncryptedCookieJar if config.secret_token and config.secret_key_base
+    # instead of EncryptedCookieJar if config.secret_token and secrets.secret_key_base
     # are both set. It reads legacy cookies signed with the old dummy key generator and
     # encrypts and re-saves them using the new key generator to provide a smooth upgrade path.
     class UpgradeLegacyEncryptedCookieJar < EncryptedCookieJar #:nodoc:

data/lib/action_dispatch/middleware/debug_exceptions.rb

@@ -34,27 +34,35 @@ module ActionDispatch
       log_error(env, wrapper)
 
       if env['action_dispatch.show_detailed_exceptions']
+        request = Request.new(env)
         template = ActionView::Base.new([RESCUES_TEMPLATE_PATH],
-          :request => Request.new(env),
-          :exception => wrapper.exception,
-          :application_trace => wrapper.application_trace,
-          :framework_trace => wrapper.framework_trace,
-          :full_trace => wrapper.full_trace,
-          :routes_inspector => routes_inspector(exception),
-          :source_extract => wrapper.source_extract,
-          :line_number => wrapper.line_number,
-          :file => wrapper.file
+          request: request,
+          exception: wrapper.exception,
+          application_trace: wrapper.application_trace,
+          framework_trace: wrapper.framework_trace,
+          full_trace: wrapper.full_trace,
+          routes_inspector: routes_inspector(exception),
+          source_extract: wrapper.source_extract,
+          line_number: wrapper.line_number,
+          file: wrapper.file
         )
         file = "rescues/#{wrapper.rescue_template}"
-        body = template.render(:template => file, :layout => 'rescues/layout')
-        render(wrapper.status_code, body)
+
+        if request.xhr?
+          body = template.render(template: file, layout: false, formats: [:text])
+          format = "text/plain"
+        else
+          body = template.render(template: file, layout: 'rescues/layout')
+          format = "text/html"
+        end
+        render(wrapper.status_code, body, format)
       else
         raise exception
       end
     end
 
-    def render(status, body)
-      [status, {'Content-Type' => "text/html; charset=#{Response.default_charset}", 'Content-Length' => body.bytesize.to_s}, [body]]
+    def render(status, body, format)
+      [status, {'Content-Type' => "#{format}; charset=#{Response.default_charset}", 'Content-Length' => body.bytesize.to_s}, [body]]
     end
 
     def log_error(env, wrapper)

data/lib/action_dispatch/middleware/exception_wrapper.rb

@@ -1,5 +1,5 @@
 require 'action_controller/metal/exceptions'
-require 'active_support/core_ext/class/attribute_accessors'
+require 'active_support/core_ext/module/attribute_accessors'
 
 module ActionDispatch
   class ExceptionWrapper

data/lib/action_dispatch/middleware/flash.rb

@@ -125,7 +125,7 @@ module ActionDispatch
       end
 
       def key?(name)
-        @flashes.key? name.to_s
+        @flashes.key? name
       end
 
       def delete(key)
@@ -243,19 +243,13 @@ module ActionDispatch
       session    = Request::Session.find(env) || {}
       flash_hash = env[KEY]
 
-      if flash_hash
-        if !flash_hash.empty? || session.key?('flash')
-          session["flash"] = flash_hash.to_session_value
-          new_hash = flash_hash.dup
-        else
-          new_hash = flash_hash
-        end
-
-        env[KEY] = new_hash
+      if flash_hash && (flash_hash.present? || session.key?('flash'))
+        session["flash"] = flash_hash.to_session_value
+        env[KEY] = flash_hash.dup
       end
 
       if (!session.respond_to?(:loaded?) || session.loaded?) && # (reset_session uses {}, which doesn't implement #loaded?)
-         session.key?('flash') && session['flash'].nil?
+        session.key?('flash') && session['flash'].nil?
         session.delete('flash')
       end
     end

data/lib/action_dispatch/middleware/params_parser.rb

@@ -43,7 +43,7 @@ module ActionDispatch
         when :json
           data = ActiveSupport::JSON.decode(request.raw_post)
           data = {:_json => data} unless data.is_a?(Hash)
-          request.deep_munge(data).with_indifferent_access
+          Request::Utils.deep_munge(data).with_indifferent_access
         else
           false
         end

data/lib/action_dispatch/middleware/public_exceptions.rb

@@ -9,12 +9,8 @@ module ActionDispatch
     def call(env)
       status       = env["PATH_INFO"][1..-1]
       request      = ActionDispatch::Request.new(env)
+      content_type = request.formats.first
       body         = { :status => status, :error => Rack::Utils::HTTP_STATUS_CODES.fetch(status.to_i, Rack::Utils::HTTP_STATUS_CODES[500]) }
-      content_type = begin
-                       request.formats.first
-                     rescue ActionController::BadRequest
-                       Mime::HTML
-                     end
 
       render(status, content_type, body)
     end

data/lib/action_dispatch/middleware/session/cache_store.rb

@@ -16,9 +16,9 @@ module ActionDispatch
 
       # Get a session from the cache.
       def get_session(env, sid)
-        unless sid and session = @cache.read(cache_key(sid))
-          sid, session = generate_sid, {}
-        end
+        sid ||= generate_sid
+        session = @cache.read(cache_key(sid))
+        session ||= {}
         [sid, session]
       end
 

data/lib/action_dispatch/middleware/session/cookie_store.rb

@@ -31,9 +31,10 @@ module ActionDispatch
     #
     #   Myapp::Application.config.session_store :cookie_store, key: '_your_app_session'
     #
-    # Configure your secret key in config/initializers/secret_token.rb:
+    # Configure your secret key in config/secrets.yml:
     #
-    #   Myapp::Application.config.secret_key_base 'secret key'
+    #   development:
+    #     secret_key_base: 'secret key'
     #
     # To generate a secret key for an existing application, run `rake secret`.
     #
@@ -50,7 +51,7 @@ module ActionDispatch
     # decode signed cookies generated by your app in external applications or
     # Javascript before upgrading.
     #
-    # Note that changing the secret key will invalidate all existing sessions!
+    # Note that changing digest or secret invalidates all existing sessions!
     class CookieStore < Rack::Session::Abstract::ID
       include Compatibility
       include StaleSessionCheck