lawnchair 0.6.5 → 0.6.6

data/VERSION

@@ -1 +1 @@
-0.6.5
+0.6.6

data/lawnchair.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{lawnchair}
-  s.version = "0.6.5"
+  s.version = "0.6.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Shane Wolf"]
-  s.date = %q{2010-08-09}
+  s.date = %q{2010-08-10}
   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 = [

data/lib/lawnchair.rb

@@ -26,7 +26,6 @@ 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

@@ -9,20 +9,16 @@ module Lawnchair
         end
       
         def fetch(key, options={}, &block)
-          if self.db_connection?
-            start_time = Time.now
-            if exists?(key)
-              value = get(key, options)
-              log("HIT", key, Time.now-start_time)
-              return value
-            else
-              value = block.call
-              set(key, value, options)
-              log("MISS", key, Time.now-start_time)
-              return value
-            end
+          start_time = Time.now
+          if exists?(key)
+            value = get(key, options)
+            log("HIT", key, Time.now-start_time)
+            return value
           else
-            block.call
+            value = block.call
+            set(key, value, options)
+            log("MISS", key, Time.now-start_time)
+            return value
           end
         end
       

data/lib/storage_engine/in_process.rb

@@ -7,10 +7,6 @@ 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,8 +2,6 @@ module Lawnchair
   module StorageEngine
     class Redis < Abstract
       class << self
-        attr_reader :db_connection
-        
         def data_store
           Lawnchair.redis
         end
@@ -25,26 +23,6 @@ module Lawnchair
           data_store.del(computed_key(key))
           log("EXPIRATION", key, Time.now-start_time)
         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/storage_engine/in_process_spec.rb

@@ -58,10 +58,4 @@ 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

@@ -69,58 +69,4 @@ describe "Lawnchair::StorageEngine::RedisStore" do
       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,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: lawnchair
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 6
-  - 5
-  version: 0.6.5
+  - 6
+  version: 0.6.6
 platform: ruby
 authors: 
 - Shane Wolf
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-09 00:00:00 -07:00
+date: 2010-08-10 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency