counter_culture 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff55da448ed08ad68f53c9ae8fee1e814b99315e
-  data.tar.gz: e3f2a61342ab909fabd3a0d0188a288bcbde0879
+  metadata.gz: adde693fbc8a3158f577294d8c824bd4635b9a2e
+  data.tar.gz: 1841858ea2173cd8582d1f90a01c72e2c50afa59
 SHA512:
-  metadata.gz: 9ddc79c3684fbbb45d411327ca4c2a28e8b782eecc212b202312b145f43f6e0e200f7b4858edde90b9eb85434ba1dc0ea89eaa2773a26e3e03af24506e440ac6
-  data.tar.gz: 94e34148fead1c2e426b3133a7772da18e37183009b62280e92f3348fc9e980b762fbd3fe14bde0b76b8e2ee529cffd5df229f0e374b08167fb72a5753622aa8
+  metadata.gz: e60214e311c99e3d9ee493fb605293388eab2880211dcb7eea0ebded7606a5b1a622664de9a461e4a9c3d57fc9089816cb713af7c371066af94be4945acb1b96
+  data.tar.gz: b5b0ef3c373f7017e69e781898b690de491721fd5847024a119c3bd6f73fb1bed02dc344ff1630730f6c67ecfbc0c4a68b21f3ab4c22c647496a09b2e3c9f090

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.1.0 (December 23, 2016)
+
+Improvements:
+  - Support for has_one associations
+
 ## 1.0.0 (November 15, 2016)
 
 Breaking changes:

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.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 1.0.0 ruby lib
+# stub: counter_culture 1.1.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "counter_culture"
-  s.version = "1.0.0"
+  s.version = "1.1.0"
 
   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-11-15"
+  s.date = "2016-12-23"
   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 = [
@@ -45,18 +45,22 @@ Gem::Specification.new do |s|
     "spec/models/categ.rb",
     "spec/models/category.rb",
     "spec/models/company.rb",
+    "spec/models/company_access_level.rb",
     "spec/models/conditional_dependent.rb",
     "spec/models/conditional_main.rb",
     "spec/models/has_string_id.rb",
     "spec/models/industry.rb",
+    "spec/models/person.rb",
     "spec/models/post.rb",
     "spec/models/post_comment.rb",
     "spec/models/product.rb",
+    "spec/models/recruiter.rb",
     "spec/models/review.rb",
     "spec/models/simple_dependent.rb",
     "spec/models/simple_main.rb",
     "spec/models/simple_review.rb",
     "spec/models/subcateg.rb",
+    "spec/models/transaction.rb",
     "spec/models/twitter_review.rb",
     "spec/models/user.rb",
     "spec/rails_app/.gitignore",

data/lib/counter_culture/reconciler.rb

@@ -124,8 +124,13 @@ module CounterCulture
         else
           join_table_name = reflect.active_record.table_name
         end
+        if reflect.has_one?
+          on_sql = "#{reflect.table_name}.#{reflect.foreign_key} = #{join_table_name}.#{reflect.association_primary_key}"
+        else
+          on_sql = "#{reflect.table_name}.#{reflect.association_primary_key} = #{join_table_name}.#{reflect.foreign_key}"
+        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}.#{reflect.association_primary_key} = #{join_table_name}.#{reflect.foreign_key}"
+        joins_sql = "LEFT JOIN #{reflect.active_record.table_name} AS #{join_table_name} ON #{on_sql}"
         # 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?
         joins_sql

data/spec/counter_culture_spec.rb

@@ -1,6 +1,8 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 require 'models/company'
+require 'models/company_access_level'
+require 'models/recruiter'
 require 'models/industry'
 require 'models/product'
 require 'models/review'
@@ -19,6 +21,8 @@ require 'models/categ'
 require 'models/subcateg'
 require 'models/another_post'
 require 'models/another_post_comment'
+require 'models/person'
+require 'models/transaction'
 
 require 'database_cleaner'
 DatabaseCleaner.strategy = :deletion
@@ -1501,5 +1505,51 @@ describe "CounterCulture" do
       fixed.length.should == 1
       company.reload.children_count.should == 1
     end
+
+    it "works with a has_one association" do
+      company = Company.create!
+      company.recruiters << Recruiter.create!
+      company.reload.recruiters_count.should == 1
+
+      company.update_columns(recruiters_count: 2)
+
+      Recruiter.counter_culture_fix_counts
+      company.reload.recruiters_count.should == 1
+    end
+  end
+
+  describe "dynamic column names with totaling instead of counting" do
+    it "should correctly sum up the values" do
+      person = Person.create!
+
+      earning_transaction = Transaction.create(monetary_value: 10, person: person)
+
+      person.reload
+      person.money_earned_total.should == 10
+
+      spending_transaction = Transaction.create(monetary_value: -20, person: person)
+      person.reload
+      person.money_spent_total.should == -20
+    end
+
+    it "should show the correct changes when changes are present" do
+      person = Person.create(id:100)
+
+      earning_transaction = Transaction.create(monetary_value: 10, person: person)
+      spending_transaction = Transaction.create(monetary_value: -20, person: person)
+
+      # Overwrite the values for the person so they are incorrect
+      person.reload
+      person.money_earned_total = 0
+      person.money_spent_total = 0
+      person.save
+
+      fixed = Transaction.counter_culture_fix_counts
+      fixed.length.should == 2
+      fixed.should == [
+        {:entity=>"Person", :id=>100, :what=>"money_earned_total", :wrong=>0, :right=>10},
+        {:entity=>"Person", :id=>100, :what=>"money_spent_total", :wrong=>0, :right=>-20}
+      ]
+    end
   end
 end

data/spec/models/company.rb

@@ -6,6 +6,8 @@ class Company < ActiveRecord::Base
   belongs_to :parent, :class_name => 'Company', :foreign_key => 'parent_id'
   has_many :children, :class_name => 'Company', :foreign_key => 'parent_id'
 
-  counter_culture :parent, :column_name => :children_count
+  has_many :company_access_levels
+  has_many :recruiters, through: :company_access_levels
 
+  counter_culture :parent, :column_name => :children_count
 end

data/spec/models/company_access_level.rb

@@ -0,0 +1,4 @@
+class CompanyAccessLevel < ActiveRecord::Base
+  belongs_to :company
+  belongs_to :recruiter
+end

data/spec/models/person.rb

@@ -0,0 +1,4 @@
+class Person < ActiveRecord::Base
+
+  has_many :transactions
+end

data/spec/models/recruiter.rb

@@ -0,0 +1,5 @@
+class Recruiter < ActiveRecord::Base
+  has_one :company_access_level
+
+  counter_culture [:company_access_level, :company]
+end

data/spec/models/transaction.rb

@@ -0,0 +1,15 @@
+class Transaction < ActiveRecord::Base
+  belongs_to :person
+
+  counter_culture [:person],
+    :column_name => proc {|model| model.earns_money? ? 'money_earned_total' : 'money_spent_total' },
+    :column_names => {
+          ["transactions.monetary_value > 0"] => 'money_earned_total',
+          ["transactions.monetary_value <= 0"] => 'money_spent_total'
+      },
+    :delta_column => 'monetary_value'
+
+  def earns_money?
+    monetary_value > 0
+  end
+end

data/spec/schema.rb

@@ -24,10 +24,16 @@ ActiveRecord::Schema.define(:version => 20120522160158) do
     t.integer  "review_approvals_count",      :default => 0, :null => false
     t.integer  "parent_id"
     t.integer  "children_count",      :default => 0, :null => false
+    t.integer  "recruiters_count",    :default => 0, :null => false
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
+  create_table "company_access_levels", :force => true do |t|
+    t.integer "company_id"
+    t.integer "recruiter_id"
+  end
+
   create_table "industries", :force => true do |t|
     t.string   "name"
     t.integer  "reviews_count",       :default => 0, :null => false
@@ -63,6 +69,11 @@ ActiveRecord::Schema.define(:version => 20120522160158) do
     t.datetime "updated_at"
   end
 
+  create_table "recruiters", :force => true do |t|
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
   create_table "users", :force => true do |t|
     t.string   "name"
     t.integer  "company_id"
@@ -164,4 +175,13 @@ ActiveRecord::Schema.define(:version => 20120522160158) do
     t.datetime "updated_at", :null => false
   end
 
+  create_table "people", :force => true do |t|
+    t.integer "money_earned_total", :null => false, :default => 0
+    t.integer "money_spent_total", :null => false, :default => 0
+  end
+
+  create_table "transactions", :force => true do |t|
+    t.integer "person_id", :null => false
+    t.integer "monetary_value", :null => false
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: counter_culture
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Magnus von Koeller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-15 00:00:00.000000000 Z
+date: 2016-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: after_commit_action
@@ -187,18 +187,22 @@ files:
 - spec/models/categ.rb
 - spec/models/category.rb
 - spec/models/company.rb
+- spec/models/company_access_level.rb
 - spec/models/conditional_dependent.rb
 - spec/models/conditional_main.rb
 - spec/models/has_string_id.rb
 - spec/models/industry.rb
+- spec/models/person.rb
 - spec/models/post.rb
 - spec/models/post_comment.rb
 - spec/models/product.rb
+- spec/models/recruiter.rb
 - spec/models/review.rb
 - spec/models/simple_dependent.rb
 - spec/models/simple_main.rb
 - spec/models/simple_review.rb
 - spec/models/subcateg.rb
+- spec/models/transaction.rb
 - spec/models/twitter_review.rb
 - spec/models/user.rb
 - spec/rails_app/.gitignore