Merge branch 'master' of github.com:winton/stasis

winton · Mar 28, 2012 · c55645f · c55645f
2 parents 9405075 + d4ec22f
commit c55645f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/lib/stasis.rb b/lib/stasis.rb
@@ -94,7 +94,7 @@ def load_paths
 
     # Reject paths that are directories or within the destination directory.
     @paths.reject! do |path|
-      !File.file?(path) || path[0..@destination.length-1] == @destination
+      !File.file?(path) || path[0..@destination.length] == @destination+'/'
     end
 
     # Reject paths that are controllers.

diff --git a/lib/stasis/dev_mode.rb b/lib/stasis/dev_mode.rb
@@ -38,11 +38,12 @@ def initialize(dir, options={})
       if options[:development].is_a?(::Integer)
         mime_types = WEBrick::HTTPUtils::DefaultMimeTypes
         mime_types.store 'js', 'application/javascript'
-
-        server = WEBrick::HTTPServer.new(
+
+        outfile = (RUBY_PLATFORM =~ /mswin|mingw/) ? 'NUL:' : '/dev/null'
+        server  = WEBrick::HTTPServer.new(
           :AccessLog => [ nil, nil ],
           :DocumentRoot => @stasis.destination,
-          :Logger => WEBrick::Log.new("/dev/null"),
+          :Logger => WEBrick::Log.new(outfile),
           :MimeTypes => mime_types,
           :Port => options[:development]
         )