merging environment-specific conf.

Author: jashkenas

lib/jammit.rb

@@ -65,11 +65,9 @@ def self.load_configuration(config_path, soft=false)
     raise ConfigurationNotFound, "could not find the \"#{config_path}\" configuration file" unless exists
     conf = YAML.load(ERB.new(File.read(config_path)).result)
 
-    # Optionally overwrite configurations based on the environment
+    # Optionally overwrite configuration based on the environment.
     rails_env = defined?(Rails) ? Rails.env : RAILS_ENV
-    if conf.has_key?(rails_env) && conf[rails_env].is_a?(Hash)
-      conf.merge!(conf.delete(rails_env))
-    end
+    conf.merge! conf.delete rails_env if conf.has_key? rails_env
 
     @config_path            = config_path
     @configuration          = symbolize_keys(conf)