fix issue with single extensions in public folder

This commit is contained in:
Thomas Reynolds 2011-04-29 22:00:22 -07:00
parent 358752272d
commit 6a4c1fb43d
2 changed files with 6 additions and 5 deletions

View file

@ -47,11 +47,11 @@ module Middleman
end end
def build_static_files 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 end
def build_dynamic_files 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 end
@@hooks = {} @@hooks = {}
@ -69,7 +69,8 @@ module Middleman
class Directory < ::Thor::Actions::EmptyDirectory class Directory < ::Thor::Actions::EmptyDirectory
attr_reader :source 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)) @source = File.expand_path(base.find_in_source_paths(source.to_s))
@block = block @block = block
super(base, destination, { :recursive => true }.merge(config)) super(base, destination, { :recursive => true }.merge(config))
@ -104,7 +105,7 @@ module Middleman
handled_by_tilt = ::Tilt.mappings.keys.include?(file_extension.gsub(/^\./, "")) handled_by_tilt = ::Tilt.mappings.keys.include?(file_extension.gsub(/^\./, ""))
if handled_by_tilt || (file_extension == ".js") if handled_by_tilt || (file_extension == ".js")
new_file_extension = (file_extension == ".js") ? ".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) file_destination.gsub!(file_extension, new_file_extension)
destination = base.tilt_template(file_source, file_destination, config, &@block) destination = base.tilt_template(file_source, file_destination, config, &@block)

View file

@ -1,3 +1,3 @@
module Middleman module Middleman
VERSION = "1.2.3" VERSION = "1.2.4"
end end