Merge pull request #530 from rumpuslabs/trailing_slash

Add trailing_slash option for prettier urls
This commit is contained in:
Thomas Reynolds 2012-07-13 09:06:14 -07:00
commit 9371eb2057
8 changed files with 60 additions and 5 deletions

View file

@ -0,0 +1,40 @@
Feature: Strip the index_file from urls
Scenario: Default behaviour, strip with trailing slash
Given the Server is running at "strip-url-app"
When I go to "/"
Then I should see "URL: '/'"
When I go to "/index.html"
Then I should see "URL: '/'"
When I go to "/other.html"
Then I should see "URL: '/other.html'"
When I go to "/subdir/index.html"
Then I should see "URL: '/subdir/'"
Scenario: Trailing slash off
Given a fixture app "strip-url-app"
And a file named "config.rb" with:
"""
set :trailing_slash, false
"""
And the Server is running
When I go to "/"
Then I should see "URL: '/'"
When I go to "/other.html"
Then I should see "URL: '/other.html'"
When I go to "/subdir/index.html"
Then I should see "URL: '/subdir'"
Scenario: Strip index off
Given a fixture app "strip-url-app"
And a file named "config.rb" with:
"""
set :strip_index_file, false
"""
And the Server is running
When I go to "/"
Then I should see "URL: '/index.html'"
When I go to "/other.html"
Then I should see "URL: '/other.html'"
When I go to "/subdir/index.html"
Then I should see "URL: '/subdir/index.html'"

View file

@ -0,0 +1 @@
URL: '<%= current_page.url %>'

View file

@ -0,0 +1 @@
URL: '<%= current_page.url %>'

View file

@ -0,0 +1 @@
URL: '<%= current_page.url %>'

View file

@ -93,6 +93,14 @@ module Middleman
# @return [String] # @return [String]
set :index_file, "index.html" set :index_file, "index.html"
# Whether to strip the index file name off links to directory indexes
# @return [Boolean]
set :strip_index_file, true
# Whether to include a trailing slash when stripping the index file
# @return [Boolean]
set :trailing_slash, true
# Location of javascripts within source. # Location of javascripts within source.
# @return [String] # @return [String]
set :js_dir, "javascripts" set :js_dir, "javascripts"

View file

@ -141,8 +141,12 @@ module Middleman
# just foo. Best for linking. # just foo. Best for linking.
# @return [String] # @return [String]
def url def url
File.join(app.respond_to?(:http_prefix) ? app.http_prefix : '/', url_path = destination_path
destination_path.sub(/\/#{Regexp.escape(app.index_file)}$/, '/')) if app.strip_index_file
url_path = url_path.sub(/(^|\/)#{Regexp.escape(app.index_file)}$/,
app.trailing_slash ? '/' : '')
end
File.join(app.respond_to?(:http_prefix) ? app.http_prefix : '/', url_path)
end end
end end
end end

View file

@ -34,8 +34,8 @@ module Middleman
resources.each do |resource| resources.each do |resource|
# Check if it would be pointless to reroute # Check if it would be pointless to reroute
next if resource.path == index_file || next if resource.destination_path == index_file ||
resource.path.end_with?(new_index_path) || resource.destination_path.end_with?(new_index_path) ||
File.extname(index_file) != resource.ext File.extname(index_file) != resource.ext
# Check if frontmatter turns directory_index off # Check if frontmatter turns directory_index off
@ -53,4 +53,4 @@ module Middleman
end end
end end
end end
end end