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

Merge pull request #488 from bhollis/link_to

Browse source 
Improve link_to so that it can handle a Resource in place of a url
This commit is contained in:
Thomas Reynolds 2012-06-16 19:44:42 -07:00
commit 524fd49c47
2 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
middleman-more/features/helpers_relative_link_to.feature → middleman-more/features/helpers_link_to.feature
View file

@ -1,6 +1,6 @@
Feature: relative_link_to helper Feature: link_to helper
Scenario: relative_link_to produces relative links Scenario: link_to produces relative links
Given a fixture app "indexable-app" Given a fixture app "indexable-app"
And an empty file named "config.rb" And an empty file named "config.rb"
And a file named "source/link_to.html.erb" with: And a file named "source/link_to.html.erb" with:
@ -21,7 +21,7 @@ Feature: relative_link_to helper
Then I should see 'absolute: <a href="../needs_index.html">Needs Index</a>' Then I should see 'absolute: <a href="../needs_index.html">Needs Index</a>'
Then I should see 'relative: <a href="../needs_index.html">Relative</a>' Then I should see 'relative: <a href="../needs_index.html">Relative</a>'
Scenario: relative_link_to produces relative links when :relative_links is set to true Scenario: link_to produces relative links when :relative_links is set to true
Given a fixture app "indexable-app" Given a fixture app "indexable-app"
And a file named "config.rb" with: And a file named "config.rb" with:
""" """
@ -47,7 +47,7 @@ Feature: relative_link_to helper
Then I should see 'absolute: <a href="../needs_index.html">Needs Index</a>' Then I should see 'absolute: <a href="../needs_index.html">Needs Index</a>'
Then I should see 'relative: <a href="../needs_index.html">Relative</a>' Then I should see 'relative: <a href="../needs_index.html">Relative</a>'
Scenario: relative_link_to knows about directory indexes Scenario: link_to knows about directory indexes
Given a fixture app "indexable-app" Given a fixture app "indexable-app"
And a file named "source/link_to.html.erb" with: And a file named "source/link_to.html.erb" with:
""" """
@ -65,4 +65,14 @@ Feature: relative_link_to helper
Then I should see 'relative: <a href="needs_index/">Relative</a>' Then I should see 'relative: <a href="needs_index/">Relative</a>'
When I go to "/link_to/sub/" When I go to "/link_to/sub/"
Then I should see 'absolute: <a href="../needs_index/">Needs Index</a>' Then I should see 'absolute: <a href="../needs_index/">Needs Index</a>'
Then I should see 'relative: <a href="../needs_index/">Relative</a>' Then I should see 'relative: <a href="../needs_index/">Relative</a>'
Scenario: link_to can take a Resource
Given a fixture app "indexable-app"
And a file named "source/link_to.html.erb" with:
"""
<%= link_to "Needs Index", sitemap.find_resource_by_path("/needs_index.html") %>
"""
And the Server is running at "indexable-app"
When I go to "/link_to/"
Then I should see '<a href="/needs_index/">Needs Index</a>'

6
middleman-more/lib/middleman-more/core_extensions/default_helpers.rb
View file

@ -124,8 +124,10 @@ module Middleman
options = args[options_index] || {} options = args[options_index] || {}
relative = options.delete(:relative) relative = options.delete(:relative)
# Handle Resources, which define their own url method
if url.include? '://' if url.respond_to? :url
args[url_arg_index] = url.url
elsif url.include? '://'
raise "Can't use the relative option with an external URL" if relative raise "Can't use the relative option with an external URL" if relative
else else
# Handle relative urls # Handle relative urls