cachy 0.1.5 → 0.1.6

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/cachy.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cachy}
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2010-10-29}
+  s.date = %q{2010-11-18}
   s.email = %q{grosser.michael@gmail.com}
   s.files = [
     "Rakefile",
@@ -22,10 +22,12 @@ Gem::Specification.new do |s|
      "lib/cachy/moneta_wrapper.rb",
      "lib/cachy/redis_wrapper.rb",
      "lib/cachy/wrapper.rb",
+     "spec/cachy/memcache_timeout_protection_spec.rb",
      "spec/cachy/memcached_wrapper_spec.rb",
      "spec/cachy/moneta_wrapper_spec.rb",
      "spec/cachy/redis_wrapper_spec.rb",
      "spec/cachy_spec.rb",
+     "spec/mem_cache.rb",
      "spec/spec_helper.rb",
      "spec/test_cache.rb"
   ]
@@ -37,7 +39,9 @@ Gem::Specification.new do |s|
   s.test_files = [
     "spec/cachy/memcached_wrapper_spec.rb",
      "spec/cachy/moneta_wrapper_spec.rb",
+     "spec/cachy/memcache_timeout_protection_spec.rb",
      "spec/cachy/redis_wrapper_spec.rb",
+     "spec/mem_cache.rb",
      "spec/cachy_spec.rb",
      "spec/test_cache.rb",
      "spec/spec_helper.rb"

data/lib/cachy/memcache_timeout_protection.rb

@@ -1,6 +1,6 @@
 # do not let MemCache timeouts kill your app,
 # mark as error and return read_error_callback (e.g. nil -> cache miss)
-require 'memcache'
+MemCache # class should exist at this point
 
 class MemCache
   # Add your callback to stop timeouts from raising
@@ -11,7 +11,10 @@ class MemCache
   #   nil
   # }
 
-  cattr_accessor :read_error_callback, :read_error_occurred
+  class << self
+    attr_accessor :read_error_callback
+  end
+  attr_accessor :read_error_occurred
 
   def cache_get_with_timeout_protection(*args)
     begin
@@ -26,5 +29,7 @@ class MemCache
       end
     end
   end
-  alias_method_chain :cache_get, :timeout_protection
+
+  alias_method :cache_get_without_timeout_protection, :cache_get
+  alias_method :cache_get, :cache_get_with_timeout_protection
 end

data/spec/cachy/memcache_timeout_protection_spec.rb

@@ -0,0 +1,50 @@
+require 'spec/spec_helper'
+require 'spec/mem_cache'
+require 'cachy/memcache_timeout_protection'
+
+describe "MemCache timeout protection" do
+  before do
+    MemCache.read_error_callback = nil
+  end
+
+  let(:cache){ MemCache.new }
+
+  def simulate_timeout
+    cache.stub!(:stubable_cache_get).and_raise('IO timeout')
+  end
+
+  it "has no errors by default" do
+    cache.read_error_occurred.should == nil
+  end
+
+  it "catches timeout errors" do
+    MemCache.read_error_callback = lambda{}
+    simulate_timeout
+    cache.get('x').should == nil
+    cache.read_error_occurred.should == true
+  end
+
+  it "resets error_occurred to false after successful get" do
+    MemCache.read_error_callback = lambda{}
+    simulate_timeout
+    cache.get('x').should == nil
+    cache.stub!(:stubable_cache_get).and_return 1
+    cache.get('x').should == 1
+    cache.read_error_occurred.should == false
+  end
+
+  it "raises if no callback is given" do
+    simulate_timeout
+    lambda{
+      cache.get('x').should == nil
+    }.should raise_error
+    cache.read_error_occurred.should == true
+  end
+
+  it "calls the callback" do
+    MemCache.read_error_callback = lambda{ 1 }
+    simulate_timeout
+    cache.get('x').should == 1
+    cache.read_error_occurred.should == true
+  end
+end

data/spec/cachy/memcached_wrapper_spec.rb

@@ -1,35 +1,9 @@
 require 'spec/spec_helper'
-
-class TestMemcached
-  def initialize
-    @wrapped = {}
-  end
-
-  def set(key, object, ttl = nil)
-    raise 'nope!' if ttl.is_a? Hash or (ttl and not ttl.is_a? Numeric)
-    @wrapped[key] = object
-  end
-
-  def get(key)
-    @wrapped[key]
-  end
-
-  def [](x)
-    @wrapped[x]
-  end
-
-  def clear
-    @wrapped.clear
-  end
-
-  def delete(key)
-    @wrapped.delete(key)
-  end
-end
+require 'spec/mem_cache'
 
 describe "Cachy::MemcachedWrapper" do
   before :all do
-    @cache = TestMemcached.new
+    @cache = MemCache.new
     Cachy.cache_store = @cache
   end
 

data/spec/mem_cache.rb

@@ -0,0 +1,35 @@
+# stub to test memcache integration
+class MemCache
+  def initialize
+    @wrapped = {}
+  end
+
+  def set(key, object, ttl = nil)
+    raise 'nope!' if ttl.is_a? Hash or (ttl and not ttl.is_a? Numeric)
+    @wrapped[key] = object
+  end
+
+  def get(key)
+    cache_get(key)
+  end
+
+  def cache_get(key)
+    stubable_cache_get(key)
+  end
+
+  def stubable_cache_get(key)
+    @wrapped[key]
+  end
+
+  def [](x)
+    @wrapped[x]
+  end
+
+  def clear
+    @wrapped.clear
+  end
+
+  def delete(key)
+    @wrapped.delete(key)
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Michael Grosser
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-29 00:00:00 +02:00
+date: 2010-11-18 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -37,10 +37,12 @@ files:
 - lib/cachy/moneta_wrapper.rb
 - lib/cachy/redis_wrapper.rb
 - lib/cachy/wrapper.rb
+- spec/cachy/memcache_timeout_protection_spec.rb
 - spec/cachy/memcached_wrapper_spec.rb
 - spec/cachy/moneta_wrapper_spec.rb
 - spec/cachy/redis_wrapper_spec.rb
 - spec/cachy_spec.rb
+- spec/mem_cache.rb
 - spec/spec_helper.rb
 - spec/test_cache.rb
 has_rdoc: true
@@ -76,7 +78,9 @@ summary: Caching library for projects that have many processes or many caches
 test_files: 
 - spec/cachy/memcached_wrapper_spec.rb
 - spec/cachy/moneta_wrapper_spec.rb
+- spec/cachy/memcache_timeout_protection_spec.rb
 - spec/cachy/redis_wrapper_spec.rb
+- spec/mem_cache.rb
 - spec/cachy_spec.rb
 - spec/test_cache.rb
 - spec/spec_helper.rb