sequel-cacheable 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/sequel-cacheable.rb

@@ -44,7 +44,7 @@ module Sequel::Plugins
 
         ttl = ttl || cache_options.ttl
         if cache_options.pack_lib?
-          obj = obj.map{|o| o.msgpack_hash } if obj.kind_of?(Array)
+          obj = obj.map{|o| o.id } if obj.kind_of?(Array)
           obj = cache_options.pack_lib.pack(obj)
         end
 
@@ -70,6 +70,26 @@ module Sequel::Plugins
         obj
       end
 
+      def cache_mget(*keys)
+        if cache_options.ignore_exceptions?
+          objs = cache_store.mget(*keys) rescue nil
+        else
+          objs = cache_store.mget(*keys)
+        end
+
+        objs = nil if objs == [nil]
+
+        if objs && cache_options.pack_lib?
+          objs.map!{|obj| 
+            key = keys.shift
+            (obj && restore_cache(cache_options.pack_lib.unpack(obj))) ||
+              model[key.sub(/^#{model}::/, '')]
+          }
+        end
+
+        objs || []
+      end
+
       def cache_del(key)
         cache_store.send(cache_store_type.delete_method, key)
       end
@@ -85,7 +105,7 @@ module Sequel::Plugins
       def restore_cache(object)
         return object if object.nil?
 
-        return object.map{|o| restore_cache(o) } if object.kind_of?(Array)
+        return cache_mget(*object.map{|id| "#{model}::#{id}" }) if object.kind_of?(Array)
 
         object.keys.each do | key |
           value = object.delete(key)
@@ -100,6 +120,7 @@ module Sequel::Plugins
       end
 
       def clear_query_cache
+        return unless cache_options.query_cache?
         cache_store.keys("#{model.name}::Query::*").each do | key |
           cache_del(key)
         end
@@ -130,7 +151,7 @@ module Sequel::Plugins
       end
 
       def after_initialize
-        store_cache
+        store_cache unless id.nil?
         super
       end
 

data/sequel-cacheable.gemspec

@@ -0,0 +1,97 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "sequel-cacheable"
+  s.version = "0.0.2"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Sho Kusano <rosylilly>"]
+  s.date = "2012-02-26"
+  s.description = "This plug-in caching mechanism to implement the Model of the Sequel"
+  s.email = "rosylilly@aduca.org"
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    ".rspec",
+    "Gemfile",
+    "Gemfile.lock",
+    "Guardfile",
+    "LICENSE.txt",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "lib/sequel-cacheable.rb",
+    "sequel-cacheable.gemspec",
+    "spec/lib/sequel-cacheable_spec.rb",
+    "spec/spec_helper.rb"
+  ]
+  s.homepage = "http://github.com/rosylilly/sequel-cacheable"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.11"
+  s.summary = "This plug-in caching mechanism to implement the Model of the Sequel"
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<sequel>, ["~> 3.32.0"])
+      s.add_runtime_dependency(%q<msgpack>, ["~> 0.4.6"])
+      s.add_runtime_dependency(%q<hashr>, ["~> 0.0.19"])
+      s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
+      s.add_development_dependency(%q<yard>, ["~> 0.7"])
+      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
+      s.add_development_dependency(%q<simplecov>, ["~> 0.6.1"])
+      s.add_development_dependency(%q<guard>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<guard-rspec>, ["~> 0.6.0"])
+      s.add_development_dependency(%q<growl>, [">= 0"])
+      s.add_development_dependency(%q<sqlite3>, [">= 0"])
+      s.add_development_dependency(%q<memcache>, [">= 0"])
+      s.add_development_dependency(%q<redis>, [">= 0"])
+      s.add_development_dependency(%q<queencheck>, [">= 0"])
+    else
+      s.add_dependency(%q<sequel>, ["~> 3.32.0"])
+      s.add_dependency(%q<msgpack>, ["~> 0.4.6"])
+      s.add_dependency(%q<hashr>, ["~> 0.0.19"])
+      s.add_dependency(%q<bundler>, [">= 1.0.0"])
+      s.add_dependency(%q<rspec>, ["~> 2.8.0"])
+      s.add_dependency(%q<yard>, ["~> 0.7"])
+      s.add_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
+      s.add_dependency(%q<simplecov>, ["~> 0.6.1"])
+      s.add_dependency(%q<guard>, ["~> 1.0.0"])
+      s.add_dependency(%q<guard-rspec>, ["~> 0.6.0"])
+      s.add_dependency(%q<growl>, [">= 0"])
+      s.add_dependency(%q<sqlite3>, [">= 0"])
+      s.add_dependency(%q<memcache>, [">= 0"])
+      s.add_dependency(%q<redis>, [">= 0"])
+      s.add_dependency(%q<queencheck>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<sequel>, ["~> 3.32.0"])
+    s.add_dependency(%q<msgpack>, ["~> 0.4.6"])
+    s.add_dependency(%q<hashr>, ["~> 0.0.19"])
+    s.add_dependency(%q<bundler>, [">= 1.0.0"])
+    s.add_dependency(%q<rspec>, ["~> 2.8.0"])
+    s.add_dependency(%q<yard>, ["~> 0.7"])
+    s.add_dependency(%q<rdoc>, ["~> 3.12"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
+    s.add_dependency(%q<simplecov>, ["~> 0.6.1"])
+    s.add_dependency(%q<guard>, ["~> 1.0.0"])
+    s.add_dependency(%q<guard-rspec>, ["~> 0.6.0"])
+    s.add_dependency(%q<growl>, [">= 0"])
+    s.add_dependency(%q<sqlite3>, [">= 0"])
+    s.add_dependency(%q<memcache>, [">= 0"])
+    s.add_dependency(%q<redis>, [">= 0"])
+    s.add_dependency(%q<queencheck>, [">= 0"])
+  end
+end
+

data/spec/lib/sequel-cacheable_spec.rb

@@ -70,6 +70,54 @@ describe Sequel::Plugins::Cacheable do
         MemcacheModel.cache_get('MemcacheModel::test').should be_nil
       end
     end
+
+    describe "act as cache" do
+      context "Model[40]" do
+        before do
+          @obj = MemcacheModel[40]
+        end
+
+        it "stored cache" do
+          MemcacheModel.cache_get(@obj.cache_key).should == @obj
+        end
+
+        it "restoreble cache data" do
+          cached = MessagePack.unpack(MemcacheCli.get(@obj.cache_key))
+          cached['string'].should == @obj.string
+          Time.at(cached['time'][0], cached['time'][1]).should === @obj.time
+        end
+
+        it "update cache data" do
+          @obj.string = 'modified++'
+          cached = MessagePack.unpack(MemcacheCli.get(@obj.cache_key))
+          cached['string'].should_not == @obj.string
+          @obj.save
+          cached = MessagePack.unpack(MemcacheCli.get(@obj.cache_key))
+          cached['string'].should == @obj.string
+        end
+
+        it "delete cache data" do
+          cache_key = @obj.cache_key; @obj.delete
+          MemcacheCli.get(cache_key).should be_nil
+          MemcacheModel[40].should be_nil
+        end
+
+        it "destroy cache data" do
+          @obj = MemcacheModel[41]
+          cache_key = @obj.cache_key; @obj.destroy
+          MemcacheCli.get(cache_key).should be_nil
+          MemcacheModel[41].should be_nil
+        end
+      end
+    end
+
+    describe "query cache" do
+      it "get" do
+        MemcacheModel.all.should == MemcacheModel.all
+      end
+
+      pending "not supported query cache on Memcache Client"
+    end
   end
 
   context RedisModel do
@@ -115,8 +163,14 @@ describe Sequel::Plugins::Cacheable do
           @obj = RedisModel[50]
         end
 
+        it "unstored cache on new" do
+          before_count = RedisCli.keys.length
+          RedisModel.new({:string => 'test'})
+          RedisCli.keys.length.should == before_count
+        end
+
         it "stored cache" do
-          RedisCli.keys(@obj.cache_key).should == [@obj.cache_key]
+          RedisModel.cache_get(@obj.cache_key).should == @obj
         end
 
         it "restoreble cache data" do
@@ -151,12 +205,14 @@ describe Sequel::Plugins::Cacheable do
 
     describe "query cache" do
       it "set and get" do
+        RedisModel.clear_query_cache
         models = RedisModel.limit(3).all
         cache_key = RedisCli.keys('RedisModel::Query::*')[0]
         RedisModel.cache_get(cache_key).should == models
       end
 
       it "clear on update" do
+        RedisModel.clear_query_cache
         RedisModel.all
         cache_key = RedisCli.keys('RedisModel::Query::*')
         cache_key.should_not be_empty
@@ -165,12 +221,22 @@ describe Sequel::Plugins::Cacheable do
       end
 
       it "clear on delete" do
+        RedisModel.clear_query_cache
         RedisModel.all
         cache_key = RedisCli.keys('RedisModel::Query::*')
         cache_key.should_not be_empty
         RedisModel[2].delete
         RedisCli.keys('RedisModel::Query::*').should be_empty
       end
+
+      it "cacheout rescue" do
+        RedisModel.clear_query_cache
+        caches = RedisModel.limit(20).all
+        cache_key = RedisCli.keys('RedisModel::Query::*')[0]
+        cache = caches[rand(caches.length-1)]
+        RedisModel.cache_del(cache.cache_key)
+        RedisModel.cache_get(cache_key).should == caches
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequel-cacheable
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &70115283680940 !ruby/object:Gem::Requirement
+  requirement: &70185903522420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.32.0
   type: :runtime
   prerelease: false
-  version_requirements: *70115283680940
+  version_requirements: *70185903522420
 - !ruby/object:Gem::Dependency
   name: msgpack
-  requirement: &70115283680240 !ruby/object:Gem::Requirement
+  requirement: &70185903521800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *70115283680240
+  version_requirements: *70185903521800
 - !ruby/object:Gem::Dependency
   name: hashr
-  requirement: &70115283678820 !ruby/object:Gem::Requirement
+  requirement: &70185903536900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.0.19
   type: :runtime
   prerelease: false
-  version_requirements: *70115283678820
+  version_requirements: *70185903536900
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70115283693140 !ruby/object:Gem::Requirement
+  requirement: &70185903534780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70115283693140
+  version_requirements: *70185903534780
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70115283690620 !ruby/object:Gem::Requirement
+  requirement: &70185903532880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70115283690620
+  version_requirements: *70185903532880
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70115283689440 !ruby/object:Gem::Requirement
+  requirement: &70185903531420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '0.7'
   type: :development
   prerelease: false
-  version_requirements: *70115283689440
+  version_requirements: *70185903531420
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70115283688660 !ruby/object:Gem::Requirement
+  requirement: &70185903530120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *70115283688660
+  version_requirements: *70185903530120
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70115283688000 !ruby/object:Gem::Requirement
+  requirement: &70185903529220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *70115283688000
+  version_requirements: *70185903529220
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70115283687380 !ruby/object:Gem::Requirement
+  requirement: &70185903544780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 0.6.1
   type: :development
   prerelease: false
-  version_requirements: *70115283687380
+  version_requirements: *70185903544780
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70115283686480 !ruby/object:Gem::Requirement
+  requirement: &70185903544040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70115283686480
+  version_requirements: *70185903544040
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70115283701860 !ruby/object:Gem::Requirement
+  requirement: &70185903543480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *70115283701860
+  version_requirements: *70185903543480
 - !ruby/object:Gem::Dependency
   name: growl
-  requirement: &70115283700860 !ruby/object:Gem::Requirement
+  requirement: &70185903542320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70115283700860
+  version_requirements: *70185903542320
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70115283699440 !ruby/object:Gem::Requirement
+  requirement: &70185903541080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70115283699440
+  version_requirements: *70185903541080
 - !ruby/object:Gem::Dependency
   name: memcache
-  requirement: &70115283698020 !ruby/object:Gem::Requirement
+  requirement: &70185903539780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70115283698020
+  version_requirements: *70185903539780
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70115283696780 !ruby/object:Gem::Requirement
+  requirement: &70185903553420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70115283696780
+  version_requirements: *70185903553420
 - !ruby/object:Gem::Dependency
   name: queencheck
-  requirement: &70115283695460 !ruby/object:Gem::Requirement
+  requirement: &70185903552000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,7 +186,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70115283695460
+  version_requirements: *70185903552000
 description: This plug-in caching mechanism to implement the Model of the Sequel
 email: rosylilly@aduca.org
 executables: []
@@ -205,6 +205,7 @@ files:
 - Rakefile
 - VERSION
 - lib/sequel-cacheable.rb
+- sequel-cacheable.gemspec
 - spec/lib/sequel-cacheable_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/rosylilly/sequel-cacheable
@@ -222,7 +223,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -213750302155396124
+      hash: -3808227649424025746
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: