merb-core 0.9.8 → 0.9.9

data/CONTRIBUTORS

@@ -4,49 +4,70 @@ Aaron Wheeler
 Abhay Kumar
 Adam Jacob
 Andy C
+Andy Delcambre
 Antti Tarvainen
 Ben Burkert
 Ben Chiu
 Ben Griffiths
 Bradly Feeley
 Brandon Dimcheff
+Brandon Mitchell
 Brian Mitchell
 Bryan Ray
 Carl Lerche
+Carlos Villela
 Charles Jolley
+Cheah Chu Yeow
+Chris Van Pelt
 Coda Hale
 Cory ODaniel
+Cristi Balan
+Damian Terentiev
 Daniel Neighman
 Daniel Schierbeck
 Daniel Siemssen
 David James
+Debian User
 Diego Scataglini
 Dirkjan Bussink
+Dr Nic
 Drew Colthorp
+Duane Johnson
 Dudley Flanders
+Eric D. White
 Ezra Zygmuntowicz
 Fabien Franzen
 Flea
 Foy Savas
 Gabe
 Geoffrey Grosenbach
+Gert Goet
+Glenn Rempe
 Goh Toh Chye
 Grant Hollingworth
 Guillaume Maury
 Hampton Catlin
 Ho-Sheng Hsiao
 Jack Dempsey
+Jakub Šťastný aka Botanicus
 James Herdman
 James Whiteman
 Janne Asmala
+Jarkko Laine
 Jaroslaw Zabiello
+Jed Hurt
 Jonas Nicklas
+Jonathan Stott
 Jonathan Younger
 Josh Nichols
+Justin Pease
+Justin S. Leitgeb
 Kyle Drake
+Lachie Cox
 Lance Carlson
 Loren Segal
 Lori Holden
+Maciej Piechotka
 Martin Grund
 Mason Browne
 Matt Aimonetti
@@ -65,16 +86,25 @@ Michael S. Klishin
 Michael Sheakoski
 Mirko Froehlich
 Nathan Weizenbaum
+Nick Dufresne
+Nicos Gollan
+Nikos Dimitrakopoulos
 Oliver Jakubiec
 Paul Barry
 Paul Boone
 Paul Carey
 Ray Morgan
 Rich Cavanaugh
+Richard Grundy
+Rob Ares
+Rob Kaufman
 Ross Lawley
+Sergey Molodtsoff
+Seth Thomas Rasmussen
 Shalon Wood
 Shay Arnett
 Simon Jefford
+Simon Rozet
 Sindre Aarsaether
 StarTrader
 Steve Tooke
@@ -90,7 +120,10 @@ William Smith
 Wilson Bilkovich
 Yehuda Katz
 Zach Holt
+atmos
+booss
 brainopia
+gert@pacificstarfish.net
 jonas
 jonuts
 macournoyer

data/README

@@ -1,6 +1,9 @@
-merb-core is a new branch of Merb (also referred to as merb-next or the 0.9 series) which aims to provide a stable, stripped down API for a future Merb 1.0 release.
+merb-core 
 
-This branch is based off the 0.5 release series but with significant rewrites.
+A new branch of Merb (sometimes referred to as merb-next) which aims to provide 
+a stable, stripped down API for the Merb 1.0 release.
+
+This branch was based off the 0.5 release series with *significant* rewrites.
 
 Goals of this release:
 
@@ -13,8 +16,9 @@ Goals of this release:
   * Implement a new render API
   * Build more extensions to regain selected features when needed
   
-To familiarize yourself with how a merb-core application might look,
+To familiarize yourself with how a merb-core application might look, 
 use merb-gen (from merb-more) to generate a few apps:
+
 $ merb-gen app myapp                   # a "normal" merb app
 $ merb-gen app myapp --flat            # a flattened app
 $ merb-gen app myapp --very-flat       # a single-file app

data/Rakefile

@@ -57,7 +57,7 @@ spec = Gem::Specification.new do |s|
   s.extra_rdoc_files = %w( README LICENSE TODO )
 
   # Dependencies
-  s.add_dependency "extlib", ">= 0.9.7"
+  s.add_dependency "extlib", ">= 0.9.8"
   s.add_dependency "erubis"
   s.add_dependency "rake"
   s.add_dependency "json_pure"
