Merge pull request #159 from dblock/master

RAILS_ENV fix + rewrite_relative_paths option

Author: jashkenas

Gemfile

@@ -0,0 +1,15 @@
+source 'http://rubygems.org'
+
+gemspec
+
+group :development, :test do
+  gem "rake", "0.9.2"
+  gem "rails", "2.3.11"
+  gem "yui-compressor", "0.9.3"
+  gem "closure-compiler", "1.1.5"
+  gem "uglifier", "0.4.0"
+end
+
+group :development do
+  gem "RedCloth", "4.2.9"
+end

index.html

@@ -236,6 +236,13 @@ <h2 id="configuration">Configuration</h2>
           if you're packaging assets in development.
         </td>
       </tr>
+      <tr>
+        <td><b>rewrite_relative_paths</b></td>
+        <td><tt>on&nbsp;|&nbsp;off</tt></td>
+        <td class="definition">
+          Defaults to <b>on</b>. When <b>off</b>, relative paths with CSS will be left unchanged.
+        </td>
+      </tr>
       <tr>
         <td><b>gzip_assets</b></td>
         <td><tt>on&nbsp;|&nbsp;off</tt></td>

lib/jammit.rb

@@ -25,7 +25,7 @@ module Jammit
   COMPRESSORS           = [:yui, :closure, :uglifier]
 
   DEFAULT_COMPRESSOR    = :yui
-
+  
   # Extension matchers for JavaScript and JST, which need to be disambiguated.
   JS_EXTENSION          = /\.js\Z/
   DEFAULT_JST_EXTENSION = "jst"
@@ -35,7 +35,7 @@ module Jammit
   class PackageNotFound < NameError; end
 
   # Jammit raises a MissingConfiguration exception when you try to load the
-  # configuration of an assets.yml file that doesn't exist, or are missing 
+  # configuration of an assets.yml file that doesn't exist, or are missing
   # a piece of required configuration.
   class MissingConfiguration < NameError; end
 
@@ -52,7 +52,7 @@ class << self
                   :package_path, :mhtml_enabled, :include_jst_script, :config_path,
                   :javascript_compressor, :compressor_options, :css_compressor_options,
                   :template_extension, :template_extension_matcher, :allow_debugging,
-                  :public_root
+                  :rewrite_relative_paths, :public_root
     attr_accessor :compressors
   end
 
@@ -71,14 +71,15 @@ def self.load_configuration(config_path, soft=false)
     conf = YAML.load(ERB.new(File.read(config_path)).result)
 
     # Optionally overwrite configuration based on the environment.
-    rails_env = defined?(Rails) ? Rails.env : ENV['RAILS_ENV']
+    rails_env = (defined?(Rails) ? ::Rails.env : ENV['RAILS_ENV'] || "development")
     conf.merge! conf.delete rails_env if conf.has_key? rails_env
 
     @config_path            = config_path
     @configuration          = symbolize_keys(conf)
     @package_path           = conf[:package_path] || DEFAULT_PACKAGE_PATH
     @embed_assets           = conf[:embed_assets] || conf[:embed_images]
     @compress_assets        = !(conf[:compress_assets] == false)
+    @rewrite_relative_paths = !(conf[:rewrite_relative_paths] == false)
     @gzip_assets            = !(conf[:gzip_assets] == false)
     @allow_debugging        = !(conf[:allow_debugging] == false)
     @mhtml_enabled          = @embed_assets && @embed_assets != "datauri"

lib/jammit/compressor.rb

@@ -172,14 +172,14 @@ def with_mhtml(css, asset_url)
       end
       [MHTML_START, mhtml, MHTML_END, css].flatten.join('')
     end
-
+    
     # Return a rewritten asset URL for a new stylesheet -- the asset should
     # be tagged for embedding if embeddable, and referenced at the correct level
     # if relative.
     def construct_asset_path(asset_path, css_path, variant)
       public_path = absolute_path(asset_path, css_path)
       return "__EMBED__#{public_path}" if embeddable?(public_path, variant)
-      source = asset_path.absolute? ? asset_path.to_s : relative_path(public_path)
+      source = asset_path.absolute? || ! Jammit.rewrite_relative_paths ? asset_path.to_s : relative_path(public_path)
       rewrite_asset_path(source, public_path)
     end
 

test/config/assets-erb.yml

@@ -1,4 +1,4 @@
-embed_assets: <%= RAILS_ENV == 'test' %>
+embed_assets: <%= ENV['RAILS_ENV'] == 'test' %>
 
 javascripts:
   js_test:

test/config/assets-no-rewrite-relative-paths.yml

@@ -0,0 +1,13 @@
+javascript_compressor: yui
+embed_assets: on
+rewrite_relative_paths: off
+
+javascripts:
+  js_test:
+    - fixtures/src/*.js
+  jst_test:
+    - fixtures/src/*.jst
+
+stylesheets:
+  css_test:
+    - fixtures/src/*.css

test/fixtures/jammed/css_test-no-rewrite-relative-paths.css

@@ -5,9 +5,7 @@
 ASSET_ROOT = File.expand_path(File.dirname(__FILE__))
 
 devnull = RUBY_PLATFORM =~ /mswin|mingw|bccwin|wince|emx/ ? 'nul' : '/dev/null'
-RAILS_DEFAULT_LOGGER = Logger.new(devnull)
-RAILS_ENV = "test"
-RAILS_ROOT = File.expand_path(File.dirname(__FILE__))
+ENV['RAILS_ENV'] ||= "test"
 ENV["RAILS_ASSET_ID"] = "101"
 
 require './lib/jammit'

test/test_helper.rb

@@ -24,42 +24,42 @@ def test_disabled_compression
     @compressor = Compressor.new
     # Should not compress js.
     packed = @compressor.compress_js(glob('test/fixtures/src/*.js'))
-    assert packed == File.read('test/fixtures/jammed/js_test-uncompressed.js')
+    assert_equal packed, File.read('test/fixtures/jammed/js_test-uncompressed.js')
     # Nothing should change with jst.
     packed = @compressor.compile_jst(glob('test/fixtures/src/*.jst'))
-    assert packed == File.read('test/fixtures/jammed/jst_test.js')
+    assert_equal packed, File.read('test/fixtures/jammed/jst_test.js')
     packed = @compressor.compress_css(glob('test/fixtures/src/*.css'))
-    assert packed == File.open('test/fixtures/jammed/css_test-uncompressed.css', 'rb') {|f| f.read }
+    assert_equal packed, File.open('test/fixtures/jammed/css_test-uncompressed.css', 'rb') {|f| f.read }
   end
 
   def test_css_compression
     assert Jammit.compress_assets
     assert Jammit.gzip_assets
     packed = @compressor.compress_css(glob('test/fixtures/src/*.css'))
-    assert packed == File.read('test/fixtures/jammed/css_test.css')
+    assert_equal packed, File.read('test/fixtures/jammed/css_test.css')
   end
 
   def test_erb_configuration
     Jammit.load_configuration('test/config/assets-erb.yml')
     assert Jammit.compress_assets
     packed = @compressor.compress_css(glob('test/fixtures/src/*.css'))
-    assert packed == File.read('test/fixtures/jammed/css_test.css')
+    assert_equal packed, File.read('test/fixtures/jammed/css_test.css')
   end
 
   def test_css_configuration
     Jammit.load_configuration('test/config/assets-css.yml')
     packed = Compressor.new.compress_css(glob('test/fixtures/src/*.css'))
-    assert packed == File.read('test/fixtures/jammed/css_test-line-break.css')
+    assert_equal packed, File.read('test/fixtures/jammed/css_test-line-break.css')
   end
 
   def test_javascript_compression
     packed = @compressor.compress_js(glob('test/fixtures/src/*.js'))
-    assert packed == File.read('test/fixtures/jammed/js_test.js')
+    assert_equal packed, File.read('test/fixtures/jammed/js_test.js')
   end
 
   def test_jst_compilation
     packed = @compressor.compile_jst(glob('test/fixtures/src/*.jst'))
-    assert packed == File.read('test/fixtures/jammed/jst_test.js')
+    assert_equal packed, File.read('test/fixtures/jammed/jst_test.js')
   end
 
   def test_environment_specific_configuration
@@ -72,4 +72,11 @@ def test_environment_specific_configuration
     ENV['RAILS_ENV'] = 'test'
   end
 
+  def test_no_rewrite_relative_paths
+    Jammit.load_configuration('test/config/assets-no-rewrite-relative-paths.yml')
+    assert !Jammit.rewrite_relative_paths
+    packed = @compressor.compress_css(glob('test/fixtures/src/*.css'))
+    assert_equal packed, File.read('test/fixtures/jammed/css_test-no-rewrite-relative-paths.css')
+  end
+
 end

test/unit/test_configuration.rb

@@ -13,7 +13,7 @@ def teardown
 
   def test_javascript_compression
     packed = @compressor.compress_js(glob('test/fixtures/src/*.js'))
-    assert packed == File.read('test/fixtures/jammed/js_test-uglifier.js')
+    assert_equal packed, File.read('test/fixtures/jammed/js_test-uglifier.js')
   end
 
   def test_jst_compilation