lawnchair 0.6.8 → 0.6.9

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", ">=0.1.2"
+    gem.add_dependency "redis", ">=2.0.0"
     gem.add_dependency "activesupport", ">=2.3.2"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION

@@ -1 +1 @@
-0.6.8
+0.6.9

data/lawnchair.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{lawnchair}
-  s.version = "0.6.8"
+  s.version = "0.6.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Shane Wolf"]
-  s.date = %q{2010-09-14}
+  s.date = %q{2010-10-08}
   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 = [
@@ -61,14 +61,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<redis>, [">= 0.1.2"])
+      s.add_runtime_dependency(%q<redis>, [">= 2.0.0"])
       s.add_runtime_dependency(%q<activesupport>, [">= 2.3.2"])
     else
-      s.add_dependency(%q<redis>, [">= 0.1.2"])
+      s.add_dependency(%q<redis>, [">= 2.0.0"])
       s.add_dependency(%q<activesupport>, [">= 2.3.2"])
     end
   else
-    s.add_dependency(%q<redis>, [">= 0.1.2"])
+    s.add_dependency(%q<redis>, [">= 2.0.0"])
     s.add_dependency(%q<activesupport>, [">= 2.3.2"])
   end
 end

data/lib/active_record_extension.rb

@@ -1,5 +1,5 @@
-require 'activesupport'
-require 'activerecord'
+require 'active_support'
+require 'active_record'
 module ActiveRecord
   module LawnchairExtension
     

data/lib/storage_engine/abstract.rb

@@ -11,8 +11,7 @@ module Lawnchair
         def fetch(key, options={}, &block)
                     
           start_time = Time.now
-          if exists?(key)
-            value = get(key, options)
+          if value = get(key, options)
             log("HIT", key, Time.now-start_time)
             return value
           else
@@ -27,7 +26,8 @@ module Lawnchair
           if options[:raw]
             data_store[computed_key(key)]
           else
-            exists?(key) ? Marshal.load(data_store[computed_key(key)]) : nil
+            value = data_store[computed_key(key)]
+            value.nil? ? nil : Marshal.load(value)
           end
         end
       

data/spec/speed.rb

@@ -1,6 +1,6 @@
 require 'benchmark'
 require "#{File.dirname(__FILE__)}/../lib/lawnchair"
-
+require 'activesupport'
 Lawnchair.connectdb
 Lawnchair.flushdb
 
@@ -18,13 +18,13 @@ puts "*** Performing #{n} iterations ***"
 
 def expensive_stuff
   a = []
-  100.times do
-    a << Date.parse("Dec 3. 1981")
+  100.times do |i|
+    a << Time.parse("Dec 3. 1981")
   end
 end
 
 Benchmark.bm(7) do |x|
-  x.report("cached:\t\t") do
+  x.report("cached:\t\t\t") do
     (1..n).each do |i|
       Lawnchair.cache("redis_cache") do
         expensive_stuff
@@ -32,7 +32,7 @@ Benchmark.bm(7) do |x|
     end
   end
   
-  x.report("in process cached:") do
+  x.report("in process cached:\t") do
     (1..n).each do |i|
       Lawnchair.cache("in_process_cache", :in_process => true) do
         expensive_stuff
@@ -45,4 +45,36 @@ Benchmark.bm(7) do |x|
       expensive_stuff
     end
   end
+end
+
+puts "**** GET vs EXISTS ****"
+
+Benchmark.bm(7) do |x|
+  x.report("get: not in cache:\t\t") do
+    (1..n).each do |i|
+      Lawnchair::StorageEngine::Redis.get("redis_cache")
+    end
+  end
+  
+  x.report("exist: not in cache:\t\t") do
+    (1..n).each do |i|      
+      Lawnchair::StorageEngine::Redis.exists?("redis_cache")
+    end
+  end
+  
+  Lawnchair.cache("redis_cache") do
+    expensive_stuff
+  end
+  
+  x.report("get: in cache:\t\t\t") do
+    (1..n).each do |i|
+      Lawnchair::StorageEngine::Redis.get("redis_cache")
+    end
+  end
+  
+  x.report("exist: in cache:\t\t") do
+    (1..n).each do |i|
+      Lawnchair::StorageEngine::Redis.exists?("redis_cache")
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: lawnchair
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 6
-  - 8
-  version: 0.6.8
+  - 9
+  version: 0.6.9
 platform: ruby
 authors: 
 - Shane Wolf
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-14 00:00:00 -07:00
+date: 2010-10-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +26,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 15
         segments: 
-        - 0
-        - 1
         - 2
-        version: 0.1.2
+        - 0
+        - 0
+        version: 2.0.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency