attune 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7be8348bda50301c2d67c55f04d974c616dd08c2
-  data.tar.gz: 2a6f630315d49c5a3148a163804e3f27774a7def
+  metadata.gz: 33e278960925d8b1aeb5e7575b66a575299e6323
+  data.tar.gz: 614890038d5ff2ab7ad3d21517c08fa6bea7df01
 SHA512:
-  metadata.gz: 8e8a3156494cef134484554b2b3973d37fd99d9da21513413ca54a1b2138a29f49b791d52792e4cfacadc1470d3d8a63301fb1078ebca5ce484b43b6ea313702
-  data.tar.gz: 38565796e45a9b63f8aa452442f19386a37d7a34aa430bfb0c4d298c9be9a60ba3a7c910b98abc8d5083e9748dd8a70a7f6e8088bfbbb28866d7b6a18039f6d0
+  metadata.gz: 1be52d8cb15c9822985205f2824997e2de1c5e60e00e192d54deaa7243568205f894acc8880f6f9598d9b57b2746f70bf158023518b79d2d11a136e0f33083fc
+  data.tar.gz: 6b60a69e5a43cd521fafe45a5dda7cedcd55fb468ea891a54f37a63bd9ec3dc3de0f34813a4a6f1eccea6e2fcf0830be8cfeea97dad09d7a4e95786e4d6a7e65

data/lib/attune/default.rb

@@ -1,7 +1,7 @@
 require 'attune/param_flattener'
 require "attune/call_dropping"
 require "attune/json_logger"
-require "attune/gzip_request"
+require "attune/gzip"
 require "attune/net_http_persistent"
 
 module Attune
@@ -30,7 +30,7 @@ module Attune
       builder.use Attune::JsonLogger
 
       # Gzip requests, Faraday handles responses automatically
-      builder.use Attune::GzipRequest
+      builder.use Attune::Gzip
 
       # Raise exceptions for HTTP 4xx/5xx
       builder.response :raise_error

data/lib/attune/gzip.rb

@@ -0,0 +1,62 @@
+module Attune
+  # Some code taken from a yet to be released version of faraday-middleware
+  class Gzip < Faraday::Middleware
+    dependency 'zlib'
+
+    CONTENT_TYPE = 'Content-Type'.freeze
+    CONTENT_ENCODING = 'Content-Encoding'.freeze
+    MIME_TYPE    = 'application/json'.freeze
+    ENCODING_TYPE = 'gzip'.freeze
+    ACCEPT_ENCODING = 'Accept-Encoding'.freeze
+    CONTENT_LENGTH = 'Content-Length'.freeze
+    SUPPORTED_ENCODINGS = 'gzip,deflate'.freeze
+    RUBY_ENCODING = '1.9'.respond_to?(:force_encoding)
+
+    def call(env)
+      if has_body?(env) && is_json?(env)
+        wio = StringIO.new("w")
+        w_gz = Zlib::GzipWriter.new(wio)
+        w_gz.write env[:body]
+        w_gz.close
+        env[:body] = wio.string
+        env[:request_headers][CONTENT_ENCODING] = ENCODING_TYPE
+      end
+      env[:request_headers][ACCEPT_ENCODING] ||= SUPPORTED_ENCODINGS
+      @app.call(env).on_complete do |env|
+        case env[:response_headers][CONTENT_ENCODING]
+        when 'gzip'
+          reset_body(env, &method(:uncompress_gzip))
+        when 'deflate'
+          reset_body(env, &method(:inflate))
+        end
+      end
+    end
+    def is_json?(env)
+      env[:request_headers][CONTENT_TYPE] == MIME_TYPE
+    end
+    def has_body?(env)
+      body = env[:body] and !(body.respond_to?(:to_str) and body.empty?)
+    end
+
+    def reset_body(env)
+      env[:body] = yield(env[:body])
+      env[:response_headers].delete(CONTENT_ENCODING)
+      env[:response_headers][CONTENT_LENGTH] = env[:body].length
+    end
+
+    def uncompress_gzip(body)
+      io = StringIO.new(body)
+      gzip_reader = if RUBY_ENCODING
+        Zlib::GzipReader.new(io, :encoding => 'ASCII-8BIT')
+      else
+        Zlib::GzipReader.new(io)
+      end
+      gzip_reader.read
+    end
+    def inflate(body)
+      Zlib::Inflate.inflate(body)
+    end
+  end
+end
+
+

data/lib/attune/json_logger.rb

@@ -24,7 +24,6 @@ module Attune
         r_id: SecureRandom.uuid,
         status: response.status,
         ua: env[:request_headers]['User-Agent'],
-        enc: env[:request_headers]['Content-Encoding'],
         method: env[:method],
         perf: {
           total: elapsed_time * 1000

data/lib/attune/version.rb

@@ -1,4 +1,4 @@
 module Attune
-  VERSION = "1.0.8"
+  VERSION = "1.0.9"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: attune
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - John Hawthorn
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-21 00:00:00.000000000 Z
+date: 2014-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -147,7 +147,7 @@ files:
 - lib/attune/client.rb
 - lib/attune/configurable.rb
 - lib/attune/default.rb
-- lib/attune/gzip_request.rb
+- lib/attune/gzip.rb
 - lib/attune/json_logger.rb
 - lib/attune/mocks.rb
 - lib/attune/models/anonymous_result.rb
@@ -201,4 +201,3 @@ test_files:
 - spec/attune_spec.rb
 - spec/remote_spec.rb
 - spec/spec_helper.rb
-has_rdoc: 

data/lib/attune/gzip_request.rb

@@ -1,27 +0,0 @@
-module Attune
-  class GzipRequest < Faraday::Middleware
-    CONTENT_TYPE = 'Content-Type'.freeze
-    CONTENT_ENCODING = 'Content-Encoding'.freeze
-    MIME_TYPE    = 'application/json'.freeze
-    ENCODING_TYPE = 'gzip'.freeze
-
-    def call(env)
-      if has_body?(env) && is_json?(env)
-        wio = StringIO.new("w")
-        w_gz = Zlib::GzipWriter.new(wio)
-        w_gz.write env[:body]
-        w_gz.close
-        env[:body] = wio.string
-        env[:request_headers][CONTENT_ENCODING] = ENCODING_TYPE
-      end
-      @app.call env
-    end
-    def is_json?(env)
-      env[:request_headers][CONTENT_TYPE] == MIME_TYPE
-    end
-    def has_body?(env)
-      body = env[:body] and !(body.respond_to?(:to_str) and body.empty?)
-    end
-  end
-end
-