lawnchair 0.5.4 → 0.5.5

data/Rakefile

@@ -10,7 +10,7 @@ begin
     gem.email = "shanewolf@gmail.com"
     gem.homepage = "http://github.com/gizm0duck/lawnchair"
     gem.authors = ["Shane Wolf"]
-    gem.add_dependency "redis"
+    gem.add_dependency "redis", ">=0.1.2"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.5.4
+0.5.5

data/lawnchair.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{lawnchair}
-  s.version = "0.5.4"
+  s.version = "0.5.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Shane Wolf"]
-  s.date = %q{2010-02-14}
+  s.date = %q{2010-02-17}
   s.description = %q{Fully featured caching mechanism for arbitrary pieces of resource expensive ruby code using Redis while being able to optionally store data in the Ruby process itself for maximum efficiency.}
   s.email = %q{shanewolf@gmail.com}
   s.extra_rdoc_files = [
@@ -60,12 +60,12 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<redis>, [">= 0"])
+      s.add_runtime_dependency(%q<redis>, [">= 0.1.2"])
     else
-      s.add_dependency(%q<redis>, [">= 0"])
+      s.add_dependency(%q<redis>, [">= 0.1.2"])
     end
   else
-    s.add_dependency(%q<redis>, [">= 0"])
+    s.add_dependency(%q<redis>, [">= 0.1.2"])
   end
 end
 

data/lib/lawnchair.rb

@@ -25,6 +25,7 @@ module Lawnchair
 
     def connectdb(redis=nil)
       @redis = (redis || Redis.new(:db => 11))
+      Lawnchair::StorageEngine::Redis.verify_db_connection
     end
 
     def flushdb

data/lib/storage_engine/abstract.rb

@@ -8,14 +8,18 @@ module Lawnchair
           @data_store ||= {}
         end
       
-        def fetch(key, options, &block)
-          if exists?(key)
-            value = get(key, options)
+        def fetch(key, options={}, &block)
+          if self.db_connection?
+            if exists?(key)
+              value = get(key, options)
+            else
+              value = block.call
+              set(key, value, options)
+              return value
+            end
           else
-            value = block.call
-            set(key, value, options)
+            block.call
           end
-          value
         end
       
         def get(key, options={})
@@ -31,6 +35,10 @@ module Lawnchair
           prefix = "Lawnchair"
           "#{prefix}:#{key}"
         end
+        
+        def db_connection?
+          true
+        end
       end
     end
   end

data/lib/storage_engine/composite.rb

@@ -17,7 +17,6 @@ module Lawnchair
     
       def fetch(key, options, &block)
         raise "No Storage Engines Configured" if storage_engines.empty?
-        
         value, index = find_in_storage(key, options)
         value ||= yield
         place_in_storage(key, value, options, index)
@@ -28,10 +27,15 @@ module Lawnchair
       def find_in_storage(key, options)
         value, index = nil, nil
         storage_engines.each_with_index do |storage_engine, i|
-          if storage_engine.exists?(key)
-            value = storage_engine.get(key, options)
+          if storage_engine.db_connection?
+            if storage_engine.exists?(key)
+              value = storage_engine.get(key, options)
+              index = i
+              break
+            end
+          else
+            value = nil
             index = i
-            break
           end
         end
         return value, index
@@ -40,7 +44,9 @@ module Lawnchair
       def place_in_storage(key, value, options, index)
         storage_engines.each_with_index do |storage_engine, i|
           break if i == index
-          storage_engine.set(key, value, options)
+          if storage_engine.db_connection?
+            storage_engine.set(key, value, options)
+          end
         end
         value
       end

data/lib/storage_engine/in_process.rb

@@ -7,6 +7,10 @@ module Lawnchair
         def data_store
           @@data_store
         end
+        
+        def db_connection?
+          true
+        end
     
         def set(key, value, options={})
           if options[:raw]

data/lib/storage_engine/redis.rb

@@ -2,6 +2,8 @@ module Lawnchair
   module StorageEngine
     class Redis < Abstract
       class << self
+        attr_reader :db_connection
+        
         def data_store
           Lawnchair.redis
         end
@@ -22,6 +24,26 @@ module Lawnchair
         def expire!(key)
           data_store.del(computed_key(key))
         end
+        
+        def connection_established!
+          verify_db_connection
+        end
+        
+        def db_connection?
+          return @db_connection unless @db_connection.nil?
+          verify_db_connection
+        end
+        
+        def verify_db_connection
+          begin
+            data_store.info
+            @db_connection = true
+          rescue Exception => e
+            @db_connection = false
+          ensure
+            return @db_connection
+          end
+        end
       end
     end
   end

data/spec/speed.rb

@@ -26,7 +26,7 @@ end
 Benchmark.bm(7) do |x|
   x.report("cached:\t\t") do
     (1..n).each do |i|
-      Lawnchair::Cache.me("redis_cache") do
+      Lawnchair.cache("redis_cache") do
         expensive_stuff
       end
     end
@@ -34,7 +34,7 @@ Benchmark.bm(7) do |x|
   
   x.report("in process cached:") do
     (1..n).each do |i|
-      Lawnchair::Cache.me("in_process_cache", :in_process => true) do
+      Lawnchair.cache("in_process_cache", :in_process => true) do
         expensive_stuff
       end
     end

data/spec/storage_engine/in_process_spec.rb

@@ -58,4 +58,10 @@ describe "Lawnchair::StorageEngine::InProcessStore" do
       in_process_store.data_store["Lawnchair:sim"].should == "ba"
     end
   end
+  
+  describe "#db_connection?" do
+    it "should return true" do
+      in_process_store.should be_db_connection
+    end
+  end
 end

data/spec/storage_engine/redis_spec.rb

@@ -19,10 +19,10 @@ describe "Lawnchair::StorageEngine::RedisStore" do
       redis_store.set("mu", "fasa")
       Lawnchair.redis.ttl("Lawnchair:mu").should == 3600 # seconds
     end
-
+  
     it "allows you to override the default ttl" do
       redis_store.set("mu", "fasa", :expires_in => 600)
-
+  
       Lawnchair.redis.ttl("Lawnchair:mu").should == 600 # seconds
     end
     
@@ -51,7 +51,7 @@ describe "Lawnchair::StorageEngine::RedisStore" do
       Lawnchair.redis.keys('*').should_not include("Lawnchair:mu")
       redis_store.exists?("mu").should be_false
     end
-
+  
     it "returns true when the key exists" do
       Lawnchair.redis["Lawnchair:mu"] = "fasa"
       Lawnchair.redis.keys('*').should include("Lawnchair:mu")
@@ -63,10 +63,64 @@ describe "Lawnchair::StorageEngine::RedisStore" do
     it "should only expire the key specified" do
       Lawnchair.redis["Lawnchair:mu"] = "fasa"
       Lawnchair.redis["Lawnchair:sim"] = "ba"
-
+  
       redis_store.expire!("mu")
       Lawnchair.redis["Lawnchair:mu"].should be_nil
       Lawnchair.redis["Lawnchair:sim"].should == "ba"
     end
   end
+  
+  describe "db_connection?" do
+    before do
+      redis_store.stub!(:verify_db_connection).and_return(true)
+    end
+    
+    context "when db_connection has been set" do
+      it "returns the value in db_connection" do
+        redis_store.instance_variable_set("@db_connection", false)
+        redis_store.db_connection?.should be_false
+      end
+    end
+    
+    context "when db_connection has NOT been set" do
+      it "returns the result from verify_db_connection" do
+        redis_store.instance_variable_set("@db_connection", nil)
+        redis_store.db_connection?.should == redis_store.verify_db_connection
+      end
+    end
+  end
+  
+  describe ".verify_db_connection" do
+    context "when we have established a connection to redis-server" do
+      it "should return true" do
+        lambda {redis_store.data_store}.should_not raise_error
+        redis_store.db_connection?.should be_true
+      end
+    end
+    
+    context "when we have NOT established a connection to redis-server" do
+      before do
+        data_store = mock(:data_store)
+        data_store.stub!(:info).and_raise("BOOM!")
+        redis_store.stub!(:data_store).and_return(data_store)
+      end
+      
+      it "returns false" do
+        redis_store.verify_db_connection
+        redis_store.db_connection?.should be_false
+      end
+    end
+  end
+  
+  describe ".connection_established!" do
+    before do
+      redis_store.instance_variable_set("@db_connection", nil)
+      redis_store.db_connection.should be_nil
+    end
+    
+    it "re-verifies the connection" do
+      redis_store.connection_established!
+      redis_store.db_connection.should be_true
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: lawnchair
 version: !ruby/object:Gem::Version 
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors: 
 - Shane Wolf
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-14 00:00:00 -08:00
+date: 2010-02-17 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.1.2
     version: 
 description: Fully featured caching mechanism for arbitrary pieces of resource expensive ruby code using Redis while being able to optionally store data in the Ruby process itself for maximum efficiency.
 email: shanewolf@gmail.com