Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Avoid using Pathname on Resolver and AS::Dependencies.

  • Loading branch information...
commit 69abbe893413c99808c8cebd2f1d468c7921c573 1 parent 6f83a50
@josevalim josevalim authored
View
2  actionpack/lib/action_view/template/resolver.rb
@@ -99,7 +99,7 @@ class FileSystemResolver < PathResolver
def initialize(path)
raise ArgumentError, "path already is a Resolver class" if path.is_a?(Resolver)
super()
- @path = Pathname.new(path).expand_path
+ @path = File.expand_path(path)
end
def eql?(resolver)
View
21 activesupport/lib/active_support/dependencies.rb
@@ -353,14 +353,23 @@ def local_const_defined?(mod, const) #:nodoc:
# Given +path+, a filesystem path to a ruby file, return an array of constant
# paths which would cause Dependencies to attempt to load this file.
def loadable_constants_for_path(path, bases = autoload_paths)
- expanded_path = Pathname.new(path[/\A(.*?)(\.rb)?\Z/, 1]).expand_path
+ path = $1 if path =~ /\A(.*)\.rb\Z/
+ expanded_path = File.expand_path(path)
+ paths = []
+
+ bases.each do |root|
+ expanded_root = File.expand_path(root)
+ next unless %r{\A#{Regexp.escape(expanded_root)}(/|\\)} =~ expanded_path
+
+ nesting = expanded_path[(expanded_root.size)..-1]
+ nesting = nesting[1..-1] if nesting && nesting[0] == ?/
+ next if nesting.blank?
- bases.inject([]) do |paths, root|
- expanded_root = Pathname.new(root).expand_path
- nesting = expanded_path.relative_path_from(expanded_root).to_s
- next paths if nesting =~ /\.\./
paths << nesting.camelize
- end.uniq
+ end
+
+ paths.uniq!
+ paths
end
# Search for a file in autoload_paths matching the provided suffix.

4 comments on commit 69abbe8

@neerajdotname
Collaborator

any particular reason for not using Pathname

@josevalim
Owner

Terribly slow. If you want an alternative implementation: http://github.com/stouset/pathname3

@josevalim
Owner

Note: This commit yielded a 50% speed improvement in development for a mid-sized Rails app.

@neerajdotname
Collaborator

that's a big gain for a relatively small line of code change

Please sign in to comment.
Something went wrong with that request. Please try again.