Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

rack-mount 0.4

  • Loading branch information...
commit 673fa7f06608151aa4a5e6e754894978b4000b63 1 parent f53c363
Joshua Peek josh authored
2  actionpack/actionpack.gemspec
View
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
s.add_dependency('activemodel', '= 3.0.pre')
s.add_dependency('rack', '~> 1.1.0')
s.add_dependency('rack-test', '~> 0.5.0')
- s.add_dependency('rack-mount', '~> 0.3.3')
+ s.add_dependency('rack-mount', '~> 0.4.0')
s.add_dependency('erubis', '~> 2.6.5')
s.require_path = 'lib'
38 actionpack/lib/action_dispatch/routing/mapper.rb
View
@@ -19,9 +19,9 @@ def call(env)
@constraints.each { |constraint|
if constraint.respond_to?(:matches?) && !constraint.matches?(req)
- return [ 417, {}, [] ]
+ return [ 404, {'X-Cascade' => 'pass'}, [] ]
elsif constraint.respond_to?(:call) && !constraint.call(req)
- return [ 417, {}, [] ]
+ return [ 404, {'X-Cascade' => 'pass'}, [] ]
end
}
@@ -34,11 +34,11 @@ 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] ]
end
-
+
private
def extract_path_and_options(args)
options = args.extract_options!
@@ -49,18 +49,18 @@ def extract_path_and_options(args)
else
path = args.first
end
-
+
[ normalize_path(path), options ]
end
def normalize_path(path)
path = nil if path == ""
path = "#{@scope[:path]}#{path}" if @scope[:path]
- path = Rack::Mount::Utils.normalize_path(path) if path
+ path = Rack::Mount::Utils.normalize_path(path) if path
raise ArgumentError, "path is required" unless path
-
- path
+
+ path
end
@@ -74,7 +74,7 @@ def app
def conditions
{ :path_info => @path }.merge(constraints).merge(request_method_condition)
end
-
+
def requirements
@requirements ||= returning(@options[:constraints] || {}) do |requirements|
requirements.reverse_merge!(@scope[:constraints]) if @scope[:constraints]
@@ -96,30 +96,30 @@ def defaults
else
default_controller ? { :controller => default_controller } : {}
end
-
+
if defaults[:controller].blank? && segment_keys.exclude?("controller")
raise ArgumentError, "missing :controller"
end
-
+
if defaults[:action].blank? && segment_keys.exclude?("action")
raise ArgumentError, "missing :action"
end
-
+
defaults
end
end
-
+
def blocks
if @options[:constraints].present? && !@options[:constraints].is_a?(Hash)
block = @options[:constraints]
else
block = nil
end
-
- ((@scope[:blocks] || []) + [ block ]).compact
+
+ ((@scope[:blocks] || []) + [ block ]).compact
end
-
+
def constraints
@constraints ||= requirements.reject { |k, v| segment_keys.include?(k.to_s) || k == :controller }
end
@@ -132,7 +132,7 @@ def request_method_condition
{ }
end
end
-
+
def segment_keys
@segment_keys ||= Rack::Mount::RegexpWithNamedGroups.new(
Rack::Mount::Strexp.compile(@path, requirements, SEPARATORS)
@@ -142,7 +142,7 @@ def segment_keys
def to
@options[:to]
end
-
+
def default_controller
@scope[:controller].to_s if @scope[:controller]
end
@@ -520,4 +520,4 @@ def with_scope_level(kind, resource = parent_resource)
include Resources
end
end
-end
+end
2  actionpack/lib/action_dispatch/routing/route_set.rb
View
@@ -21,7 +21,7 @@ def call(env)
prepare_params!(params)
unless controller = controller(params)
- return [417, {}, []]
+ return [404, {'X-Cascade' => 'pass'}, []]
end
controller.action(params[:action]).call(env)
Please sign in to comment.
Something went wrong with that request. Please try again.