actionpack 3.0.0.beta4 → 3.0.0.rc

data/lib/action_dispatch/middleware/flash.rb

@@ -4,7 +4,7 @@ module ActionDispatch
     # read a notice you put there or <tt>flash["notice"] = "hello"</tt>
     # to put a new one.
     def flash
-      session['flash'] ||= Flash::FlashHash.new
+      @env['action_dispatch.request.flash_hash'] ||= (session["flash"] || Flash::FlashHash.new)
     end
   end
 
@@ -176,7 +176,14 @@ module ActionDispatch
 
       @app.call(env)
     ensure
-      if (session = env['rack.session']) && session.key?('flash') && session['flash'].empty?
+      session    = env['rack.session'] || {}
+      flash_hash = env['action_dispatch.request.flash_hash']
+
+      if flash_hash && (!flash_hash.empty? || session.key?('flash'))
+        session["flash"] = flash_hash
+      end
+
+      if session.key?('flash') && session['flash'].empty?
         session.delete('flash')
       end
     end

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

@@ -12,6 +12,35 @@ module ActionDispatch
       ENV_SESSION_KEY = 'rack.session'.freeze
       ENV_SESSION_OPTIONS_KEY = 'rack.session.options'.freeze
 
+      # thin wrapper around Hash that allows us to lazily
+      # load session id into session_options
+      class OptionsHash < Hash
+        def initialize(by, env, default_options)
+          @by = by
+          @env = env
+          @session_id_loaded = false
+          merge!(default_options)
+        end
+
+        def [](key)
+          if key == :id
+            load_session_id! unless key?(:id) || has_session_id?
+          end
+          super
+        end
+
+      private
+
+        def has_session_id?
+          @session_id_loaded
+        end
+
+        def load_session_id!
+          self[:id] = @by.send(:extract_session_id, @env)
+          @session_id_loaded = true
+        end
+      end
+
       class SessionHash < Hash
         def initialize(by, env)
           super()
@@ -21,66 +50,80 @@ module ActionDispatch
         end
 
         def [](key)
-          load! unless @loaded
+          load_for_read!
+          super(key.to_s)
+        end
+
+        def has_key?(key)
+          load_for_read!
           super(key.to_s)
         end
 
         def []=(key, value)
-          load! unless @loaded
+          load_for_write!
           super(key.to_s, value)
         end
 
+        def clear
+          load_for_write!
+          super
+        end
+
         def to_hash
+          load_for_read!
           h = {}.replace(self)
           h.delete_if { |k,v| v.nil? }
           h
         end
 
         def update(hash)
-          load! unless @loaded
+          load_for_write!
           super(hash.stringify_keys)
         end
 
         def delete(key)
-          load! unless @loaded
+          load_for_write!
           super(key.to_s)
         end
 
         def inspect
-          load! unless @loaded
+          load_for_read!
           super
         end
 
+        def exists?
+          return @exists if instance_variable_defined?(:@exists)
+          @exists = @by.send(:exists?, @env)
+        end
+
         def loaded?
           @loaded
         end
 
+        def destroy
+          clear
+          @by.send(:destroy, @env) if @by
+          @env[ENV_SESSION_OPTIONS_KEY][:id] = nil if @env && @env[ENV_SESSION_OPTIONS_KEY]
+          @loaded = false
+        end
+
         private
-          def load!
-            stale_session_check! do
-              id, session = @by.send(:load_session, @env)
-              (@env[ENV_SESSION_OPTIONS_KEY] ||= {})[:id] = id
-              replace(session.stringify_keys)
-              @loaded = true
-            end
+
+          def load_for_read!
+            load! if !loaded? && exists?
           end
 
-          def stale_session_check!
-            yield
-          rescue ArgumentError => argument_error
-            if argument_error.message =~ %r{undefined class/module ([\w:]*\w)}
-              begin
-                # Note that the regexp does not allow $1 to end with a ':'
-                $1.constantize
-              rescue LoadError, NameError => const_error
-                raise ActionDispatch::Session::SessionRestoreError, "Session contains objects whose class definition isn't available.\nRemember to require the classes for all objects kept in the session.\n(Original exception: #{const_error.message} [#{const_error.class}])\n"
-              end
-
-              retry
-            else
-              raise
-            end
+          def load_for_write!
+            load! unless loaded?
           end
