actionpack 3.0.0.beta3 → 3.0.0.beta4

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

@@ -38,9 +38,9 @@ module ActionDispatch
           options = env['rack.session.options']
           expiry  = options[:expire_after] || 0
           @pool.set(sid, session_data, expiry)
-          return true
+          sid
         rescue MemCache::MemCacheError, Errno::ECONNREFUSED
-          return false
+          false
         end
     end
   end

data/lib/action_dispatch/middleware/show_exceptions.rb

@@ -6,7 +6,7 @@ module ActionDispatch
   # This middleware rescues any exception returned by the application and renders
   # nice exception pages if it's being rescued locally.
   class ShowExceptions
-    LOCALHOST = ['127.0.0.1', '::1'].freeze
+    LOCALHOST = [/^127\.0\.0\.\d{1,3}$/, "::1", /^0:0:0:0:0:0:0:1(%.*)?$/].freeze
 
     RESCUES_TEMPLATE_PATH = File.join(File.dirname(__FILE__), 'templates')
 
@@ -45,7 +45,17 @@ module ActionDispatch
     end
 
     def call(env)
-      @app.call(env)
+      status, headers, body = @app.call(env)
+
+      # Only this middleware cares about RoutingError. So, let's just raise
+      # it here.
+      # TODO: refactor this middleware to handle the X-Cascade scenario without
+      # having to raise an exception.
+      if headers['X-Cascade'] == 'pass'
+        raise ActionController::RoutingError, "No route matches #{env['PATH_INFO'].inspect}"
+      end
+
+      [status, headers, body]
     rescue Exception => exception
       raise exception if env['action_dispatch.show_exceptions'] == false
       render_exception(env, exception)
@@ -62,7 +72,7 @@ module ActionDispatch
           rescue_action_in_public(exception)
         end
       rescue Exception => failsafe_error
-        $stderr.puts "Error during failsafe response: #{failsafe_error}"
+        $stderr.puts "Error during failsafe response: #{failsafe_error}\n  #{failsafe_error.backtrace * "\n  "}"
         FAILSAFE_RESPONSE
       end
 
@@ -104,7 +114,7 @@ module ActionDispatch
 
       # True if the request came from localhost, 127.0.0.1.
       def local_request?(request)
-        LOCALHOST.any?{ |local_ip| request.remote_addr == local_ip && request.remote_ip == local_ip }
+        LOCALHOST.any? { |local_ip| local_ip === request.remote_addr && local_ip === request.remote_ip }
       end
 
       def status_code(exception)
@@ -123,14 +133,10 @@ module ActionDispatch
         return unless logger
 
         ActiveSupport::Deprecation.silence do
-          if ActionView::Template::Error === exception
-            logger.fatal(exception.to_s)
-          else
-            logger.fatal(
-              "\n#{exception.class} (#{exception.message}):\n  " +
-              clean_backtrace(exception).join("\n  ") + "\n\n"
-            )
-          end
+          message = "\n#{exception.class} (#{exception.message}):\n"
+          message << exception.annoted_source_code if exception.respond_to?(:annoted_source_code)
+          message << exception.backtrace.join("\n  ")
+          logger.fatal("#{message}\n\n")
         end
       end
 

data/lib/action_dispatch/middleware/stack.rb

@@ -3,49 +3,15 @@ require "active_support/inflector/methods"
 module ActionDispatch
   class MiddlewareStack < Array
     class Middleware
-      def self.new(klass, *args, &block)
-        if klass.is_a?(self)
-          klass
-        else
-          super
-        end
-      end
-
       attr_reader :args, :block
 
-      def initialize(klass, *args, &block)
-        @klass = klass
-
-        options = args.extract_options!
-        if options.has_key?(:if)
-          @conditional = options.delete(:if)
-        else
-          @conditional = true
-        end
-        args << options unless options.empty?
-
-        @args = args
-        @block = block
+      def initialize(klass_or_name, *args, &block)
+        @ref = ActiveSupport::Dependencies::Reference.new(klass_or_name)
+        @args, @block = args, block
       end
 
       def klass
-        if @klass.respond_to?(:new)
-          @klass
-        elsif @klass.respond_to?(:call)
-          @klass.call
-        else
-          ActiveSupport::Inflector.constantize(@klass.to_s)
-        end
-      end
-
-      def active?
-        return false unless klass
-
-        if @conditional.respond_to?(:call)
-          @conditional.call
-        else
-          @conditional
-        end
+        @ref.get
       end
 
       def ==(middleware)
@@ -55,11 +21,7 @@ module ActionDispatch
         when Class
           klass == middleware
         else
-          if lazy_compare?(@klass) && lazy_compare?(middleware)
-            normalize(@klass) == normalize(middleware)
-          else
-            klass.name == middleware.to_s
-          end
+          normalize(@ref.name) == normalize(middleware)
         end
       end
 
@@ -68,25 +30,14 @@ module ActionDispatch
       end
 
       def build(app)
-        if block
-          klass.new(app, *build_args, &block)
-        else
-          klass.new(app, *build_args)
-        end
+        klass.new(app, *args, &block)
       end
 
-      private
-        def lazy_compare?(object)
-          object.is_a?(String) || object.is_a?(Symbol)
-        end
-
-        def normalize(object)
-          object.to_s.strip.sub(/^::/, '')
-        end
+    private
 
-        def build_args
-          Array(args).map { |arg| arg.respond_to?(:call) ? arg.call : arg }
-        end
+      def normalize(object)
+        object.to_s.strip.sub(/^::/, '')
+      end
     end
 
     def initialize(*args, &block)
@@ -96,7 +47,7 @@ module ActionDispatch
 
     def insert(index, *args, &block)
       index = self.index(index) unless index.is_a?(Integer)
-      middleware = Middleware.new(*args, &block)
+      middleware = self.class::Middleware.new(*args, &block)
       super(index, middleware)
     end
 
@@ -114,20 +65,19 @@ module ActionDispatch
     end
 
     def use(*args, &block)
-      middleware = Middleware.new(*args, &block)
+      middleware = self.class::Middleware.new(*args, &block)
       push(middleware)
     end
 
     def active
-      find_all { |middleware| middleware.active? }
+      ActiveSupport::Deprecation.warn "All middlewares in the chaing are active since the laziness " << 
+        "was removed from the middleware stack", caller
     end
 
-    def build(app = nil, &blk)
-      app ||= blk
-
+    def build(app = nil, &block)
+      app ||= block
       raise "MiddlewareStack#build requires an app" unless app
-
-      active.reverse.inject(app) { |a, e| e.build(a) }
+      reverse.inject(app) { |a, e| e.build(a) }
     end
   end
 end

data/lib/action_dispatch/middleware/templates/rescues/_request_and_response.erb

@@ -13,7 +13,7 @@
   request_dump = clean_params.empty? ? 'None' : clean_params.inspect.gsub(',', ",\n")
 
   def debug_hash(hash)
-    hash.sort_by { |k, v| k.to_s }.map { |k, v| "#{k}: #{v.inspect}" }.join("\n")
+    hash.sort_by { |k, v| k.to_s }.map { |k, v| "#{k}: #{v.inspect rescue $!.message}" }.join("\n")
   end
 %>
 

data/lib/action_dispatch/railtie.rb

@@ -10,8 +10,6 @@ module ActionDispatch
 
     # Prepare dispatcher callbacks and run 'prepare' callbacks
     initializer "action_dispatch.prepare_dispatcher" do |app|
-      # TODO: This used to say unless defined?(Dispatcher). Find out why and fix.
-      require 'rails/dispatcher'
       ActionDispatch::Callbacks.to_prepare { app.routes_reloader.reload_if_changed }
     end
   end

data/lib/action_dispatch/routing/deprecated_mapper.rb

@@ -1,4 +1,5 @@
 require 'active_support/core_ext/object/blank'
+require 'active_support/core_ext/object/with_options'
 
 module ActionDispatch
   module Routing

data/lib/action_dispatch/routing/mapper.rb

@@ -64,10 +64,11 @@ module ActionDispatch
             end
 
             path = normalize_path(path)
+            path_without_format = path.sub(/\(\.:format\)$/, '')
 
-            if using_match_shorthand?(path, options)
-              options[:to] ||= path[1..-1].sub(%r{/([^/]*)$}, '#\1')
-              options[:as] ||= path[1..-1].gsub("/", "_")
+            if using_match_shorthand?(path_without_format, options)
+              options[:to] ||= path_without_format[1..-1].sub(%r{/([^/]*)$}, '#\1')
+              options[:as] ||= path_without_format[1..-1].gsub("/", "_")
             end
 
             [ path, options ]
@@ -462,6 +463,10 @@ module ActionDispatch
             name.to_s.singularize
           end
 
+          def member_prefix
+            ':id'
+          end
+
           def member_name
             singular
           end
@@ -508,6 +513,10 @@ module ActionDispatch
             end
           end
 
+          def nested_prefix
+            id_segment
+          end
+
           def nested_options
             options = { :name_prefix => member_name }
             options["#{singular}_id".to_sym] = id_constraint if id_constraint?
@@ -531,9 +540,21 @@ module ActionDispatch
             end
           end
 
+          def member_prefix
+            ''
+          end
+
           def member_name
             name
           end
+
+          def nested_prefix
+            ''
+          end
+
+          def nested_options
+            { :name_prefix => member_name }
+          end
         end
 
         def initialize(*args) #:nodoc:
@@ -543,6 +564,7 @@ module ActionDispatch
 
         def resource(*resources, &block)
           options = resources.extract_options!
+          options = (@scope[:options] || {}).merge(options)
 
           if apply_common_behavior_for(:resource, resources, options, &block)
             return self
@@ -553,17 +575,17 @@ module ActionDispatch
           scope(:path => resource.path, :controller => resource.controller) do
             with_scope_level(:resource, resource) do
 
-              scope(:name_prefix => resource.name.to_s, :as => "") do
-                yield if block_given?
-              end
+              yield if block_given?
 
-              scope(resource.options) do
-                get    :show if resource.actions.include?(:show)
-                post   :create if resource.actions.include?(:create)
-                put    :update if resource.actions.include?(:update)
-                delete :destroy if resource.actions.include?(:destroy)
-                get    :new, :as => resource.name if resource.actions.include?(:new)
-                get    :edit, :as => resource.name if resource.actions.include?(:edit)
+              with_scope_level(:member) do
+                scope(resource.options) do
+                  get    :show if resource.actions.include?(:show)
+                  post   :create if resource.actions.include?(:create)
+                  put    :update if resource.actions.include?(:update)
+                  delete :destroy if resource.actions.include?(:destroy)
+                  get    :new, :as => resource.name if resource.actions.include?(:new)
+                  get    :edit, :as => resource.name if resource.actions.include?(:edit)
+                end
               end
             end
           end
@@ -573,6 +595,7 @@ module ActionDispatch
 
         def resources(*resources, &block)
           options = resources.extract_options!
+          options = (@scope[:options] || {}).merge(options)
 
           if apply_common_behavior_for(:resources, resources, options, &block)
             return self
@@ -621,29 +644,49 @@ module ActionDispatch
         end
 
         def member
-          unless @scope[:scope_level] == :resources
-            raise ArgumentError, "can't use member outside resources scope"
+          unless resource_scope?
+            raise ArgumentError, "can't use member outside resource(s) scope"
           end
 
           with_scope_level(:member) do
-            scope(':id', :name_prefix => parent_resource.member_name, :as => "") do
+            scope(parent_resource.member_prefix, :name_prefix => parent_resource.member_name, :as => "") do
+              yield
+            end
+          end
+        end
+
+        def new
+          unless resource_scope?
+            raise ArgumentError, "can't use new outside resource(s) scope"
+          end
+          
+          with_scope_level(:new) do
+            scope(new_scope_prefix, :name_prefix => parent_resource.member_name, :as => "") do
               yield
             end
           end
         end
 
         def nested
-          unless @scope[:scope_level] == :resources
-            raise ArgumentError, "can't use nested outside resources scope"
+          unless resource_scope?
+            raise ArgumentError, "can't use nested outside resource(s) scope"
           end
 
           with_scope_level(:nested) do
-            scope(parent_resource.id_segment, parent_resource.nested_options) do
+            scope(parent_resource.nested_prefix, parent_resource.nested_options) do
               yield
             end
           end
         end
 
+        def namespace(path)
+          if resource_scope?
+            nested { super }
+          else
+            super
+          end
+        end
+
         def match(*args)
           options = args.extract_options!
 
@@ -670,7 +713,7 @@ module ActionDispatch
                 @scope[:path] = old_path
               end
             else
-              with_exclusive_name_prefix(action) do
+              with_exclusive_name_prefix(action_name_prefix(action, options)) do
                 return match("#{action_path(action, path_names)}(.:format)", options.reverse_merge(:to => action))
               end
             end
@@ -683,15 +726,26 @@ module ActionDispatch
             return collection { match(*args) }
           when :member
             return member { match(*args) }
+          when :new
+            return new { match(*args) }
           end
 
-          if @scope[:scope_level] == :resources
-            raise ArgumentError, "can't define route directly in resources scope"
+          if @scope[:scope_level] == :resource
+            return member { match(*args) }
+          end
+
+          if resource_scope?
+            raise ArgumentError, "can't define route directly in resource(s) scope"
           end
 
           super
         end
 
+        def root(options={})
+          options[:on] ||= :collection if @scope[:scope_level] == :resources
+          super(options)
+        end
+
         protected
           def parent_resource #:nodoc:
             @scope[:scope_level_resource]
@@ -703,6 +757,10 @@ module ActionDispatch
             path_names[name.to_sym] || name.to_s
           end
 
+          def action_name_prefix(action, options = {})
+            (options[:on] == :new || @scope[:scope_level] == :new) ? "#{action}_new" : action
+          end
+
           def apply_common_behavior_for(method, resources, options, &block)
             if resources.length > 1
               resources.each { |r| send(method, r, options, &block) }
@@ -716,7 +774,7 @@ module ActionDispatch
               return true
             end
 
-            if @scope[:scope_level] == :resources
+            if resource_scope?
               nested do
                 send(method, resources.pop, options, &block)
               end
@@ -726,6 +784,14 @@ module ActionDispatch
             false
           end
 
+          def new_scope_prefix
+            @scope[:path_names][:new] || 'new'
+          end
+
+          def resource_scope?
+            [:resource, :resources].include?(@scope[:scope_level])
+          end
+
           def with_exclusive_name_prefix(prefix)
             begin
               old_name_prefix = @scope[:name_prefix]