From 6a4c1fb43d6b34b773a4d2537d0d2b11cca3f812 Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Fri, 29 Apr 2011 22:00:22 -0700 Subject: [PATCH] fix issue with single extensions in public folder --- lib/middleman/builder.rb | 9 +++++---- lib/middleman/version.rb | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/middleman/builder.rb b/lib/middleman/builder.rb index abb7c4cf..2dea246c 100644 --- a/lib/middleman/builder.rb +++ b/lib/middleman/builder.rb @@ -47,11 +47,11 @@ module Middleman end def build_static_files - action Directory.new(self, Middleman::Server.public, Middleman::Server.build_dir, { :force => true }) + action Directory.new(self, Middleman::Server.public, :public, Middleman::Server.build_dir, { :force => true }) end def build_dynamic_files - action Directory.new(self, Middleman::Server.views, Middleman::Server.build_dir, { :force => true }) + action Directory.new(self, Middleman::Server.views, :dynamic, Middleman::Server.build_dir, { :force => true }) end @@hooks = {} @@ -69,7 +69,8 @@ module Middleman class Directory < ::Thor::Actions::EmptyDirectory attr_reader :source - def initialize(base, source, destination=nil, config={}, &block) + def initialize(base, source, mode, destination=nil, config={}, &block) + @mode = mode @source = File.expand_path(base.find_in_source_paths(source.to_s)) @block = block super(base, destination, { :recursive => true }.merge(config)) @@ -104,7 +105,7 @@ module Middleman handled_by_tilt = ::Tilt.mappings.keys.include?(file_extension.gsub(/^\./, "")) if handled_by_tilt || (file_extension == ".js") new_file_extension = (file_extension == ".js") ? ".js" : "" - next if file_source.split('/').last.split('.').length < 3 + next if @mode == :dynamic && file_source.split('/').last.split('.').length < 3 file_destination.gsub!(file_extension, new_file_extension) destination = base.tilt_template(file_source, file_destination, config, &@block) diff --git a/lib/middleman/version.rb b/lib/middleman/version.rb index 8c2d3eb3..6f1d8b7a 100644 --- a/lib/middleman/version.rb +++ b/lib/middleman/version.rb @@ -1,3 +1,3 @@ module Middleman - VERSION = "1.2.3" + VERSION = "1.2.4" end