cacho 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 383e74d0ac66a216ed011020530efbc4570cce1e
-  data.tar.gz: 84c5210831578a5f131a66535fce4d53b709e203
+  metadata.gz: f5ca8cc9f078ae86e02bc6afb967b4e63596cbc6
+  data.tar.gz: 2dfd696b59443bd1077ec5dd614838f057a4c526
 SHA512:
-  metadata.gz: 9a447d7cf5f0dfeefa4e011409f54cfcf5b8f4d266855903002e578fde6d50165895f443da1be3acb280f4b3e4fc220d957e861f5c2336665e0b66bd40cb7bba
-  data.tar.gz: 3b6a1da1d8299e79bc0aa2626548ca12ab847471afe914a58e2936f1fe9add41d4a8851327cf4a12c79e2bbedb44bc36566d472946570a3a18de407c469e1c37
+  metadata.gz: 8f83a5f46beaf4a85ae194143f0c34e7c682f42b7d27e1a89a4837fbe554499ca0458ac1d01a6aa50ce82ebfd43e9a8fe8b3e7c35e012e3a0cf902dda5fb1d76
+  data.tar.gz: 91be7e3b2db90c242bcdb54fd1788640c2d7a0d0130565a7cfac8aa2ad1d184b1909fb92c5608cc2483e7338b049bb35885e6eac9a29aa037fbc508b8973d3b0

data/CHANGELOG.md

@@ -0,0 +1,11 @@
+0.1.1 - 2014-11-02
+==================
+
+* Use the `charset` directive in `Content-Type` if present.
+
+* Ignore `Content-Type` when empty.
+
+0.1.0 - 2014-10-30
+==================
+
+* First release.

data/lib/cacho.rb

@@ -7,7 +7,7 @@ require "csv"
 require "fileutils"
 
 class Cacho
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 
   attr_accessor :hasher
 
@@ -100,10 +100,17 @@ class Cacho::Client
         body = Zlib::GzipReader.new(StringIO.new(body)).read
       end
 
-      if res["Content-Type"].start_with?("application/json")
-        parsed = JSON.parse(body)
-      else
-        parsed = body
+      if res["Content-Type"]
+        if charset = res["Content-Type"][/\bcharset=(.+)\b/, 1]
+          body.force_encoding(charset)
+          body.encode!(Encoding.default_external)
+        end
+
+        if res["Content-Type"].start_with?("application/json")
+          parsed = JSON.parse(body)
+        else
+          parsed = body
+        end
       end
 
       if @callbacks[:rate_limit_detector]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cacho
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Damian Janowski
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-30 00:00:00.000000000 Z
+date: 2014-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-http-persistent
@@ -34,6 +34,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGELOG.md
 - README.md
 - Rakefile
 - UNLICENSE