counter_culture 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40d222184acc3b81f1abf7dfd2dbede253eacb7a
-  data.tar.gz: bdf081ac5294d1a5a8b693c3639ccf82b0642e0b
+  metadata.gz: b2cbcbac5a73c66f70195da9047859c849d67166
+  data.tar.gz: 712abce425aae48e7b8decf15edaee9c921cf95c
 SHA512:
-  metadata.gz: e81781257cff2487c108d441dfe92ea65bd5f8b42a90c61752d68fe7233d8aa30ebc90c8625c487626b7e461edfb36eaadde30aa539760dcb277a1a2fdd4f0bb
-  data.tar.gz: f0c9a1687eff220ccd4d703e901e49f7ad0193207f5fbdcb3a00b5dbb6aea8fd6e288c1f77ad037c9125bee0ce07873ca8f0fb2c5ecddfdc40fc2698532d9d04
+  metadata.gz: c6fac4dfb787d6f232daa3d3387415b11504b965503a33d685bb6eb2730a6301a13d5c7e15e83f8f508d76c26be0d98da0c832e161dd4904159ac6d59a4d622a
+  data.tar.gz: 787de2041877eb28f2ef2027689c38c00fffdf8caa924cbe0538cdf159b774fdedfa5030a257ce2a9606e586aff9e9d350f81b8a07b7d750c3f448ca831405dd

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.6.1 (April 26, 2017)
+
+Bugfixes:
+  - Fix `counter_culture_fix_counts` for a multi-level relation where an intermediate link is `has_one`, rather than `belongs_to`
+
 ## 1.6.0 (April 24, 2017)
 
 Improvements:

data/VERSION

