From dbdc13bf1fecfbbd426a49c6fe30943d74ff189c Mon Sep 17 00:00:00 2001 From: Blake Mizerany Date: Tue, 6 Jan 2009 17:31:11 -0800 Subject: [PATCH] Cleaning up (class << self; def meth; end; end) where I can --- lib/sinatra/base.rb | 41 +++++++++++++++++++---------------------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/lib/sinatra/base.rb b/lib/sinatra/base.rb index 3c645b81..968d921f 100644 --- a/lib/sinatra/base.rb +++ b/lib/sinatra/base.rb @@ -722,29 +722,26 @@ module Sinatra set :run, false set :reload, Proc.new { app_file? && development? } - @reloading = false - - class << self - def reloading? - @reloading - end - - def configure(*envs) - super unless reloading? - end - - def call(env) - reload! if reload? - super - end - - def reload! - @reloading = true - superclass.send :inherited, self - ::Kernel.load app_file - @reloading = false - end + def self.reloading? + @reloading ||= false end + + def self.configure(*envs) + super unless reloading? + end + + def self.call(env) + reload! if reload? + super + end + + def self.reload! + @reloading = true + superclass.send :inherited, self + ::Kernel.load app_file + @reloading = false + end + end class Application < Default