Merge pull request #57 from Shopify/fix-auto-compression

Do not gzip assets that are already gzipped

Author: rafaelfranca

lib/sprockets/asset.rb

@@ -139,7 +139,9 @@ def stale?(environment)
     # Save asset to disk.
     def write_to(filename, options = {})
       # Gzip contents if filename has '.gz'
-      options[:compress] ||= File.extname(filename) == '.gz'
+      unless options.key?(:compress)
+        options[:compress] = File.extname(filename) == '.gz' && File.extname(logical_path) != '.gz'
+      end
 
       FileUtils.mkdir_p File.dirname(filename)
 

lib/sprockets/static_asset.rb

@@ -21,7 +21,9 @@ def to_path
     # Save asset to disk.
     def write_to(filename, options = {})
       # Gzip contents if filename has '.gz'
-      options[:compress] ||= File.extname(filename) == '.gz'
+      unless options.key?(:compress)
+        options[:compress] = File.extname(filename) == '.gz' && File.extname(logical_path) != '.gz'
+      end
 
       FileUtils.mkdir_p File.dirname(filename)
 

test/fixtures/asset/archive.tar.gz

@@ -77,6 +77,19 @@ def self.test(name, &block)
       assert !File.exist?(target)
     end
   end
+
+  test "do not gzip assets that are already gzipped" do
+    @asset = @env.find_asset('archive.tar.gz')
+    target = fixture_path('asset/tmp.tar.gz')
+    begin
+      @asset.write_to(target)
+      assert File.exist?(target)
+      assert_equal Digest::MD5.hexdigest(@asset.to_s), Digest::MD5.hexdigest(File.read(target))
+    ensure
+      FileUtils.rm(target) if File.exist?(target)
+      assert !File.exist?(target)
+    end
+  end
 end
 
 module FreshnessTests