active_model_cachers 2.1.3 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22fbf696d9d01bea8d59d1c885ef7e0724bc46894d263ae0bd59023fcbf3d034
-  data.tar.gz: f4b2166e69e896992e3fe0352201473faec0050f40253ace399a64af35ff8e71
+  metadata.gz: d62a0b3c3456a59bd79c3df098c46c6259d6683576714d0744671ab397f6ae27
+  data.tar.gz: e8608849cdb7f0eb50f83c8a19a95c106c88e3d4a5e3ea1155bcedbcde6c4770
 SHA512:
-  metadata.gz: 2c397c8098e6190ee501b91794bdadde52d561560cb1916c45a1da3ae60b24c1b7137b7cb0ebfe49ca5d9dc760e7052345dc4d9930e53face0be7e57bc831ad4
-  data.tar.gz: 2ddab829f8dbe887e5757d3a674a9468b9811fe0f363a27bf548d55a7b8b5ffd22c0e05e41f49e0e6a41e6277fd6480f8c22fd1627ed7e4f7c8d7cf08163e986
+  metadata.gz: 0ea2eaaba63a07e27354f60f8a2790269da1fb6b2208eb6a05f1c7b0b24cffc51dcd0c593c197b9c20af26c041fbfb0c8eca8e18600468daad90ee47b6ea3b10
+  data.tar.gz: 8ac03f042b17d41c265fb861f7c602651df02691780c1779d9441eb906efb9fac2d89791b83e3f1daf33717aab8b35c9b4223ffa3ecc076ecfe1cc356953e56e

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 ## Change Log
 
+### [v2.1.3](https://github.com/khiav223577/active_model_cachers/compare/v2.1.2...v2.1.3) 2018/06/07
+- [#38](https://github.com/khiav223577/active_model_cachers/pull/38) Fix: Eager-loaded models will not register `after_commit` callback (@khiav223577)
+
 ### [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)
 

data/lib/active_model_cachers/active_record/cacher.rb

@@ -78,6 +78,7 @@ module ActiveModelCachers
 
       def exec_by(attr, primary_key, service_klasses, method, data: nil)
         bindings = [@model]
+        reflects = (attr.belongs_to? ? [] : [attr.reflect])
         if @model and attr.association?
           if attr.belongs_to? and method != :clean_cache # no need to load binding when just cleaning cache
             association = @model.association(attr.column)
@@ -86,7 +87,7 @@ module ActiveModelCachers
         end
         data ||= (@model ? @model.send(primary_key) : nil) || @id
         service_klasses.each_with_index do |service_klass, index|
-          data = service_klass.instance(data).send(method, binding: bindings[index])
+          data = service_klass.instance(data).send(method, binding: bindings[index], reflect: reflects[index])
           return if data == nil
         end
         return data

data/lib/active_model_cachers/cache_service.rb

@@ -7,7 +7,7 @@ module ActiveModelCachers
   class CacheService
     class << self
       attr_accessor :cache_key
-      attr_accessor :query
+      attr_accessor :query_mapping
 
       def instance(id)
         hash = (RequestStore.store[self] ||= {})
@@ -65,17 +65,17 @@ module ActiveModelCachers
       @id = id
     end
 
-    def get(binding: nil)
-      @cached_data ||= fetch_from_cache(binding: binding)
+    def get(binding: nil, reflect: nil)
+      @cached_data ||= fetch_from_cache(binding: binding, reflect: reflect)
       return cache_to_raw_data(@cached_data)
     end
 
-    def peek(binding: nil)
+    def peek(binding: nil, reflect: nil)
       @cached_data ||= get_from_cache
       return cache_to_raw_data(@cached_data)
     end
 
-    def clean_cache(binding: nil)
+    def clean_cache(binding: nil, reflect: nil)
       @cached_data = nil
       Rails.cache.delete(cache_key)
       return nil
@@ -88,8 +88,15 @@ module ActiveModelCachers
       return @id ? "#{key}_#{@id}" : key
     end
 
-    def get_without_cache(binding)
-      query = self.class.query
+    def get_query(binding, reflect)
+      self.class.query_mapping[reflect] || begin
+        puts "Warning: cannot find query. possible reflects: #{self.class.query_mapping.keys}, reflect: #{reflect}"
+        self.class.query_mapping.values.first
+      end
+    end
+
+    def get_without_cache(binding, attr)
+      query = get_query(binding, attr)
       return binding ? binding.instance_exec(@id, &query) : query.call(@id) if @id and query.parameters.size == 1
       return binding ? binding.instance_exec(&query) : query.call
     end
@@ -111,9 +118,9 @@ module ActiveModelCachers
       ActiveModelCachers.config.store.read(cache_key)
     end
 
-    def fetch_from_cache(binding: nil)
+    def fetch_from_cache(binding: nil, reflect: nil)
       ActiveModelCachers.config.store.fetch(cache_key, expires_in: 30.minutes) do
-        raw_to_cache_data(get_without_cache(binding))
+        raw_to_cache_data(get_without_cache(binding, reflect))
       end
     end
 

data/lib/active_model_cachers/cache_service_factory.rb

@@ -13,22 +13,22 @@ module ActiveModelCachers
       end
 
       def create_for_active_model(attr, query)
-        create(get_cache_key(attr), query)
-      end
+        cache_key = get_cache_key(attr)
 
-      def create(cache_key, query)
-        @key_class_mapping[cache_key] ||= ->{
+        klass = @key_class_mapping[cache_key] ||= ->{
           klass = Class.new(CacheService)
           klass.cache_key = cache_key
-          klass.query = query
+          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)
-        reflect = attr.klass.reflect_on_association(:posts)
         changed = clean_klass_cache_if_reloaded!(cache_key, current_klass, attr)
         @cache_key_klass_mapping[cache_key] = current_klass
         return changed

data/lib/active_model_cachers/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_model_cachers
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.4
 platform: ruby
 authors:
 - khiav reoy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-07 00:00:00.000000000 Z
+date: 2018-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler