redis-memo 0.0.0.beta.1 → 0.0.0.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e64eaaecf192519453c1accb0d10ca25ed2cf8274c10b6cb128a14e9a2e616e
-  data.tar.gz: fd98fce04f77660b8fc5960e491695504ef438394a882fb80d36b706038d10e5
+  metadata.gz: bfc639839800aa1290622d733d9fd23619de8ccd63f2129e4570eb41a295884b
+  data.tar.gz: 26e2d86776244ba5cb0a8cebbc18e468ccf737888de9990c3a2bb9fc931bd4d5
 SHA512:
-  metadata.gz: 20ca8f3efa4ca8591d073960c5fd5b9c8fbcd920b58ae6fe378ec3511af082c2cf964c72cda93739b6bef7294d5be9ceb77eb6000cb3df567f18b2bd581cf4c8
-  data.tar.gz: 1c485024e2eb3f541139bbd8f136279f5b1010b7b81ab30929d2e87a8917c4f0d8fb35d2ae39d94fd14d2f918b6476f53d589026f4412a8b118d6b2b6d732a93
+  metadata.gz: 3c6950a588fbf448d4b88e126ee9b32753ef314225d3aa5f69430d7e386a9a1085b517a08f4f6de2725810f35b493c20e2af62729f547891bcc78aaf4ce73ef2
+  data.tar.gz: 1e380d3ff6d457a6c93dcdebcbf9be072e919b2f5ff25377f169287ed8ac6c379f9a8db29a494d9174cff91e815e680201970ece43baba69b627678b628a3d77

data/lib/redis_memo/memoizable/dependency.rb

@@ -12,25 +12,37 @@ class RedisMemo::Memoizable::Dependency
     @nodes.values
   end
 
-  def depends_on(memo_or_model, **conditions)
-    if !memo_or_model.is_a?(RedisMemo::Memoizable)
+  def depends_on(dependency, **conditions)
+    case dependency
+    when self.class
+      nodes.merge!(dependency.nodes)
+    when RedisMemo::Memoizable
+      memo = dependency
+      return if nodes.include?(memo.cache_key)
+      nodes[memo.cache_key] = memo
+
+      if memo.depends_on
+        # Extract dependencies from the current memoizable and recurse
+        instance_exec(&memo.depends_on)
+      end
+    when UsingActiveRecord
       [
-        memo_or_model.redis_memo_class_memoizable,
-        RedisMemo::MemoizeQuery.create_memo(memo_or_model, **conditions),
+        dependency.redis_memo_class_memoizable,
+        RedisMemo::MemoizeQuery.create_memo(dependency, **conditions),
       ].each do |memo|
         nodes[memo.cache_key] = memo
       end
-
-      return
+    else
+      raise(
+        RedisMemo::ArgumentError,
+        "Invalid dependency #{dependency}"
+      )
     end
+  end
 
-    memo = memo_or_model
-    return if nodes.include?(memo.cache_key)
-    nodes[memo.cache_key] = memo
-
-    if memo.depends_on
-      # Extract dependencies from the current memoizable and recurse
-      instance_exec(&memo.depends_on)
+  class UsingActiveRecord
+    def self.===(dependency)
+      RedisMemo::MemoizeQuery.using_active_record?(dependency)
     end
   end
 end

data/lib/redis_memo/memoize_method.rb

@@ -40,6 +40,20 @@ module RedisMemo::MemoizeMethod
     end
 
     alias_method method_name, method_name_with_memo
+
+    @__redis_memo_method_dependencies ||= Hash.new
+    @__redis_memo_method_dependencies[method_name] = depends_on
+
+    define_method :dependency_of do |method_name, *method_args|
+      method_depends_on = self.class.instance_variable_get(:@__redis_memo_method_dependencies)[method_name]
+      unless method_depends_on
+        raise(
+          RedisMemo::ArgumentError,
+          "#{method_name} is not a memoized method"
+        )
+      end
+      RedisMemo::MemoizeMethod.extract_dependencies(self, *method_args, &method_depends_on)
+    end
   end
 
   def self.method_id(ref, method_name)
@@ -49,15 +63,19 @@ module RedisMemo::MemoizeMethod
     "#{class_name}#{is_class_method ? '::' : '#'}#{method_name}"
   end
 
+  def self.extract_dependencies(ref, *method_args, &depends_on)
+    dependency = RedisMemo::Memoizable::Dependency.new
+
+    # Resolve the dependency recursively
+    dependency.instance_exec(ref, *method_args, &depends_on)
+    dependency
+  end
+
   def self.method_cache_keys(future_contexts)
     memos = Array.new(future_contexts.size)
     future_contexts.each_with_index do |(ref, _, method_args, depends_on), i|
       if depends_on
-        dependency = RedisMemo::Memoizable::Dependency.new
-
-        # Resolve the dependency recursively
-        dependency.instance_exec(ref, *method_args, &depends_on)
-
+        dependency = extract_dependencies(ref, *method_args, &depends_on)
         memos[i] = dependency.memos
       end
     end

data/lib/redis_memo/memoize_query.rb

@@ -44,11 +44,15 @@ if defined?(ActiveRecord)
     end
 
     def self.using_active_record!(model_class)
-      unless model_class.respond_to?(:<) && model_class < ActiveRecord::Base
+      unless using_active_record?(model_class)
         raise RedisMemo::ArgumentError, "'#{model_class.name}' does not use ActiveRecord"
       end
     end
 
+    def self.using_active_record?(model_class)
+      model_class.respond_to?(:<) && model_class < ActiveRecord::Base
+    end
+
     @@memoized_columns = Hash.new { |h, k| h[k] = [Set.new, Set.new] }
 
     def self.memoized_columns(model_or_table, editable_only: false)
@@ -68,26 +72,23 @@ if defined?(ActiveRecord)
         )
       end
 
-      extra_props.each do |key, values|
+      extra_props.each do |key, value|
         # The data type is ensured by the database, thus we don't need to cast
         # types here for better performance
         column_name = key.to_s
-        values = [values] unless values.is_a?(Enumerable)
         extra_props[key] =
           if model_class.defined_enums.include?(column_name)
             enum_mapping = model_class.defined_enums[column_name]
-            values.map do |value|
-              # Assume a value is a converted enum if it does not exist in the
-              # enum mapping
-              (enum_mapping[value.to_s] || value).to_s
-            end
+            # Assume a value is a converted enum if it does not exist in the
+            # enum mapping
+            (enum_mapping[value.to_s] || value).to_s
           else
-            values.map(&:to_s)
+            value.to_s
           end
       end
 
       RedisMemo::Memoizable.new(
-        __redis_memo_memoize_query_model_class_name__: model_class.name,
+        __redis_memo_memoize_query_table_name__: model_class.table_name,
         **extra_props,
       )
     end

data/lib/redis_memo/memoize_query/invalidation.rb

@@ -33,7 +33,7 @@ class RedisMemo::MemoizeQuery::Invalidation
     # Methods that won't trigger model callbacks
     # https://guides.rubyonrails.org/active_record_callbacks.html#skipping-callbacks
     %i(
-      import
+      import import!
       decrement_counter
       delete_all delete_by
       increment_counter

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-memo
 version: !ruby/object:Gem::Version
-  version: 0.0.0.beta.1
+  version: 0.0.0.beta.2
 platform: ruby
 authors:
 - Chan Zuckerberg Initiative