active_model_cachers 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8f1049480902351ca775b8682a51f49f580d42eb
-  data.tar.gz: a26eef63dd1c0a799d6d91ec81b468bc27c18cc2
+SHA256:
+  metadata.gz: 8c49c9bc175d4ab55f5507cc4a6c4db006a099c90819e71788ced4b799d510f9
+  data.tar.gz: bb19f0043d46963c75b4ef71d30945c35156acb778b19d3f72e874b6c6dbdd15
 SHA512:
-  metadata.gz: 3f9dd545f78b1f6531ea09f340edcd4b00b15571825f325467745e00573f35f42688d86c6504d9953b029e0868b368094d460bf854f675a581398377e88e93f6
-  data.tar.gz: d2cd5b03a2ba48ee110e04fb30e5b4f2c5a41827af4f2a426b150ad3971967aac6c9cdc53e2f7c7417de06ff5b280daac24daeacc54ffd9caf199191c3582cfb
+  metadata.gz: 478355a8ee8fed5b1a25fcb6c2ef258888f6507c8e6bc74e98b9c559470b9475b750e69c7e03a7f77b05324cfc7927076e3c6173e08d0dbe4e4247283ab87011
+  data.tar.gz: c2029fb1379a12f03669b9a7dfa09858ab96a3cba755074ed1483e5a5239a890cd1c33dc9bfaf2973e7b76f5d1f42b166bb9a51b27e4c958d727d137d27437e4

data/.travis.yml

@@ -13,6 +13,7 @@ gemfile:
   - gemfiles/4.2.gemfile
   - gemfiles/5.0.gemfile
   - gemfiles/5.1.gemfile
+  - gemfiles/5.2.gemfile
 addons:
     code_climate:
         repo_token: 02a53f73b72a95af756b1c0270d4b22a6f07d25a1c65048e341371e7b72671d9

data/gemfiles/5.2.gemfile

@@ -0,0 +1,12 @@
+source 'https://rubygems.org'
+
+gem "activerecord", "~> 5.2.0"
+gem "request_store", "~> 1.4.0"
+
+group :test do
+  gem "simplecov"
+  gem "codeclimate-test-reporter", "~> 1.0.0"
+end
+
+gemspec :path => "../"
+

data/lib/active_model_cachers/active_record/extension.rb

@@ -73,13 +73,6 @@ module ActiveModelCachers
         end
       end
 
-      def get_column_value_from_id(id, column, model)
-        return id if column == 'id'
-        model ||= cacher_at(id).peek_self if has_cacher?
-        return model.send(column) if model
-        return where(id: id).limit(1).pluck(column).first
-      end
-
       @@column_value_cache = ActiveModelCachers::ColumnValueCache.new
       def define_callback_for_cleaning_cache(class_name, column, foreign_key, on: nil, &clean)
         ActiveSupport::Dependencies.onload(class_name) do

data/lib/active_model_cachers/cache_service.rb

@@ -57,7 +57,8 @@ module ActiveModelCachers
     def raw_to_cache_data(raw)
       return NilObject if raw == nil
       return FalseObject if raw == false
-      return raw
+      clean_ar_cache(raw.is_a?(Array) ? raw : [raw])
+      return raw_without_singleton_methods(raw)
     end
 
     def cache_to_raw_data(cached_data)
@@ -75,5 +76,19 @@ module ActiveModelCachers
         raw_to_cache_data(get_without_cache(binding))
       end
     end
+
+    def clean_ar_cache(models)
+      return if not models.first.is_a?(::ActiveRecord::Base)
+      models.each_with_index do |model, index|
+        model.send(:clear_aggregation_cache)
+        model.send(:clear_association_cache)
+      end
+    end
+
+    def raw_without_singleton_methods(raw)
+      return raw if raw.singleton_methods.empty?
+      return raw.class.find_by(id: raw.id) if raw.is_a?(::ActiveRecord::Base) # cannot marshal singleton, so load a new record instead.
+      return raw # not sure what to do with other cases
+    end
   end
 end

data/lib/active_model_cachers/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_model_cachers
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - khiav reoy
@@ -116,6 +116,7 @@ files:
 - gemfiles/4.2.gemfile
 - gemfiles/5.0.gemfile
 - gemfiles/5.1.gemfile
+- gemfiles/5.2.gemfile
 - lib/active_model_cachers.rb
 - lib/active_model_cachers/active_record/attr_model.rb
 - lib/active_model_cachers/active_record/cacher.rb
@@ -151,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Let you cache whatever you want with ease by providing cachers to active