heroku-deflater 0.3.0 → 0.4.0

data/.rspec

@@ -0,0 +1,3 @@
+--colour
+--format progress
+--tag ~slow

data/Gemfile

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
-gem 'rack', '>=1.4.2'
+gem 'rack', '~>1.4.5'
 
 group :development do
   gem "bundler"

data/Gemfile.lock

@@ -7,10 +7,10 @@ GEM
       git (>= 1.2.5)
       rake
       rdoc
-    json (1.7.6)
-    rack (1.4.2)
+    json (1.7.7)
+    rack (1.4.5)
     rake (10.0.3)
-    rdoc (3.12)
+    rdoc (3.12.1)
       json (~> 1.4)
 
 PLATFORMS
@@ -19,4 +19,4 @@ PLATFORMS
 DEPENDENCIES
   bundler
   jeweler
-  rack (>= 1.4.2)
+  rack (~> 1.4.5)

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/heroku-deflater.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "heroku-deflater"
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Roman Shterenzon"]
-  s.date = "2013-01-07"
+  s.date = "2013-02-22"
   s.description = "Deflate assets on heroku"
   s.email = "romanbsd@yahoo.com"
   s.extra_rdoc_files = [
@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
     "README.md"
   ]
   s.files = [
+    ".rspec",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
@@ -26,7 +27,8 @@ Gem::Specification.new do |s|
     "heroku-deflater.gemspec",
     "lib/heroku-deflater.rb",
     "lib/heroku-deflater/railtie.rb",
-    "lib/heroku-deflater/skip_images.rb"
+    "lib/heroku-deflater/skip_binary.rb",
+    "spec/skip_binary_spec.rb"
   ]
   s.homepage = "http://github.com/romanbsd/heroku-deflater"
   s.licenses = ["MIT"]
@@ -38,16 +40,16 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rack>, [">= 1.4.2"])
+      s.add_runtime_dependency(%q<rack>, ["~> 1.4.5"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
-      s.add_dependency(%q<rack>, [">= 1.4.2"])
+      s.add_dependency(%q<rack>, ["~> 1.4.5"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rack>, [">= 1.4.2"])
+    s.add_dependency(%q<rack>, ["~> 1.4.5"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
   end

data/lib/heroku-deflater/railtie.rb

@@ -1,15 +1,17 @@
 require 'rack/deflater'
-require 'heroku-deflater/skip_images'
+require 'heroku-deflater/skip_binary'
 
 module HerokuDeflater
   class Railtie < Rails::Railtie
     initializer "heroku_deflater.configure_rails_initialization" do |app|
       app.middleware.insert_before ActionDispatch::Static, Rack::Deflater
-      app.middleware.insert_before ActionDispatch::Static, HerokuDeflater::SkipImages
+      app.middleware.insert_before ActionDispatch::Static, HerokuDeflater::SkipBinary
     end
 
-    config.after_initialize do |app|
-      app.config.static_cache_control ||= "public, max-age=86400"
+    # Set default Cache-Control headers to one week.
+    # The configuration block in config/application.rb overrides this.
+    config.before_configuration do |app|
+      app.config.static_cache_control = 'public, max-age=604800'
     end
   end
 end

data/lib/heroku-deflater/skip_binary.rb

@@ -0,0 +1,30 @@
+module HerokuDeflater
+  # Add a no-transform Cache-Control header to binary types, so they won't get gzipped
+  class SkipBinary
+    def initialize(app)
+      @app = app
+    end
+
+    WHITELIST = [
+      %r{^text/},
+      'application/javascript',
+      'application/json'
+    ].freeze
+
+    def call(env)
+      status, headers, body = @app.call(env)
+      headers = Rack::Utils::HeaderHash.new(headers)
+      content_type = headers['Content-Type']
+      cache_control = headers['Cache-Control'].to_s.downcase
+
+      unless cache_control.include?('no-transform') or WHITELIST.any? { |type| type === content_type }
+        if cache_control.empty?
+          headers['Cache-Control'] = 'no-transform'
+        else
+          headers['Cache-Control'] += ', no-transform'
+        end
+      end
+      [status, headers, body]
+    end
+  end
+end

data/spec/skip_binary_spec.rb

@@ -0,0 +1,39 @@
+require 'rack/mock'
+require 'heroku-deflater/skip_binary'
+
+describe HerokuDeflater::SkipBinary do
+  let(:env) { Rack::MockRequest.env_for('/') }
+
+  def app_returning_type(type, headers = {})
+    lambda { |env| [200, {'Content-Type' => type}.merge(headers), ['']] }
+  end
+
+  def process(type, headers = {})
+    described_class.new(app_returning_type(type, headers)).call(env)[1]
+  end
+
+  it "forbids compressing of binary types" do
+    %w[application/gzip application/pdf image/jpeg].each do |type|
+      headers = process(type)
+      headers['Cache-Control'].to_s.should include('no-transform')
+    end
+  end
+
+  it "allows compressing of text types" do
+    %w[text/plain text/html application/json application/javascript].each do |type|
+      headers = process(type)
+      headers['Cache-Control'].to_s.should_not include('no-transform')
+    end
+  end
+
+  it "adds to existing headers" do
+    headers = process('image/gif', 'Cache-Control' => 'public')
+    headers['Cache-Control'].should eq('public, no-transform')
+  end
+
+  it "doesn't add 'no-transform' if it's already present" do
+    headers = process('image/gif', 'Cache-Control' => 'public, no-transform')
+    headers['Cache-Control'].should eq('public, no-transform')
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heroku-deflater
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-07 00:00:00.000000000 Z
+date: 2013-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 1.4.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 1.4.5
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -67,6 +67,7 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files:
+- .rspec
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -76,7 +77,8 @@ files:
 - heroku-deflater.gemspec
 - lib/heroku-deflater.rb
 - lib/heroku-deflater/railtie.rb
-- lib/heroku-deflater/skip_images.rb
+- lib/heroku-deflater/skip_binary.rb
+- spec/skip_binary_spec.rb
 homepage: http://github.com/romanbsd/heroku-deflater
 licenses:
 - MIT
@@ -92,7 +94,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4431948398019269820
+      hash: 3241685697845166073
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/heroku-deflater/skip_images.rb

@@ -1,22 +0,0 @@
-module HerokuDeflater
-  # Add a no-transform Cache-Control header to images, so they won't get gzipped
-  class SkipImages
-    def initialize(app)
-      @app = app
-    end
-
-    # TODO: whitelist rather than blacklist
-    def call(env)
-      status, headers, body = @app.call(env)
-      headers = Rack::Utils::HeaderHash.new(headers)
-      if headers['Content-Type'].to_s.start_with?('image/')
-        if headers['Cache-Control'].nil? or headers['Cache-Control'].empty?
-          headers['Cache-Control'] = 'no-transform'
-        else
-          headers['Cache-Control'] += ', no-transform'
-        end
-      end
-      [status, headers, body]
-    end
-  end
-end