counter_culture 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64eb9b917d27eb10893760ab26afdb228af051a3c2a49524e081b40c857482a0
-  data.tar.gz: b27d02bf40278eb9a1c311bd74095838235f551ec83cff595c9c465438d34d05
+  metadata.gz: eddddf9ccad9aca42b6b1cd53149c7bb03d7da3624dc85df00705acbe5f44c02
+  data.tar.gz: ba158099b8c8209f390be7e39aa257621e801d211f6c291412b21ca4f1afc56e
 SHA512:
-  metadata.gz: 961d64e29863cb4d9e0d6b1a46c1917c4c7bbed7ac42cb9a6cf52d7ad5989f959f35d438379e1353417bb3e98c70dc50aa2a8798e0253771ade979c542900d4a
-  data.tar.gz: f79799eb4a5a0dcf1597538dbf2c86ea1fd8804cf096e8848ff7d2839605f30410420abae1c243d1ee4d3f88090e3f2ad457107e45cfaac95f54eaa30977b7b3
+  metadata.gz: 917106835d1847c50fcba61c064d456a05db40ef12dabb000a4da1a8d508d5837db66234567ca688cd4e83faa75981597aa2c16650301027c78a58fddbd1e198
+  data.tar.gz: 9255cd93515ccc1177bccc12e3eadca029bb618cc6e2c0d17b96f44cacaab01222e2e9c4b7f64a5ae36db24ae9b0d94a263b152bdd88c67ba47e348419222902

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.2.5 and 2.3.1 and against the latest patch releases of Rails 3.2, 4.0, 4.1, 4.2, 5.0 and 5.1.
+Tested against Ruby 2.2.10, 2.3.7, 2.4.4 and 2.5.1 and against the latest patch releases of Rails 3.2, 4.0, 4.1, 4.2, 5.0, 5.1 and 5.2.
 
 ## Installation
 

data/VERSION

@@ -1 +1 @@
-2.0.1
+2.1.0

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 2.0.1 ruby lib
+# stub: counter_culture 2.1.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "counter_culture".freeze
-  s.version = "2.0.1"
+  s.version = "2.1.0"
 
   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 = "2018-08-21"
+  s.date = "2018-10-19"
   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 = [
@@ -66,6 +66,8 @@ Gem::Specification.new do |s|
     "spec/models/transaction.rb",
     "spec/models/twitter_review.rb",
     "spec/models/user.rb",
+    "spec/models/with_module/model1.rb",
+    "spec/models/with_module/model2.rb",
     "spec/rails_app/.gitignore",
     "spec/rails_app/Gemfile",
     "spec/rails_app/README.rdoc",

data/lib/counter_culture/counter.rb

@@ -13,7 +13,7 @@ module CounterCulture
         fail("execute_after_commit was removed; updates now run within the transaction")
       end
 
-      @counter_cache_name = options.fetch(:column_name, "#{model.name.tableize}_count")
+      @counter_cache_name = options.fetch(:column_name, "#{model.name.demodulize.tableize}_count")
       @column_names = options[:column_names]
       @delta_column = options[:delta_column]
       @foreign_key_values = options[:foreign_key_values]

data/spec/counter_culture_spec.rb

@@ -26,6 +26,8 @@ require 'models/soft_delete_paranoia'
 require 'models/conversation'
 require 'models/candidate_profile'
 require 'models/candidate'
+require 'models/with_module/model1'
+require 'models/with_module/model2'
 
 require 'database_cleaner'
 DatabaseCleaner.strategy = :deletion
@@ -2096,6 +2098,23 @@ describe "CounterCulture" do
     end
   end
 
+  describe "with a module for the model" do
+    it "works" do
+      model2 = WithModule::Model2.create!
+      5.times { WithModule::Model1.create!(model2: model2) }
+
+      model2.reload
+      expect(model2.model1s_count).to eq(5)
+
+      model2.update_column(:model1s_count, -1)
+
+      WithModule::Model1.counter_culture_fix_counts
+
+      model2.reload
+      expect(model2.model1s_count).to eq(5)
+    end
+  end
+
   private
   def papertrail_supported_here?
     return false if Rails.version < "5.0.0"

data/spec/models/with_module/model1.rb

@@ -0,0 +1,8 @@
+module WithModule
+  class Model1 < ActiveRecord::Base
+    self.table_name_prefix = 'with_module_'
+
+    belongs_to :model2
+    counter_culture :model2
+  end
+end

data/spec/models/with_module/model2.rb

@@ -0,0 +1,7 @@
+module WithModule
+  class Model2 < ActiveRecord::Base
+    self.table_name_prefix = 'with_module_'
+
+    has_many :model1s
+  end
+end

data/spec/schema.rb

@@ -230,4 +230,12 @@ ActiveRecord::Schema.define(:version => 20120522160158) do
     t.datetime :created_at
   end
   add_index :versions, [:item_id, :item_type]
+
+  create_table :with_module_model1s, :force => true do |t|
+    t.integer :model2_id
+  end
+
+  create_table :with_module_model2s, :force => true do |t|
+    t.integer :model1s_count
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: counter_culture
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Magnus von Koeller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-21 00:00:00.000000000 Z
+date: 2018-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: after_commit_action
@@ -264,6 +264,8 @@ files:
 - spec/models/transaction.rb
 - spec/models/twitter_review.rb
 - spec/models/user.rb
+- spec/models/with_module/model1.rb
+- spec/models/with_module/model2.rb
 - spec/rails_app/.gitignore
 - spec/rails_app/Gemfile
 - spec/rails_app/README.rdoc