http-request 1.2.0 → 1.2.1

data/lib/http-request.rb

@@ -2,6 +2,7 @@ require 'net/http'
 require 'net/https'
 require 'addressable/uri'
 require 'zlib'
+require 'stringio'
 
 module HttpRequest
   extend self

data/lib/http-request/connection.rb

@@ -89,7 +89,7 @@ module HttpRequest
       headers['User-Agent']       ||= user_agent
       headers['Connection']       ||= 'keep-alive' if keep_alive
       headers['Content-Length']   ||= body.bytesize.to_s if body
-      headers['Accept-Encoding']  ||= 'gzip, deflate'
+      headers['Accept-Encoding']  ||= 'gzip' # TODO: add deflate support
 
       # Build request
       req_klass = instance_eval("Net::HTTP::"+verb.to_s.capitalize)

data/lib/http-request/response.rb

@@ -14,14 +14,16 @@ module HttpRequest
 
       # Auto deflate compressed content
       content_encoding = @header['content-encoding'].to_s.downcase
-      if !content_encoding.empty? && (content_encoding.index('gzip') || content_encoding.index('deflate'))
+      if !content_encoding.empty? && content_encoding =~ /gzip/
         gz = Zlib::GzipReader.new(StringIO.new(@body))
+        @body = gz.read
       end
 
       # Use encoding suggested by charset
       charset = @header['content-type'].to_s.match(/charset=([a-z0-9-]*)/i).to_s
       if !charset.empty?
-        @body.force_encoding(charset.split('=')[1]) rescue nil
+        encoding = Encoding.find(charset.split('=')[1]) rescue 'utf-8'
+        @body.force_encoding(encoding)
       end
     end
 

data/lib/http-request/version.rb

@@ -1,3 +1,3 @@
 module HttpRequest
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http-request
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-11 00:00:00.000000000 Z
+date: 2012-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -86,7 +86,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1774260015767547978
+      hash: 2860803797911007449
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: