fix some realpath issue with missing files

rkh · Feb 28, 2010 · 265d6ad · 265d6ad
1 parent 015ac64
commit 265d6ad
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/lib/sinatra/reloader.rb b/lib/sinatra/reloader.rb
@@ -20,8 +20,12 @@ def self.register(route)
       end
 
       def self.new(file)
-        return nil unless File.exist? file
-        @map[file.realpath] ||= super
+        file = file.expand_path
+        begin
+          file = file.realpath
+        rescue Errno::ENOENT
+        end
+        @map[file] ||= super
       end
 
       class << self
@@ -74,6 +78,7 @@ def dont_reload(*files)
         files.flatten.each do |file|
           # Rubinius and JRuby ignore block passed to glob.
           Dir.glob(file).each { |f| FileWatcher[f].dont_reload! dont }
+          FileWatcher[file].dont_reload! dont
         end
       end