Skip to content

Commit 8ad2f39

Browse files
authored
Merge pull request #336 from rails/schneems/fix-asset-lookup-perf-3.x
Backport #331 - Asset lookup 4x Faster in large directories
2 parents 697269c + f2e3623 commit 8ad2f39

File tree

4 files changed

+12
-0
lines changed

4 files changed

+12
-0
lines changed

.travis.yml

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ rvm:
88
- 2.0.0
99
- 2.1
1010
- 2.2
11+
- 2.3.1
1112

1213
matrix:
1314
include:

Gemfile

+8
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,10 @@
11
source "https://rubygems.org"
22
gemspec
3+
4+
if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2.2")
5+
gem 'rack', '< 2.0'
6+
end
7+
8+
if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.0")
9+
gem 'json', '< 2.0'
10+
end

gemfiles/Gemfile-1.9

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
source "https://rubygems.org"
22
gemspec path: '..'
33
gem 'sass', '< 3.4'
4+
gem 'rack', '< 2.0'
5+
gem 'json', '< 2.0'

lib/sprockets/resolve.rb

+1
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,7 @@ def dirname_matches(dirname, basename)
178178
candidates = []
179179
entries = self.entries(dirname)
180180
entries.each do |entry|
181+
next unless File.basename(entry).start_with?(basename)
181182
name, type, _, _ = parse_path_extnames(entry)
182183
if basename == name
183184
candidates << [File.join(dirname, entry), type]

0 commit comments

Comments
 (0)