init.rb in merb-gen-1.1.0.pre

- old
+ new

@@ -1,17 +1,12 @@
 # Go to http://wiki.merbivore.com/pages/init-rb
 
-<%= "# " unless orm != :none %> use_orm :<%= orm %>
+<%= "use_orm :#{orm}" unless orm == :none %>
 use_test :<%= testing_framework %>
 use_template_engine :<%= template_engine %>
 
-# If you need to use dependency immediately in this file you must add :immediate => true 
-# to dependency definition:
-# dependency "merb-slices", :immediate => true
-#
-# Specify a specific version of a dependency
-# dependency "RedCloth", "> 3.0"
+# Specify your dependencies in the Gemfile
 
 Merb::BootLoader.before_app_loads do
   # This will get executed after dependencies have been loaded but before your app's classes have loaded.
 end
  
@@ -27,18 +22,27 @@
 end
 
 Merb::Config.use { |c|
   c[:environment]         = 'production',
   c[:framework]           = {},
-  c[:log_level]           = :debug,
-  c[:log_stream]          = STDOUT,
-  # or use file for logging:
-  # c[:log_file]          = Merb.root / "log" / "merb.log",
-  c[:use_mutex]           = false,
-  c[:session_store]       = 'cookie',
-  c[:session_id_key]      = '_<%= base_name  %>_session_id',
-  c[:session_secret_key]  = '<%= Digest::SHA1.hexdigest(rand(100000000000).to_s).to_s %>',
-  c[:exception_details]   = true,
-  c[:reload_classes]      = true,
-  c[:reload_templates]    = true,
-  c[:reload_time]         = 0.5
+  c[:use_mutex]           = false
+  c[:session_store]       = 'cookie'
+  c[:session_id_key]      = '_<%= base_name  %>_session_id'
+  c[:session_secret_key]  = '<%= Digest::SHA1.hexdigest(rand(100000000000).to_s).to_s %>'
+
+  if Merb.env?(:production)
+    # edit production settings
+    c[:log_level]         = :error
+    c[:log_file]          = Merb.root / "log" / "production.log"
+    c[:exception_details] = false
+    c[:reload_classes]    = false
+    c[:reload_templates]  = false
+  else
+    # edit development/test settings
+    c[:log_level]         = :debug
+    c[:log_stream]        = STDOUT
+    c[:exception_details] = true
+    c[:reload_classes]    = true
+    c[:reload_templates]  = true
+    c[:reload_time]       = 0.5
+  end
 }