active_model_cachers 2.1.5 → 2.1.6

data/lib/active_model_cachers/cache_service_factory.rb

@@ -1,55 +1,55 @@
-# frozen_string_literal: true
-require 'request_store'
-require 'active_model_cachers/cache_service'
-
-module ActiveModelCachers
-  class CacheServiceFactory
-    @key_class_mapping = {}
-    @cache_key_klass_mapping = {}
-
-    class << self
-      def has_cacher?(attr)
-        return (@key_class_mapping[get_cache_key(attr)] != nil)
-      end
-
-      def create_for_active_model(attr, query)
-        cache_key = get_cache_key(attr)
-
-        klass = @key_class_mapping[cache_key] ||= ->{
-          klass = Class.new(CacheService)
-          klass.cache_key = cache_key
-          klass.query_mapping = {}
-          klass.instance_variable_set(:@callbacks_defined, false) # to remove warning: instance variable @callbacks_defined not initialized
-          next klass
-        }[]
-
-        klass.query_mapping[attr.reflect] = query
-        return klass
-      end
-
-      def set_klass_to_mapping(attr, current_klass)
-        cache_key = get_cache_key(attr)
-        changed = clean_klass_cache_if_reloaded!(cache_key, current_klass, attr)
-        @cache_key_klass_mapping[cache_key] = current_klass
-        return changed
-      end
-
-      private
-
-      def get_cache_key(attr)
-        class_name, column = attr.extract_class_and_column
-        return "active_model_cachers_#{class_name}_at_#{column}" if column
-        foreign_key = attr.foreign_key(reverse: true)
-        return "active_model_cachers_#{class_name}_by_#{foreign_key}" if foreign_key and foreign_key.to_s != 'id'
-        return "active_model_cachers_#{class_name}"
-      end
-
-      def clean_klass_cache_if_reloaded!(cache_key, current_klass, attr)
-        origin_klass, @cache_key_klass_mapping[cache_key] = @cache_key_klass_mapping[cache_key], current_klass
-        return false if origin_klass == nil or origin_klass == current_klass # when code reloaded in development.
-        @key_class_mapping[cache_key] = nil
-        return true
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+require 'request_store'
+require 'active_model_cachers/cache_service'
+
+module ActiveModelCachers
+  class CacheServiceFactory
+    @key_class_mapping = {}
+    @cache_key_klass_mapping = {}
+
+    class << self
+      def has_cacher?(attr)
+        return (@key_class_mapping[get_cache_key(attr)] != nil)
+      end
+
+      def create_for_active_model(attr, query)
+        cache_key = get_cache_key(attr)
+
+        klass = @key_class_mapping[cache_key] ||= ->{
+          klass = Class.new(CacheService)
+          klass.cache_key = cache_key
+          klass.query_mapping = {}
+          klass.instance_variable_set(:@callbacks_defined, false) # to remove warning: instance variable @callbacks_defined not initialized
+          next klass
+        }[]
+
+        klass.query_mapping[attr.reflect] = query
+        return klass
+      end
+
+      def set_klass_to_mapping(attr, current_klass)
+        cache_key = get_cache_key(attr)
+        changed = clean_klass_cache_if_reloaded!(cache_key, current_klass, attr)
+        @cache_key_klass_mapping[cache_key] = current_klass
+        return changed
+      end
+
+      private
+
+      def get_cache_key(attr)
+        class_name, column = attr.extract_class_and_column
+        return "active_model_cachers_#{class_name}_at_#{column}" if column
+        foreign_key = attr.foreign_key(reverse: true)
+        return "active_model_cachers_#{class_name}_by_#{foreign_key}" if foreign_key and foreign_key.to_s != 'id'
+        return "active_model_cachers_#{class_name}"
+      end
+
+      def clean_klass_cache_if_reloaded!(cache_key, current_klass, attr)
+        origin_klass, @cache_key_klass_mapping[cache_key] = @cache_key_klass_mapping[cache_key], current_klass
+        return false if origin_klass == nil or origin_klass == current_klass # when code reloaded in development.
+        @key_class_mapping[cache_key] = nil
+        return true
+      end
+    end
+  end
+end

data/lib/active_model_cachers/column_value_cache.rb

@@ -1,47 +1,47 @@
-# frozen_string_literal: true
-
-class ActiveModelCachers::ColumnValueCache
-  def initialize
-    @cache1 = Hash.new{|h, k| h[k] = {} }
-    @cache2 = Hash.new{|h, k| h[k] = {} }
-  end
-
-  def add(object, class_name, id, foreign_key, model)
-    value = (@cache1[class_name][[id, foreign_key]] ||= get_id_from(object, id, foreign_key, model))
-    return ->{ (value == :not_set ? query_value(object, class_name, id, foreign_key) : value)}
-  end
-
-  def query_value(object, class_name, id, foreign_key)
-    cache = @cache2[class_name]
-    if cache.empty?
-      no_data_keys = @cache1[class_name].select{|k, v| v == :not_set }.keys
-      ids = no_data_keys.map(&:first).uniq
-      columns = ['id', *no_data_keys.map(&:second)].uniq
-      pluck_columns(object, object.where(id: ids).limit(ids.size), columns).each do |columns_data|
-        model_id = columns_data.first
-        columns.each_with_index do |column, index|
-          cache[[model_id, column]] = columns_data[index]
-        end
-      end
-    end
-    return cache[[id, foreign_key]]
-  end
-
-  def clean_cache
-    @cache1.clear
-    @cache2.clear
-  end
-
-  private
-
-  def pluck_columns(_, relation, columns)
-    relation.pluck(*columns)
-  end
-
-  def get_id_from(object, id, column, model)
-    return id if column == 'id'
-    model ||= object.cacher.peek_by(id: id) if object.has_cacher?
-    return model.send(column) if model and model.has_attribute?(column)
-    return :not_set
-  end
-end
+# frozen_string_literal: true
+
+class ActiveModelCachers::ColumnValueCache
+  def initialize
+    @cache1 = Hash.new{|h, k| h[k] = {} }
+    @cache2 = Hash.new{|h, k| h[k] = {} }
+  end
+
+  def add(object, class_name, id, foreign_key, model)
+    value = (@cache1[class_name][[id, foreign_key]] ||= get_id_from(object, id, foreign_key, model))
+    return ->{ (value == :not_set ? query_value(object, class_name, id, foreign_key) : value)}
+  end
+
+  def query_value(object, class_name, id, foreign_key)
+    cache = @cache2[class_name]
+    if cache.empty?
+      no_data_keys = @cache1[class_name].select{|k, v| v == :not_set }.keys
+      ids = no_data_keys.map(&:first).uniq
+      columns = ['id', *no_data_keys.map(&:second)].uniq
+      pluck_columns(object, object.where(id: ids).limit(ids.size), columns).each do |columns_data|
+        model_id = columns_data.first
+        columns.each_with_index do |column, index|
+          cache[[model_id, column]] = columns_data[index]
+        end
+      end
+    end
+    return cache[[id, foreign_key]]
+  end
+
+  def clean_cache
+    @cache1.clear
+    @cache2.clear
+  end
+
+  private
+
+  def pluck_columns(_, relation, columns)
+    relation.pluck(*columns)
+  end
+
+  def get_id_from(object, id, column, model)
+    return id if column == 'id'
+    model ||= object.cacher.peek_by(id: id) if object.has_cacher?
+    return model.send(column) if model and model.has_attribute?(column)
+    return :not_set
+  end
+end

data/lib/active_model_cachers/config.rb

@@ -1,6 +1,6 @@
-# frozen_string_literal: true
-module ActiveModelCachers
-  class Config
-    attr_accessor :store
-  end
-end
+# frozen_string_literal: true
+module ActiveModelCachers
+  class Config
+    attr_accessor :store
+  end
+end

data/lib/active_model_cachers/false_object.rb

@@ -1,5 +1,5 @@
-# frozen_string_literal: true
-module ActiveModelCachers
-  class FalseObject
-  end
-end
+# frozen_string_literal: true
+module ActiveModelCachers
+  class FalseObject
+  end
+end

data/lib/active_model_cachers/hook/associations.rb

@@ -1,43 +1,43 @@
-# frozen_string_literal: true
-require 'active_record'
-require 'active_record/associations/has_many_association'
-require 'active_model_cachers/hook/on_model_delete'
-
-module ActiveModelCachers::Hook
-  module Associations
-    def delete_count(method, scope)
-      if method == :delete_all
-        # TODO:
-      else # nullify
-        call_hooks{ scope.pluck(:id) }
-      end
-      super
-    end
-
-    def delete_records(records, method)
-      case method
-      when :destroy
-      when :delete_all
-        # TODO:
-      else
-        call_hooks{ records.map(&:id) }
-      end
-      super
-    end
-
-    private
-
-    def call_hooks(&get_ids)
-      ids = nil
-      get_ids_with_cache = ->{ ids ||= get_ids.call }
-      ActiveModelCachers::ActiveRecord::Extension.global_callbacks.on_nullify.exec(
-        self,
-        reflection.klass,
-        reflection.foreign_key,
-        get_ids_with_cache,
-      )
-    end
-  end
-end
-
-ActiveRecord::Associations::HasManyAssociation.send(:prepend, ActiveModelCachers::Hook::Associations)
+# frozen_string_literal: true
+require 'active_record'
+require 'active_record/associations/has_many_association'
+require 'active_model_cachers/hook/on_model_delete'
+
+module ActiveModelCachers::Hook
+  module Associations
+    def delete_count(method, scope)
+      if method == :delete_all
+        # TODO:
+      else # nullify
+        call_hooks{ scope.pluck(:id) }
+      end
+      super
+    end
+
+    def delete_records(records, method)
+      case method
+      when :destroy
+      when :delete_all
+        # TODO:
+      else
+        call_hooks{ records.map(&:id) }
+      end
+      super
+    end
+
+    private
+
+    def call_hooks(&get_ids)
+      ids = nil
+      get_ids_with_cache = ->{ ids ||= get_ids.call }
+      ActiveModelCachers::ActiveRecord::Extension.global_callbacks.on_nullify.exec(
+        self,
+        reflection.klass,
+        reflection.foreign_key,
+        get_ids_with_cache,
+      )
+    end
+  end
+end
+
+ActiveRecord::Associations::HasManyAssociation.send(:prepend, ActiveModelCachers::Hook::Associations)

data/lib/active_model_cachers/hook/dependencies.rb

@@ -1,38 +1,38 @@
-# frozen_string_literal: true
-require 'active_support/dependencies'
-
-module ActiveModelCachers::Hook
-  module Depdenencies
-    def onload(const_name, times: 1, &block)
-      const = const_name if not const_name.is_a?(String)
-      if const or Module.const_defined?(const_name)
-        (const || const_name.constantize).instance_exec(&block)
-      else
-        load_hooks[const_name].push(block: block, times: times)
-      end
-    end
-
-    def load_hooks
-      @load_hooks ||= Hash.new{|h, k| h[k] = [] }
-    end
-
-    def new_constants_in(*)
-      new_constants = super.each do |const_name|
-        hooks = load_hooks[const_name]
-        need_compact = false
-        hooks.each_with_index do |hook, idx|
-          if (hook[:times] -= 1) < 0
-            hooks[idx] = nil
-            need_compact = true
-            next
-          end
-          const_name.constantize.instance_exec(&hook[:block])
-        end
-        hooks.compact! if need_compact
-      end
-      return new_constants
-    end
-  end
-end
-
-ActiveSupport::Dependencies.send(:extend, ActiveModelCachers::Hook::Depdenencies)
+# frozen_string_literal: true
+require 'active_support/dependencies'
+
+module ActiveModelCachers::Hook
+  module Depdenencies
+    def onload(const_name, times: 1, &block)
+      const = const_name if not const_name.is_a?(String)
+      if const or Module.const_defined?(const_name)
+        (const || const_name.constantize).instance_exec(&block)
+      else
+        load_hooks[const_name].push(block: block, times: times)
+      end
+    end
+
+    def load_hooks
+      @load_hooks ||= Hash.new{|h, k| h[k] = [] }
+    end
+
+    def new_constants_in(*)
+      new_constants = super.each do |const_name|
+        hooks = load_hooks[const_name]
+        need_compact = false
+        hooks.each_with_index do |hook, idx|
+          if (hook[:times] -= 1) < 0
+            hooks[idx] = nil
+            need_compact = true
+            next
+          end
+          const_name.constantize.instance_exec(&hook[:block])
+        end
+        hooks.compact! if need_compact
+      end
+      return new_constants
+    end
+  end
+end
+
+ActiveSupport::Dependencies.send(:extend, ActiveModelCachers::Hook::Depdenencies)

data/lib/active_model_cachers/hook/on_model_delete.rb

@@ -1,29 +1,29 @@
-# frozen_string_literal: true
-require 'active_record'
-
-module ActiveModelCachers::Hook
-  module OnModelDelete
-    module InstanceMethods
-      def delete
-        self.class.delete(id, self) if persisted?
-        @destroyed = true
-        freeze
-      end
-    end
-
-    module ClassMethods
-      def delete(id, model = nil)
-        ActiveModelCachers::ActiveRecord::Extension.global_callbacks.before_delete1.exec(self, self, id, model)
-        ActiveModelCachers::ActiveRecord::Extension.global_callbacks.before_delete2.exec(self, self, id, model)
-
-        result = super(id)
-
-        ActiveModelCachers::ActiveRecord::Extension.global_callbacks.after_delete.exec(self, self, id, model)
-        return result
-      end
-    end
-  end
-end
-
-ActiveRecord::Base.send(:include, ActiveModelCachers::Hook::OnModelDelete::InstanceMethods)
-ActiveRecord::Base.send(:extend, ActiveModelCachers::Hook::OnModelDelete::ClassMethods)
+# frozen_string_literal: true
+require 'active_record'
+
+module ActiveModelCachers::Hook
+  module OnModelDelete
+    module InstanceMethods
+      def delete
+        self.class.delete(id, self) if persisted?
+        @destroyed = true
+        freeze
+      end
+    end
+
+    module ClassMethods
+      def delete(id, model = nil)
+        ActiveModelCachers::ActiveRecord::Extension.global_callbacks.before_delete1.exec(self, self, id, model)
+        ActiveModelCachers::ActiveRecord::Extension.global_callbacks.before_delete2.exec(self, self, id, model)
+
+        result = super(id)
+
+        ActiveModelCachers::ActiveRecord::Extension.global_callbacks.after_delete.exec(self, self, id, model)
+        return result
+      end
+    end
+  end
+end
+
+ActiveRecord::Base.send(:include, ActiveModelCachers::Hook::OnModelDelete::InstanceMethods)
+ActiveRecord::Base.send(:extend, ActiveModelCachers::Hook::OnModelDelete::ClassMethods)