0
@@ -13,6 +13,46 @@ module Merb
0
   module GlobalHelpers; end
0
   class << self
0
 
0
+    # Merge environment settings
0
+    # Can allow you to have a "localdev" that runs like your "development"
0
+    #   OR
0
+    # A "staging" environment that runs like your "production"
0
+    #
0
+    # ==== Parameters
0
+    # env<~String>:: Environment to run like
0
+    # use_db<~Boolean>:: Should Merb use the merged environments DB connection
0
+    #     Defaults to +false+
0
+    def merge_env(env,use_db=false)
0
+      if Merb.environment_info.nil?
0
+        Merb.environment_info = {
0
+          :real_env => Merb.environment,
0
+          :merged_envs => [],
0
+          :db_env => Merb.environment
0
+        }
0
+      end
0
+      
0
+      #Only load if it hasn't been loaded
0
+      unless Merb.environment_info[:merged_envs].member? env
0
+        Merb.environment_info[:merged_envs] << env
0
+        
0
+        env_file = Merb.dir_for(:config) / "environments" / ("#{env}.rb")
0
+        if File.exists?(env_file)
0
+          load(env_file)
0
+        else
0
+          Merb.logger.warn! "Environment file does not exist! #{env_file}"
0
+        end
0
+        
0
+      end
0
+      
0
+      # Mark specific environment to load when ORM loads,
0
+      # if multiple environments are loaded, the last one
0
+      # with use_db as TRUE will be loaded
0
+      if use_db
0
+        Merb.environment_info[:db_env] = env
0
+      end
0
+    end
0
+
0
+
0
     # Startup Merb by setting up the Config and starting the server.
0
     # This is where Merb application environment and root path are set.
0
     #
0
@@ -59,7 +99,7 @@ module Merb
0
       start_environment(Merb::Config.to_hash.merge(argv))
0
     end
0
 
0
-    attr_accessor :environment, :load_paths, :adapter
0
+    attr_accessor :environment, :load_paths, :adapter, :environment_info
0
 
0
     alias :env :environment
0
 

0
@@ -30,5 +30,16 @@ describe "Merb.env helpers" do
0
     end
0
   end
0
   
0
+  it "should allow an environment to merge another environments settings" do
0
+    %w(development test production staging demo custom).each do |e|
0
+
0
+      Merb.environment = e
0
+      Merb.start_environment
0
+      Merb.merge_env "some_other_env"
0
+      Merb.environment_info.nil?.should be_false
0
+      Merb.environment_info[:merged_envs].first.should == "some_other_env"
0
+    end
0
+  end
0
+  
0
   
0
 end
0
\ No newline at end of file