diff options
author | Emilio Tagua <miloops@gmail.com> | 2009-06-24 16:30:27 -0300 |
---|---|---|
committer | Emilio Tagua <miloops@gmail.com> | 2009-06-24 16:30:27 -0300 |
commit | 50f73bd39c729b4ba4b5215b608e5767ab0aa7a1 (patch) | |
tree | fdbf3c3955cae33bef1095fff776f1e8a65f6294 /actionpack/test | |
parent | 0002fd4ab6604d8c8e6171da9b7e4764e279ec9d (diff) | |
parent | 1b844e4bf4462609c6f4f58950ca05cec5cb3929 (diff) | |
download | rails-50f73bd39c729b4ba4b5215b608e5767ab0aa7a1.tar.gz rails-50f73bd39c729b4ba4b5215b608e5767ab0aa7a1.tar.bz2 rails-50f73bd39c729b4ba4b5215b608e5767ab0aa7a1.zip |
Merge commit 'rails/master'
Diffstat (limited to 'actionpack/test')
-rw-r--r-- | actionpack/test/lib/fixture_template.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/test/lib/fixture_template.rb b/actionpack/test/lib/fixture_template.rb index 5cf414a1c6..ee526b5de5 100644 --- a/actionpack/test/lib/fixture_template.rb +++ b/actionpack/test/lib/fixture_template.rb @@ -12,7 +12,7 @@ module ActionView #:nodoc: @hash.select { |k,v| k =~ regexp }.each do |path, source| templates << Template.new(source, path, *path_to_details(path)) end - templates + templates.sort_by {|t| -t.details.values.compact.size } end end end @@ -44,7 +44,7 @@ module ActionView #:nodoc: k == :formats ? formats_regexp : '' end end - + %r'^#{Regexp.escape(path)}#{extensions}#{handler_regexp}$' end @@ -52,7 +52,7 @@ module ActionView #:nodoc: # :api: plugin def path_to_details(path) # [:erb, :format => :html, :locale => :en, :partial => true/false] - if m = path.match(%r'(_)?[\w-]+(\.[\w-]+)*\.(\w+)$') + if m = path.match(%r'(_)?[\w-]+((?:\.[\w-]+)*)\.(\w+)$') partial = m[1] == '_' details = (m[2]||"").split('.').reject { |e| e.empty? } handler = Template.handler_class_for_extension(m[3]) |