From 7baf45cc1396f223108ff80fce059c7955e0e3f8 Mon Sep 17 00:00:00 2001 From: Joe Cheng Date: Fri, 26 Mar 2010 00:43:46 -0700 Subject: [PATCH] Implement "index.php.haml => index.php" --- lib/staticmatic/mixins/build.rb | 2 +- lib/staticmatic/mixins/render.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/staticmatic/mixins/build.rb b/lib/staticmatic/mixins/build.rb index c30e1c8..1928d2f 100644 --- a/lib/staticmatic/mixins/build.rb +++ b/lib/staticmatic/mixins/build.rb @@ -38,7 +38,7 @@ module StaticMatic::BuildMixin end def generate_site_file(filename, extension, content) - path = File.join(@site_dir,"#{filename}.#{extension}") + path = File.join(@site_dir, File.extname(filename).empty? ? "#{filename}.#{extension}" : filename) FileUtils.mkdir_p(File.dirname(path)) File.open(path, 'w+') do |f| f << content diff --git a/lib/staticmatic/mixins/render.rb b/lib/staticmatic/mixins/render.rb index 86250c6..16c0ae4 100644 --- a/lib/staticmatic/mixins/render.rb +++ b/lib/staticmatic/mixins/render.rb @@ -31,7 +31,7 @@ module StaticMatic::RenderMixin end def generate_html_with_layout(source, source_dir = '') - @current_page = File.join(source_dir, "#{source}.html") + @current_page = File.join(source_dir, File.extname(source).empty? ? "#{source}.html" : source) @current_file_stack.unshift(File.join(source_dir, "#{source}.haml")) begin template_content = generate_html(source, source_dir) -- 1.6.4.4