degzipper 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1151434f8833470a8de8ba07d73bd3430c2330e9
-  data.tar.gz: 51b24f05136a687187e2977a6bf7e589d118c836
+  metadata.gz: 9a36b7f29e14fe05b8873d292452bf787cde984f
+  data.tar.gz: d18190258ac989ccff637b97f0b6b2fbd3ac8883
 SHA512:
-  metadata.gz: c7f93d6007d513925ab291f3757e502d7757d15126585116725d5ffa8e7b75c14f981d0802a2d1bdeb35d338525b425cbaf5b844b0c5d47f991822b4d631a21e
-  data.tar.gz: 19149bcb8ac05e5470c0f35b13a626ad474dfeb18cdd754dc9e31bd599ee1866592e7f9bf3299e452a52ced7b5980525f700a85285c13472b675e78578e45fc6
+  metadata.gz: 3651b710bd5659f4f986f4e43ccaeae217854f18eeef3f6b22e69a54d025c1abaadaa0bc34a9a7fdc06a1d7cf2729717c3578a8451e1d59111e001b48b1cf39b
+  data.tar.gz: 625046d22854e92f3fb59e7f2b1476631b889906805796b196eb3eb24f5c9e79cea053eea14bc9d420488cda9447da83e5333a93a2bf4dcd6fe91174a924813d

data/.travis.yml

@@ -0,0 +1,3 @@
+language: ruby
+rvm:
+  - "2.2.2"

data/CHANGELOG.md

