active_model_cachers 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 86a87d0163261f63b8c5e0275032146d7fd493afd8bdeb189a0a494f4a8c17d6
-  data.tar.gz: 48f0a91d6dbd4694fdcc6a89560b03f11d40a72e41d65318dba9e4d394b62ea0
+SHA1:
+  metadata.gz: 8f1049480902351ca775b8682a51f49f580d42eb
+  data.tar.gz: a26eef63dd1c0a799d6d91ec81b468bc27c18cc2
 SHA512:
-  metadata.gz: d6b80679ae29bd12fa299c3bd88785489c310ed82130ecae9bbe5e8850ecd5050154651a8428eca9b4cd22d8da815b919cd803920cd1aa007a432a60ff359605
-  data.tar.gz: b9d588a0cafdabdb49207a81fbc63f8e915570a17196e5fcecbc96924cf1cefcf661ed3bb1f90d68963e91ea768104a44bb36d02a59d2624adaf400303c65466
+  metadata.gz: 3f9dd545f78b1f6531ea09f340edcd4b00b15571825f325467745e00573f35f42688d86c6504d9953b029e0868b368094d460bf854f675a581398377e88e93f6
+  data.tar.gz: d2cd5b03a2ba48ee110e04fb30e5b4f2c5a41827af4f2a426b150ad3971967aac6c9cdc53e2f7c7417de06ff5b280daac24daeacc54ffd9caf199191c3582cfb

data/README.md

@@ -132,6 +132,9 @@ current_user.cacher.clean(:profile)
 
 # Or calling the clean_* method
 current_user.cacher.clean_profile
+
+# clean the cache without loading model
+User.cacher_at(user_id).clean_profile
 ```
 
 ## Smart Caching
@@ -166,7 +169,7 @@ end
 @profile = current_user.cacher.profile
 
 # directly get profile without loading user.
-@profile = User.cacher_at(profile_id).profile
+@profile = User.cacher_at(user_id).profile
 ```
 
 ### Caching Polymorphic Associations

data/lib/active_model_cachers/active_record/attr_model.rb

@@ -4,10 +4,11 @@ module ActiveModelCachers
     class AttrModel
       attr_reader :klass, :column, :reflect
 
-      def initialize(klass, column, primary_key: nil)
+      def initialize(klass, column, primary_key: nil, foreign_key: nil)
         @klass = klass
         @column = column
         @primary_key = primary_key
+        @foreign_key = foreign_key
         @reflect = klass.reflect_on_association(column)
       end
 
@@ -48,6 +49,7 @@ module ActiveModelCachers
       end
 
       def foreign_key(reverse: false)
+        return @foreign_key if @foreign_key
         return if not association?
         # key may be symbol if specify foreign_key in association options
         return @reflect.chain.last.foreign_key.to_s if reverse and join_table
@@ -85,10 +87,10 @@ module ActiveModelCachers
       def query_association(binding, id)
         return binding.association(@column).load_target if binding.is_a?(::ActiveRecord::Base)
         id = @reflect.active_record.where(id: id).limit(1).pluck(foreign_key).first if foreign_key != 'id'
-        if @reflect.collection?
-          return id ? @reflect.klass.where(@reflect.foreign_key => id).to_a : []
-        else
-          return id ? @reflect.klass.find_by(primary_key => id) : nil
+        case
+        when collection? ; return id ? @reflect.klass.where(@reflect.foreign_key => id).to_a : []
+        when has_one?    ; return id ? @reflect.klass.find_by(foreign_key(reverse: true) => id) : nil
+        else             ; return id ? @reflect.klass.find_by(primary_key => id) : nil
         end
       end
     end

data/lib/active_model_cachers/active_record/cacher.rb

@@ -43,11 +43,9 @@ module ActiveModelCachers
       def exec_by(attr, primary_key, service_klasses, method)
         bindings = [@model]
         if @model and attr.association?
-          get_target = ->{ @model.association(attr.column).load_target }
-          if attr.has_one?
-            data = get_target.call.try(primary_key)
-          else
-            bindings << get_target.call if method != :clean_cache # no need to load binding when just cleaning cache
+          if attr.belongs_to? and method != :clean_cache # no need to load binding when just cleaning cache
+            association = @model.association(attr.column)
+            bindings << association.load_target if association.loaded?
           end
         end
         data ||= (@model ? @model.send(primary_key) : nil) || @id

data/lib/active_model_cachers/active_record/extension.rb

@@ -14,7 +14,7 @@ module ActiveModelCachers
       end
 
       def cache_at(column, query = nil, expire_by: nil, on: nil, foreign_key: nil, primary_key: nil)
-        attr = AttrModel.new(self, column, primary_key: primary_key)
+        attr = AttrModel.new(self, column, foreign_key: foreign_key, primary_key: primary_key)
         return cache_belongs_to(attr) if attr.belongs_to?
 
         query ||= ->(id){ attr.query_model(self, id) }

data/lib/active_model_cachers/cache_service_factory.rb

@@ -31,7 +31,8 @@ module ActiveModelCachers
       def get_cache_key(attr)
         class_name, column = (attr.single_association? ? [attr.class_name, nil] : [attr.klass, attr.column])
         return "active_model_cachers_#{class_name}_at_#{column}" if column
-        return "active_model_cachers_#{class_name}_by_#{attr.primary_key}" if attr.primary_key and attr.primary_key.to_s != 'id'
+        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
     end

data/lib/active_model_cachers/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module ActiveModelCachers
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_model_cachers
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - khiav reoy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-13 00:00:00.000000000 Z
+date: 2018-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -151,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Let you cache whatever you want with ease by providing cachers to active