cachengue 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d61f4fc468d164194855289a59933c239687ba325f33470816ab45dbf383a50
-  data.tar.gz: 68fc8ff64e399aca19acc01fbf20272537a67a86c08722967cf7de2e7f19ba0a
+  metadata.gz: 2d9a4ba2667c81c7f2c04fc2ee56f742853fb1e6e218a26e21603be01c488379
+  data.tar.gz: 3e460d20577417ce8b277916cd0bc942fd970fdf2a63db99fa2f5623fcc98142
 SHA512:
-  metadata.gz: edda0834cac796434c6f0e9df1137323f7cd6c1a5ab7713a5ef8fdb251caa8d04682f132ea22ff06a18058d5ec52a8370b6b5b00afb0cb533f4b112a810af2db
-  data.tar.gz: ea1e368ed2bc7897c66ec6cbf9a20e82489750d41aea1ee4b1d3bf4fef1779009ffe080d69589e40ec3fe7b85616d48ec410cd1c0039258c01ad112fa1e25f06
+  metadata.gz: 4e41ed83b12ca627832435ad0a5ef18574635f55a6d4625f663aa17a4f6fb70c178bd15fc5c86de308d60cf8ee5aaafdafa1ad05c11439962a13fbdfbfc68cfc
+  data.tar.gz: 3ab80002c30016a4566f1330502387c17bfb4ad3853e879bc7509ea887293b596bde9b33033d5f3052e7746363c5c970ce7ba57ff935ea85b538d8ab1d847f53

data/.gitignore

@@ -10,3 +10,6 @@
 
 # rspec failure tracking
 .rspec_status
+
+# Gem files
+*.gem

data/Gemfile.lock

@@ -12,10 +12,10 @@ GEM
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.1.3)
     i18n (1.1.1)
       concurrent-ruby (~> 1.0)
-    minitest (5.3.5)
+    minitest (5.11.3)
     rake (10.5.0)
     thread_safe (0.3.6)
     tzinfo (1.2.5)

data/lib/cachengue/caching.rb

@@ -8,13 +8,34 @@ module Cachengue
 
     module_function
 
-    def format_key(namespace, method_name, args)
+    def format_key_by_options(namespace, method_name, args, options)
+      format_key(
+        options[:namespace] || namespace,
+        options[:key] || options[:method] || method_name,
+        options[:args] || args,
+        options[:hash_args]
+      )
+    end
+
+    def format_key(namespace, method_name, args, args_hash)
       args = args.is_a?(Array) ? args.map(&:as_json) : [args.as_json]
+      args = Digest::SHA256.base64digest(String(args)) if args_hash
       namespace = key_prefix(namespace)
 
       "#{namespace}:#{method_name}:#{args}"
     end
 
+    def format_options(options)
+      options.without(
+        :args,
+        :key,
+        :args_hash,
+        :method,
+        :multi,
+        :namespace
+      )
+    end
+
     def key_prefix(namespace = nil)
       if namespace.present?
         "cachengue:#{namespace.to_s.underscore}"
@@ -47,7 +68,8 @@ module Cachengue
       key = format_key(
         options.fetch(:namespace),
         options[:key] || options.fetch(:method),
-        options.fetch(:args)
+        options.fetch(:args),
+        options[:args_hash]
       )
 
       clear_keys([key])
@@ -61,29 +83,70 @@ module Cachengue
       end
     end
 
-    def fetch(namespace, method_name, args, options = {})
-      key = format_key(
-        options[:namespace] || namespace,
-        options[:key] || options[:method] || method_name,
-        options[:args] || args
-      )
+    def get_value_by(args)
+      value = yield(*args)
 
-      options = options.without(
-        :args,
-        :key,
-        :method,
-        :namespace
-      )
+      if defined?(::ActiveRecord) && value.is_a?(::ActiveRecord::Relation)
+        value.to_a
+      else
+        value
+      end
+    end
+
+    def fetch(namespace, method_name, args, options = {}, &block)
+      if options[:multi]
+        fetch_multi(namespace, method_name, args, options, &block)
+      else
+        fetch_one(namespace, method_name, args, options, &block)
+      end
+    end
+
+    def fetch_one(namespace, method_name, args, options = {}, &block)
+      key = format_key_by_options(namespace, method_name, args, options)
+      options = format_options(options)
 
       Rails.cache.fetch(key, options) do
-        value = yield(*args)
+        get_value_by(args, &block)
+      end
+    end
+
+    def fetch_multi(namespace, method_name, args_list, options = {})
+      return {} if args_list.empty?
+
+      args_keys = {}
+
+      args_list.each do |args|
+        key = format_key_by_options(namespace, method_name, args, options)
 
-        if defined?(::ActiveRecord) && value.is_a?(::ActiveRecord::Relation)
-          value.to_a
-        else
-          value
-        end
+        args_keys[key] = args
       end
+
+      options = format_options(options)
+      results = read_multi(args_keys.keys)
+
+      computed_keys = args_keys.keys - results.keys
+      computed_values = computed_keys.map { |key| args_keys.fetch(key) }
+      computed = write_multi(computed_keys, computed_values, options, &Proc.new)
+
+      results.merge!(computed)
+      results.transform_keys! { |key| args_keys.fetch(key) }
+      results
+    end
+
+    def read_multi(keys)
+      Rails.cache.read_multi(*keys)
+    end
+
+    def write_multi(keys, values, options)
+      results = {}
+
+      keys.each_with_index do |key, index|
+        results[key] = get_value_by(values.fetch(index), &Proc.new)
+      end
+
+      Rails.cache.write_multi(results, options)
+
+      results
     end
   end
 end

data/lib/cachengue/namespace.rb

@@ -11,10 +11,18 @@ module Cachengue
       end
     end
 
-    def module_cachengue(method_name, options = {})
+    def module_cachengue(method_name, options = {}, &block)
       singleton_class.instance_eval do
         define_method(method_name) do |*args|
-          Caching.fetch(self, method_name, args, options, &Proc.new)
+          Caching.fetch_one(self, method_name, args, options, &block)
+        end
+      end
+
+      return unless options[:multi]
+
+      singleton_class.instance_eval do
+        define_method("#{method_name}_multi") do |*args|
+          Caching.fetch_multi(self, method_name, args, options, &block)
         end
       end
     end

data/lib/cachengue/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Cachengue
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cachengue
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - shipnow developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-29 00:00:00.000000000 Z
+date: 2019-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -107,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: cache gem for ruby on rails