rack-cache 0.5.3 → 1.0

data/CHANGES

@@ -1,4 +1,28 @@
-## 0.6.0 / Unreleased
+## 1.0 / December 2010
+
+  * Rack::Cache is 1.0 and will now maintain semantic versioning <http://semver.org/>
+
+  * Add Dalli memcache client support and removed support for the unmaintained
+    memcache-client library. You will need to move your apps to Dalli before
+    upgrading rack-cache to 1.0.
+
+## 0.5.3 / September 2010
+
+  * A matching If-Modified-Since is ignored if an If-None-Match is also provided
+    and doesn't match. This is in line with RFC 2616.
+
+  * Converts string status codes to integers before returns to workaround bad
+    behaving rack middleware and apps.
+
+  * Misc doc clean up.
+
+## 0.5.2 / September 2009
+
+  * Exceptions raised from the metastore are not fatal. This makes a lot of
+    sense in most cases because its okay for the cache to be down - it
+    shouldn't blow up your app.
+
+## 0.5.1 / June 2009
 
   * Added support for memcached clusters and other advanced
     configuration provided by the memcache-client and memcached

data/README

@@ -75,6 +75,22 @@ See the following for more information:
 
     http://snippets.aktagon.com/snippets/302
 
+Using with Dalli
+----------------
+
+Dalli is a high performance memcached client for Ruby.
+More information at: https://github.com/mperham/dalli
+
+    require 'dalli'
+    require 'rack/cache'
+
+    use Rack::Cache,
+      :verbose => true,
+      :metastore   => "memcached://localhost:11211/meta",
+      :entitystore => "memcached://localhost:11211/body"
+
+    run app
+
 Links
 -----
 

data/lib/rack/cache/cachecontrol.rb

@@ -182,11 +182,12 @@ module Rack
     private
       def parse(value)
         return  if value.nil? || value.empty?
-        value.delete(' ').split(',').inject(self) do |hash,part|
+        value.delete(' ').split(',').each do |part|
+          next if part.empty?
           name, value = part.split('=', 2)
-          hash[name.downcase] = (value || true) unless name.empty?
-          hash
+          self[name.downcase] = (value || true) unless name.empty?
         end
+        self
       end
     end
   end

data/lib/rack/cache/entitystore.rb

@@ -204,16 +204,16 @@ module Rack::Cache
       end
     end
 
-    # Uses the memcache-client ruby library. This is the default unless
+    # Uses the Dalli ruby library. This is the default unless
     # the memcached library has already been required.
-    class MemCache < MemCacheBase
+    class Dalli < MemCacheBase
       def initialize(server="localhost:11211", options={})
         @cache =
           if server.respond_to?(:stats)
             server
           else
-            require 'memcache'
-            ::MemCache.new(server, options)
+            require 'dalli'
+            ::Dalli::Client.new(server, options)
           end
       end
 
@@ -284,7 +284,7 @@ module Rack::Cache
       if defined?(::Memcached)
         MemCached
       else
-        MemCache
+        Dalli
       end
 
     MEMCACHED = MEMCACHE

data/lib/rack/cache/metastore.rb

@@ -301,14 +301,14 @@ module Rack::Cache
       end
     end
 
-    class MemCache < MemCacheBase
+    class Dalli < MemCacheBase
       def initialize(server="localhost:11211", options={})
         @cache =
           if server.respond_to?(:stats)
             server
           else
-            require 'memcache'
-            ::MemCache.new(server, options)
+            require 'dalli'
+            ::Dalli::Client.new(server, options)
           end
       end
 
@@ -368,7 +368,7 @@ module Rack::Cache
       if defined?(::Memcached)
         MemCached
       else
-        MemCache
+        Dalli
       end
     MEMCACHED = MEMCACHE
 

data/lib/rack/cache/storage.rb

@@ -39,11 +39,11 @@ module Rack::Cache
           fail "Unknown storage provider: #{uri.to_s}"
         end
       else
-        # hack in support for passing a MemCache or Memcached object
+        # hack in support for passing a Dalli::Client or Memcached object
         # as the storage URI.
         case
-        when defined?(::MemCache) && uri.kind_of?(::MemCache)
-          type.const_get(:MemCache).resolve(uri)
+        when defined?(::Dalli) && uri.kind_of?(::Dalli::Client)
+          type.const_get(:Dalli).resolve(uri)
         when defined?(::Memcached) && uri.respond_to?(:stats)
           type.const_get(:MemCached).resolve(uri)
         else

data/rack-cache.gemspec

@@ -3,8 +3,8 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
 
   s.name = 'rack-cache'
-  s.version = '0.5.3'
-  s.date = '2010-09-10'
+  s.version = '1.0'
+  s.date = '2010-12-24'
 
   s.description = "HTTP Caching for Rack"
   s.summary     = "HTTP Caching for Rack"
