deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'v3-stable'

Browse source
This commit is contained in:
Thomas Reynolds 2014-07-20 13:54:45 -07:00
parent debf3c704b 15d6210df8
commit 9087da05d5
5 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
middleman-core/features/helpers_auto_javascript_include_tag.feature
View file

@ -6,6 +6,11 @@ Feature: Built-in auto_javascript_include_tag view helper
When I go to "/auto-js.html" When I go to "/auto-js.html"
Then I should see "javascripts/auto-js.js" Then I should see "javascripts/auto-js.js"
Scenario: Viewing the root path (directory index)
Given the Server is running at "auto-js-directory-index-app"
When I go to "/auto-js/index.html"
Then I should see "javascripts/auto-js.js"
Scenario: Viewing the root path (build mode) Scenario: Viewing the root path (build mode)
Given a successfully built app at "auto-js-app" Given a successfully built app at "auto-js-app"
When I cd to "build" When I cd to "build"

1
middleman-core/fixtures/auto-js-directory-index-app/config.rb Normal file
View file

@ -0,0 +1 @@
activate :directory_indexes

1
middleman-core/fixtures/auto-js-directory-index-app/source/auto-js.html.erb Executable file
View file

@ -0,0 +1 @@
<%= auto_javascript_include_tag %>

1
middleman-core/fixtures/auto-js-directory-index-app/source/javascripts/auto-js.js Normal file
View file

@ -0,0 +1 @@

2
middleman-core/lib/middleman-core/core_extensions/default_helpers.rb
View file

@ -122,7 +122,7 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
# If the basename of the request as no extension, assume we are serving a # If the basename of the request as no extension, assume we are serving a
# directory and join index_file to the path. # directory and join index_file to the path.
path = File.join(asset_dir, current_path) path = File.join(asset_dir, current_resource.path)
path = path.sub(/#{Regexp.escape(File.extname(path))}$/, ".#{asset_ext}") path = path.sub(/#{Regexp.escape(File.extname(path))}$/, ".#{asset_ext}")
yield path if sitemap.find_resource_by_path(path) yield path if sitemap.find_resource_by_path(path)