awesome_counter_cache 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da9f3b10f0b3d3f91d23585c3cbb6234b585987d7d4ba4704026de6871830e66
-  data.tar.gz: '09a7a1388a4d93709e10712d8dd3d8a9c7ad0af76a456d4b2b2b674a1f697d6b'
+  metadata.gz: 53d101e35ce62ad8828e71e6312d4ccfbfe4b0c656138e9b62106691e293ea87
+  data.tar.gz: eb20dba29be9f77e111a818f6eb6b05d0aab5ece37ddd877b9f0f57543c37ecd
 SHA512:
-  metadata.gz: 635c8b6ba277428198ab978addf81aa9723b713d26f4dcf6a6a26bdc84ef84a444c7450be3cb4b1419afbb699be7f60fbaafcca92a7c8bb328f5d794cfcd274b
-  data.tar.gz: ccd61848475acd36066de42204772e0ea8d0778e4a4ebda7b7dc26f3fe1de0f13cdc4f91d083e63a770a2df61328b2ddfe15cc15049a04e805f20fa1d703ba8e
+  metadata.gz: b225f04b9680ec55509a65a80cc1b9cd2449ad309ab78f67a4a80fe6b6cdd8d1da8620ceb3211bd3f0466f2e0d74af56b1c1f80d66085c626ba83e0f47bd9ed3
+  data.tar.gz: e476fef6661308e2d3fba792904fef6bc86dfbce9ee9366538e47a0db3cb219e1d60fe5ed966882e04caa1ec911702e2c623e430a2b814947b7f6f711d91111a

data/lib/awesome_counter_cache/class_methods.rb

@@ -3,7 +3,7 @@ module AwesomeCounterCache::ClassMethods
     id = awesome_counter_caches.length
     args[:column_name] ||= "#{model_name.plural}_count"
     args[:delta_magnitude] ||= proc { 1 }
-    args[:relation_foreign_key] = reflections.fetch(relation_name.to_s).foreign_key
+    args[:model_class] = self
     args[:relation_name] = relation_name
     args[:id] = id
 

data/lib/awesome_counter_cache/counter_cache.rb

@@ -1,11 +1,22 @@
 class AwesomeCounterCache::CounterCache
-  attr_accessor :column_name, :delta_magnitude, :id, :relation_foreign_key, :relation_name
+  attr_reader :column_name, :delta_magnitude, :id, :model_class, :relation_name
 
-  def initialize(column_name:, delta_magnitude:, id:, relation_foreign_key:, relation_name:)
+  def initialize(column_name:, delta_magnitude:, id:, model_class:, relation_name:)
     @column_name = column_name
     @delta_magnitude = delta_magnitude
     @id = id
-    @relation_foreign_key = relation_foreign_key
+    @model_class = model_class
     @relation_name = relation_name
+
+    raise "Invalid model class: #{model_class&.name}" if model_class.blank?
+    raise "Invalid relation name: #{relation_name}" if relation_name.blank?
+  end
+
+  def reflection
+    model_class.reflections.fetch(relation_name.to_s)
+  end
+
+  def relation_foreign_key
+    reflection.foreign_key
   end
 end

data/lib/awesome_counter_cache/instance_methods.rb

@@ -3,7 +3,7 @@ module AwesomeCounterCache::InstanceMethods
     id = counter_cache.id
     state = @awesome_counter_cache_data.fetch(id)
     state.delta_current = counter_cache.delta_magnitude.call(model)
-    model.create_awesome_counter_cache_for(counter_cache.relation_name, @awesome_counter_cache_data.fetch(id), counter_cache)
+    model.create_awesome_counter_cache_for(@awesome_counter_cache_data.fetch(id), counter_cache)
     state.delta_original = state.delta_current
     state.delta_current = nil
   end
@@ -12,7 +12,7 @@ module AwesomeCounterCache::InstanceMethods
     id = counter_cache.id
     state = @awesome_counter_cache_data.fetch(id)
     state.delta_current = counter_cache.delta_magnitude.call(model)
-    model.destroy_awesome_counter_cache_for(counter_cache.relation_name, @awesome_counter_cache_data.fetch(id), counter_cache)
+    model.destroy_awesome_counter_cache_for(@awesome_counter_cache_data.fetch(id), counter_cache)
     state.delta_original = state.delta_current
     state.delta_current = nil
   end
@@ -21,7 +21,7 @@ module AwesomeCounterCache::InstanceMethods
     id = counter_cache.id
     state = @awesome_counter_cache_data.fetch(id)
     state.delta_current = counter_cache.delta_magnitude.call(model)
-    model.update_awesome_counter_cache_for(counter_cache.relation_name, @awesome_counter_cache_data.fetch(id), counter_cache)
+    model.update_awesome_counter_cache_for(@awesome_counter_cache_data.fetch(id), counter_cache)
     state.delta_original = state.delta_current
     state.delta_current = nil
   end
@@ -41,8 +41,8 @@ module AwesomeCounterCache::InstanceMethods
     end
   end
 
-  def create_awesome_counter_cache_for(relation_name, state, counter_cache)
-    relation_model = __send__(relation_name)
+  def create_awesome_counter_cache_for(state, counter_cache)
+    relation_model = __send__(counter_cache.relation_name)
     return if relation_model.blank?
 
     addition = state.delta_current
@@ -66,8 +66,8 @@ module AwesomeCounterCache::InstanceMethods
     end
   end
 
-  def destroy_awesome_counter_cache_for(relation_name, state, counter_cache)
-    relation_model = __send__(relation_name)
+  def destroy_awesome_counter_cache_for(state, counter_cache)
+    relation_model = __send__(counter_cache.relation_name)
     return if relation_model.blank?
 
     addition = -state.delta_original
@@ -78,10 +78,18 @@ module AwesomeCounterCache::InstanceMethods
     end
   end
 
-  def update_awesome_counter_cache_for(relation_name, state, counter_cache) # rubocop:disable Metrics/AbcSize
+  def update_awesome_counter_cache_for(state, counter_cache) # rubocop:disable Metrics/AbcSize, Metrics/PerceivedComplexity
     addition = state.delta_current - state.delta_original
-    relation_model_class = self.class.reflections.fetch(relation_name.to_s).klass
-    primary_key_value = read_attribute(counter_cache.relation_foreign_key)
+    relation_model_class = counter_cache.reflection.klass
+
+    if counter_cache.reflection.options[:through]
+      # Read ID through relationship because there isn't a column to read from
+      primary_key_value = __send__(counter_cache.relation_name)&.id
+    else
+      # Read ID directly from column because its faster (no db-lookup)
+      # Use __send__ because read_attribute fails silently if column doesn't exist
+      primary_key_value = __send__(counter_cache.relation_foreign_key)
+    end
 
     if saved_changes.key?(counter_cache.relation_foreign_key)
       # Record change from one to another - reduce and increase based on previously recorded values
@@ -96,7 +104,7 @@ module AwesomeCounterCache::InstanceMethods
         # Increase the count of the new record
         relation_model_class.update_counters(primary_key_value, counter_cache.column_name => state.delta_current) # rubocop:disable Rails/SkipsModelValidations
       end
-    elsif !addition.zero?
+    elsif primary_key_value && !addition.zero?
       # Add to the current record
       relation_model_class.update_counters(primary_key_value, counter_cache.column_name => addition) # rubocop:disable Rails/SkipsModelValidations
     end

data/lib/awesome_counter_cache/version.rb

@@ -1,3 +1,3 @@
 module AwesomeCounterCache
-  VERSION = "0.0.2".freeze
+  VERSION = "0.0.3".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awesome_counter_cache
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - kaspernj