Make it possible to override dynamic_templates in your app

ZhangHanDong · May 22, 2010 · 60d9a2f · 60d9a2f
1 parent b74ace4
commit 60d9a2f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/bin/camping b/bin/camping
@@ -2,8 +2,6 @@
 
 $:.unshift File.dirname(__FILE__) + "/../lib"
 
-ENV['DYNAMIC_TEMPLATES']=true.to_s
-
 require 'camping'
 require 'camping/server'
 

diff --git a/lib/camping/server.rb b/lib/camping/server.rb
@@ -99,7 +99,10 @@ def initialize(*)
       super
       @reloader = Camping::Reloader.new
       @reloader.on_reload do |app|
-		app.options[:dynamic_templates] = true if ENV['DYNAMIC_TEMPLATES']
+        if !app.options.has_key?(:dynamic_templates)
+		      app.options[:dynamic_templates] = true
+	      end
+
         if !Camping::Models.autoload?(:Base) && options[:database]
           Camping::Models::Base.establish_connection(
             :adapter => 'sqlite3',