heroku-deflater 0.2.0 → 0.3.0

data/Gemfile

@@ -1,5 +1,7 @@
 source "http://rubygems.org"
 
+gem 'rack', '>=1.4.2'
+
 group :development do
   gem "bundler"
   gem "jeweler"

data/Gemfile.lock

@@ -7,7 +7,8 @@ GEM
       git (>= 1.2.5)
       rake
       rdoc
-    json (1.7.5)
+    json (1.7.6)
+    rack (1.4.2)
     rake (10.0.3)
     rdoc (3.12)
       json (~> 1.4)
@@ -18,3 +19,4 @@ PLATFORMS
 DEPENDENCIES
   bundler
   jeweler
+  rack (>= 1.4.2)

data/README.md

@@ -3,8 +3,6 @@
 A simple rack middleware that enables compressing of your assets and application
 responses on Heroku, while not wasting CPU cycles on pointlessly gzipping images.
 
-It also bundles the fix for the nasty Rack::Deflater [bug][1].
-
 ## Installing
 
 Add to your Gemfile:
@@ -27,4 +25,4 @@ Add to your Gemfile:
 Copyright (c) 2012 Roman Shterenzon. See LICENSE.txt for
 further details.
 
-[1]: https://github.com/rack/rack/issues/349
+[1]: https://github.com/rack/rack/issues/349

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/heroku-deflater.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "heroku-deflater"
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Roman Shterenzon"]
-  s.date = "2012-12-25"
+  s.date = "2013-01-07"
   s.description = "Deflate assets on heroku"
   s.email = "romanbsd@yahoo.com"
   s.extra_rdoc_files = [
@@ -25,7 +25,6 @@ Gem::Specification.new do |s|
     "VERSION",
     "heroku-deflater.gemspec",
     "lib/heroku-deflater.rb",
-    "lib/heroku-deflater/deflater.rb",
     "lib/heroku-deflater/railtie.rb",
     "lib/heroku-deflater/skip_images.rb"
   ]
@@ -39,13 +38,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_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<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
+    s.add_dependency(%q<rack>, [">= 1.4.2"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
   end

data/lib/heroku-deflater/railtie.rb

@@ -1,5 +1,4 @@
 require 'rack/deflater'
-require 'heroku-deflater/deflater'
 require 'heroku-deflater/skip_images'
 
 module HerokuDeflater

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heroku-deflater
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-25 00:00:00.000000000 Z
+date: 2013-01-07 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
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -59,7 +75,6 @@ files:
 - VERSION
 - heroku-deflater.gemspec
 - lib/heroku-deflater.rb
-- lib/heroku-deflater/deflater.rb
 - lib/heroku-deflater/railtie.rb
 - lib/heroku-deflater/skip_images.rb
 homepage: http://github.com/romanbsd/heroku-deflater
@@ -77,7 +92,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1157460233835853722
+      hash: 4431948398019269820
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/heroku-deflater/deflater.rb

@@ -1,105 +0,0 @@
-# Fixes https://github.com/rack/rack/issues/349
-require "zlib"
-require "stringio"
-require "time"  # for Time.httpdate
-require 'rack/utils'
-
-module Rack
-  class Deflater
-    def initialize(app)
-      @app = app
-    end
-
-    def call(env)
-      status, headers, body = @app.call(env)
-      headers = Utils::HeaderHash.new(headers)
-
-      # Skip compressing empty entity body responses and responses with
-      # no-transform set.
-      if Utils::STATUS_WITH_NO_ENTITY_BODY.include?(status) ||
-          headers['Cache-Control'].to_s =~ /\bno-transform\b/ ||
-         (headers['Content-Encoding'] && headers['Content-Encoding'] !~ /\bidentity\b/)
-        return [status, headers, body]
-      end
-
-      request = Request.new(env)
-
-      encoding = Utils.select_best_encoding(%w(gzip deflate identity),
-                                            request.accept_encoding)
-
-      # Set the Vary HTTP header.
-      vary = headers["Vary"].to_s.split(",").map { |v| v.strip }
-      unless vary.include?("*") || vary.include?("Accept-Encoding")
-        headers["Vary"] = vary.push("Accept-Encoding").join(",")
-      end
-
-      case encoding
-      when "gzip"
-        headers['Content-Encoding'] = "gzip"
-        headers.delete('Content-Length')
-        mtime = headers.key?("Last-Modified") ?
-          Time.httpdate(headers["Last-Modified"]) : Time.now
-        [status, headers, GzipStream.new(body, mtime)]
-      when "deflate"
-        headers['Content-Encoding'] = "deflate"
-        headers.delete('Content-Length')
-        [status, headers, DeflateStream.new(body)]
-      when "identity"
-        [status, headers, body]
-      when nil
-        body.close if body.respond_to?(:close)
-        message = "An acceptable encoding for the requested resource #{request.fullpath} could not be found."
-        [406, {"Content-Type" => "text/plain", "Content-Length" => message.length.to_s}, [message]]
-      end
-    end
-
-    class GzipStream
-      def initialize(body, mtime)
-        @body = body
-        @mtime = mtime
-      end
-
-      def each(&block)
-        @writer = block
-        gzip  =::Zlib::GzipWriter.new(self)
-        gzip.mtime = @mtime
-        @body.each { |part|
-          gzip.write(part)
-          gzip.flush
-        }
-      ensure
-        @body.close if @body.respond_to?(:close)
-        gzip.close
-        @writer = nil
-      end
-
-      def write(data)
-        @writer.call(data)
-      end
-    end
-
-    class DeflateStream
-      DEFLATE_ARGS = [
-        Zlib::DEFAULT_COMPRESSION,
-        # drop the zlib header which causes both Safari and IE to choke
-        -Zlib::MAX_WBITS,
-        Zlib::DEF_MEM_LEVEL,
-        Zlib::DEFAULT_STRATEGY
-      ]
-
-      def initialize(body)
-        @body = body
-      end
-
-      def each
-        deflater = ::Zlib::Deflate.new(*DEFLATE_ARGS)
-        @body.each { |part| yield deflater.deflate(part, Zlib::SYNC_FLUSH) }
-        yield deflater.finish
-        nil
-      ensure
-        @body.close if @body.respond_to?(:close)
-        deflater.close
-      end
-    end
-  end
-end