Merge branch 'master' of https://github.com/christoffer/jammit

Author: jashkenas

lib/jammit.rb

@@ -64,6 +64,13 @@ def self.load_configuration(config_path, soft=false)
     return false if soft && !exists
     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
+    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
+
     @config_path            = config_path
     @configuration          = symbolize_keys(conf)
     @package_path           = conf[:package_path] || DEFAULT_PACKAGE_PATH

test/config/assets-environment.yml

@@ -0,0 +1,8 @@
+compress_assets: on
+gzip_assets: on
+
+development:
+  compress_assets: off
+
+test:
+  gzip_assets: off

test/unit/test_configuration.rb

@@ -62,4 +62,15 @@ def test_jst_compilation
     assert packed == File.read('test/fixtures/jammed/jst_test.js')
   end
 
+  def test_environment_specific_configuration
+    Object.send(:remove_const, :RAILS_ENV)
+    Object.const_set :RAILS_ENV, "development"
+    Jammit.load_configuration('test/config/assets-environment.yml')
+
+    assert !Jammit.compress_assets # Should override with environment specific configuration
+    assert Jammit.gzip_assets # but keep the general configuration
+
+    Object.send(:remove_const, :RAILS_ENV)
+    Object.const_set :RAILS_ENV, "test"
+  end
 end