@@ -0,0 +1,6 @@
+# Change Log
+
+## [0.0.4] - 2015-06-29
+
+### Fixed
+- [Fix no-utf encoding and add the `real` deflate implementation (#3)](https://github.com/andrhamm/degzipper/pull/3)

data/README.md

@@ -1,7 +1,7 @@
 # Degzipper
 Rack middleware to inflate incoming Gzip data from HTTP requests.
 
-[![Code Climate](https://codeclimate.com/github/andrhamm/degzipper.png)](https://codeclimate.com/github/andrhamm/degzipper)
+[![Build Status](https://travis-ci.org/andrhamm/degzipper.svg)](https://travis-ci.org/andrhamm/degzipper) [![Code Climate](https://codeclimate.com/github/andrhamm/degzipper.png)](https://codeclimate.com/github/andrhamm/degzipper)
 
 ## Getting Started
 Degzipper is a Rack Middleware. That means that you can use it the same way that you use any other Rack middleware. For example, to use in a Sinatra application I might do this:

data/degzipper.gemspec

@@ -21,4 +21,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rack"
 end

data/lib/degzipper/middleware.rb

@@ -4,31 +4,38 @@ module Degzipper
       @app = app
     end
 
-    def method_handled?(env)
-      !!(env['REQUEST_METHOD'] =~ /(POST|PUT|PATCH)/)
-    end
-
-    def encoding_handled?(env)
-      ['gzip', 'deflate'].include? env['HTTP_CONTENT_ENCODING']
-    end
-
     def call(env)
-      if method_handled?(env) && encoding_handled?(env)
+      if method_handled?(env['REQUEST_METHOD']) && encoding_handled?(env['HTTP_CONTENT_ENCODING'])
         extracted = decode(env['rack.input'], env['HTTP_CONTENT_ENCODING'])
 
         env.delete('HTTP_CONTENT_ENCODING')
         env['CONTENT_LENGTH'] = extracted.bytesize
-        env['rack.input'] = StringIO.new(extracted)
+        env['rack.input'] = StringIO.new(extracted).set_encoding('utf-8')
       end
 
-      status, headers, response = @app.call(env)
-      return [status, headers, response]
+      @app.call(env)
+    end
+
+    private
+
+    def method_handled?(method)
+      ['POST', 'PUT', 'PATCH'].include? method
+    end
+
+    def encoding_handled?(encoding)
+      ['gzip', 'zlib', 'deflate'].include? encoding
     end
 
     def decode(input, content_encoding)
       case content_encoding
         when 'gzip' then Zlib::GzipReader.new(input).read
-        when 'deflate' then Zlib::Inflate.inflate(input.read)
+        when 'zlib' then Zlib::Inflate.inflate(input.string)
+        when 'deflate'
+          stream = Zlib::Inflate.new(-Zlib::MAX_WBITS)
+          content = stream.inflate(input.string)
+          stream.finish
+          stream.close
+          content
       end
     end
   end

data/lib/degzipper/version.rb

@@ -1,3 +1,3 @@
 module Degzipper
-  VERSION = "0.0.3"
+  VERSION = '0.0.4'
 end

data/spec/degzipper_spec.rb

@@ -4,14 +4,15 @@ require 'rack'
 require 'zlib'
 
 RSpec.describe Degzipper::Middleware do
-  def gzip(content)
-    string_io = StringIO.new
-
-    gz = Zlib::GzipWriter.new(string_io)
-    gz.write content
-    gz.close
+  def make_request(input, encoding)
+    body = middleware.call(Rack::MockRequest.env_for(
+      '/',
+      method: 'POST',
+      input: input,
+      'HTTP_CONTENT_ENCODING' => encoding
+    ))[2]
 
-    string_io.string
+    JSON.parse(body)
   end
 
   let(:middleware) do
@@ -24,57 +25,73 @@ RSpec.describe Degzipper::Middleware do
         length: req.content_length.to_i
       )
 
-      [200, {}, [body]]
+      [200, {}, body]
     end)
   end
 
   it 'passes through a non-gzipped request body' do
-    _, _, body = middleware.call(Rack::MockRequest.env_for(
-      '/',
-      method: 'POST',
-      input: 'hello'
-    ))
-
-    parsed_body = JSON.parse(body.first)
+    resp = make_request('hello', nil)
 
-    expect(parsed_body).to eq(
+    expect(resp).to eq(
       'body' => 'hello',
       'content_encoding' => nil,
       'length' => 5
     )
   end
 
-  it 'extracts a gzipped request body' do
-    _, _, body = middleware.call(Rack::MockRequest.env_for(
-      '/',
-      method: 'POST',
-      input: gzip('hello'),
-      'HTTP_CONTENT_ENCODING' => 'gzip'
-    ))
+  shared_examples_for 'a compression' do |type|
+    it 'extracts a compressed request body' do
+      resp = make_request(compress('hello'), type)
 
-    parsed_body = JSON.parse(body.first)
+      expect(resp).to eq(
+        'body' => 'hello',
+        'content_encoding' => nil,
+        'length' => 5
+      )
+    end
 
-    expect(parsed_body).to eq(
-      'body' => 'hello',
-      'content_encoding' => nil,
-      'length' => 5
-    )
+    it 'sets the correct content length for UTF-8 content' do
+      resp = make_request(compress('你好'), type)
+
+      expect(resp).to eq(
+        'body' => '你好',
+        'content_encoding' => nil,
+        'length' => 6
+      )
+    end
   end
 
-  it 'sets the correct content length for UTF-8 content' do
-    _, _, body = middleware.call(Rack::MockRequest.env_for(
-      '/',
-      method: 'POST',
-      input: gzip('你好'),
-      'HTTP_CONTENT_ENCODING' => 'gzip'
-    ))
+  context 'gzip' do
+    it_behaves_like 'a compression', 'gzip'
 
-    parsed_body = JSON.parse(body.first)
+    def compress(content)
+      string_io = StringIO.new
 
-    expect(parsed_body).to eq(
-      'body' => '你好',
-      'content_encoding' => nil,
-      'length' => 6
-    )
+      gz = Zlib::GzipWriter.new(string_io)
+      gz.write content
+      gz.close
+
+      string_io.string
+    end
+  end
+
+
+  context 'zlib' do
+    it_behaves_like 'a compression', 'zlib'
+
+    def compress(content)
+      Zlib::Deflate.deflate(content)
+    end
+  end
+
+  context 'deflate' do
+    it_behaves_like 'a compression', 'deflate'
+
+    def compress(content)
+      stream = Zlib::Deflate.new(Zlib::DEFAULT_COMPRESSION, -Zlib::MAX_WBITS)
+      result = stream.deflate(content, Zlib::FINISH)
+      stream.close
+      result
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: degzipper
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Andrew Hammond
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-11 00:00:00.000000000 Z
+date: 2015-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,6 +53,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Rack middleware to inflate incoming Gzip data from HTTP requests.
 email:
 - andrew@evertrue.com
@@ -62,6 +76,8 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -92,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Rack middleware to inflate incoming Gzip data from HTTP requests.