counter_culture 2.2.4 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1aa4340620f0ec34dbb3c5509ef3390eaffde8c280d9cdc06c11ba842367c33f
-  data.tar.gz: ab9934d186e52e271ff2b5b09cc85927892c7b9c5e8e18220bc4e2dda56dd918
+  metadata.gz: c8bc293e01a8e0b0f05d3d183092552f8136e76f7d08145aa354e0dc7c2693ba
+  data.tar.gz: 905edad7a81274176e100eaa58b5ee798d985c97f4c6543dee7b6fe81fd57675
 SHA512:
-  metadata.gz: 6d9dfd7a08e7b68e8d4d00b731fe6ca27d78fc51e060992c60b494cbb0853c29f57a8d2373fc5ed8b2442b44c1e7ed1952c3a4eccda15244c66a4f652bf841a5
-  data.tar.gz: 1f197ae5fa09c9044557790a0d2e7f2b61ae5d3dd3352dc7c5cbc1bc6164d9e8dfa3401084c544a708a43c750705e1f80af1530d4166c226335610bfbfc6907c
+  metadata.gz: 723cc217870d0640c81f94c692604b260dfa1c45b747693807bbd8f5ceb5557c01398bbe4f9313a844a430b685eee25c9910a2360ffddd124c4d8c759ce72689
+  data.tar.gz: bdcf5cef68f33898f535a976a642fa1b4f1397a496f23e2519c35076935b5fe431e58b7a810ee243ef89596ada2f40dd522642233e46f50b395626d32142f727

data/.travis.yml

@@ -6,9 +6,9 @@ addons:
   postgresql: "9.6"
 rvm:
   - "2.3.8"
-  - "2.4.6"
-  - "2.5.5"
-  - "2.6.3"
+  - "2.4.7"
+  - "2.5.6"
+  - "2.6.4"
 gemfile:
   - gemfiles/rails_4.2.gemfile
   - gemfiles/rails_5.0.gemfile
@@ -23,7 +23,7 @@ matrix:
   exclude:
     - rvm: "2.3.8"
       gemfile: gemfiles/rails_6.0.gemfile
-    - rvm: "2.4.6"
+    - rvm: "2.4.7"
       gemfile: gemfiles/rails_6.0.gemfile
 before_install:
   - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.3.0 (January 28, 2020)
+
+Improvements:
+  - Allow using scopes in `column_names` (#272)
+
 ## 2.2.4 (August 21, 2019)
 
 Bugfixes:

data/README.md

@@ -7,7 +7,7 @@ Turbo-charged counter caches for your Rails app. Huge improvements over the Rail
 * Supports dynamic column names, making it possible to split up the counter cache for different types of objects
 * Can keep a running count, or a running total
 
-Tested against Ruby 2.3.8, 2.4.6, 2.5.5 and 2.6.2 and against the latest patch releases of Rails 4.2, 5.0, 5.1 and 5.2.
+Tested against Ruby 2.3.8, 2.4.7, 2.5.6 and 2.6.4 and against the latest patch releases of Rails 4.2, 5.0, 5.1, 5.2 and 6.0.
 
 Please note that -- unlike Rails' built-in counter-caches -- counter_culture does not currently change the behavior of the `.size` method on ActiveRecord associations. If you want to avoid a database query and read the cached value, please use the attribute name containing the counter cache directly.
 ```
@@ -329,6 +329,23 @@ class Product < ActiveRecord::Base
 end
 ```
 
+You can specify a scope instead of a where condition string for `column_names`:
+
+```ruby
+class Product < ActiveRecord::Base
+  belongs_to :category
+  scope :awesomes, ->{ where "products.product_type = ?", 'awesome' }
+  scope :suckys, ->{ where "products.product_type = ?", 'sucky' }
+
+  counter_culture :category,
+      column_name: proc {|model| "#{model.product_type}_count" },
+      column_names: {
+          Product.awesomes => :awesome_count,
+          Product.suckys => :sucky_count
+      }
+end
+```
+
 If you would like to avoid this configuration and simply skip counter caches with
 dynamic column names, while still fixing those counters on the model that are not
 dynamic, you can pass `skip_unsupported`:

data/lib/counter_culture/reconciler.rb

@@ -252,7 +252,11 @@ module CounterCulture
           if index == reverse_relation.size - 1
             # conditions must be applied to the join on which we are counting
             if where
-              joins_sql += " AND (#{model.send(:sanitize_sql_for_conditions, where)})"
+              if where.respond_to?(:to_sql)
+                joins_sql += " AND #{target_table_alias}.#{model.primary_key} IN (#{where.select(model.primary_key).to_sql})"
+              else
+                joins_sql += " AND (#{model.send(:sanitize_sql_for_conditions, where)})"
+              end
             end
             # respect the deleted_at column if it exists
             if model.column_names.include?('deleted_at')

data/lib/counter_culture/version.rb

@@ -1,3 +1,3 @@
 module CounterCulture
-  VERSION = '2.2.4'.freeze
+  VERSION = '2.3.0'.freeze
 end

data/run_tests_locally.sh

@@ -3,7 +3,7 @@
 set -e
 source /usr/local/share/chruby/chruby.sh
 
-for RUBY_VERSION in 2.3.8 2.4.6 2.5.5 2.6.2; do
+for RUBY_VERSION in 2.3.8 2.4.7 2.5.6 2.6.4; do
   chruby $RUBY_VERSION
   ruby --version
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: counter_culture
 version: !ruby/object:Gem::Version
-  version: 2.2.4
+  version: 2.3.0
 platform: ruby
 authors:
 - Magnus von Koeller
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-22 00:00:00.000000000 Z
+date: 2020-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: after_commit_action
@@ -304,7 +304,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Turbo-charged counter caches for your Rails app.