counter_culture 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84e93f1182982eccea8a717da0a95ebb3e4cfef8
-  data.tar.gz: 87e88e5de74ddf5c23d7df9ff3273ce3f0b17fdf
+  metadata.gz: ffba219862c747eb8b00e3b89d29f6306e32c2c2
+  data.tar.gz: 80783eda6b30c56e2d5b203c9ffcd2e92a44056c
 SHA512:
-  metadata.gz: 0c7286393c38d78c7d59817dfe5dae1c7c05484d3f8c186f3c56b5f0dcaa8c0da3e922aad3395ea94c08cc638536633dfbdd8c3338edf9fd17927eea029ff024
-  data.tar.gz: 4872ec4223bc8a7ebdc0ca31852e0e7358121dc32f49c8302f744d451b5e32d3a17fcf972dfa8b9cd8be3c21753c2aea38cfec8b2e2fac86ae47cc5a4b1c4079
+  metadata.gz: 89b88c26c5646a04a828d59eefdd872c6da43e54242e6db119303809331f8a04095c99c699a3636056277e725b9f83c7f55a1d32c93358e5bc92bd8908e8e0cb
+  data.tar.gz: 1bdba2475e7d09b878b89d5fae4de51f7116aa1326d3ea7eaa3fc3fc9a399683f606b5adf5998ac8f0da7fcc9ae2310299300482d9145c5d2b8cb2cb0349a0e0

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.5.1 (April 17, 2017)
+
+Bugfixes:
+  - Support for `nil` values in polymorphic relationships
+
 ## 1.5.0 (March 21, 2017)
 
 New features:

data/VERSION

@@ -1 +1 @@
-1.5.0
+1.5.1

data/counter_culture.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: counter_culture 1.5.0 ruby lib
+# stub: counter_culture 1.5.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "counter_culture".freeze
-  s.version = "1.5.0"
+  s.version = "1.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Magnus von Koeller".freeze]
-  s.date = "2017-03-21"
+  s.date = "2017-04-17"
   s.description = "counter_culture provides turbo-charged counter caches that are kept up-to-date not just on create and destroy, that support multiple levels of indirection through relationships, allow dynamic column names and that avoid deadlocks by updating in the after_commit callback.".freeze
   s.email = "magnus@vonkoeller.de".freeze
   s.extra_rdoc_files = [

data/lib/counter_culture/counter.rb

@@ -125,7 +125,7 @@ module CounterCulture
       while !value.nil? && relation.size > 0
         value = value.send(relation.shift)
       end
-      return value.try(relation_primary_key(first_relation, source: obj, was: was).to_sym)
+      return value.try(relation_primary_key(first_relation, source: obj, was: was).try(:to_sym))
     end
 
     # gets the reflect object on the given relation
@@ -171,9 +171,9 @@ module CounterCulture
         type_column = reflect.foreign_type.to_sym
         # so now turn that into the class that we're looking for here
         if was
-          attribute_was(source, type_column).constantize
+          attribute_was(source, type_column).try(:constantize)
         else
-          source.public_send(type_column).constantize
+          source.public_send(type_column).try(:constantize)
         end
       else
         reflect.klass
@@ -227,7 +227,7 @@ module CounterCulture
       if reflect.options.key?(:polymorphic)
         raise "can't handle multiple keys with polymorphic associations" unless (relation.is_a?(Symbol) || relation.length == 1)
         raise "must specify source for polymorphic associations..." unless source
-        return relation_klass(relation, source: source, was: was).primary_key
+        return relation_klass(relation, source: source, was: was).try(:primary_key)
       end
       reflect.association_primary_key(klass)
     end

data/lib/counter_culture/reconciler.rb

@@ -45,7 +45,7 @@ module CounterCulture
 
     def polymorphic_associated_model_classes
       foreign_type_field = relation_reflect(relation).foreign_type
-      model.pluck("DISTINCT #{foreign_type_field}").map(&:constantize)
+      model.pluck("DISTINCT #{foreign_type_field}").compact.map(&:constantize)
     end
 
     def associated_model_class

data/spec/counter_culture_spec.rb

@@ -1643,6 +1643,26 @@ describe "CounterCulture" do
         expect(product1.reload.poly_images_count).to eq(1)
         expect(employee.reload.poly_images_count).to eq(2)
       end
+
+      it "can handle nil values" do
+        img = PolyImage.create(imageable: employee)
+        PolyImage.create(imageable: nil)
+        mess_up_counts
+
+        PolyImage.counter_culture_fix_counts
+
+        expect(employee.reload.poly_images_count).to eq(1)
+
+        img.imageable = nil
+        img.save!
+
+        expect(employee.reload.poly_images_count).to eq(0)
+
+        img.imageable = employee
+        img.save!
+
+        expect(employee.reload.poly_images_count).to eq(1)
+      end
     end
     describe "custom column name" do
       it "increments counter cache on create" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: counter_culture
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Magnus von Koeller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-21 00:00:00.000000000 Z
+date: 2017-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: after_commit_action