actionpack 3.0.0.beta → 3.0.0.beta2

data/lib/action_dispatch/middleware/show_exceptions.rb

@@ -5,20 +5,6 @@ require 'action_dispatch/http/request'
 module ActionDispatch
   # This middleware rescues any exception returned by the application and renders
   # nice exception pages if it's being rescued locally.
-  #
-  # Every time an exception is caught, a notification is published, becoming a good API
-  # to deal with exceptions. So, if you want send an e-mail through ActionMailer
-  # everytime this notification is published, you just need to do the following:
-  #
-  #   ActiveSupport::Notifications.subscribe "action_dispatch.show_exception" do |name, start, end, instrumentation_id, payload|
-  #     ExceptionNotifier.deliver_exception(start, payload)
-  #   end
-  #
-  # The payload is a hash which has two pairs:
-  #
-  # * :env - Contains the rack env for the given request;
-  # * :exception - The exception raised;
-  #
   class ShowExceptions
     LOCALHOST = ['127.0.0.1', '::1'].freeze
 

data/lib/action_dispatch/middleware/stack.rb

@@ -58,7 +58,7 @@ module ActionDispatch
           if lazy_compare?(@klass) && lazy_compare?(middleware)
             normalize(@klass) == normalize(middleware)
           else
-            klass == ActiveSupport::Inflector.constantize(middleware.to_s)
+            klass.name == middleware.to_s
           end
         end
       end
@@ -122,7 +122,11 @@ module ActionDispatch
       find_all { |middleware| middleware.active? }
     end
 
-    def build(app)
+    def build(app = nil, &blk)
+      app ||= blk
+
+      raise "MiddlewareStack#build requires an app" unless app
+
       active.reverse.inject(app) { |a, e| e.build(a) }
     end
   end

data/lib/action_dispatch/railtie.rb

@@ -3,7 +3,9 @@ require "rails"
 
 module ActionDispatch
   class Railtie < Rails::Railtie
-    railtie_name :action_dispatch
+    config.action_dispatch = ActiveSupport::OrderedOptions.new
+    config.action_dispatch.x_sendfile_header = ""
+    config.action_dispatch.ip_spoofing_check = true
 
     # Prepare dispatcher callbacks and run 'prepare' callbacks
     initializer "action_dispatch.prepare_dispatcher" do |app|

data/lib/action_dispatch/routing.rb

@@ -1,5 +1,6 @@
 require 'active_support/core_ext/object/to_param'
 require 'active_support/core_ext/regexp'
+require 'action_controller/polymorphic_routes'
 
 module ActionDispatch
   # == Routing
@@ -205,6 +206,7 @@ module ActionDispatch
     autoload :Mapper, 'action_dispatch/routing/mapper'
     autoload :Route, 'action_dispatch/routing/route'
     autoload :RouteSet, 'action_dispatch/routing/route_set'
+    autoload :UrlFor, 'action_dispatch/routing/url_for'
 
     SEPARATORS = %w( / . ? )
     HTTP_METHODS = [:get, :head, :post, :put, :delete, :options]

data/lib/action_dispatch/routing/deprecated_mapper.rb

@@ -1,5 +1,32 @@
+require 'active_support/core_ext/object/blank'
+
 module ActionDispatch
   module Routing
+    class RouteSet
+      attr_accessor :controller_namespaces
+
+      CONTROLLER_REGEXP = /[_a-zA-Z0-9]+/
+
+      def controller_constraints
+        @controller_constraints ||= begin
+          namespaces = controller_namespaces + in_memory_controller_namespaces
+          source = namespaces.map { |ns| "#{Regexp.escape(ns)}/#{CONTROLLER_REGEXP.source}" }
+          source << CONTROLLER_REGEXP.source
+          Regexp.compile(source.sort.reverse.join('|'))
+        end
+      end
+
+      def in_memory_controller_namespaces
+        namespaces = Set.new
+        ActionController::Base.subclasses.each do |klass|
+          controller_name = klass.underscore
+          namespaces << controller_name.split('/')[0...-1].join('/')
+        end
+        namespaces.delete('')
+        namespaces
+      end
+    end
+
     # Mapper instances are used to build routes. The object passed to the draw
     # block in config/routes.rb is a Mapper instance.
     #
@@ -244,14 +271,15 @@ module ActionDispatch
         attr_reader :collection_methods, :member_methods, :new_methods
         attr_reader :path_prefix, :name_prefix, :path_segment
         attr_reader :plural, :singular
-        attr_reader :options
+        attr_reader :options, :defaults
 
