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

Make with_layout work with globs/regexes

Browse source
This commit is contained in:
Ben Hollis 2012-03-15 00:31:50 -07:00
parent 5db1a9453a
commit 4a5fededf7
2 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
middleman-core/features/custom_layouts.feature
View file

@ -13,6 +13,12 @@ Feature: Custom layouts
When I go to "/custom-layout.html"
Then I should see "Custom Layout"
Scenario: Using with_layout block with globs
Given "/custom-*" with_layout block has layout "custom"
And the Server is running at "custom-layout-app2"
When I go to "/custom-layout.html"
Then I should see "Custom Layout"
Scenario: Using custom :layout attribute with folders
Given page "/custom-layout-dir/" has layout "custom"
And the Server is running at "custom-layout-app2"

10
middleman-core/lib/middleman-core/core_extensions/routing.rb
View file

@ -45,6 +45,9 @@ module Middleman::CoreExtensions::Routing
def page(url, opts={}, &block)
a_block = block_given? ? block : nil
# Default layout
opts[:layout] = layout if opts[:layout].nil?
# If the url is a regexp
if url.is_a?(Regexp) || url.include?("*")
@ -56,9 +59,6 @@ module Middleman::CoreExtensions::Routing
return
end
# Default layout
opts[:layout] = layout if opts[:layout].nil?
# Normalized path
url = full_path(url)
@ -79,14 +79,10 @@ module Middleman::CoreExtensions::Routing
end
end
# If we have a block or opts
if a_block || !opts.empty?
# Setup a metadata matcher for rendering those options
provides_metadata_for_path url do |url|
{ :options => opts, :blocks => [a_block] }
end
end
end
end
end