counter_culture 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: adde693fbc8a3158f577294d8c824bd4635b9a2e
-  data.tar.gz: 1841858ea2173cd8582d1f90a01c72e2c50afa59
+  metadata.gz: 257485aedd64efe7fa6d054b77d54170f88df34a
+  data.tar.gz: fd59ea55659f4c66717f7386945bb93268a2c5ad
 SHA512:
-  metadata.gz: e60214e311c99e3d9ee493fb605293388eab2880211dcb7eea0ebded7606a5b1a622664de9a461e4a9c3d57fc9089816cb713af7c371066af94be4945acb1b96
-  data.tar.gz: b5b0ef3c373f7017e69e781898b690de491721fd5847024a119c3bd6f73fb1bed02dc344ff1630730f6c67ecfbc0c4a68b21f3ab4c22c647496a09b2e3c9f090
+  metadata.gz: 1056dad890bac7862cc6f3d9a729412e85efbbe00d31798cc2f0f9b504c6b163e23b86df16c803703ba4f8e17e52d5a66e27b131bf4a27ede191192d0b76666b
+  data.tar.gz: 84cd87e9e0a0c3044087f5273139937ab1aec2650df93fbcf39e4fd1aa3d3f6c41541073fcf79407389951f236c3c75ad3e25facbe158fe886f35d698ff1e8cf

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.1.1 (January 13, 2017)
+
+Bugfixes:
+  - Don't blow up if the `column_names` hash contains a `nil` column name
+
 ## 1.1.0 (December 23, 2016)
 
 Improvements:

data/Gemfile

@@ -12,7 +12,7 @@ gem "activesupport", ">= 3.0.0"
 group :development, :test do
   gem "rake"
   gem "rails", '>= 3.1.0'
-  gem "rspec", "~> 2.10.0"
+  gem "rspec", "~> 3.0"
   gem "awesome_print"
 end
 

data/Gemfile.lock

@@ -47,7 +47,7 @@ GEM
     database_cleaner (1.5.1)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    diff-lcs (1.1.3)
+    diff-lcs (1.2.5)
     erubis (2.7.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
@@ -126,15 +126,20 @@ GEM
     rake (11.3.0)
     rdoc (3.12.2)
       json (~> 1.4)
-    rspec (2.10.0)
-      rspec-core (~> 2.10.0)
-      rspec-expectations (~> 2.10.0)
-      rspec-mocks (~> 2.10.0)
-    rspec-core (2.10.1)
-    rspec-expectations (2.10.0)
-      diff-lcs (~> 1.1.3)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
     rspec-extra-formatters (1.0.0)
-    rspec-mocks (2.10.1)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
     semver (1.0.1)
     sprockets (3.4.0)
       rack (> 1, < 3)
@@ -162,9 +167,9 @@ DEPENDENCIES
   rails (>= 3.1.0)
   rake
   rdoc (~> 3.12)
-  rspec (~> 2.10.0)
+  rspec (~> 3.0)
   rspec-extra-formatters
   sqlite3
 
 BUNDLED WITH
-   1.13.6
+   1.13.7

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.1.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.1.0 ruby lib
+# stub: counter_culture 1.1.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "counter_culture"
-  s.version = "1.1.0"
+  s.version = "1.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Magnus von Koeller"]
-  s.date = "2016-12-23"
+  s.date = "2017-01-13"
   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."
   s.email = "magnus@vonkoeller.de"
   s.extra_rdoc_files = [
@@ -128,7 +128,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<activesupport>, [">= 3.0.0"])
       s.add_development_dependency(%q<rake>, [">= 0"])
       s.add_development_dependency(%q<rails>, [">= 3.1.0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.10.0"])
+      s.add_development_dependency(%q<rspec>, ["~> 3.0"])
       s.add_development_dependency(%q<awesome_print>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, [">= 1.2.0"])
@@ -139,7 +139,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<activesupport>, [">= 3.0.0"])
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<rails>, [">= 3.1.0"])
-      s.add_dependency(%q<rspec>, ["~> 2.10.0"])
+      s.add_dependency(%q<rspec>, ["~> 3.0"])
       s.add_dependency(%q<awesome_print>, [">= 0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, [">= 1.2.0"])
@@ -151,7 +151,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<activesupport>, [">= 3.0.0"])
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<rails>, [">= 3.1.0"])
-    s.add_dependency(%q<rspec>, ["~> 2.10.0"])
+    s.add_dependency(%q<rspec>, ["~> 3.0"])
     s.add_dependency(%q<awesome_print>, [">= 0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, [">= 1.2.0"])

data/lib/counter_culture/reconciler.rb

@@ -39,6 +39,12 @@ module CounterCulture
 
       # iterate over all the possible counter cache column names
       counter_column_names.each do |where, column_name|
+        # if the column name is nil, that means those records don't affect
+        # counts; we don't need to do anything in that case. but we allow
+        # specifying that condition regardless to make the syntax less
+        # confusing
+        next unless column_name
+
         # select join column and count (from above) as well as cache column ('column_name') for later comparison
         counts_query = scope.select("#{relation_class.table_name}.#{relation_class.primary_key}, #{relation_class.table_name}.#{relation_reflect(relation).association_primary_key}, #{count_select} AS count, #{relation_class.table_name}.#{column_name}")