CacheGorilla 0.0.1 → 0.0.2

data/History.txt

@@ -1,3 +1,6 @@
+=== 0.0.2 2010-07-10
+* Added ability to expire memcache before Redis
+
 === 0.0.1 2010-07-10
 
 * 1 major enhancement:

data/README.rdoc

@@ -1,9 +1,9 @@
 = CacheGorilla
 
-http://www.animalpictures1.com/data/media/65/gorilla-7.jpg
-
 * http://github.com/timrosenblatt/CacheGorilla
 
+http://www.animalpictures1.com/data/media/65/gorilla-7.jpg
+
 == DESCRIPTION:
 
 Let's say you've got a MongoDB server, being used as a key-value store for an app being served by three sticky-load-balanced web servers. Running an instance of memcached will speed up repeated reads. 
@@ -12,10 +12,6 @@ Let's say you've got a MongoDB server, being used as a key-value store for an ap
 
 This speeds up MongoDB by using antimatter and solar rays.
 
-== FEATURES/PROBLEMS:
-
-* FIX (list of features or problems)
-
 == SYNOPSIS:
 
   include CacheGorilla

data/Rakefile

@@ -11,10 +11,10 @@ Hoe.plugin :newgem
 # Generate all the Rake tasks
 # Run 'rake -T' to see list of generated tasks (from gem root directory)
 $hoe = Hoe.spec 'CacheGorilla' do
-  self.developer 'Tim', 'Rosenblatt'
+  self.developer 'Tim Rosenblatt', 'rubygems@timrosenblatt.com'
   self.post_install_message = 'PostInstall.txt' # TODO remove if post-install message not required
   self.rubyforge_name       = self.name # TODO this is default value
-  # self.extra_deps         = [['activesupport','>= 2.0.2']]
+  self.extra_deps         = [['mongo','>= 1.0.0'], ['memcached', '>= 0.19.5']]
 
 end
 

data/lib/CacheGorilla.rb

@@ -2,7 +2,7 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module CacheGorilla
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
   
   begin
     require "memcached"
@@ -35,10 +35,13 @@ module CacheGorilla
         :port => ENV['MONGO_RUBY_DRIVER_PORT'] || 27017,
         :db => 'cache',
         :collection => 'cache',
-        :server => 'localhost'
+        :server => 'localhost',
+        :mongo_pool_size => 5,
+        :mongo_timeout => 5,
+        :memcache_default_expire => nil
       }.update(options)
 
-      @mongo_connection = Mongo::Connection.new(@options[:host], @options[:port], :pool_size => 5, :timeout => 5)
+      @mongo_connection = Mongo::Connection.new(@options[:host], @options[:port], :pool_size => @options[:mongo_pool_size], :timeout => @options[:mongo_timeout])
       @mongo_collection = @mongo_connection.db(@options[:db]).collection(@options[:collection])
       
       @memcache = MemCache.new(options[:server], @options)
@@ -58,7 +61,7 @@ module CacheGorilla
         res = nil if res && res['expires'] && Time.now > res['expires']
         
         if res
-          args = [res['_id'], res['data'], res['expires']].compact
+          args = [res['_id'], res['data'], @options[:memcache_default_expire] || res['expires']].compact
           @memcache.set(*args)
         end
         
@@ -85,7 +88,7 @@ module CacheGorilla
       @mongo_collection.update({ '_id' => key }, { '_id' => key, 'data' => value, 'expires' => exp }, { :upsert => true }) # upsert is the best technical term ever.
       
       unless options.has_key?(:bypass_memcache)
-        args = [key, value, options[:expires_in]].compact
+        args = [key, value, options[:expires_in] || @options[:memcache_default_expire]].compact
         @memcache.set(*args)
       end
       

data/spec/CacheGorilla_spec.rb

@@ -99,4 +99,30 @@ describe "CacheGorilla" do
     @cg.memcache_get("key").should be_nil
     @cg["key"].should == "value"
   end
+  
+  it "expires memcache before mongo" do
+    @cg = CacheGorilla.new(:db => "cache_gorilla_test", :memcache_default_expire => 2)
+    @cg["key"] = "value"
+    sleep(5)
+    @cg.memcache_get("key").should be_nil
+    @cg["key"].should == "value"
+  end
+  
+  it "expires memcache before mongo when filling the cache during a miss" do
+    @cg = CacheGorilla.new(:db => "cache_gorilla_test", :memcache_default_expire => 2)
+    @cg["key"] = "value"
+    sleep(5)
+    @cg.memcache_get("key").should be_nil
+    @cg["key"].should == "value"
+    sleep(5)
+    @cg.memcache_get("key").should be_nil
+    @cg["key"].should == "value"
+  end
+  
+  it "respects overridden memcache expiration times" do
+    @cg = CacheGorilla.new(:db => "cache_gorilla_test", :memcache_default_expire => 2)
+    @cg.store("key", "value", :expires_in => 100)
+    sleep(5)
+    @cg.memcache_get("key").should == "value"
+  end
 end

metadata

@@ -5,22 +5,50 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
-- Tim
+- Tim Rosenblatt
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-07-10 00:00:00 -04:00
+date: 2010-07-11 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rubyforge
+  name: mongo
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: memcached
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 19
+        - 5
+        version: 0.19.5
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rubyforge
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -30,11 +58,11 @@ dependencies:
         - 4
         version: 2.0.4
   type: :development
-  version_requirements: *id001
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: hoe
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -44,10 +72,10 @@ dependencies:
         - 1
         version: 2.6.1
   type: :development
-  version_requirements: *id002
+  version_requirements: *id004
 description: Let's say you've got a MongoDB server, being used as a key-value store for an app being served by three sticky-load-balanced web servers. Running an instance of memcached will speed up repeated reads.
 email: 
-- Rosenblatt
+- rubygems@timrosenblatt.com
 executables: []
 
 extensions: []
@@ -71,7 +99,7 @@ files:
 - spec/spec_helper.rb
 - tasks/rspec.rake
 has_rdoc: true
-homepage: http://www.animalpictures1.com/data/media/65/gorilla-7.jpg
+homepage: http://github.com/timrosenblatt/CacheGorilla
 licenses: []
 
 post_install_message: PostInstall.txt