Changeset 137 for trunk/lib/camping/reloader.rb

Timestamp:

07/13/2006 00:48:56 (2 years ago)

Author:

why

Message:

• lib/camping/reloader.rb: handle deletion of the script, removal of the class upon partial load.
  
• lib/camping/fastcgi.rb: load new scripts.
  
• bin/camping: loading of new scripts on to the index page.
  

Files:

• trunk/lib/camping/reloader.rb (modified) (4 diffs)

trunk/lib/camping/reloader.rb

@@ -41 +41 @@
     end
 
+    # Find the application, based on the script name.
+    def find_app(title)
+        @klass = Object.const_get(Object.constants.grep(/^#{title}$/i)[0]) rescue nil
+    end
+
+    # If the file isn't found, if we need to remove the app from the global
+    # namespace, this will be sure to do so and set @klass to nil.
+    def remove_app
+        Object.send :remove_const, @klass.name if @klass
+        @klass = nil
+    end
+
     # Loads (or reloads) the application.  The reloader will take care of calling
     # this for you.  You can certainly call it yourself if you feel it's warranted.
@@ -53 +65 @@
         rescue Exception => e
             puts "!! trouble loading #{title}: [#{e.class}] #{e.message}"
-            @klass = nil
+            find_app title
+            remove_app
             return
         end
 
         @mtime = mtime
-        @klass = Object.const_get(Object.constants.grep(/^#{title}$/i)[0]) rescue nil
+        find_app title
         unless @klass and @klass.const_defined? :C
             puts "!! trouble loading #{title}: not a Camping app, no #{title.capitalize} module found"
-            @klass = nil
+            remove_app
             return
         end
@@ -74 +87 @@
         ((@requires || []) + [@script]).map do |fname|
             fname = fname.gsub(/^#{Regexp::quote File.dirname(@script)}\//, '')
-            File.mtime(File.join(File.dirname(@script), fname))
+            begin
+                File.mtime(File.join(File.dirname(@script), fname))
+            rescue Errno::ENOENT
+                remove_app
+                @mtime
+            end
         end.max
     end
@@ -87 +105 @@
         end
         k = @klass
-        Object.instance_eval { remove_const k.name } if k
+        Object.send :remove_const, k.name if k
         load_app
     end