heroku_rails_deflate 1.0.1 → 1.0.2

data/Gemfile

@@ -1,8 +1,8 @@
 source "http://rubygems.org"
 
 gem 'rack', '~> 1.4.5'
-gem 'actionpack', '~> 3.2.13'
-gem 'activesupport', '~> 3.2.13'
+gem 'actionpack', '>= 3.2.13'
+gem 'activesupport', '>= 3.2.13'
 
 group :development do
   gem "rspec"

data/Gemfile.lock

@@ -1,9 +1,9 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionpack (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
+    actionpack (3.2.16)
+      activemodel (= 3.2.16)
+      activesupport (= 3.2.16)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
@@ -11,19 +11,19 @@ GEM
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.13)
-      activesupport (= 3.2.13)
+    activemodel (3.2.16)
+      activesupport (= 3.2.16)
       builder (~> 3.0.0)
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
+    activesupport (3.2.16)
+      i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     addressable (2.3.5)
     builder (3.0.4)
-    diff-lcs (1.2.2)
+    diff-lcs (1.2.5)
     erubis (2.7.0)
     faraday (0.8.8)
       multipart-post (~> 1.2.0)
-    git (1.2.5)
+    git (1.2.6)
     github_api (0.10.1)
       addressable
       faraday (~> 0.8.1)
@@ -32,11 +32,11 @@ GEM
       nokogiri (~> 1.5.2)
       oauth2
     hashie (2.0.5)
-    highline (1.6.19)
-    hike (1.2.1)
+    highline (1.6.20)
+    hike (1.2.3)
     httpauth (0.2.0)
-    i18n (0.6.1)
-    jeweler (1.8.6)
+    i18n (0.6.9)
+    jeweler (1.8.8)
       builder
       bundler (~> 1.0)
       git (>= 1.2.5)
@@ -46,11 +46,11 @@ GEM
       rake
       rdoc
     journey (1.0.4)
-    json (1.8.0)
+    json (1.8.1)
     jwt (0.1.8)
       multi_json (>= 1.5)
-    multi_json (1.7.2)
-    multi_xml (0.5.4)
+    multi_json (1.8.2)
+    multi_xml (0.5.5)
     multipart-post (1.2.0)
     nokogiri (1.5.10)
     oauth2 (0.9.2)
@@ -68,27 +68,27 @@ GEM
     rake (10.1.0)
     rdoc (4.0.1)
       json (~> 1.4)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.4)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.0)