@@ -65,7 +65,7 @@ spec = Gem::Specification.new do |s|
   s.add_dependency "rack"
   s.add_dependency "mime-types"
   s.add_dependency "hpricot"
-  s.add_dependency "thor", ">= 0.9.6"
+  s.add_dependency "thor", ">= 0.9.7"
   # this escalates to "regular" dependencies, comment it out
   # for now. RubyGems need some love.
   #s.add_development_dependency "libxml-ruby"
@@ -336,7 +336,7 @@ def contributors(since_release = nil)
   git_log(since_release).split("\n").uniq.sort
 end
 
-PREVIOUS_RELEASE = '0.9.7'
+PREVIOUS_RELEASE = '0.9.8'
 namespace :history do
   namespace :update do
     desc "updates contributors list"

data/lib/merb-core.rb

@@ -1,26 +1,25 @@
-#---
 # require 'merb' must happen after Merb::Config is instantiated
-require 'rubygems'
+require "rubygems"
 
 # Add the local gems dir if found within the app root; any dependencies loaded
 # hereafter will try to load from the local gems before loading system gems.
 root_key = %w[-m --merb-root].detect { |o| ARGV.index(o) }
 root = ARGV[ARGV.index(root_key) + 1] if root_key
 root = root.to_a.empty? ? Dir.getwd : root
-if File.directory?(gems_dir = File.join(root, 'gems')) && !$BUNDLE
+if File.directory?(gems_dir = File.join(root, "gems")) && !$BUNDLE
   $BUNDLE = true; Gem.clear_paths; Gem.path.unshift(gems_dir)
   # Warn if local merb-core is available but not loaded.
   if File.expand_path($0).index(root) != 0 && 
-    (local_mc = Dir[File.join(gems_dir, 'specifications', 'merb-core-*.gemspec')].last)
-    puts "Warning: please use bin/#{File.basename($0)} to load #{File.basename(local_mc, '.gemspec')} from ./gems"
+    (local_mc = Dir[File.join(gems_dir, "specifications", "merb-core-*.gemspec")].last)
+    puts "Warning: please use bin/#{File.basename($0)} to load #{File.basename(local_mc, ".gemspec")} from ./gems"
   end
 end
 
-require 'thread'
-require 'set'
-require 'fileutils'
-require 'socket'
-require 'pathname'
+require "thread"
+require "set"
+require "fileutils"
+require "socket"
+require "pathname"
 require "extlib"
 require "extlib/dictionary"
 
@@ -30,31 +29,47 @@ $LOAD_PATH.unshift __DIR__ unless
   $LOAD_PATH.include?(__DIR__) ||
   $LOAD_PATH.include?(File.expand_path(__DIR__))
 
+# Some dependencies tend to require&rescue for optionally required files;
+# doing so will load the full rubygems, even though it was just optional.
+$MINIGEMS_SKIPPABLE = ['encoding/character/utf-8']
+
 module Merb
   # Create stub module for global controller helpers.
   module GlobalHelpers; end
   
   class << self
-    attr_accessor :exiting
+    attr_reader :exiting
+
+    def exiting=(bool)
+      Extlib.exiting = bool
+      if bool && Extlib.const_defined?("Pooling") && Extlib::Pooling.scavenger
+        Extlib::Pooling.scavenger.wakeup
+      end
+      @exiting = bool
+    end
 
     # Merge environment settings
-    # Can allow you to have a "localdev" that runs like your "development"
+    #
+    # This can allow you to have a "localdev" environment that runs like your "development".
     #   OR
-    # A "staging" environment that runs like your "production"
+    # A "staging" environment that runs identical to your "production" environment.
     #
     # ==== Examples
-    # From any environment config file (ie, development.rb, custom.rb, localdev.rb, etc)
+    # From any environment config file (ie, development.rb, custom.rb, localdev.rb, etc).
     #   staging.rb:
-    #     Merb.merge_env "production"         #We want to use all the settings production uses
-    #     Merb::Config.use { |c|
-    #       c[:log_level]         = "debug"   #except we want debug log level
-    #       c[:exception_details] = true      #and we want to see exception details
-    #     }
+    #     Merb.merge_env "production"         # We want to use all the settings production uses
+    #     Merb::Config.use do |c|
+    #       c[:log_level]         = "debug"   # except we want debug log level
+    #       c[:log_stream]        = @some_io  # and log to this IO handle
+    #       c[:exception_details] = true      # and we want to see exception details
+    #     end
     #
     # ==== Parameters
     # env<~String>:: Environment to run like
     # use_db<~Boolean>:: Should Merb use the merged environments DB connection
     #     Defaults to +false+
+    #
+    # @api public
     def merge_env(env,use_db=false)
       if Merb.environment_info.nil?
         Merb.environment_info = {
@@ -74,7 +89,6 @@ module Merb
         else
           Merb.logger.warn! "Environment file does not exist! #{env_file}"
         end
-        
       end
       
       # Mark specific environment to load when ORM loads,
@@ -85,14 +99,15 @@ module Merb
       end
     end
 
-    # Startup Merb by setting up the Config and starting the server.
-    # This is where Merb application environment and root path are set.
+    # Start Merb by setting up the Config and then starting the server.
+    # Set the Merb application environment and the root path.
     #
     # ==== Parameters
     # argv<String, Hash>::
     #   The config arguments to start Merb with. Defaults to +ARGV+.
-    def start(argv=ARGV)
-      # Hardcode the log stream to STDOUT
+    #
+    # @api public
+    def start(argv = ARGV)
       Merb::Config[:log_stream] = STDOUT
       if Hash === argv
         Merb::Config.setup(argv)
@@ -103,6 +118,7 @@ module Merb
       
       Merb.environment = Merb::Config[:environment]
       Merb.root = Merb::Config[:merb_root]
+
       case Merb::Config[:action]
       when :kill
         Merb::Server.kill(Merb::Config[:port], 2)
@@ -112,6 +128,7 @@ module Merb
         Merb::Server.kill("main", "HUP")
       else
         Merb::Server.start(Merb::Config[:port], Merb::Config[:cluster])
+        @started = true
       end
     end
 
@@ -120,11 +137,10 @@ module Merb
     # ==== Parameters
     # argv<String, Hash>::
     #   The config arguments to start Merb with. Defaults to +ARGV+.
+    #
+    # @api public
     def start_environment(argv=ARGV)
-      unless (@started ||= false)
-        start(argv)
-        @started = true
-      end
+      start(argv) unless (@started ||= false)
     end
 
     # Restart the Merb environment explicitly.
@@ -132,6 +148,8 @@ module Merb
     # ==== Parameters
     # argv<String, Hash>::
     #   The config arguments to restart Merb with. Defaults to +Merb::Config+.
+    #
+    # @api public
     def restart_environment(argv={})
       @started = false
       start_environment(Merb::Config.to_hash.merge(argv))
@@ -144,30 +162,30 @@ module Merb
 
     Merb.load_paths = Dictionary.new { [Merb.root] } unless Merb.load_paths.is_a?(Dictionary)
 
-    # This is the core mechanism for setting up your application layout.
+    # This is the mechanism for setting up your application layout.
     # There are three application layouts in Merb:
     #
-    # Regular app/:type layout of Ruby on Rails fame:
+    # 1. Regular app/:type layout of Ruby on Rails fame:
     #
-    # app/models      for models
-    # app/mailers     for mailers (special type of controllers)
-    # app/parts       for parts, Merb components
-    # app/views       for templates
-    # app/controllers for controller
-    # lib             for libraries
+    # app/models       for models
+    # app/mailers      for mailers (special type of controllers)
+    # app/parts        for parts, Merb components
+    # app/views        for templates
+    # app/controllers  for controller
+    # lib              for libraries
     #
-    # Flat application layout:
+    # 2. Flat application layout:
     #
     # application.rb       for models, controllers, mailers, etc
     # config/init.rb       for initialization and router configuration
     # config/framework.rb  for framework and dependencies configuration
     # views                for views
     #
-    # and Camping-style "very flat" application layout, where the whole Merb
-    # application and configs fit into a single file.
+    # 3. Camping-style "very flat" application layout, where the whole Merb
+    # application and configs are contained within a single file.
     #
     # ==== Notes
-    # Autoloading for lib uses empty glob by default. If you
+    # Autoloading for lib uses an empty glob by default. If you
     # want to have your libraries under lib use autoload, add
     # the following to Merb init file:
     #
@@ -193,6 +211,8 @@ module Merb
     # file_glob<String>::
     #   A glob that will be used to autoload files under the path. Defaults to
     #   "**/*.rb".
+    #
+    # @api public
     def push_path(type, path, file_glob = "**/*.rb")
       enforce!(type => Symbol)
       load_paths[type] = [path, file_glob]
@@ -203,18 +223,19 @@ module Merb
     #
     # ==== Parameters
     # *args<Array(Symbol)>::
-    #   components names, for instance, :views, :models
+    #   component(s) names, for instance, :views, :models
     #
     # ==== Examples
-    # Using this combined with Merb::GlobalHelpers.push_path
-    # you can make your Merb application use legacy Rails
-    # application components.
+    # Using this combined with Merb::GlobalHelpers.push_path you can make 
+    # your Merb application use legacy Rails application components.
     #
     # Merb.root = "path/to/legacy/app/root"
     # Merb.remove_paths(:mailer)
-    # Merb.push_path(:mailer,     Merb.root / "app" / "models",      "**/*.rb")
+    # Merb.push_path(:mailer, Merb.root / "app" / "models", "**/*.rb")
     #
     # Will make Merb use app/models for mailers just like Ruby on Rails does.
+    #
+    # @api public
     def remove_paths(*args)
       args.each {|arg| load_paths.delete(arg)}
     end
@@ -224,6 +245,8 @@ module Merb
     #
     # ==== Returns
     # String:: The directory for the requested type.
+    #
+    # @api public
     def dir_for(type)
       Merb.load_paths[type].first
     end
@@ -233,18 +256,24 @@ module Merb
     #
     # ===== Returns
     # String:: The pattern with which to match files within the type directory.
+    #
+    # @api public
     def glob_for(type)
       Merb.load_paths[type][1]
     end
 
     # ==== Returns
     # String:: The Merb root path.
+    #
+    # @api public
     def root
       @root || Merb::Config[:merb_root] || File.expand_path(Dir.pwd)
     end
 
     # ==== Parameters
     # value<String>:: Path to the root directory.
+    #
+    # @api public
     def root=(value)
       @root = value
     end
@@ -261,28 +290,41 @@ module Merb
     #   Merb.root = "/home/merb/app"
     #   Merb.path("images") # => "/home/merb/app/images"
     #   Merb.path("views", "admin") # => "/home/merb/app/views/admin"
-    #---
+    #
     # @public
     def root_path(*path)
       File.join(root, *path)
     end
 
-    # Logger settings
+    # Return the Merb Logger object for the current thread.
+    # Set it up if it does not exist.
+    # 
+    # @api public
     def logger
       Thread.current[:merb_logger] ||= Merb::Logger.new
     end
 
-    def logger=(obj)
-      unless obj
-        Thread.current[:merb_logger] = nil
-      end
+    # Removes the logger for the current thread (nil).
+    # 
+    # @api public
+    def reset_logger!
+      Thread.current[:merb_logger] = nil
     end
 
     # ==== Returns
     # String::
-    #   The path to the log file. If this Merb instance is running as a daemon
-    #   this will return +STDOUT+.
+    #   The path to the log file. 
+    #   If this Merb instance is running as a daemon this will return +STDOUT+.
+    #
+    # ==== Notes
+    # When Merb.testing? the port is modified to become :test - this keeps this
+    # special environment situation from ending up in the memoized @streams
+    # just once, thereby never taking changes into account again. Now, it will
+    # be memoized as :test - and just logging to merb_test.log.
+    # 
+    # @api public
     def log_stream(port = "main")
+      port = :test if Merb.testing?
       @streams ||= {}
       @streams[port] ||= begin
         log = if Merb.testing?
@@ -309,7 +351,9 @@ module Merb
     end
 
     # ==== Returns
-    # String:: Path to directory that contains the log file.
+    # String:: Path to the log directory which contains the log file.
+    # 
+    # @api public
     def log_path
       case Merb::Config[:log_file]
       when String then File.dirname(Merb::Config[:log_file])
@@ -319,6 +363,8 @@ module Merb
 
     # ==== Returns
     # String:: The path of root directory of the Merb framework.
+    # 
+    # @api public
     def framework_root
       @framework_root ||= File.dirname(__FILE__)
     end
@@ -329,8 +375,9 @@ module Merb
     #   are matched by Rack application handler.
     #
     # ==== Notes
-    # Concatenates :deferred_actions configuration option
-    # values.
+    # Concatenates :deferred_actions configuration option values.
+    # 
+    # @api public
     def deferred_actions
       @deferred ||= begin
         if Merb::Config[:deferred_actions].empty?
@@ -341,28 +388,10 @@ module Merb
       end
     end
 
-    # Allows flat apps by setting no default framework directories and yielding
-    # a Merb::Router instance. This is optional since the router will
-    # automatically configure the app with default routes.
-    #
-    # ==== Block parameters
-    # r<Merb::Router::Behavior>::
-    #   The root behavior upon which new routes can be added.
-    def flat!(framework = {})
-      default = {
-        :framework => { :public => [Merb.root / "public", nil] },
-        :session_store => 'none',
-        :exception_details => true
-      }
-            
-      Merb::Config[:framework] = default.merge(framework)
-
-      Merb::Router.prepare do |r|
-        yield(r) if block_given?
-        r.default_routes
-      end
-    end
-    
+    # Perform a hard Exit.
+    # Print a backtrace to the merb logger before exiting if verbose is enabled.
+    #
+    # @api private
     def fatal!(str, e = nil)
       Merb.logger.fatal!
       Merb.logger.fatal!("\e[1;31;47mFATAL: #{str}\e[0m")
@@ -372,6 +401,9 @@ module Merb
       exit(1)
     end
     
+    # Print a colorized backtrace to the merb logger.
+    #
+    # @api private
     def print_colorized_backtrace(e)
       e.backtrace.map! do |line|
         line.gsub!(/^#{Merb.framework_root}/, "\e[34mFRAMEWORK_ROOT\e[31m")
@@ -392,13 +424,15 @@ module Merb
     #
     # ==== Returns
     # <Symbol>:: default ORM.
+    #
+    # @api public
     def orm
       @orm ||= :none
     end
     
     # @deprecated
     def orm_generator_scope
-      Merb.logger.warn!("WARNING: Merb.orm_generator_scope is deprecated")
+      Merb.logger.warn!("WARNING: Merb.orm_generator_scope is deprecated!")
       return :merb_default if Merb.orm == :none
       Merb.orm
     end
@@ -407,6 +441,8 @@ module Merb
     #
     # ==== Returns
     # <Symbol>:: default test framework.
+    #
+    # @api public
     def test_framework
       @test_framework ||= :rspec
     end
@@ -421,6 +457,8 @@ module Merb
     #
     # ==== Returns
     # <Symbol>:: default template engine.
+    #
+    # @api public
     def template_engine
       @template_engine ||= :erb
     end
@@ -432,14 +470,16 @@ module Merb
     #
     # ==== Notes
     # Bundling required gems makes your application independent from the 
-    # environment it runs in. This is a good practice to freeze application 
-    # framework and gems it uses and very useful when application is run in 
+    # environment it runs in. It is a good practice to freeze application 
+    # framework and gems and is very useful when application is run in 
     # some sort of sandbox, for instance, shared hosting with preconfigured gems.
+    #
+    # @api public
     def bundled?
       $BUNDLE || ENV.key?("BUNDLE")
     end
 
-    # Load configuration and assign logger.
+    # Load configuration and assign the logger.
     #
     # ==== Parameters
     # options<Hash>:: Options to pass on to the Merb config.
@@ -477,9 +517,11 @@ module Merb
     #                             flush after new messages are
     #                             added, defaults to true.
     #
-    # :log_file<IO>::             IO for logger. Default is STDOUT.
+    # :log_stream<IO>::           IO handle for logger. Defaults to STDOUT.
+    #
+    # :log_file<String>::         File path for logger. Overrides :log_stream.
     #
-    # :log_level<Symbol>::        logger level, default is :warn
+    # :log_level<Symbol>::        logger level, default is :info
     #
     # :disabled_components<Array[Symbol]>::
     #   array of disabled component names,
@@ -494,8 +536,10 @@ module Merb
     # Some of these options come from command line on Merb
     # application start, some of them are set in Merb init file
     # or environment-specific.
+    #
+    # @api public
     def load_config(options = {})
-      Merb::Config.setup({ :log_file => STDOUT, :log_level => :warn, :log_auto_flush => true }.merge(options))
+      Merb::Config.setup(Merb::Config.defaults.merge(options))
       Merb::BootLoader::Logger.run
     end
 
@@ -507,6 +551,8 @@ module Merb
     #
     # ==== Parameters
     # options<Hash>:: Options to pass on to the Merb config.
+    #
+    # @api public
     def load_dependencies(options = {})
       load_config(options)
       Merb::BootLoader::BuildFramework.run
@@ -516,6 +562,8 @@ module Merb
 
     # Reload application and framework classes.
     # See Merb::BootLoader::ReloadClasses for details.
+    #
+    # @api public
     def reload
       Merb::BootLoader::ReloadClasses.reload
     end
@@ -523,6 +571,8 @@ module Merb
     # ==== Returns
     # Boolean:: True if Merb environment is testing for instance,
     # Merb is running with RSpec, Test::Unit of other testing facility.
+    #
+    # @api public
     def testing?
       $TESTING ||= env?(:test) || Merb::Config[:testing]
     end
@@ -535,6 +585,8 @@ module Merb
     # Merb.env #=> production
     # Merb.env?(:production) #=> true
     # Merb.env?(:development) #=> false
+    #
+    # @api public
     def env?(env)
       Merb.env == env.to_s
     end
@@ -562,6 +614,8 @@ module Merb
     #     reload_classes     true
     #     reload_time        0.5
     #   end
+    #
+    # @api public
     def config(&block)
       Merb::Config.configure(&block) if block_given?
       Config
@@ -571,24 +625,32 @@ module Merb
     #
     # ==== Parameters
     # *args:: One or more symbols of Merb internal components.
+    #
+    # @api public
     def disable(*components)
       disabled_components.push(*components)
     end
 
     # ==== Parameters
     # Array:: All components that should be disabled.
+    #
+    # @api public
     def disabled_components=(components)
       disabled_components.replace components
     end
 
     # ==== Returns
     # Array:: All components that have been disabled.
+    #
+    # @api public
     def disabled_components
       Merb::Config[:disabled_components] ||= []
     end
 
     # ==== Returns
     # Boolean:: True if all components (or just one) are disabled.
+    #
+    # @api public
     def disabled?(*components)
       components.all? { |c| disabled_components.include?(c) }
     end
@@ -599,6 +661,8 @@ module Merb
     # ==== Notes
     # Recommended way to find out what paths Rakefiles
     # are loaded from.
+    #
+    # @api public
     def rakefiles
       @rakefiles ||= []
     end
@@ -607,8 +671,9 @@ module Merb
     # Array(String):: Paths generators are loaded from
     #
     # === Notes
-    # Recommended way to find out what paths generators
-    # are loaded from.
+    # Recommended way to find out what paths generators are loaded from.
+    #
+    # @api public
     def generators
       @generators ||= []
     end
@@ -618,6 +683,8 @@ module Merb
     #
     # ==== Notes
     # Recommended way to add Rakefiles load path for plugins authors.
+    #
+    # @api public
     def add_rakefiles(*rakefiles)
       @rakefiles ||= []
       @rakefiles += rakefiles
@@ -628,6 +695,8 @@ module Merb
     #
     # ==== Notes
     # Recommended way to add Generator load paths for plugin authors.
+    #
+    # @api public
     def add_generators(*generators)
       @generators ||= []
       @generators += generators
@@ -638,6 +707,8 @@ module Merb
     # ==== Parameters
     # signal:: The name of the signal to install a handler for.
     # &block:: The block to be run when the given signal is received.
+    #
+    # @api public
     def trap(signal, &block)
       Kernel.trap(signal, &block) unless Merb.disabled?(:signals)
     end
@@ -645,12 +716,12 @@ module Merb
   end
 end
 
-require 'merb-core/autoload'
-require 'merb-core/server'
-require 'merb-core/gem_ext/erubis'
-require 'merb-core/logger'
-require 'merb-core/version'
-require 'merb-core/controller/mime'
+require "merb-core/autoload"
+require "merb-core/server"
+require "merb-core/gem_ext/erubis"
+require "merb-core/logger"
+require "merb-core/version"
+require "merb-core/controller/mime"
 
 # Set the environment if it hasn't already been set.
-Merb.environment ||= ENV['MERB_ENV'] || Merb::Config[:environment] || (Merb.testing? ? 'test' : 'development')
+Merb.environment ||= ENV["MERB_ENV"] || Merb::Config[:environment] || (Merb.testing? ? "test" : "development")