cacheability 1.1.0 → 1.2.0

data/README

@@ -1,16 +1,19 @@
-Cacheability
-============
+= cacheability
+
 A gem that makes client-side caching of HTTP requests a no-brainer. It is built upon the Rack:Cache gem from Ryan Tomayko.
 
 Cached data can be stored in heap, file or memcached. See the Rack::Cache documentation (http://tomayko.com/src/rack-cache/) for more information.
 
-Installation
-============
-  gem install cryx-cacheability
+= Installation
+
+  gem install cacheability
   
-Usage
-=====
+= Usage
+
   require 'cacheability/restclient'
+  
+  RestClient.log = 'stdout' # displays requests and status codes
+  
   resource = RestClient::CacheableResource.new(  'http://some/cacheable/resource', 
                                                   :cache => { :metastore => 'file:/tmp/cache/meta', 
                                                               :entitystore => 'file:/tmp/cache/body' } 
@@ -27,15 +30,14 @@ Do yourself a favor and read:
 * Things Caches Do - http://tomayko.com/writings/things-caches-do
 
 
-Supported libraries
-===================
+= Supported libraries
+
 * rest-client > 0.9
 
-Dependencies
-============
+= Dependencies
+
 * rack-cache
 
-COPYRIGHT
-=========
+= COPYRIGHT
 
 Copyright (c) 2008 Cyril Rohr. See LICENSE for details.

data/VERSION.yml

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

data/cacheability.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cacheability}
-  s.version = "1.1.0"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Cyril Rohr"]
@@ -37,7 +37,8 @@ Gem::Specification.new do |s|
   s.summary = %q{A gem that makes client-side caching of HTTP requests a no-brainer. Replace your calls to RestClient::Resource.new with RestClient::CacheableResource.new and the caching is taken care of for you ! Supports heap, file and memcache storage.}
   s.test_files = [
     "spec/cacheability_spec.rb",
-     "spec/spec_helper.rb"
+     "spec/spec_helper.rb",
+     "spec/test.rb"
   ]
 
   if s.respond_to? :specification_version then

data/lib/cacheability/restclient.rb

@@ -24,7 +24,7 @@ module RestClient
   
   class CacheableResource < Resource
     attr_reader :cache
-    CACHE_DEFAULT_OPTIONS = {:verbose => true}.freeze
+    CACHE_DEFAULT_OPTIONS = {:verbose => false}
     
     def initialize(*args)
       super(*args)
@@ -52,12 +52,13 @@ module RestClient
           "rack.multiprocess" => true,
           "rack.url_scheme" => uri.scheme,
           "rack.input" => StringIO.new,
-          "rack.errors" => StringIO.new   # Rack-Cache writes errors into this field
+          "rack.errors" => logger   # 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))
+        env['rack.errors'].close if env['rack.errors'].respond_to?(:close)
         RestClient::Response.new(response.body, response)
       else
         super(additional_headers)
@@ -88,5 +89,17 @@ module RestClient
       response = RestClient::Response.new("", e.response)
       [304, debeautify_headers( response.headers ), [response.to_s]]
     end
+    
+    # Ugly, but waiting for RestClient to become smarter
+    #
+    def logger
+      return StringIO.new unless log_to = RestClient.log
+      case log_to
+      when 'stdout' then STDOUT
+      when 'stderr' then STDERR
+      else
+        File.new(log_to, 'a')
+      end
+		end
   end
 end

data/spec/cacheability_spec.rb

@@ -7,6 +7,7 @@ describe RestClient::CacheableResource do
   require File.dirname(__FILE__) + '/../lib/cacheability/restclient'
   before do
     @cache_options = {:metastore => 'file:/tmp/cache/meta', :entitystore => 'file:/tmp/cache/body'}
+    RestClient.log = nil
   end
   
   it "should instantiate the cache at init" do
@@ -60,7 +61,7 @@ describe RestClient::CacheableResource do
     it "should render a RestClient::Response even when the data is coming from the cache" do
       @resource.cache.should_receive(:call).and_return([200, {'ADDITIONAL_HEADER' => 'whatever'}, "body"])
       response = @resource.get({'HTTP_ADDITIONAL_HEADER' => 'whatever'}, true)
-      response.should be_is_a(RestClient::Response)
+      response.should be_a(RestClient::Response)
       response.code.should == 200
       response.headers.should == {:ADDITIONAL_HEADER => 'whatever'}
       response.to_s.should == "body"

data/spec/test.rb

@@ -0,0 +1,7 @@
+require 'rubygems'
+require 'restclient'
+require File.dirname(__FILE__) + '/../lib/cacheability/restclient'
+require 'pp'
+RestClient.log = 'stdout'
+
+RestClient::CacheableResource.new('https://api.grid5000.fr/sid/versions/current.json', :user => 'crohr', :password => 'pmtppe1m', :cache => {:verbose => false}).get

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cacheability
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Cyril Rohr
@@ -73,3 +73,4 @@ summary: A gem that makes client-side caching of HTTP requests a no-brainer. Rep
 test_files: 
 - spec/cacheability_spec.rb
 - spec/spec_helper.rb
+- spec/test.rb