+    rspec-mocks (2.14.4)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    tilt (1.3.6)
+    tilt (1.4.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  actionpack (~> 3.2.13)
-  activesupport (~> 3.2.13)
+  actionpack (>= 3.2.13)
+  activesupport (>= 3.2.13)
   bundler
   jeweler
   rack (~> 1.4.5)

data/README.md

@@ -55,7 +55,8 @@ part. After you get done with this, you could take it to the next level by addin
 
 ## Thanks
 
-This gem expands on code originally published in a [gist](https://gist.github.com/guyboltonking/2152663) by [guyboltonking](https://github.com/guyboltonking). 
+This gem uses a combination of techniques from this [gist](https://gist.github.com/guyboltonking/2152663) by [guyboltonking](https://github.com/guyboltonking) and
+[romanbsd](https://github.com/romanbsd)'s gem [heroku-deflater](https://github.com/romanbsd/heroku-deflater).
 
 ## Copyright
 

data/Rakefile

@@ -36,3 +36,7 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
+task default: [:spec]

data/heroku_rails_deflate.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "heroku_rails_deflate"
-  s.version = "1.0.1"
+  s.version = "1.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Olson"]
-  s.date = "2013-08-02"
+  s.date = "2014-02-13"
   s.description = "This gem is designed for use by Rails applications running on Heroku. For others, the better approach is to use a frontend server such as nginx or Apache. However, the Heroku Cedar stack is no longer fronted by a file server, and there is no automatic provision for gzipping responses. This gem activates Rack::Deflate for all requests. In addition, we serve up the gzipped versions of our precompiled assets, taking advantage of the higher compression ratio used during precompilation, and reducing CPU load at request time."
   s.email = "matt@mattolson.com"
   s.extra_rdoc_files = [
@@ -45,23 +45,23 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rack>, ["~> 1.4.5"])
-      s.add_runtime_dependency(%q<actionpack>, ["~> 3.2.13"])
-      s.add_runtime_dependency(%q<activesupport>, ["~> 3.2.13"])
+      s.add_runtime_dependency(%q<actionpack>, [">= 3.2.13"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 3.2.13"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
       s.add_dependency(%q<rack>, ["~> 1.4.5"])
-      s.add_dependency(%q<actionpack>, ["~> 3.2.13"])
-      s.add_dependency(%q<activesupport>, ["~> 3.2.13"])
+      s.add_dependency(%q<actionpack>, [">= 3.2.13"])
+      s.add_dependency(%q<activesupport>, [">= 3.2.13"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
     s.add_dependency(%q<rack>, ["~> 1.4.5"])
-    s.add_dependency(%q<actionpack>, ["~> 3.2.13"])
-    s.add_dependency(%q<activesupport>, ["~> 3.2.13"])
+    s.add_dependency(%q<actionpack>, [">= 3.2.13"])
+    s.add_dependency(%q<activesupport>, [">= 3.2.13"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])

data/lib/heroku_rails_deflate/railtie.rb

@@ -7,13 +7,20 @@ module HerokuRailsDeflate
     initializer "heroku_rails_deflate.middleware_initialization", :after => :load_config_initializers do |app|
       # Put Rack::Deflater in the right place
       if app.config.action_controller.perform_caching && app.config.action_dispatch.rack_cache
+        # If Rack::Cache is enabled, make sure we are caching compressed files
         app.config.middleware.insert_after 'Rack::Cache', 'Rack::Deflater'
       else
+        # Make sure we compress after retrieving static files
         app.config.middleware.insert_before 'ActionDispatch::Static', 'Rack::Deflater'
       end
 
-      # Insert our custom middleware for serving gzipped static assets
-      app.config.middleware.insert_after 'Rack::Deflater', 'HerokuRailsDeflate::ServeZippedAssets', app.paths["public"].first, app.config.assets.prefix, app.config.static_cache_control
+      # Insert our middleware for serving gzipped static assets. If we serve a compressed
+      # version, we tell deflater to skip it.
+      app.config.middleware.insert_after 'Rack::Deflater',
+                                         'HerokuRailsDeflate::ServeZippedAssets',
+                                         app.paths["public"].first,
+                                         app.config.assets.prefix,
+                                         app.config.static_cache_control
     end
 
     # Set default Cache-Control headers to 365 days. Override in config/application.rb.

data/lib/heroku_rails_deflate/serve_zipped_assets.rb

@@ -2,31 +2,37 @@ require 'action_controller'
 require 'active_support/core_ext/uri'
 require 'action_dispatch/middleware/static'
 
+# Middleware to serve the gzipped version of static assets if they exist
 # Adapted from https://gist.github.com/guyboltonking/2152663
 module HerokuRailsDeflate
   class ServeZippedAssets
-    def initialize(app, root, assets_path, cache_control=nil)
+    # Params:
+    #   root: the public directory
+    #   asset_prefix: config.assets.prefix
+    #   cache_control: config.static_cache_control
+    def initialize(app, root, asset_prefix, cache_control=nil)
       @app = app
-      @assets_path = assets_path.chomp('/') + '/'
+      @asset_prefix = asset_prefix.chomp('/') + '/'
       @file_handler = ActionDispatch::FileHandler.new(root, cache_control)
     end
 
     def call(env)
+      # Only process get requests
       if env['REQUEST_METHOD'] == 'GET'
         request = Rack::Request.new(env)
-        encoding = Rack::Utils.select_best_encoding(%w(gzip identity), request.accept_encoding)
 
-        if encoding == 'gzip'
-          # See if gzipped version exists in assets directory
+        # See if client accepts gzip encoding
+        if Rack::Utils.select_best_encoding(%w(gzip identity), request.accept_encoding) == 'gzip'
+          # Check if compressed version exists in assets directory
           compressed_path = env['PATH_INFO'] + '.gz'
-          if compressed_path.start_with?(@assets_path) && (match = @file_handler.match?(compressed_path))
-            # Get the FileHandler to serve up the gzipped file, then strip the .gz suffix
-            env["PATH_INFO"] = match
+          if compressed_path.start_with?(@asset_prefix) && (match = @file_handler.match?(compressed_path))
+            # Use FileHandler to serve up the gzipped file, then strip the .gz suffix
+            path = env["PATH_INFO"] = match
             status, headers, body = @file_handler.call(env)
             path = env["PATH_INFO"] = env["PATH_INFO"].chomp('.gz')
 
             # Set the Vary HTTP header.
-            vary = headers["Vary"].to_s.split(",").map { |v| v.strip }
+            vary = headers["Vary"].to_s.split(",").map(&:strip)
             unless vary.include?("*") || vary.include?("Accept-Encoding")
               headers["Vary"] = vary.push("Accept-Encoding").join(",")
             end
@@ -34,7 +40,6 @@ module HerokuRailsDeflate
             # Add encoding and type
             headers['Content-Encoding'] = 'gzip'
             headers['Content-Type'] = Rack::Mime.mime_type(File.extname(path), 'text/plain')
-            headers.delete('Content-Length')
 
             # Update cache-control to add directive telling Rack::Deflate to leave it alone.
             cache_control = headers['Cache-Control'].try(:to_s).try(:downcase)
@@ -44,14 +49,13 @@ module HerokuRailsDeflate
               headers['Cache-Control'] += ', no-transform'
             end
 
+            body.close if body.respond_to?(:close)
             return [status, headers, body]
           end
         end
       end
 
-      status, headers, body = @app.call(env)
-      body.close if body.respond_to?(:close)
-      [status, headers, body]
+      @app.call(env)
     end
   end
 end

data/lib/heroku_rails_deflate/version.rb

@@ -2,7 +2,7 @@ module HerokuRailsDeflate
   class Version
     MAJOR = 1
     MINOR = 0
-    PATCH = 1
+    PATCH = 2
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heroku_rails_deflate
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-02 00:00:00.000000000 Z
+date: 2014-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -32,7 +32,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.2.13
   type: :runtime
@@ -40,7 +40,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.2.13
 - !ruby/object:Gem::Dependency
@@ -48,7 +48,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.2.13
   type: :runtime
@@ -56,7 +56,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.2.13
 - !ruby/object:Gem::Dependency
@@ -152,7 +152,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2875700319250447575
+      hash: 310604106122414860
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: