multi_cache 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a7177cba4599c246887fff21c95f74bb6824a33
-  data.tar.gz: 5ee77e35dc0158d261b5274a315f14006c058b7b
+  metadata.gz: 10a0489c08d03d2a52fd956ce51701cd21caaba3
+  data.tar.gz: 678eeeb73f29422cea57545f8d1bee98754543f9
 SHA512:
-  metadata.gz: 630ec8d1b446bbc2d51fc8d7193643d9b3d40e63ecc78689bedb43ef0b73fc7b659d23b16c0a829199fccd211bfcd4f12ccc214ff97749fb2baef14aca6fc605
-  data.tar.gz: cbabc056f51cee3f6f1a437aa0171df128b671c4f7e269f80728280e5a8c087b374105d21fd9947905778d28e5cfccf6a9265224f412956787806028fbf08afa
+  metadata.gz: ab03e772a21ee54221b7ade431c0ed4c152ab19f929dfbc6c9912ac57cfbeeeffc486c3cd19613e24c75558e3ec17b54ebc3340d313ff1f52dbf694ec4279885
+  data.tar.gz: b142534604bd6770494b15390f3cd12333d7327a835a2b357921960c23419468348fe617344fb16c59f404ffd1b74bd3a4e6752bd6455614d0b66247138f7e80

data/lib/multi_cache.rb

@@ -44,9 +44,11 @@ module MultiCache
   #
   # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # 
 
-  CACHE_KEY_MASTER_PREFIX   = "MultiCache"
-  CACHE_KEY_SEPARATOR       = "_"
-  @@multicache_redis_name   = nil
+  CACHE_KEY_MASTER_PREFIX = 'MultiCache'
+  CACHE_KEY_SEPARATOR = ':'
+  # Three months in seconds
+  MULTICACHE_DEFAULT_TTL = 7776000
+  @@multicache_redis_name = nil
 
   def self.configure
     raise ArgumentError, "requires a block" unless block_given?
@@ -66,40 +68,47 @@ module MultiCache
 
   included do
 
-    after_save    :destroy_obj_cache
+    after_save :destroy_obj_cache
     after_destroy :destroy_obj_cache
 
-    def self.get_cached(id_or_obj, cache_prefix)
+    def self.get_cached(id_or_obj, cache_category)
       id_and_obj = get_id_and_obj(id_or_obj)
 
-      validate_cache_prefix(cache_prefix)
+      validate_cache_category(cache_category)
 
-      cache_key = obj_cache_key(id_and_obj[:id], cache_prefix)
-      cached = MultiCache.get_redis.hgetall(cache_key)
+      cache_key = obj_cache_key(id_and_obj[:id])
+      cached_json = MultiCache.get_redis.hget(cache_key, cache_category)
 
-      if cached.blank?
-        cached = gen_cache_content(id_or_obj, cache_prefix)
-
-        raise "the output of GEN_CACHE_CONTENT must be a hash" if !(cached.is_a?Hash)
-        if cached.present?
-          MultiCache.get_redis.hmset(cache_key, *(cached.to_a.reduce([], :+)))
-        end
-        cached = MultiCache.get_redis.hgetall(cache_key)
+      if cached_json.nil?
+        # Not found in cache
+        cached_hash = gen_cache_content(id_or_obj, cache_category)
+        self.write_to_cache(cached_hash, cache_key, cache_category)
+      else
+        cached_hash = JSON.parse(cached_json)
       end
 
-      parse_cache_content(cached, cache_prefix)
+      parse_cache_content(cached_hash, cache_category)
+    end
+
+    def self.write_to_cache(cached_hash, cache_key, cache_category)
+      raise "the output of GEN_CACHE_CONTENT must be a hash" if !(cached_hash.is_a? Hash)
+      if !cached_hash.nil?
+        created = MultiCache.get_redis.hset(cache_key, cache_category, cached_hash.to_json)
+        MultiCache.get_redis.expire(cache_key, MULTICACHE_DEFAULT_TTL) if created
+      end
     end
 
     # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # 
     # Cache key determination
     # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # 
