middleman 1.1.5 → 1.1.6

data/features/page_alias_and_layouts.feature

@@ -9,4 +9,31 @@ Feature: Custom layouts
   Scenario: Using with_layout block
     Given "/custom-layout.html" with_layout block has layout "custom"
     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"
+    When I go to "/custom-layout-dir"
+    Then I should see "Custom Layout"
+    When I go to "/custom-layout-dir/"
+    Then I should see "Custom Layout"
+    When I go to "/custom-layout-dir/index.html"
+    Then I should see "Custom Layout"
+    
+  Scenario: Using custom :layout attribute with folders
+    Given page "/custom-layout-dir" has layout "custom"
+    When I go to "/custom-layout-dir"
+    Then I should see "Custom Layout"
+    When I go to "/custom-layout-dir/"
+    Then I should see "Custom Layout"
+    When I go to "/custom-layout-dir/index.html"
+    Then I should see "Custom Layout"
+    
+  Scenario: Using custom :layout attribute with folders
+    Given page "/custom-layout-dir/index.html" has layout "custom"
+    When I go to "/custom-layout-dir"
+    Then I should see "Custom Layout"
+    When I go to "/custom-layout-dir/"
+    Then I should see "Custom Layout"
+    When I go to "/custom-layout-dir/index.html"
     Then I should see "Custom Layout"

data/fixtures/test-app/views/custom-layout-dir/index.html.haml

@@ -0,0 +1 @@
+%h1 Welcome

data/lib/middleman/server.rb

@@ -101,12 +101,20 @@ module Middleman
     # page "/about.html", :layout => false
     # page "/", :layout => :homepage_layout
     def self.page(url, options={}, &block)
-      url << settings.index_file if url.match(%r{/$})
+      url = url.gsub(%r{#{settings.index_file}$}, "")
+      url = url.gsub(%r{(\/)$}, "") if url.length > 1
+      
+      paths = [url]
+      paths << "#{url}/" if url.length > 1 && url.split("/").last.split('.').length <= 1
+      paths << "/#{path_to_index(url)}"
   
       options[:layout] = current_layout if options[:layout].nil?
-      get(url) do
-        return yield if block_given?
-        process_request(options)
+
+      paths.each do |p|
+        get(p) do
+          return yield if block_given?
+          process_request(options)
+        end
       end
     end
 
@@ -116,15 +124,18 @@ module Middleman
     end
     
   private
-    # Internal method to look for templates and evaluate them if found
-    def process_request(options={})
-      # Normalize the path and add index if we're looking at a directory
-      path = request.path
+    def self.path_to_index(path)
       parts = path ? path.split('/') : []
       if parts.last.nil? || parts.last.split('.').length == 1
         path = File.join(path, settings.index_file) 
       end
-      path.gsub!(%r{^/}, '')
+      path.gsub(%r{^/}, '')
+    end
+  
+    # Internal method to look for templates and evaluate them if found
+    def process_request(options={})
+      # Normalize the path and add index if we're looking at a directory
+      path = self.class.path_to_index(request.path)
       
       static_path = File.join(Middleman::Server.public, path)
       # if File.exists? static_path

data/lib/middleman/version.rb

@@ -1,3 +1,3 @@
 module Middleman
-  VERSION = "1.1.5"
+  VERSION = "1.1.6"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: middleman
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 1
   - 1
-  - 5
-  version: 1.1.5
+  - 6
+  version: 1.1.6
 platform: ruby
 authors: 
 - Thomas Reynolds
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-20 00:00:00 -07:00
+date: 2011-04-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -393,6 +393,7 @@ files:
 - fixtures/test-app/views/auto-css.html.haml
 - fixtures/test-app/views/auto-image-sizes.html.haml
 - fixtures/test-app/views/cache-buster.html.haml
+- fixtures/test-app/views/custom-layout-dir/index.html.haml
 - fixtures/test-app/views/custom-layout.html.haml
 - fixtures/test-app/views/index.html.haml
 - fixtures/test-app/views/inline-css.html.haml
@@ -528,6 +529,7 @@ test_files:
 - fixtures/test-app/views/auto-css.html.haml
 - fixtures/test-app/views/auto-image-sizes.html.haml
 - fixtures/test-app/views/cache-buster.html.haml
+- fixtures/test-app/views/custom-layout-dir/index.html.haml
 - fixtures/test-app/views/custom-layout.html.haml
 - fixtures/test-app/views/index.html.haml
 - fixtures/test-app/views/inline-css.html.haml