+
+          def load!
+            id, session = @by.send(:load_session, @env)
+            @env[ENV_SESSION_OPTIONS_KEY][:id] = id
+            replace(session.stringify_keys)
+            @loaded = true
+          end
+
       end
 
       DEFAULT_OPTIONS = {
@@ -108,8 +151,8 @@ module ActionDispatch
         session_data = env[ENV_SESSION_KEY]
         options = env[ENV_SESSION_OPTIONS_KEY]
 
-        if !session_data.is_a?(AbstractStore::SessionHash) || session_data.send(:loaded?) || options[:expire_after]
-          session_data.send(:load!) if session_data.is_a?(AbstractStore::SessionHash) && !session_data.send(:loaded?)
+        if !session_data.is_a?(AbstractStore::SessionHash) || session_data.loaded? || options[:expire_after]
+          session_data.send(:load!) if session_data.is_a?(AbstractStore::SessionHash) && !session_data.loaded?
 
           sid = options[:id] || generate_sid
           session_data = session_data.to_hash
@@ -133,7 +176,7 @@ module ActionDispatch
 
         def prepare!(env)
           env[ENV_SESSION_KEY] = SessionHash.new(self, env)
-          env[ENV_SESSION_OPTIONS_KEY] = @default_options.dup
+          env[ENV_SESSION_OPTIONS_KEY] = OptionsHash.new(self, env, @default_options)
         end
 
         def generate_sid
@@ -141,15 +184,33 @@ module ActionDispatch
         end
 
         def set_cookie(request, options)
-          request.cookie_jar[@key] = options
+          if request.cookie_jar[@key] != options[:value] || !options[:expires].nil?
+            request.cookie_jar[@key] = options
+          end
         end
 
         def load_session(env)
-          request = Rack::Request.new(env)
-          sid   = request.cookies[@key]
-          sid ||= request.params[@key] unless @cookie_only
-          sid, session = get_session(env, sid)
-          [sid, session]
+          stale_session_check! do
+            if sid = current_session_id(env)
+              sid, session = get_session(env, sid)
+            else
+              sid, session = generate_sid, {}
+            end
+            [sid, session]
+          end
+        end
+
+        def extract_session_id(env)
+          stale_session_check! do
+            request = ActionDispatch::Request.new(env)
+            sid = request.cookies[@key]
+            sid ||= request.params[@key] unless @cookie_only
+            sid
+          end
+        end
+
+        def current_session_id(env)
+          env[ENV_SESSION_OPTIONS_KEY][:id]
         end
 
         def ensure_session_key!
@@ -161,6 +222,26 @@ module ActionDispatch
           end
         end
 
+        def stale_session_check!
+          yield
+        rescue ArgumentError => argument_error
+          if argument_error.message =~ %r{undefined class/module ([\w:]*\w)}
+            begin
+              # Note that the regexp does not allow $1 to end with a ':'
+              $1.constantize
+            rescue LoadError, NameError => const_error
+              raise ActionDispatch::Session::SessionRestoreError, "Session contains objects whose class definition isn't available.\nRemember to require the classes for all objects kept in the session.\n(Original exception: #{const_error.message} [#{const_error.class}])\n"
+            end
+            retry
+          else
+            raise
+          end
+        end
+
+        def exists?(env)
+          current_session_id(env).present?
+        end
+
         def get_session(env, sid)
           raise '#get_session needs to be implemented.'
         end
@@ -169,6 +250,10 @@ module ActionDispatch
           raise '#set_session needs to be implemented and should return ' <<
             'the value to be stored in the cookie (usually the sid)'
         end
+
+        def destroy(env)
+          raise '#destroy needs to be implemented.'
+        end
     end
   end
 end

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

@@ -35,20 +35,10 @@ module ActionDispatch
     #   such as 'MD5', 'RIPEMD160', 'SHA256', etc.
     #
     # To generate a secret key for an existing application, run
-    # "rake secret" and set the key in config/environment.rb.
+    # "rake secret" and set the key in config/initializers/secret_token.rb.
     #
     # Note that changing digest or secret invalidates all existing sessions!
     class CookieStore < AbstractStore
-      class OptionsHash < Hash
-        def initialize(by, env, default_options)
-          @session_data = env[AbstractStore::ENV_SESSION_KEY]
-          merge!(default_options)
-        end
-
-        def [](key)
-          key == :id ? @session_data[:session_id] : super(key)
-        end
-      end
 
       def initialize(app, options = {})
         super(app, options.merge!(:cookie_only => true))
@@ -57,19 +47,32 @@ module ActionDispatch
 
       private
 
-        def prepare!(env)
-          env[ENV_SESSION_KEY] = SessionHash.new(self, env)
-          env[ENV_SESSION_OPTIONS_KEY] = OptionsHash.new(self, env, @default_options)
-        end
-
         def load_session(env)
-          request = ActionDispatch::Request.new(env)
-          data = request.cookie_jar.signed[@key]
+          data = unpacked_cookie_data(env)
           data = persistent_session_id!(data)
-          data.stringify_keys!
           [data["session_id"], data]
         end
 
+        def extract_session_id(env)
+          if data = unpacked_cookie_data(env)
+            data["session_id"]
+          else
+            nil
+          end
+        end
+
+        def unpacked_cookie_data(env)
+          env["action_dispatch.request.unsigned_session_cookie"] ||= begin
+            stale_session_check! do
+              request = ActionDispatch::Request.new(env)
+              if data = request.cookie_jar.signed[@key]
+                data.stringify_keys!
+              end
+              data || {}
+            end
+          end
+        end
+
         def set_cookie(request, options)
           request.cookie_jar.signed[@key] = options
         end
@@ -78,6 +81,10 @@ module ActionDispatch
           persistent_session_id!(session_data, sid)
         end
 
+        def destroy(env)
+          # session data is stored on client; nothing to do here
+        end
+
         def persistent_session_id!(data, sid=nil)
           data ||= {}
           data["session_id"] ||= sid || generate_sid

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

@@ -25,7 +25,6 @@ module ActionDispatch
 
       private
         def get_session(env, sid)
-          sid ||= generate_sid
           begin
             session = @pool.get(sid) || {}
           rescue MemCache::MemCacheError, Errno::ECONNREFUSED
@@ -42,6 +41,15 @@ module ActionDispatch
         rescue MemCache::MemCacheError, Errno::ECONNREFUSED
           false
         end
+
+        def destroy(env)
+          if sid = current_session_id(env)
+            @pool.delete(sid)
+          end
+        rescue MemCache::MemCacheError, Errno::ECONNREFUSED
+          false
+        end
+
     end
   end
 end

data/lib/action_dispatch/middleware/show_exceptions.rb

@@ -122,7 +122,7 @@ module ActionDispatch
       end
 
       def render(status, body)
-        [status, {'Content-Type' => 'text/html', 'Content-Length' => body.length.to_s}, [body]]
+        [status, {'Content-Type' => 'text/html', 'Content-Length' => body.bytesize.to_s}, [body]]
       end
 
       def public_path
@@ -135,7 +135,7 @@ module ActionDispatch
         ActiveSupport::Deprecation.silence do
           message = "\n#{exception.class} (#{exception.message}):\n"
           message << exception.annoted_source_code if exception.respond_to?(:annoted_source_code)
-          message << exception.backtrace.join("\n  ")
+          message << "  " << application_trace(exception).join("\n  ")
           logger.fatal("#{message}\n\n")
         end
       end

data/lib/action_dispatch/middleware/stack.rb

@@ -46,7 +46,7 @@ module ActionDispatch
     end
 
     def insert(index, *args, &block)
-      index = self.index(index) unless index.is_a?(Integer)
+      index = assert_index(index, :before)
       middleware = self.class::Middleware.new(*args, &block)
       super(index, middleware)
     end
@@ -54,9 +54,8 @@ module ActionDispatch
     alias_method :insert_before, :insert
 
     def insert_after(index, *args, &block)
-      i = index.is_a?(Integer) ? index : self.index(index)
-      raise "No such middleware to insert after: #{index.inspect}" unless i
-      insert(i + 1, *args, &block)
+      index = assert_index(index, :after)
+      insert(index + 1, *args, &block)
     end
 
     def swap(target, *args, &block)
@@ -70,7 +69,7 @@ module ActionDispatch
     end
 
     def active
-      ActiveSupport::Deprecation.warn "All middlewares in the chaing are active since the laziness " << 
+      ActiveSupport::Deprecation.warn "All middlewares in the chain are active since the laziness " << 
         "was removed from the middleware stack", caller
     end
 
@@ -79,5 +78,13 @@ module ActionDispatch
       raise "MiddlewareStack#build requires an app" unless app
       reverse.inject(app) { |a, e| e.build(a) }
     end
+
+  protected
+
+    def assert_index(index, where)
+      i = index.is_a?(Integer) ? index : self.index(index)
+      raise "No such middleware to insert #{where}: #{index.inspect}" unless i
+      i
+    end
   end
 end

data/lib/action_dispatch/railtie.rb

@@ -10,7 +10,7 @@ module ActionDispatch
 
     # Prepare dispatcher callbacks and run 'prepare' callbacks
     initializer "action_dispatch.prepare_dispatcher" do |app|
-      ActionDispatch::Callbacks.to_prepare { app.routes_reloader.reload_if_changed }
+      ActionDispatch::Callbacks.to_prepare { app.routes_reloader.execute_if_updated }
     end
   end
 end

data/lib/action_dispatch/routing.rb

@@ -1,9 +1,8 @@
 require 'active_support/core_ext/object/to_param'
 require 'active_support/core_ext/regexp'
-require 'action_controller/polymorphic_routes'
 
 module ActionDispatch
-  # == Routing
+  # = Routing
   #
   # The routing module provides URL rewriting in native Ruby. It's a way to
   # redirect incoming requests to controllers and actions. This replaces
@@ -31,7 +30,7 @@ module ActionDispatch
   # Think of creating routes as drawing a map for your requests. The map tells
   # them where to go based on some predefined pattern:
   #
-  #   AppName::Applications.routes.draw do |map|
+  #   AppName::Application.routes.draw do
   #     Pattern 1 tells some request to go to one place
   #     Pattern 2 tell them to go to another
   #     ...
@@ -62,7 +61,7 @@ module ActionDispatch
   #
   #   redirect_to show_item_path(:id => 25)
   #
-  # Use <tt>root</tt> as a shorthand to name a route for the root path "".
+  # Use <tt>root</tt> as a shorthand to name a route for the root path "/".
   #
   #   # In routes.rb
   #   root :to => 'blogs#index'
@@ -72,7 +71,7 @@ module ActionDispatch
   #
   #   # and provide these named routes
   #   root_url   # => 'http://www.example.com/'
-  #   root_path  # => ''
+  #   root_path  # => '/'
   #
   # Note: when using +controller+, the route is simply named after the
   # method you call on the block parameter rather than map.
@@ -91,9 +90,7 @@ module ActionDispatch
   #
   # Routes can generate pretty URLs. For example:
   #
-  #   match '/articles/:year/:month/:day', :constraints => {
-  #     :controller => 'articles',
-  #     :action     => 'find_by_date',
+  #   match '/articles/:year/:month/:day' => 'articles#find_by_id', :constraints => {
   #     :year       => /\d{4}/,
   #     :month      => /\d{1,2}/,
   #     :day        => /\d{1,2}/
@@ -108,7 +105,7 @@ module ActionDispatch
   # You can specify a regular expression to define a format for a parameter.
   #
   #   controller 'geocode' do
-  #     match 'geocode/:postalcode' => :show', :constraints => {
+  #     match 'geocode/:postalcode' => :show, :constraints => {
   #       :postalcode => /\d{5}(-\d{4})?/
   #     }
   #
@@ -116,13 +113,13 @@ module ActionDispatch
   # expression modifiers:
   #
   #   controller 'geocode' do
-  #     match 'geocode/:postalcode' => :show', :constraints => {
+  #     match 'geocode/:postalcode' => :show, :constraints => {
   #       :postalcode => /hx\d\d\s\d[a-z]{2}/i
   #     }
   #   end
   #
   #   controller 'geocode' do
-  #     match 'geocode/:postalcode' => :show', :constraints => {
+  #     match 'geocode/:postalcode' => :show, :constraints => {
   #       :postalcode => /# Postcode format
   #          \d{5} #Prefix
   #          (-\d{4})? #Suffix
@@ -167,7 +164,7 @@ module ActionDispatch
   #
   # You can reload routes if you feel you must:
   #
-  #   Rails::Application.reload_routes!
+  #   Rails.application.reload_routes!
   #
   # This will clear all named routes and reload routes.rb if the file has been modified from
   # last load. To absolutely force reloading, use <tt>reload!</tt>.
@@ -219,13 +216,14 @@ module ActionDispatch
     autoload :Route, 'action_dispatch/routing/route'
     autoload :RouteSet, 'action_dispatch/routing/route_set'
     autoload :UrlFor, 'action_dispatch/routing/url_for'
+    autoload :PolymorphicRoutes, 'action_dispatch/routing/polymorphic_routes'
 
     SEPARATORS = %w( / . ? ) #:nodoc:
     HTTP_METHODS = [:get, :head, :post, :put, :delete, :options] #:nodoc:
 
     # A helper module to hold URL related helpers.
     module Helpers #:nodoc:
-      include ActionController::PolymorphicRoutes
+      include PolymorphicRoutes
     end
   end
 end