-    def obj_cache_key(cache_prefix)
-      self.class.obj_cache_key(self.id, cache_prefix)
+    def obj_cache_key(id = self.id)
+      self.class.obj_cache_key(id)
     end
 
-    def self.obj_cache_key(id, custom_prefix)
+    def self.obj_cache_key(id)
       # Do not change ordering since we match keys using this
-      [fixed_cache_prefix(id), custom_prefix.to_s].join(CACHE_KEY_SEPARATOR)
+      raise ArgumentError.new 'Key can not be blank' if id.blank?
+      [fixed_cache_prefix(id)].join(CACHE_KEY_SEPARATOR)
     end
 
     def self.fixed_cache_prefix(id = nil)
@@ -110,26 +119,16 @@ module MultiCache
 
     # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # 
     # Cache destruction
-    # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # 
-    def destroy_obj_cache(cb_obj = nil)
-      self.class.destroy_obj_cache(self.id)
+    # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+
+    def destroy_obj_cache(category = nil)
+      self.class.destroy_obj_cache(self.id, category)
     end
 
-    def self.destroy_obj_cache(id)
+    def self.destroy_obj_cache(id, category = nil)
       # Delete cache for one object only
       prefix = self.fixed_cache_prefix(id)
-      MultiCache.del_from_redis(prefix)
-    end
-
-    def self.destroy_class_cache
-      # Destroy cache for all objects of this class
-      prefix = self.fixed_cache_prefix
-      MultiCache.del_from_redis(prefix)
-    end
-
-    def self.destroy_cache_keys
-      # Destroy cache for all MultiCache
-      MultiCache.del_from_redis(CACHE_KEY_MASTER_PREFIX)
+      MultiCache.del_from_redis(prefix, category)
     end
 
     # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # 
@@ -152,20 +151,19 @@ module MultiCache
       id_and_obj
     end
 
-    def self.validate_cache_prefix(cache_prefix)
-      if !(multi_cache_prefixes.include?cache_prefix)
-        raise "#{self} Class: cache prefix '#{cache_prefix}' " + 
-              "must be among #{multi_cache_prefixes}"
+    def self.validate_cache_category(cache_category)
+      if !(multi_cache_prefixes.include? cache_category)
+        raise "#{self} Class: cache category '#{cache_category}' " +
+                  "must be among #{multi_cache_prefixes}"
       end
     end
   end
 
-  def self.del_from_redis(prefix_match) 
-    Thread.new do
-      MultiCache.get_redis.keys("#{prefix_match}*").each do |prefix|
-        MultiCache.get_redis.del(prefix)
-        # TODO: Use scan instead of keys
-      end
+  def self.del_from_redis(prefix, category)
+    if category.nil?
+      MultiCache.get_redis.del(prefix)
+    else
+      MultiCache.get_redis.hdel(prefix, Array.wrap(category).compact)
     end
   end
 end

data/lib/multi_cache/version.rb

@@ -1,3 +1,3 @@
 module MultiCache
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/multi_cache.gemspec

@@ -5,8 +5,8 @@ require 'multi_cache/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "multi_cache"
-  spec.version       = '0.1.1'
-  spec.authors       = ["Akshay Rao"]
+  spec.version       = '0.1.2'
+  spec.authors       = ["Akshay Rao", "Sonu Kumar"]
   spec.email         = ["14akshayrao@gmail.com"]
 
   spec.summary       = %q{Framework to help you easily manage caches under multiple keys}

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: multi_cache
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Akshay Rao
+- Sonu Kumar
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-12 00:00:00.000000000 Z
+date: 2018-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,6 +85,7 @@ files:
 - lib/multi_cache.rb
 - lib/multi_cache/version.rb
 - multi_cache-0.1.0.gem
+- multi_cache-0.1.1.gem
 - multi_cache.gemspec
 homepage: http://www.avanti.in
 licenses: