public
Fork of rails/rails
Description: Ruby on Rails
Homepage: http://rubyonrails.org
Clone URL: git://github.com/josh/rails.git
Readable

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/stable@4748 
5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Nicholas Seckar (author)
Thu Aug 10 09:08:28 -0700 2006
commit  94e1350667eb666eda63341b539d466e4b0efc3d
tree    89875d30d4002b90b07dfc0aeb4c1f570e256dd6
parent  ce692cdf4870537c3ad691ebe2385f77ec399137
...
219
220
221
222
223
224
225
226
227
228
...
232
233
234
235
236
237
238
...
273
274
275
276
 
 
277
278
279
...
219
220
221
 
 
 
 
222
223
224
...
228
229
230
 
231
232
233
...
268
269
270
 
271
272
273
274
275
0
@@ -219,10 +219,6 @@ module ActionController
0
           g.result :controller, expr, true
0
         end
0
 
0
- def file_kinds(kind)
0
- ((@file_kinds ||= [:components]) << kind).uniq! || @file_kinds
0
- end
0
-
0
         def traverse_to_controller(segments, start_at = 0)
0
           mod = ::Object
0
           length = segments.length
0
@@ -232,7 +228,6 @@ module ActionController
0
             return nil unless /\A[A-Za-z][A-Za-z\d_]*\Z/ =~ (segment = segments[index])
0
             index += 1
0
             
0
- file_kinds :app
0
             mod_name = segment.camelize
0
             controller_name = "#{mod_name}Controller"
0
             path_suffix = File.join(segments[start_at..(index - 1)])
0
@@ -273,7 +268,8 @@ module ActionController
0
             $LOAD_PATH.select do |base|
0
               base = File.expand_path(base)
0
               extended_root = File.expand_path(RAILS_ROOT)
0
- base.match(/\A#{Regexp.escape(extended_root)}\/*(#{file_kinds(:lib) * '|'})\/[a-z]/) || base =~ %r{rails-[\d.]+/builtin}
0
+ # Exclude all paths that are not nested within app, lib, or components.
0
+ base.match(/\A#{Regexp.escape(extended_root)}\/*(app|lib|components)\/[a-z]/) || base =~ %r{rails-[\d.]+/builtin}
0
             end
0
           else
0
             $LOAD_PATH

Comments

    No one has commented yet.