@@ -62,11 +62,12 @@ Gem::Specification.new do |s|
   s.add_dependency 'rack', '>= 0.4'
 
   s.add_development_dependency 'test-spec'
+  s.add_development_dependency 'memcached'
+  s.add_development_dependency 'dalli'
 
   s.has_rdoc = true
   s.homepage = "http://tomayko.com/src/rack-cache/"
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Rack::Cache", "--main", "Rack::Cache"]
   s.require_paths = %w[lib]
-  s.rubyforge_project = 'wink'
   s.rubygems_version = '1.1.1'
 end

data/test/cachecontrol_test.rb

@@ -49,6 +49,12 @@ describe 'Rack::Cache::CacheControl' do
     cache_control['max-age'].should.equal '600'
   end
 
+  it 'strips blank segments' do
+    cache_control = Rack::Cache::CacheControl.new('max-age=600,,max-stale=300')
+    cache_control['max-age'].should.equal '600'
+    cache_control['max-stale'].should.equal '300'
+  end
+
   it 'removes all directives with #clear' do
     cache_control = Rack::Cache::CacheControl.new('max-age=600, must-revalidate')
     cache_control.clear

data/test/entitystore_test.rb

@@ -188,12 +188,12 @@ describe 'Rack::Cache::EntityStore' do
   end
 
 
-  need_memcache 'entity store tests' do
-    describe 'MemCache' do
+  need_dalli 'entity store tests' do
+    describe 'Dalli' do
       it_should_behave_like 'A Rack::Cache::EntityStore Implementation'
       before do
-        $memcache.flush_all
-        @store = Rack::Cache::EntityStore::MemCache.new($memcache)
+        $dalli.flush_all
+        @store = Rack::Cache::EntityStore::Dalli.new($dalli)
       end
       after do
         @store = nil

data/test/metastore_test.rb

@@ -261,13 +261,13 @@ describe 'Rack::Cache::MetaStore' do
     end
   end
 
-  need_memcache 'metastore tests' do
-    describe 'MemCache' do
+  need_dalli 'metastore tests' do
+    describe 'Dalli' do
       it_should_behave_like 'A Rack::Cache::MetaStore Implementation'
       before :each do
         @temp_dir = create_temp_directory
-        $memcache.flush_all
-        @store = Rack::Cache::MetaStore::MemCache.new($memcache)
+        $dalli.flush_all
+        @store = Rack::Cache::MetaStore::Dalli.new($dalli)
         @entity_store = Rack::Cache::EntityStore::Heap.new
       end
     end

data/test/spec_setup.rb

@@ -15,7 +15,7 @@ end
 # of the MemCached meta and entity stores.
 ENV['MEMCACHED'] ||= 'localhost:11211'
 $memcached = nil
-$memcache = nil
+$dalli = nil
 
 def have_memcached?(server=ENV['MEMCACHED'])
   return $memcached unless $memcached.nil?
@@ -36,36 +36,36 @@ end
 
 have_memcached?
 
-def have_memcache?(server=ENV['MEMCACHED'])
-  return $memcache unless $memcache.nil?
-  require 'memcache'
-  $memcache = MemCache.new(server)
-  $memcache.set('ping', '')
+def have_dalli?(server=ENV['MEMCACHED'])
+  return $dalli unless $dalli.nil?
+  require 'dalli'
+  $dalli = Dalli::Client.new(server)
+  $dalli.set('ping', '')
   true
 rescue LoadError => boom
-  $memcache = false
+  $dalli = false
   false
 rescue => boom
-  STDERR.puts "memcache not working. related tests will be skipped."
-  $memcache = false
+  STDERR.puts "dalli not working. related tests will be skipped."
+  $dalli = false
   false
 end
 
-have_memcache?
+have_dalli?
 
-def need_memcached(forwhat)
-  if have_memcached?
+def need_dalli(forwhat)
+  if have_dalli?
     yield
   else
-    STDERR.puts "skipping memcached #{forwhat}"
+    STDERR.puts "skipping Dalli #{forwhat}"
   end
 end
 
-def need_memcache(forwhat)
-  if have_memcache?
+def need_memcached(forwhat)
+  if have_memcached?
     yield
   else
-    STDERR.puts "skipping memcache #{forwhat}"
+    STDERR.puts "skipping memcached #{forwhat}"
   end
 end
 

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rack-cache
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 15
   prerelease: false
   segments: 
+  - 1
   - 0
-  - 5
-  - 3
-  version: 0.5.3
+  version: "1.0"
 platform: ruby
 authors: 
 - Ryan Tomayko
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-10 00:00:00 -07:00
+date: 2010-12-24 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,6 +46,34 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: memcached
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: dalli
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
 description: HTTP Caching for Rack
 email: r@tomayko.com
 executables: []
@@ -132,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: wink
+rubyforge_project: 
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 2