@@ -1 +1 @@
-1.6.0
+1.6.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.6.0 ruby lib
+# stub: counter_culture 1.6.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "counter_culture".freeze
-  s.version = "1.6.0"
+  s.version = "1.6.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-04-24"
+  s.date = "2017-04-26"
   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 = [
@@ -40,11 +40,14 @@ Gem::Specification.new do |s|
     "spec/counter_culture_spec.rb",
     "spec/models/another_post.rb",
     "spec/models/another_post_comment.rb",
+    "spec/models/candidate.rb",
+    "spec/models/candidate_profile.rb",
     "spec/models/categ.rb",
     "spec/models/category.rb",
     "spec/models/company.rb",
     "spec/models/conditional_dependent.rb",
     "spec/models/conditional_main.rb",
+    "spec/models/conversation.rb",
     "spec/models/has_string_id.rb",
     "spec/models/industry.rb",
     "spec/models/person.rb",

data/lib/counter_culture/reconciler.rb

@@ -154,35 +154,55 @@ module CounterCulture
       def join_clauses
         return @join_clauses if defined?(@join_clauses)
 
-        # we need to work our way back from the end-point of the relation to this class itself;
-        # make a list of arrays pointing to the second-to-last, third-to-last, etc.
-        reverse_relation = (1..relation.length).to_a.reverse.inject([]) { |a, i| a << relation[0, i]; a }
-
-        # store joins in an array so that we can later apply column-specific conditions
+        # we need to work our way back from the end-point of the relation to
+        # this class itself; make a list of arrays pointing to the
+        # second-to-last, third-to-last, etc.
+        reverse_relation = (1..relation.length).to_a.reverse.
+          inject([]) { |a, i| a << relation[0, i]; a }
+
+        # store joins in an array so that we can later apply column-specific
+        # conditions
         @join_clauses = reverse_relation.map do |cur_relation|
           reflect = relation_reflect(cur_relation)
-          if relation_class.table_name == reflect.active_record.table_name
-            join_table_name = "#{relation_class.table_name}_#{relation_class.table_name}"
-          else
-            join_table_name = reflect.active_record.table_name
+
+          target_table_alias = target_table = reflect.active_record.table_name
+          if relation_class.table_name == target_table
+            # join with alias to avoid ambiguous table name in
+            # self-referential models
+            target_table_alias += "_#{target_table}"
           end
+
           if polymorphic?
             # NB: polymorphic only supports one level of relation (at present)
             association_primary_key = reflect.association_primary_key(relation_class)
-            reflect_table_name = relation_class.table_name
+            source_table = relation_class.table_name
           else
             association_primary_key = reflect.association_primary_key
-            reflect_table_name = reflect.table_name
+            source_table = reflect.table_name
           end
 
-          # join with alias to avoid ambiguous table name with self-referential models:
-          joins_sql = "LEFT JOIN #{reflect.active_record.table_name} AS #{join_table_name} ON #{reflect_table_name}.#{association_primary_key} = #{join_table_name}.#{reflect.foreign_key}"
-          # adds 'type' condition to JOIN clause if the current model is a child in a Single Table Inheritance
-          joins_sql = "#{joins_sql} AND #{reflect.active_record.table_name}.type IN ('#{model.name}')" if reflect.active_record.column_names.include?('type') && !model.descends_from_active_record?
+          source_table_key = association_primary_key
+          target_table_key = reflect.foreign_key
+          if reflect.has_one?
+            # a has_one relation flips the location of the keys on the tables
+            # around
+            (source_table_key, target_table_key) =
+              [target_table_key, source_table_key]
+          end
+
+          joins_sql = "LEFT JOIN #{target_table} AS #{target_table_alias} "\
+            "ON #{source_table}.#{source_table_key} = #{target_table_alias}.#{target_table_key}"
+          # adds 'type' condition to JOIN clause if the current model is a
+          # child in a Single Table Inheritance
+          if reflect.active_record.column_names.include?('type') &&
+              !model.descends_from_active_record?
+            joins_sql += " AND #{target_table}.type IN ('#{model.name}')"
+          end
           if polymorphic?
-            # adds 'type' condition to JOIN clause if the current model is a polymorphic relation
+            # adds 'type' condition to JOIN clause if the current model is a
+            # polymorphic relation
             # NB only works for one-level relations
-            joins_sql = "#{joins_sql} AND #{reflect.active_record.table_name}.#{reflect.foreign_type} = '#{relation_class.name}'"
+            joins_sql += " AND #{target_table}.#{reflect.foreign_type} = '#{relation_class.name}'"
           end
           joins_sql
         end

data/spec/counter_culture_spec.rb

@@ -22,6 +22,9 @@ require 'models/another_post_comment'
 require 'models/person'
 require 'models/transaction'
 require 'models/soft_delete'
+require 'models/conversation'
+require 'models/candidate_profile'
+require 'models/candidate'
 
 require 'database_cleaner'
 DatabaseCleaner.strategy = :deletion
@@ -1495,6 +1498,44 @@ describe "CounterCulture" do
     expect(categ.reload.posts_count).to eq(1)
   end
 
+  it "works correctly with a has_one association in the middle" do
+    candidate_profile1 = CandidateProfile.create(candidate: Candidate.create)
+    candidate1 = candidate_profile1.candidate
+    candidate_profile2 = CandidateProfile.create(candidate: Candidate.create)
+    candidate2 = candidate_profile2.candidate
+
+    expect(candidate_profile1.conversations_count).to eq(0)
+    expect(candidate_profile2.conversations_count).to eq(0)
+
+    conversation1 = Conversation.create(candidate: candidate1)
+    expect(candidate_profile1.reload.conversations_count).to eq(1)
+
+    conversation2 = Conversation.create(candidate: candidate2)
+    expect(candidate_profile2.reload.conversations_count).to eq(1)
+
+    conversation2.candidate = candidate1
+    conversation2.save!
+
+    expect(candidate_profile1.reload.conversations_count).to eq(2)
+    expect(candidate_profile2.reload.conversations_count).to eq(0)
+
+    candidate_profile1.update_column(:conversations_count, 99)
+    candidate_profile2.update_column(:conversations_count, 99)
+
+    Conversation.counter_culture_fix_counts
+
+    expect(candidate_profile1.reload.conversations_count).to eq(2)
+    expect(candidate_profile2.reload.conversations_count).to eq(0)
+
+    conversation2.destroy
+    expect(candidate_profile1.reload.conversations_count).to eq(1)
+    expect(candidate_profile2.reload.conversations_count).to eq(0)
+
+    conversation1.destroy
+    expect(candidate_profile1.reload.conversations_count).to eq(0)
+    expect(candidate_profile2.reload.conversations_count).to eq(0)
+  end
+
   describe "#previous_model" do
     let(:user){User.create :name => "John Smith", :manages_company_id => 1}
 

data/spec/models/candidate.rb

@@ -0,0 +1,3 @@
+class Candidate < ActiveRecord::Base
+  has_one :candidate_profile, inverse_of: :candidate
+end

data/spec/models/candidate_profile.rb

@@ -0,0 +1,3 @@
+class CandidateProfile < ActiveRecord::Base
+  belongs_to :candidate
+end

data/spec/models/conversation.rb

@@ -0,0 +1,4 @@
+class Conversation < ActiveRecord::Base
+  belongs_to :candidate
+  counter_culture [:candidate, :candidate_profile]
+end

data/spec/schema.rb

@@ -201,4 +201,16 @@ ActiveRecord::Schema.define(:version => 20120522160158) do
     t.integer  "poly_images_count_dup", :default => 0, :null => false
     t.integer  "special_poly_images_count", :default => 0, :null => false
   end
+
+  create_table "conversations", :force => true do |t|
+    t.integer "candidate_id"
+  end
+
+  create_table "candidates", :force => true do |t|
+  end
+
+  create_table "candidate_profiles", :force => true do |t|
+    t.integer "candidate_id"
+    t.integer "conversations_count", :default => 0, :null => false
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: counter_culture
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Magnus von Koeller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-24 00:00:00.000000000 Z
+date: 2017-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: after_commit_action
@@ -210,11 +210,14 @@ files:
 - spec/counter_culture_spec.rb
 - spec/models/another_post.rb
 - spec/models/another_post_comment.rb
+- spec/models/candidate.rb
+- spec/models/candidate_profile.rb
 - spec/models/categ.rb
 - spec/models/category.rb
 - spec/models/company.rb
 - spec/models/conditional_dependent.rb
 - spec/models/conditional_main.rb
+- spec/models/conversation.rb
 - spec/models/has_string_id.rb
 - spec/models/industry.rb
 - spec/models/person.rb