-        def initialize(entities, options)
+        def initialize(entities, options, defaults)
           @plural   ||= entities
           @singular ||= options[:singular] || plural.to_s.singularize
           @path_segment = options.delete(:as) || @plural
 
           @options = options
+          @defaults = defaults
 
           arrange_actions
           add_default_actions
@@ -280,7 +308,7 @@ module ActionDispatch
 
         def new_path
           new_action   = self.options[:path_names][:new] if self.options[:path_names]
-          new_action ||= ActionController::Base.resources_path_names[:new]
+          new_action ||= self.defaults[:path_names][:new]
           @new_path  ||= "#{path}/#{new_action}"
         end
 
@@ -370,7 +398,7 @@ module ActionDispatch
       end
 
       class SingletonResource < Resource #:nodoc:
-        def initialize(entity, options)
+        def initialize(entity, options, defaults)
           @singular = @plural = entity
           options[:controller] ||= @singular.to_s.pluralize
           super
@@ -717,7 +745,7 @@ module ActionDispatch
 
       private
         def map_resource(entities, options = {}, &block)
-          resource = Resource.new(entities, options)
+          resource = Resource.new(entities, options, :path_names => @set.resources_path_names)
 
           with_options :controller => resource.controller do |map|
             map_associations(resource, options)
@@ -734,7 +762,7 @@ module ActionDispatch
         end
 
         def map_singleton_resource(entities, options = {}, &block)
-          resource = SingletonResource.new(entities, options)
+          resource = SingletonResource.new(entities, options, :path_names => @set.resources_path_names)
 
           with_options :controller => resource.controller do |map|
             map_associations(resource, options)
@@ -826,7 +854,7 @@ module ActionDispatch
             actions.each do |action|
               [method].flatten.each do |m|
                 action_path = resource.options[:path_names][action] if resource.options[:path_names].is_a?(Hash)
-                action_path ||= ActionController::Base.resources_path_names[action] || action
+                action_path ||= @set.resources_path_names[action] || action
 
                 map_resource_routes(map, resource, action, "#{resource.member_path}#{resource.action_separator}#{action_path}", "#{action}_#{resource.shallow_name_prefix}#{resource.singular}", m, { :force_id => true })
               end

data/lib/action_dispatch/routing/mapper.rb

@@ -1,3 +1,6 @@
+require 'active_support/core_ext/hash/except'
+require 'active_support/core_ext/object/blank'
+
 module ActionDispatch
   module Routing
     class Mapper
@@ -30,31 +33,36 @@ module ActionDispatch
       end
 
       class Mapping
+        IGNORE_OPTIONS = [:to, :as, :controller, :action, :via, :on, :constraints, :defaults, :only, :except, :anchor]
+
         def initialize(set, scope, args)
           @set, @scope    = set, scope
           @path, @options = extract_path_and_options(args)
         end
 
         def to_route
-          [ app, conditions, requirements, defaults, @options[:as] ]
+          [ app, conditions, requirements, defaults, @options[:as], @options[:anchor] ]
         end
 
         private
           def extract_path_and_options(args)
             options = args.extract_options!
 
-            case
-            when using_to_shorthand?(args, options)
+            if using_to_shorthand?(args, options)
               path, to = options.find { |name, value| name.is_a?(String) }
               options.merge!(:to => to).delete(path) if path
-            when using_match_shorthand?(args, options)
-              path = args.first
-              options = { :to => path.gsub("/", "#"), :as => path.gsub("/", "_") }
             else
               path = args.first
             end
 
-            [ normalize_path(path), options ]
+            path = normalize_path(path)
+
+            if using_match_shorthand?(path, options)
+              options[:to] ||= path[1..-1].sub(%r{/([^/]*)$}, '#\1')
+              options[:as] ||= path[1..-1].gsub("/", "_")
+            end
+
+            [ path, options ]
           end
 
           # match "account" => "account#index"
@@ -63,14 +71,13 @@ module ActionDispatch
           end
 
           # match "account/overview"
-          def using_match_shorthand?(args, options)
-            args.present? && options.except(:via).empty? && !args.first.include?(':')
+          def using_match_shorthand?(path, options)
+            path && options.except(:via, :anchor, :to, :as).empty? && path =~ %r{^/[\w\/]+$}
           end
 
           def normalize_path(path)
-            path = "#{@scope[:path]}/#{path}"
-            raise ArgumentError, "path is required" if path.empty?
-            Mapper.normalize_path(path)
+            raise ArgumentError, "path is required" if @scope[:path].blank? && path.blank?
+            Mapper.normalize_path("#{@scope[:path]}/#{path}")
           end
 
           def app
@@ -85,15 +92,22 @@ module ActionDispatch
           end
 
           def requirements
