@@ -1,4 +1,6 @@ -$LOAD_PATH.unshift File.dirname(__FILE__) +libdir = File.dirname(__FILE__) +$LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir) + require 'sinatra/base' require 'sinatra/main' require 'sinatra/compat' lib/sinatra.rb @@ -796,7 +796,6 @@ module Sinatra end def self.call(env) - $LOADED_FEATURES.delete("sinatra.rb") reload! if reload? super end @@ -804,6 +803,7 @@ module Sinatra def self.reload! @reloading = true superclass.send :inherited, self + $LOADED_FEATURES.delete("sinatra.rb") ::Kernel.load app_file @reloading = false end lib/sinatra/base.rb eec7d2141685b8a44fc202a58f384bfad6c3d435 Ryan Tomayko rtomayko@gmail.com http://github.com/rtomayko/sinatra/commit/0324732179f8b732abd1790dabce468b3894d756 0324732179f8b732abd1790dabce468b3894d756 2009-01-17T17:10:10-08:00 2009-01-16T18:45:22-08:00 Minor tweaks to use_in_file_templates! auto loading 1. Don't add the sinatra lib dir to $: on each reload. 2. Don't remove sinatra.rb from $LOADED_FEATURES unless we're reloading. a5018db2cd6baf6153798885943c97850483cdb8 Ryan Tomayko rtomayko@gmail.com