Cleaning up (class << self; def meth; end; end) where I can

sinatra · Jan 7, 2009 · dbdc13b · dbdc13b
1 parent eef4cb3
commit dbdc13b
Showing 1 changed file with 16 additions and 19 deletions.
diff --git a/lib/sinatra/base.rb b/lib/sinatra/base.rb
@@ -722,29 +722,26 @@ class Default < Base
     set :run, false
     set :reload, Proc.new { app_file? && development? }
 
-    @reloading = false
+    def self.reloading?
-
+      @reloading ||= false
-    class << self
+    end
-      def reloading?
-        @reloading
-      end
 
-      def configure(*envs)
+    def self.configure(*envs)
-        super unless reloading?
+      super unless reloading?
-      end
+    end
 
-      def call(env)
+    def self.call(env)
-        reload! if reload?
+      reload! if reload?
-        super
+      super
-      end
+    end
 
-      def reload!
+    def self.reload!
-        @reloading = true
+      @reloading = true
-        superclass.send :inherited, self
+      superclass.send :inherited, self
-        ::Kernel.load app_file
+      ::Kernel.load app_file
-        @reloading = false
+      @reloading = false
-      end
     end
+
   end
 
   class Application < Default