-            @requirements ||= returning(@options[:constraints] || {}) do |requirements|
+            @requirements ||= (@options[:constraints] || {}).tap do |requirements|
               requirements.reverse_merge!(@scope[:constraints]) if @scope[:constraints]
               @options.each { |k, v| requirements[k] = v if v.is_a?(Regexp) }
-              requirements[:controller] ||= @set.controller_constraints
             end
           end
 
           def defaults
-            @defaults ||= if to.respond_to?(:call)
+            @defaults ||= (@options[:defaults] || {}).tap do |defaults|
+              defaults.merge!(default_controller_and_action)
+              defaults.reverse_merge!(@scope[:defaults]) if @scope[:defaults]
+              @options.each { |k, v| defaults[k] = v unless v.is_a?(Regexp) || IGNORE_OPTIONS.include?(k.to_sym) }
+            end
+          end
+
+          def default_controller_and_action
+            if to.respond_to?(:call)
               { }
             else
               defaults = case to
@@ -143,8 +157,8 @@ module ActionDispatch
 
           def segment_keys
             @segment_keys ||= Rack::Mount::RegexpWithNamedGroups.new(
-                Rack::Mount::Strexp.compile(@path, requirements, SEPARATORS)
-              ).names
+              Rack::Mount::Strexp.compile(@path, requirements, SEPARATORS)
+            ).names
           end
 
           def to
@@ -175,9 +189,15 @@ module ActionDispatch
         end
 
         def match(*args)
-          @set.add_route(*Mapping.new(@set, @scope, args).to_route)
+          mapping = Mapping.new(@set, @scope, args).to_route
+          @set.add_route(*mapping)
           self
         end
+
+        def default_url_options=(options)
+          @set.default_url_options = options
+        end
+        alias_method :default_url_options, :default_url_options=
       end
 
       module HttpHelpers
@@ -239,6 +259,7 @@ module ActionDispatch
 
         def scope(*args)
           options = args.extract_options!
+          options = options.dup
 
           case args.first
           when String
@@ -283,13 +304,17 @@ module ActionDispatch
         end
 
         def namespace(path)
-          scope(path.to_s, :name_prefix => path.to_s, :namespace => path.to_s) { yield }
+          scope(path.to_s, :name_prefix => path.to_s, :controller_namespace => path.to_s) { yield }
         end
 
         def constraints(constraints = {})
           scope(:constraints => constraints) { yield }
         end
 
+        def defaults(defaults = {})
+          scope(:defaults => defaults) { yield }
+        end
+
         def match(*args)
           options = args.extract_options!
 
@@ -318,12 +343,12 @@ module ActionDispatch
             parent ? "#{parent}_#{child}" : child
           end
 
-          def merge_namespace_scope(parent, child)
+          def merge_controller_namespace_scope(parent, child)
             parent ? "#{parent}/#{child}" : child
           end
 
           def merge_controller_scope(parent, child)
-            @scope[:namespace] ? "#{@scope[:namespace]}/#{child}" : child
+            @scope[:controller_namespace] ? "#{@scope[:controller_namespace]}/#{child}" : child
           end
 
           def merge_resources_path_names_scope(parent, child)
@@ -334,6 +359,10 @@ module ActionDispatch
             merge_options_scope(parent, child)
           end
 
+          def merge_defaults_scope(parent, child)
+            merge_options_scope(parent, child)
+          end
+
           def merge_blocks_scope(parent, child)
             (parent || []) + [child]
           end
@@ -354,11 +383,11 @@ module ActionDispatch
           attr_reader :plural, :singular, :options
 
           def initialize(entities, options = {})
-            entities = entities.to_s
+            @name = entities.to_s
             @options = options
 
-            @plural   = entities.pluralize
-            @singular = entities.singularize
+            @plural   = @name.pluralize
+            @singular = @name.singularize
           end
 
           def default_actions
@@ -367,9 +396,9 @@ module ActionDispatch
 
           def actions
             if only = options[:only]
-              only.map(&:to_sym)
+              Array(only).map(&:to_sym)
             elsif except = options[:except]
-              default_actions - except.map(&:to_sym)
+              default_actions - Array(except).map(&:to_sym)
             else
               default_actions
             end
@@ -385,7 +414,7 @@ module ActionDispatch
           end
 
           def name
-            options[:as] || plural
+            options[:as] || @name
           end
 
           def controller
@@ -396,8 +425,13 @@ module ActionDispatch
             singular
           end
 
+          # Checks for uncountable plurals, and appends "_index" if they're.
           def collection_name
