redis-cacheable 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31bc4cb6af9e7e18b7e2c8d3a30595fdc4895e25
-  data.tar.gz: b940d81a3321cdecd05711648edd6b29848f1966
+  metadata.gz: 98a5a1b98e0a15129aca2cb7a233753616afeaf2
+  data.tar.gz: 090bb1ff29ddf917770383b4023e9199d2277429
 SHA512:
-  metadata.gz: 4baeafafa7813e8d6f57ea66bb8262889d3d2e5c9fb0ab1a0e680b466199b068e01ff20fde55e551dc905be5acb1dd32f218d132154386cc60e016aae6794311
-  data.tar.gz: 33291e1c2af0b7e58ed8779ab43e647147dd66676c4487da96c72fa3249ddc29730db60011223b2b230396aa8bc763aef0554dad7957ca781e336d68815b2f96
+  metadata.gz: c834765451f6c570044caae6b44d48599a5b9b805f7f84ecacef4e1c7e764aea796d7ea997a92bd74dc84c9c86730d67ac550d48484664b9e73a30a8ffe64814
+  data.tar.gz: 36e45970515cb1f874a09c4a7a414fc4e062cb0916a419e5bc5d93de1cb000e1e8246e0ecde220a3fb270c9344c6b8473b51770faac54e6c24c9ac482dadb077

data/lib/redis_cacheable.rb

@@ -67,6 +67,12 @@ module RedisCacheable
       end
     end
 
+    def del_from_redis(key)
+      redis do |conn|
+        conn.del(key)
+      end
+    end
+
     # @private
     # for internal use
     def __redis_cache_key__
@@ -80,9 +86,37 @@ module RedisCacheable
     end
   end
 
-  def cache_to_redis
+  def cache_to_redis(expire: nil)
+    redis do |conn|
+      if expire
+        conn.setex(redis_cache_key, expire, MultiJson.dump(redis_cache_data))
+      else
+        conn.set(redis_cache_key, MultiJson.dump(redis_cache_data))
+      end
+    end
+  end
+
+  def del_from_redis
+    redis do |conn|
+      conn.del(redis_cache_key)
+    end
+  end
+
+  def expire_redis(sec)
+    redis do |conn|
+      conn.expire(redis_cache_key, sec)
+    end
+  end
+
+  def expireat_redis(unix_time)
+    redis do |conn|
+      conn.expireat(redis_cache_key, unix_time)
+    end
+  end
+
+  def ttl_redis
     redis do |conn|
-      conn.set(redis_cache_key, MultiJson.dump(redis_cache_data))
+      conn.ttl(redis_cache_key)
     end
   end
 

data/lib/redis_cacheable/version.rb

@@ -1,3 +1,3 @@
 module RedisCacheable
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/redis-cacheable.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "activesupport", ">= 3"
-  spec.add_dependency "redis"
+  spec.add_dependency "redis", ">= 3"
   spec.add_dependency "redis-namespace"
   spec.add_dependency "connection_pool"
   spec.add_dependency "multi_json"

data/spec/lib/redis_cacheable_spec.rb

@@ -32,6 +32,10 @@ end
 class InheritChild < InheritBase; end
 
 describe RedisCacheable do
+  before do
+    Redis.new.flushall
+  end
+
   describe "Object including RedisCacheable" do
     describe "#cache_to_redis" do
       context "if redis_attrs is symbols" do
@@ -43,6 +47,16 @@ describe RedisCacheable do
         end
       end
 
+      context "if given expire option" do
+        subject { CacheableObject.new(id: 1, name: "target").cache_to_redis(expire: 1) }
+
+        it "cache redis_attrs data to redis and expired after given time" do
+          subject
+          sleep 1
+          expect(CacheableObject.find_from_redis(1)).to be_nil
+        end
+      end
+
       context "if redis_attrs is proc" do
         subject { ProcCacheableObject.new(id: 1, name: "target").cache_to_redis }
 
@@ -70,5 +84,49 @@ describe RedisCacheable do
         end
       end
     end
+
+    describe "#del_from_redis" do
+      it "delete cached data from redis" do
+        object = CacheableObject.new(id: 1, name: "target")
+        object.cache_to_redis
+        expect(CacheableObject.find_from_redis(1)).to eq({"id" => 1, "name" => "target"})
+        object.del_from_redis
+
+        expect(CacheableObject.find_from_redis(1)).to be_nil
+      end
+    end
+
+    describe "#expire_redis" do
+      it "set expire time to cached data" do
+        object = CacheableObject.new(id: 1, name: "target")
+        object.cache_to_redis
+        expect(CacheableObject.find_from_redis(1)).to eq({"id" => 1, "name" => "target"})
+        object.expire_redis(2)
+        expect(CacheableObject.find_from_redis(1)).to eq({"id" => 1, "name" => "target"})
+        sleep 2
+        expect(CacheableObject.find_from_redis(1)).to be_nil
+      end
+    end
+
+    describe "#expireat_redis" do
+      it "set expire time to cached data by unix_time" do
+        object = CacheableObject.new(id: 1, name: "target")
+        object.cache_to_redis
+        expect(CacheableObject.find_from_redis(1)).to eq({"id" => 1, "name" => "target"})
+        object.expireat_redis((Time.now + 2).to_i)
+        expect(CacheableObject.find_from_redis(1)).to eq({"id" => 1, "name" => "target"})
+        sleep 2
+        expect(CacheableObject.find_from_redis(1)).to be_nil
+      end
+    end
+
+    describe "#ttl_redis" do
+      it "returns time to expire as second" do
+        object = CacheableObject.new(id: 1, name: "target")
+        object.cache_to_redis
+        object.expire_redis(2)
+        expect((1.0..2.0).cover?(object.ttl_redis)).to be_true
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis-cacheable
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - joker1007
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-20 00:00:00.000000000 Z
+date: 2014-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: redis-namespace
   requirement: !ruby/object:Gem::Requirement