merb-gen 0.9.8 → 0.9.9

data/lib/generators/templates/application/{merb → merb_core}/config/environments/development.rb

@@ -4,7 +4,12 @@ Merb::Config.use { |c|
   c[:reload_templates] = true
   c[:reload_classes] = true
   c[:reload_time] = 0.5
-  c[:log_auto_flush ] = true
   c[:ignore_tampered_cookies] = true
+  c[:log_auto_flush ] = true
   c[:log_level] = :debug
-}
+
+  c[:log_stream] = STDOUT
+  c[:log_file]   = nil
+  # Or redirect logging into a file:
+  # c[:log_file]  = Merb.root / "log" / "development.log"
+}

data/lib/generators/templates/application/{merb → merb_core}/config/environments/production.rb

@@ -3,5 +3,8 @@ Merb::Config.use { |c|
   c[:exception_details] = false
   c[:reload_classes] = false
   c[:log_level] = :error
-  c[:log_file] = Merb.log_path + "/production.log"
-}
+  
+  c[:log_file]  = Merb.root / "log" / "production.log"
+  # or redirect logger using IO handle
+  # c[:log_stream] = STDOUT
+}

data/lib/generators/templates/application/{merb → merb_core}/config/environments/rake.rb

@@ -3,5 +3,9 @@ Merb::Config.use { |c|
   c[:exception_details] = true
   c[:reload_classes]  = false
   c[:log_auto_flush ] = true
-  c[:log_file] = Merb.log_path / 'merb_rake.log'
-}
+
+  c[:log_stream] = STDOUT
+  c[:log_file]   = nil
+  # Or redirect logging into a file:
+  # c[:log_file]  = Merb.root / "log" / "development.log"
+}

data/lib/generators/templates/application/merb_core/config/environments/staging.rb

@@ -0,0 +1,10 @@
+Merb.logger.info("Loaded STAGING Environment...")
+Merb::Config.use { |c|
+  c[:exception_details] = false
+  c[:reload_classes]    = false
+  c[:log_level]         = :error
+
+  c[:log_file]  = Merb.root / "log" / "staging.log"
+  # or redirect logger using IO handle
+  # c[:log_stream] = STDOUT
+}

data/lib/generators/templates/application/merb_core/config/environments/test.rb

@@ -0,0 +1,12 @@
+Merb.logger.info("Loaded TEST Environment...")
+Merb::Config.use { |c|
+  c[:testing]           = true
+  c[:exception_details] = true
+  c[:log_auto_flush ]   = true
+  # log less in testing environment
+  c[:log_level]         = :error
+
+  c[:log_file]  = Merb.root / "log" / "test.log"
+  # or redirect logger using IO handle
+  # c[:log_stream] = STDOUT
+}

data/lib/generators/templates/application/{merb → merb_core}/config/init.rb

@@ -150,22 +150,22 @@ end
 # ==== Tune your inflector
 
 # To fine tune your inflector use the word, singular_word and plural_word
-# methods of English::Inflect module metaclass.
+# methods of Extlib::Inflection module metaclass.
 #
 # Here we define erratum/errata exception case:
 #
-# English::Inflect.word "erratum", "errata"
+# Extlib::Inflection.word "erratum", "errata"
 #
 # In case singular and plural forms are the same omit
 # second argument on call:
 #
-# English::Inflect.word 'information'
+# Extlib::Inflection.word 'information'
 #
 # You can also define general, singularization and pluralization
 # rules:
 #
 # Once the following rule is defined:
-# English::Inflect.rule 'y', 'ies'
+# Extlib::Inflection.rule 'y', 'ies'
 #
 # You can see the following results:
 # irb> "fly".plural
@@ -175,14 +175,14 @@ end
 #
 # Example for singularization rule:
 #
-# English::Inflect.singular_rule 'o', 'oes'
+# Extlib::Inflection.singular_rule 'o', 'oes'
 #
 # Works like this:
 # irb> "heroes".singular
 # => hero
 #
 # Example of pluralization rule:
-# English::Inflect.singular_rule 'fe', 'ves'
+# Extlib::Inflection.singular_rule 'fe', 'ves'
 #
 # And the result is:
 # irb> "wife".plural