aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/routing.rb
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2006-07-31 18:59:58 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2006-07-31 18:59:58 +0000
commit865b175765edf6138deb6f10ae3280ddea4cc7fd (patch)
tree240d292136fbd7dc82b3e3652e58ff870f9668f1 /actionpack/lib/action_controller/routing.rb
parentffaecb792e8f23efba513ffd8655f7832ba67b89 (diff)
downloadrails-865b175765edf6138deb6f10ae3280ddea4cc7fd.tar.gz
rails-865b175765edf6138deb6f10ae3280ddea4cc7fd.tar.bz2
rails-865b175765edf6138deb6f10ae3280ddea4cc7fd.zip
Added map.resources from the Simply Restful plugin (backwards incompatible with the plugin!) [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4637 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/routing.rb')
-rw-r--r--actionpack/lib/action_controller/routing.rb9
1 files changed, 1 insertions, 8 deletions
diff --git a/actionpack/lib/action_controller/routing.rb b/actionpack/lib/action_controller/routing.rb
index 835758675e..7ca773469c 100644
--- a/actionpack/lib/action_controller/routing.rb
+++ b/actionpack/lib/action_controller/routing.rb
@@ -58,7 +58,7 @@ module ActionController
use_controllers! nil
end
- def normalize_paths(paths=$LOAD_PATH)
+ def normalize_paths(paths = $LOAD_PATH)
# do the hokey-pokey of path normalization...
paths = paths.collect do |path|
path = path.
@@ -351,7 +351,6 @@ module ActionController
end
protected
-
def requirement_for(key)
return requirements[key] if requirements.key? key
segments.each do |segment|
@@ -415,7 +414,6 @@ module ActionController
def optionality_implied?
false
end
-
end
class StaticSegment < Segment
@@ -450,11 +448,9 @@ module ActionController
def to_s
value
end
-
end
class DividerSegment < StaticSegment
-
def initialize(value = nil)
super(value)
self.raw = true
@@ -464,7 +460,6 @@ module ActionController
def optionality_implied?
true
end
-
end
class DynamicSegment < Segment
@@ -760,7 +755,6 @@ module ActionController
end
class RouteSet
-
# Mapper instances are used to build routes. The object passed to the draw
# block in config/routes.rb is a Mapper instance.
#
@@ -839,7 +833,6 @@ module ActionController
end
private
-
def url_helper_name(name, kind = :url)
:"#{name}_#{kind}"
end