-            plural
+            uncountable? ? "#{plural}_index" : plural
+          end
+
+          def uncountable?
+            singular == plural
           end
 
           def name_for_action(action)
@@ -412,6 +446,32 @@ module ActionDispatch
           def id_segment
             ":#{singular}_id"
           end
+
+          def constraints
+            options[:constraints] || {}
+          end
+
+          def id_constraint?
+            options[:id] && options[:id].is_a?(Regexp) || constraints[:id] && constraints[:id].is_a?(Regexp)
+          end
+
+          def id_constraint
+            options[:id] || constraints[:id]
+          end
+
+          def collection_options
+            (options || {}).dup.tap do |options|
+              options.delete(:id)
+              options[:constraints] = options[:constraints].dup if options[:constraints]
+              options[:constraints].delete(:id) if options[:constraints].is_a?(Hash)
+            end
+          end
+
+          def nested_options
+            options = { :name_prefix => member_name }
+            options["#{singular}_id".to_sym] = id_constraint if id_constraint?
+            options
+          end
         end
 
         class SingletonResource < Resource #:nodoc:
@@ -430,8 +490,8 @@ module ActionDispatch
             end
           end
 
-          def name
-            options[:as] || singular
+          def member_name
+            name
           end
         end
 
@@ -443,7 +503,7 @@ module ActionDispatch
         def resource(*resources, &block)
           options = resources.extract_options!
 
-          if verify_common_behavior_for(:resource, resources, options, &block)
+          if apply_common_behavior_for(:resource, resources, options, &block)
             return self
           end
 
@@ -451,14 +511,19 @@ module ActionDispatch
 
           scope(:path => resource.name.to_s, :controller => resource.controller) do
             with_scope_level(:resource, resource) do
-              yield if block_given?
 
-              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.singular if resource.actions.include?(:new)
-              get    :edit, :as => resource.singular if resource.actions.include?(:edit)
+              scope(:name_prefix => resource.name.to_s, :as => "") do
+                yield if block_given?
+              end
+
+              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
 
@@ -468,7 +533,7 @@ module ActionDispatch
         def resources(*resources, &block)
           options = resources.extract_options!
 
-          if verify_common_behavior_for(:resources, resources, options, &block)
+          if apply_common_behavior_for(:resources, resources, options, &block)
             return self
           end
 
@@ -479,17 +544,21 @@ module ActionDispatch
               yield if block_given?
 
               with_scope_level(:collection) do
-                get  :index if resource.actions.include?(:index)
-                post :create if resource.actions.include?(:create)
-                get  :new, :as => resource.singular if resource.actions.include?(:new)
+                scope(resource.collection_options) do
+                  get  :index if resource.actions.include?(:index)
+                  post :create if resource.actions.include?(:create)
+                  get  :new, :as => resource.singular if resource.actions.include?(:new)
+                end
               end
 
               with_scope_level(:member) do
                 scope(':id') do
-                  get    :show if resource.actions.include?(:show)
-                  put    :update if resource.actions.include?(:update)
-                  delete :destroy if resource.actions.include?(:destroy)
-                  get    :edit, :as => resource.singular if resource.actions.include?(:edit)
+                  scope(resource.options) do
+                    get    :show if resource.actions.include?(:show)
+                    put    :update if resource.actions.include?(:update)
+                    delete :destroy if resource.actions.include?(:destroy)
+                    get    :edit, :as => resource.singular if resource.actions.include?(:edit)
+                  end
                 end
               end
             end
@@ -528,15 +597,32 @@ module ActionDispatch
           end
 
           with_scope_level(:nested) do
-            scope(parent_resource.id_segment, :name_prefix => parent_resource.member_name) do
+            scope(parent_resource.id_segment, parent_resource.nested_options) do
               yield
             end
           end
         end
 
+        def mount(app, options = nil)
+          if options
+            path = options.delete(:at)
+          else
+            options = app
+            app, path = options.find { |k, v| k.respond_to?(:call) }
+            options.delete(app) if app
+          end
+
+          raise "A rack application must be specified" unless path
+
+          match(path, options.merge(:to => app, :anchor => false))
+          self
+        end
+
         def match(*args)
           options = args.extract_options!
 
+          options[:anchor] = true unless options.key?(:anchor)
+
           if args.length > 1
             args.each { |path| match(path, options) }
             return self
@@ -591,7 +677,7 @@ module ActionDispatch
             path_names[name.to_sym] || name.to_s
           end
 
-          def verify_common_behavior_for(method, resources, options, &block)
+          def apply_common_behavior_for(method, resources, options, &block)
             if resources.length > 1
               resources.each { |r| send(method, r, options, &block) }
               return true