cryx-cacheability 0.1.0 → 0.1.1

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 1
-:patch: 0
+:patch: 1
 :major: 0

data/lib/cacheability/restclient.rb

@@ -7,8 +7,12 @@ module RestClient
   class MockHTTPResponse
     attr_reader :code, :headers, :body
     def initialize(rack_response)
-      @code, @headers, @body = rack_response
+      @code, @headers, io = rack_response
+      @body = ""
+      io.each{ |block| @body << block }
+      io.close if io.respond_to?(:close)
     end
+    
     def to_hash
       @headers
     end    
@@ -37,13 +41,20 @@ module RestClient
           "PATH_INFO" => path_info,
           "QUERY_STRING" => uri.query,
           "SERVER_NAME" => uri.host,
-          "SERVER_PORT" => uri.port.to_s
+          "SERVER_PORT" => uri.port.to_s,
+          "rack.version" => Rack::VERSION,
+          "rack.run_once" => false,
+          "rack.multithread" => true,
+          "rack.multiprocess" => true,
+          "rack.url_scheme" => uri.scheme,
+          "rack.input" => StringIO.new,
+          "rack.errors" => StringIO.new   # Rack-Cache writes errors into this field
         }
         debeautify_headers(additional_headers).each do |key, value|
           env.merge!("HTTP_"+key.to_s.gsub("-", "_").upcase => value)
         end
         response = MockHTTPResponse.new(cache.call(env))
-        RestClient::Response.new(response.body.to_s, response)
+        RestClient::Response.new(response.body, response)
       else
         super(additional_headers)
       end
@@ -66,9 +77,8 @@ module RestClient
       response = get(debeautify_headers(http_headers), pass_through_cache=false)
       response.headers.delete(:x_content_digest) # don't know why, but it seems to make the validation fail if kept...
       [response.code, debeautify_headers( response.headers ), response.to_s]
-    rescue RestClient::NotModified
-      # should be modified to include response headers when the rest-client gem is up to date
-      [304, {}, ""]
+    rescue RestClient::NotModified => e
+      [304, e.response.to_hash, ""]
     end
   end
 end

data/spec/cacheability_spec.rb

@@ -1,5 +1,7 @@
 require File.dirname(__FILE__) + '/spec_helper'
 require 'restclient'
+require File.dirname(__FILE__) + '/../lib/cacheability/restclient'
+
 
 describe RestClient::CacheableResource do
   require File.dirname(__FILE__) + '/../lib/cacheability/restclient'
@@ -18,6 +20,8 @@ describe RestClient::CacheableResource do
   describe "correctly instantiated" do
     before do
       @mock_cache = mock('rack-cache singleton')
+      @mock_rack_errors = mock('string io')
+      @mock_304_net_http_response = mock('http response', :code => 304, :body => "", :to_hash => {'header1' => 'value1'})
       Rack::Cache.stub!(:new).and_return(@mock_cache)
       @env = {
         'REQUEST_METHOD' => 'GET',
@@ -31,7 +35,7 @@ describe RestClient::CacheableResource do
     end
     
     it "should pass through the cache" do
-      @resource.cache.should_receive(:call).with( hash_including( @env.merge({'HTTP_ADDITIONAL_HEADER' => 'whatever'}) ) )
+      @resource.cache.should_receive(:call).with( hash_including( @env.merge({'HTTP_ADDITIONAL_HEADER' => 'whatever'}) ) ).and_return([200, {}, "response body"])
       @resource['/?q1=a&q2=b'].get(:additional_header => 'whatever')
     end
   
@@ -48,9 +52,9 @@ describe RestClient::CacheableResource do
     end
     
     it "should return a 304 not modified response if the call to the backend returned a 304 not modified response" do
-      @resource.should_receive(:get).with({'ADDITIONAL-HEADER' => 'whatever'}, false).and_raise(RestClient::NotModified)
+      @resource.should_receive(:get).with({'ADDITIONAL-HEADER' => 'whatever'}, false).and_raise(RestClient::NotModified.new(@mock_304_net_http_response))
       response = @resource.call(@env.merge({'HTTP_ADDITIONAL_HEADER' => 'whatever'}))
-      response.should == [304, {}, ""]
+      response.should == [304, {"header1"=>"value1"}, ""]
     end
     
     it "should render a RestClient::Response even when the data is coming from the cache" do

data/spec/spec_helper.rb

@@ -1,8 +1,8 @@
+require 'rubygems'
 require 'spec'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
-require File.dirname(__FILE__) + '/../lib/cacheability'
 
 Spec::Runner.configure do |config|
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cryx-cacheability
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Cyril Rohr
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-02 00:00:00 -08:00
+date: 2009-03-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,7 +22,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-description: TODO
+description: A gem that makes client-side caching of HTTP requests a no-brainer. It is built upon the Rack:Cache gem from Ryan Tomayko.
 email: cyril.rohr@irisa.fr
 executables: []
 
@@ -37,6 +37,7 @@ files:
 - lib/cacheability.rb
 - spec/cacheability_spec.rb
 - spec/spec_helper.rb
+- spec/test.rb
 has_rdoc: true
 homepage: http://github.com/cryx/cacheability
 post_install_message: