cache_depends_on 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc9cd539c0b5d27ae04edbc2858505f176fdf130
-  data.tar.gz: 627fcf125320c3827fbc1be01063b87215e53119
+  metadata.gz: 8369280354a8dc49af0ff290e18647e1a7f6cc90
+  data.tar.gz: 73ffce26bb06d0eb383575e6414aa1cd3f4704d3
 SHA512:
-  metadata.gz: 5f9261d4eebf2386de8a00d59053c099d2f2900c0bb7a6289aadf6bb25447c64f7c000573a60799d98845264a1bf004c021ac626d357721b4f957452d463716a
-  data.tar.gz: e4eedbe151de73a1d9834f0427e24b009e4bbc75b29a2f169f0014d6a70380e1767b2f8b9883f3ae9d6952c78ac85e718732fd78a275b5e4d2551e8aced99c9e
+  metadata.gz: 5bd7e39538dbe10be10f4b41bda52e2960ded638f56cb9bbd817db914f48b67f473cba0bc7075d9b5f5f9972c6c86b8560449f6722959a3cc1cf201060cb8fb5
+  data.tar.gz: 4adccda76f55f41c409bfa9cdf972e966ee7a2225bb1784672712f1191c86cd8bb8acb57c0c8c902477ac1219f68f2c7b9547abf084ccd0e4c713cb99cfebf72

data/cache_depends_on.gemspec

@@ -29,4 +29,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'sqlite3'
   spec.add_development_dependency 'database_cleaner'
   spec.add_development_dependency 'appraisal'
+  spec.add_development_dependency 'pry-byebug'
 end

data/lib/cache_depends_on/active_record_model_extension.rb

@@ -8,16 +8,39 @@ module CacheDependsOn
     included do
       cattr_accessor(:invalidates_cache_of) { [] }
 
-      after_commit { invalidate_dependent_caches }
+      after_commit { invalidate_marked_dependent_caches }
+
+      after_touch { invalidate_dependent_caches_after_outermost_transaction }
+
+      after_save { invalidate_dependent_caches_after_outermost_transaction }
+
+      after_destroy { invalidate_dependent_caches_after_outermost_transaction }
 
       define_model_callbacks :cache_invalidation
     end
 
+    def invalidate_after_outermost_transaction
+      self.marked_to_be_invalidated_after_outermost_transaction = true
+      invalidate_dependent_caches_after_outermost_transaction
+    end
+
     def invalidate_cache
-      touch
+      if marked_to_be_invalidated_after_outermost_transaction
+        self.marked_to_be_invalidated_after_outermost_transaction = false
+        touch
+      end
+    end
+
+    protected
+
+    attr_accessor :marked_to_be_invalidated_after_outermost_transaction
+
+    def invalidate_dependent_caches_after_outermost_transaction
+      invalidates_cache_of.select(&:collection?).each { |association| __send__(association.name).each(&:invalidate_after_outermost_transaction) }
+      invalidates_cache_of.reject(&:collection?).each { |association| __send__(association.name).try(:invalidate_after_outermost_transaction) }
     end
 
-    def invalidate_dependent_caches
+    def invalidate_marked_dependent_caches
       run_callbacks(:cache_invalidation) do
         invalidates_cache_of.select(&:collection?).each { |association| __send__(association.name).each(&:invalidate_cache) }
         invalidates_cache_of.reject(&:collection?).each { |association| __send__(association.name).try(:invalidate_cache) }

data/lib/cache_depends_on/association_cache_dependency_definer.rb

@@ -6,12 +6,12 @@ module CacheDependsOn
     attr_reader :model_klass
 
     def define_cache_dependency_on(association_names)
-      model_klass.class_eval { include ActiveRecordModelExtension }
-
       find_associations_by_names(association_names).each do |association|
         association.klass.class_eval { include ActiveRecordModelExtension }
         association.klass.invalidates_cache_of << find_inverse_of(association)
       end
+
+      model_klass.class_eval { include ActiveRecordModelExtension }
     end
 
     private

data/lib/cache_depends_on/version.rb

@@ -1,3 +1,3 @@
 module CacheDependsOn
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cache_depends_on
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Daniel Vartanov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-28 00:00:00.000000000 Z
+date: 2016-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -114,6 +114,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 'A better way of controlling cache dependencies than ''belongs_to :product,
   touch: true'''
 email: