active_model_cachers 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26cbc738077c571fd681dba6f83be1faf69672e52f6d21ef242ff1bec6d7b8d1
-  data.tar.gz: efa2374d6689b0c2fc1c2738293053ecfcc67720840f53ec7ef789c6a84543b3
+  metadata.gz: 22fbf696d9d01bea8d59d1c885ef7e0724bc46894d263ae0bd59023fcbf3d034
+  data.tar.gz: f4b2166e69e896992e3fe0352201473faec0050f40253ace399a64af35ff8e71
 SHA512:
-  metadata.gz: 179179ebf0b2b926963bdfc64392b65c952c5246cfdf4475196bfb9f5af6d2e8996f2c686bc33d031b3ef579c3736a68055e558363df991bb9708275f129f187
-  data.tar.gz: 21bac3df913b18a496c926816d2553c6fb84248d912b6a7861e41f03a37a82059ae86e14264f3f67fbc6bb23894e8bfd3514021d3b14d4d1d1af03c28907eafd
+  metadata.gz: 2c397c8098e6190ee501b91794bdadde52d561560cb1916c45a1da3ae60b24c1b7137b7cb0ebfe49ca5d9dc760e7052345dc4d9930e53face0be7e57bc831ad4
+  data.tar.gz: 2ddab829f8dbe887e5757d3a674a9468b9811fe0f363a27bf548d55a7b8b5ffd22c0e05e41f49e0e6a41e6277fd6480f8c22fd1627ed7e4f7c8d7cf08163e986

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 ## Change Log
 
+### [v2.1.2](https://github.com/khiav223577/active_model_cachers/compare/v2.1.1...v2.1.2) 2018/06/01
+- [#37](https://github.com/khiav223577/active_model_cachers/pull/37) Fix: ModelName cant be referred to in development (@khiav223577)
+
 ### [v2.1.1](https://github.com/khiav223577/active_model_cachers/compare/v2.1.0...v2.1.1) 2018/05/25
 - [#35](https://github.com/khiav223577/active_model_cachers/pull/35) Preventing registering same callbacks in some cases (@khiav223577)
 - [#34](https://github.com/khiav223577/active_model_cachers/pull/34) Enhance - automatically clean cache when `#touch` (@ff2248)

data/lib/active_model_cachers/active_record/extension.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+require 'active_model_cachers/active_record/global_callbacks'
 require 'active_model_cachers/active_record/attr_model'
 require 'active_model_cachers/active_record/cacher'
 require 'active_model_cachers/hook/dependencies'
@@ -83,6 +84,19 @@ module ActiveModelCachers
           service_klasses << cache_self
         end
       end
+
+      @global_callbacks = GlobalCallbacks.new
+      def self.global_callbacks
+        @global_callbacks
+      end
+
+      def self.extended(base)
+        global_callbacks = @global_callbacks
+        base.instance_exec do
+          after_commit ->{ global_callbacks.after_commit.exec(self, self.class) }
+          after_touch ->{ global_callbacks.after_touch.exec(self, self.class) }
+        end
+      end
     end
   end
 end

data/lib/active_model_cachers/active_record/global_callbacks.rb

@@ -0,0 +1,59 @@
+module ActiveModelCachers
+  module ActiveRecord
+    class GlobalCallbacks
+      def initialize
+        @type_callbacks = {}
+      end
+
+      def pre_before_delete(class_name = nil, &block)
+        define_callbacks(:pre_before_delete, class_name, &block)
+      end
+
+      def before_delete(class_name = nil, &block)
+        define_callbacks(:before_delete, class_name, &block)
+      end
+
+      def after_delete(class_name = nil, &block)
+        define_callbacks(:after_delete, class_name, &block)
+      end
+
+      def on_nullify(class_name = nil, &block)
+        define_callbacks(:on_nullify, class_name, &block)
+      end
+
+      def after_commit(class_name = nil, &block)
+        define_callbacks(:after_commit, class_name, &block)
+      end
+
+      def after_touch(class_name = nil, &block)
+        define_callbacks(:after_touch, class_name, &block)
+      end
+
+      private
+
+      def define_callbacks(type, class_name, &block)
+        (@type_callbacks[type] ||= ClassCallbacks.new).tap do |s|
+          s.add_callback(class_name, &block) if class_name
+        end
+      end
+    end
+
+    class ClassCallbacks
+      def initialize
+        @class_callbacks = Hash.new{|h, k| h[k] = [] }
+      end
+
+      def callbacks_at(class_name)
+        @class_callbacks[class_name]
+      end
+
+      def add_callback(class_name, &block)
+        callbacks_at(class_name) << block
+      end
+
+      def exec(scope, klass, *args)
+        callbacks_at(klass.name).each{|s| scope.instance_exec(*args, &s) }
+      end
+    end
+  end
+end

data/lib/active_model_cachers/active_record/patch_rails_3.rb

@@ -6,22 +6,15 @@ module ActiveModelCachers
       def find_by(*args)
         where(*args).order('').first
       end
+    end
+  end
+end
 
-      # after_commit in Rails 3 cannot specify multiple :on
-      # EX:
-      #   after_commit ->{ ... }, on: [:create, :destroy]
-      #
-      # Should rewrite it as:
-      #   after_commit ->{ ... }, on: :create
-      #   after_commit ->{ ... }, on: :destroy
-
-      def after_commit(*args, &block) # mass-assign protected attributes `id` In Rails 3
-        if args.last.is_a?(Hash)
-          if (on = args.last[:on]).is_a?(Array)
-            return on.each{|s| after_commit(*[*args[0...-1], { **args[-1], on: s }], &block) }
-          end
-        end
-        super
+module ActiveRecord
+  module Transactions
+    if not method_defined?(:transaction_include_any_action?)
+      def transaction_include_any_action?(fire_on)
+        fire_on.any?{|s| transaction_include_action?(s) }
       end
     end
   end

data/lib/active_model_cachers/cache_service.rb

@@ -24,31 +24,36 @@ module ActiveModelCachers
         @callbacks_defined = true
 
         clean = ->(id){ clean_at(with_id ? id : nil) }
+        clean_ids = []
+        fire_on = Array(on) if on
 
-        ActiveSupport::Dependencies.onload(class_name) do
-          clean_ids = []
+        ActiveRecord::Extension.global_callbacks.instance_exec do
+          on_nullify(class_name) do |nullified_column, get_ids|
+            get_ids.call.each{|s| clean.call(s) } if nullified_column == column
+          end
+
+          after_touch(class_name) do
+            clean.call(send(foreign_key))
+          end
+
+          after_commit(class_name) do # TODO: on
+            next if fire_on and not transaction_include_any_action?(fire_on)
+            changed = column ? previous_changes.key?(column) : previous_changes.present?
+            clean.call(send(foreign_key)) if changed || destroyed?
+          end
 
-          prepend_before_delete do |id, model|
+          pre_before_delete(class_name) do |id, model|
             clean_ids << @@column_value_cache.add(self, class_name, id, foreign_key, model)
           end
 
-          before_delete do |_, model|
+          before_delete(class_name) do |_, model|
             clean_ids.each{|s| clean.call(s.call) }
             clean_ids = []
           end
 
-          after_delete do
+          after_delete(class_name) do
             @@column_value_cache.clean_cache
           end
-
-          on_nullify(column){|ids| ids.each{|s| clean.call(s) }}
-
-          after_commit ->{
-            changed = column ? previous_changes.key?(column) : previous_changes.present?
-            clean.call(send(foreign_key)) if changed || destroyed?
-          }, on: on
-
-          after_touch ->{ clean.call(send(foreign_key)) }
         end
       end
     end

data/lib/active_model_cachers/hook/associations.rb

@@ -27,10 +27,15 @@ module ActiveModelCachers::Hook
 
     private
 
-    def call_hooks
-      return if (hooks = reflection.klass.nullify_hooks_at(reflection.foreign_key)).blank?
-      ids = yield
-      hooks.each{|s| s.call(ids) }
+    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

data/lib/active_model_cachers/hook/on_model_delete.rb

@@ -12,40 +12,14 @@ module ActiveModelCachers::Hook
     end
 
     module ClassMethods
-      def prepend_before_delete(&callback)
-        before_delete_hooks.unshift(callback)
-      end
-
-      def before_delete(&callback)
-        before_delete_hooks << callback
-      end
-
-      def after_delete(&callback)
-        after_delete_hooks << callback
-      end
-
-      def before_delete_hooks
-        @before_delete_hooks ||= []
-      end
-
-      def after_delete_hooks
-        @after_delete_hooks ||= []
-      end
-
       def delete(id, model = nil)
-        before_delete_hooks.each{|s| s.call(id, model) }
-        result = super(id)
-        after_delete_hooks.each{|s| s.call(id, model) }
-        return result
-      end
+        ActiveModelCachers::ActiveRecord::Extension.global_callbacks.pre_before_delete.exec(self, self, id, model)
+        ActiveModelCachers::ActiveRecord::Extension.global_callbacks.before_delete.exec(self, self, id, model)
 
-      def nullify_hooks_at(column)
-        @nullify_hooks ||= Hash.new{|h, k| h[k] = [] }
-        return @nullify_hooks[column]
-      end
+        result = super(id)
 
-      def on_nullify(column, &callback)
-        nullify_hooks_at(column) << callback
+        ActiveModelCachers::ActiveRecord::Extension.global_callbacks.after_delete.exec(self, self, id, model)
+        return result
       end
     end
   end

data/lib/active_model_cachers/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module ActiveModelCachers
-  VERSION = '2.1.2'
+  VERSION = '2.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_model_cachers
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - khiav reoy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-01 00:00:00.000000000 Z
+date: 2018-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -121,6 +121,7 @@ files:
 - lib/active_model_cachers/active_record/attr_model.rb
 - lib/active_model_cachers/active_record/cacher.rb
 - lib/active_model_cachers/active_record/extension.rb
+- lib/active_model_cachers/active_record/global_callbacks.rb
 - lib/active_model_cachers/active_record/patch_rails_3.rb
 - lib/active_model_cachers/cache_service.rb
 - lib/active_model_cachers/cache_service_factory.rb