@@ -11,9 +11,8 @@ module StaticMatic path_info = request.params[Mongrel::Const::PATH_INFO].chomp("/") get_or_head = %w(GET HEAD).include? request.params[Mongrel::Const::REQUEST_METHOD] - if get_or_head and @files.can_serve(path_info) - @files.process(request, response) # try to serve static file from site dir - elsif @staticmatic.can_render? path_info + + if @staticmatic.can_render? path_info file_ext = File.extname(path_info).gsub(/^\./, '') response.start(200) do |head, out| output = if (file_ext == "css") @@ -30,6 +29,8 @@ module StaticMatic head[Mongrel::Const::CONTENT_TYPE] = Mongrel::DirHandler::MIME_TYPES[".#{file_ext}"] || "application/octet-stream" out.write(output || "") end + elsif get_or_head && @files.can_serve(path_info) + @files.process(request, response) # try to serve static file from site dir end end lib/staticmatic/previewer.rb @@ -1,6 +1,6 @@ Gem::Specification.new do |s| s.name = "staticmatic" - s.version = "2.1.2" + s.version = "2.1.3" s.date = "2008-09-11" s.authors = ["Stephen Bartholomew", "Thomas Reynolds"] s.email = "tdreyno@gmail.com" staticmatic.gemspec aa5908d36a29e912ac9f25ebc5e5c7689fcf5c92 Stephen Bartholomew steve@curve21.com http://github.com/stevebartholomew/staticmatic/commit/8781bd1cbc1c929b8cc674af1a523f8199185af2 8781bd1cbc1c929b8cc674af1a523f8199185af2 2008-09-12T03:26:07-07:00 2008-09-12T03:26:07-07:00 Fixed Previewer to see if SM can render a file *before* checking the static directory 405b98b6e644e76afd38386485f737892e500ab8 Stephen Bartholomew steve@curve21.com