http-request 1.2.1 → 1.2.2

data/lib/http-request.rb

@@ -1,8 +1,9 @@
 require 'net/http'
 require 'net/https'
-require 'addressable/uri'
 require 'zlib'
 require 'stringio'
+require 'addressable/uri'
+require 'mime/types'
 
 module HttpRequest
   extend self

data/lib/http-request/response.rb

@@ -12,18 +12,25 @@ module HttpRequest
         header.each {|k,v| header[k] = v.first if v.is_a?(Array) && v.length == 1 }
       end
 
-      # Auto deflate compressed content
+      # Auto decompress content
       content_encoding = @header['content-encoding'].to_s.downcase
       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
+      # Content type handling
+      content_type = @header['content-type'].to_s
+      charset = content_type.match(/charset=([a-z0-9-]*)/i).to_s
       if !charset.empty?
+        # Encode to suggested charset
         encoding = Encoding.find(charset.split('=')[1]) rescue 'utf-8'
         @body.force_encoding(encoding)
+      else
+        # Encode to utf-8 by default for any ascii content types
+        # that don't specify the charset
+        mime_type = MIME::Types[content_type].first
+        @body.force_encoding('utf-8') if mime_type && mime_type.ascii?
       end
     end
 

data/lib/http-request/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http-request
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-12 00:00:00.000000000 Z
+date: 2012-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -27,6 +27,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.3'
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.19'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.19'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -72,7 +88,7 @@ files:
 - lib/http-request/response.rb
 - lib/http-request/version.rb
 - lib/http-request.rb
-homepage: http://nulayer.com
+homepage: https://github.com/nulayer/http-request
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -86,7 +102,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2860803797911007449
+      hash: 4195676129085579668
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: