zendesk_api 0.3.8 → 0.3.9

data/Gemfile.lock

@@ -7,7 +7,7 @@ GIT
 PATH
   remote: .
   specs:
-    zendesk_api (0.3.8)
+    zendesk_api (0.3.9)
       faraday (>= 0.8.0)
       faraday_middleware (>= 0.8.7)
       hashie (>= 1.2)

data/lib/zendesk_api/middleware/request/etag_cache.rb

@@ -30,7 +30,12 @@ module ZendeskAPI
 
           @app.call(env).on_complete do
             if cached && env[:status] == 304 # not modified
-              env.merge!(:body => cached[:body], :response_headers => cached[:response_headers])
+              env[:body] = cached[:body]
+              env[:response_headers].merge!(
+                :etag => cached[:response_headers][:etag],
+                :content_type => cached[:response_headers][:content_type],
+                :content_length => cached[:response_headers][:content_length]
+              )
             elsif env[:status] == 200 && env[:response_headers]["Etag"] # modified and cacheable
               @cache.write(cache_key(env), env)
             end

data/lib/zendesk_api/version.rb

@@ -1,3 +1,3 @@
 module ZendeskAPI
-  VERSION = "0.3.8"
+  VERSION = "0.3.9"
 end

data/spec/core/middleware/request/etag_cache_spec.rb

@@ -5,16 +5,17 @@ describe ZendeskAPI::Middleware::Request::EtagCache do
     client.config.cache.size = 1
 
     stub_json_request(:get, %r{blergh}, '{"x":1}', :headers => {"Etag" => "x"})
-    response = client.connection.get("blergh")
-    response.status.should == 200
-    response.body.should == {"x"=>1}
-
-    headers = response.headers
+    first_response = client.connection.get("blergh")
+    first_response.status.should == 200
+    first_response.body.should == {"x"=>1}
 
     stub_request(:get, %r{blergh}).to_return(:status => 304, :headers => {"Etag" => "x"})
     response = client.connection.get("blergh")
     response.status.should == 304
     response.body.should == {"x"=>1}
-    response.headers.should == headers
+
+    %w{content_type content_length etag}.each do |header|
+      response.headers[header].should == first_response.headers[header]
+    end
   end
 end

data/spec/core/spec_helper.rb

@@ -73,7 +73,7 @@ module TestHelper
 
   def stub_json_request(verb, path_matcher, body = json, options = {})
     stub_request(verb, path_matcher).to_return(Hashie::Mash.new(
-      :body => body, :headers => { :content_type => "application/json" }
+      :body => body, :headers => { :content_type => "application/json", :content_length => body.size }
     ).deep_merge(options))
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zendesk_api
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
   prerelease: 
 platform: ruby
 authors: