cryx-cacheability 1.1.0 → 1.2.1

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/Rakefile

@@ -10,11 +10,43 @@ begin
     s.description = "Transparent caching for your HTTP requests (heap, file, memcache). Built-in support for RestClient. Built upon Rack::Cache."
     s.authors = ["Cyril Rohr"]
     s.add_dependency "rack-cache"
+    s.rubyforge_project = 'cacheability'
+  end
+  
+  Jeweler::RubyforgeTasks.new do |rubyforge|
+    rubyforge.doc_task = "rdoc"
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
 end
 
+
+begin
+  require 'rake/contrib/sshpublisher'
+  namespace :rubyforge do
+
+    desc "Release gem and RDoc documentation to RubyForge"
+    task :release => ["rubyforge:release:gem", "rubyforge:release:docs"]
+
+    namespace :release do
+      desc "Publish RDoc to RubyForge."
+      task :docs => [:rdoc] do
+        config = YAML.load(
+            File.read(File.expand_path('~/.rubyforge/user-config.yml'))
+        )
+
+        host = "#{config['username']}@rubyforge.org"
+        remote_dir = "/var/www/gforge-projects/cacheability/"
+        local_dir = 'rdoc'
+
+        Rake::SshDirPublisher.new(host, remote_dir, local_dir).upload
+      end
+    end
+  end
+rescue LoadError
+  puts "Rake SshDirPublisher is unavailable or your rubyforge environment is not configured."
+end
+
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
@@ -43,4 +75,5 @@ rescue LoadError
   puts "Cucumber is not available. In order to run features, you must: sudo gem install cucumber"
 end
 
+
 task :default => :spec

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
+:patch: 1
 :major: 1
-:minor: 1
-:patch: 0
+: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.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Cyril Rohr"]
@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/cryx/cacheability}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
+  s.rubyforge_project = %q{cacheability}
   s.rubygems_version = %q{1.3.2}
   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 = [

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"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cryx-cacheability
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.2.1
 platform: ruby
 authors: 
 - Cyril Rohr
@@ -64,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: cacheability
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3