counter_culture 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abf23aa3efb1a2f3257bbf6892182ce3ae4ce928
-  data.tar.gz: dba604aa21f0c043169ff3b7f49050450b74f870
+  metadata.gz: d2851375f488ec2d44fad34f75bc463cc7b6d30e
+  data.tar.gz: e8cee5f97368554bd04a0acc97b9feffb7e9fe5c
 SHA512:
-  metadata.gz: fa34f25d6de4af563033c744e84b82a6ba2b45a14115f74245fa73b40e09e51a3882634863b0aa1d94bb6c7b004b73392c5f7b11180f6c55f47825d27af00c6f
-  data.tar.gz: 2a317f9b84e3d1f47b6a686cf3d53360514796905fcba622f19c897569fd17b806f99f7e563434ef4759d0d22212dd15db5134217d116debfc4849e3aef3fddc
+  metadata.gz: b6af5865d97f22a07be30100266b5b2ee67778c9447c3e74e45c82d21e268912f83d295431cc4ad5ed26d3cc86eee95277a846044b9247ef61b238e6b98ac411
+  data.tar.gz: f8ac7e975612ddb98bb955b090db7d29511b602797fa3d684a1743a1d000f95e8a5bd8d2c0b6092c8a6cec236cd932a7437517e2da33c2e39c5e64e69d21fbca

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.8.0 (August 30, 2017)
+
+Improvements:
+  - Quote all table names to work correctly with PostgreSQL schemata
+  - Use ActiveRecord version, not Rails version, to make things work for projects that use ActiveRecord but not Rails
+
 ## 1.7.0 (June 12, 2017)
 
 Improvements:
@@ -5,7 +11,7 @@ Improvements:
 
 ## 1.6.2 (April 26, 2017)
 
-Bugfixes;
+Bugfixes:
   - Restore compatibility with older Rails versions
 
 ## 1.6.1 (April 26, 2017)

data/VERSION

@@ -1 +1 @@
-1.7.0
+1.8.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.7.0 ruby lib
+# stub: counter_culture 1.8.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "counter_culture"
-  s.version = "1.7.0"
+  s.version = "1.8.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 = "2017-06-12"
+  s.date = "2017-08-30"
   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 = [

data/lib/counter_culture/counter.rb

@@ -1,6 +1,7 @@
 module CounterCulture
   class Counter
     CONFIG_OPTIONS = [ :column_names, :counter_cache_name, :delta_column, :foreign_key_values, :touch, :delta_magnitude, :execute_after_commit ]
+    ACTIVE_RECORD_VERSION = Gem.loaded_specs["activerecord"].version
 
     attr_reader :model, :relation, *CONFIG_OPTIONS
 
@@ -197,7 +198,7 @@ module CounterCulture
     end
 
     def attribute_changed?(obj, attr)
-      if Rails.version >= "5.1.0"
+      if ACTIVE_RECORD_VERSION >= Gem::Version.new("5.1.0")
         obj.saved_changes[attr].present?
       else
         obj.send(:attribute_changed?, attr)
@@ -260,9 +261,9 @@ module CounterCulture
     def previous_model(obj)
       prev = obj.dup
 
-      changes_method = Rails.version >= "5.1.0" ? :saved_changes : :changed_attributes
+      changes_method = ACTIVE_RECORD_VERSION >= Gem::Version.new("5.1.0") ? :saved_changes : :changed_attributes
       obj.public_send(changes_method).each do |key, value|
-        old_value = Rails.version >= "5.1.0" ? value.first : value
+        old_value = ACTIVE_RECORD_VERSION >= Gem::Version.new("5.1.0") ? value.first : value
         prev.public_send("#{key}=", old_value)
       end
 
@@ -280,7 +281,7 @@ module CounterCulture
 
     def attribute_was(obj, attr)
       changes_method =
-        if Rails.version >= "5.1.0"
+        if ACTIVE_RECORD_VERSION >= Gem::Version.new("5.1.0")
           "_before_last_save"
         else
           "_was"

data/lib/counter_culture/reconciler.rb

@@ -75,27 +75,19 @@ 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
+          # 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
+
+          relation_class_table_name = quote_table_name(relation_class.table_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(relation_class)}, #{count_select} AS count, #{relation_class.table_name}.#{column_name}")
+          counts_query = scope.select("#{relation_class_table_name}.#{relation_class.primary_key}, #{relation_class_table_name}.#{relation_reflect(relation).association_primary_key(relation_class)}, #{count_select} AS count, #{relation_class_table_name}.#{column_name}")
 
           # we need to join together tables until we get back to the table this class itself lives in
-          # conditions must also be applied to the join on which we are counting
-          join_clauses.each_with_index do |join, index|
-            if index == join_clauses.size - 1
-              if where
-                join += " AND (#{model.send(:sanitize_sql_for_conditions, where)})"
-              end
-              # respect the deleted_at column if it exists
-              if model.column_names.include?('deleted_at')
-                join += " AND #{model.table_name}.deleted_at IS NULL"
-              end
-            end
+          join_clauses(where).each do |join|
             counts_query = counts_query.joins(join)
           end
 
@@ -144,16 +136,17 @@ module CounterCulture
       end
 
       def self_table_name
-        @self_table_name ||= if relation_class.table_name == model.table_name
-          "#{model.table_name}_#{model.table_name}"
-        else
-          model.table_name
+        return @self_table_name if @self_table_name
+
+        @self_table_name = parameterize(model.table_name)
+        if relation_class.table_name == model.table_name
+          @self_table_name = "#{@self_table_name}_#{@self_table_name}"
         end
+        @self_table_name = quote_table_name(@self_table_name)
+        @self_table_name
       end
 
-      def join_clauses
-        return @join_clauses if defined?(@join_clauses)
-
+      def join_clauses(where)
         # 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.
@@ -162,14 +155,15 @@ module CounterCulture
 
         # store joins in an array so that we can later apply column-specific
         # conditions
-        @join_clauses = reverse_relation.map do |cur_relation|
+        join_clauses = reverse_relation.each_with_index.map do |cur_relation, index|
           reflect = relation_reflect(cur_relation)
 
-          target_table_alias = target_table = reflect.active_record.table_name
-          if relation_class.table_name == target_table
+          target_table = quote_table_name(reflect.active_record.table_name)
+          target_table_alias = parameterize(target_table)
+          if relation_class.table_name == reflect.active_record.table_name
             # join with alias to avoid ambiguous table name in
             # self-referential models
-            target_table_alias += "_#{target_table}"
+            target_table_alias += "_#{target_table_alias}"
           end
 
           if polymorphic?
@@ -180,6 +174,7 @@ module CounterCulture
             association_primary_key = reflect.association_primary_key
             source_table = reflect.table_name
           end
+          source_table = quote_table_name(source_table)
 
           source_table_key = association_primary_key
           target_table_key = reflect.foreign_key
@@ -204,10 +199,34 @@ module CounterCulture
             # NB only works for one-level relations
             joins_sql += " AND #{target_table}.#{reflect.foreign_type} = '#{relation_class.name}'"
           end
+          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)})"
+            end
+            # respect the deleted_at column if it exists
+            if model.column_names.include?('deleted_at')
+              joins_sql += " AND #{target_table_alias}.deleted_at IS NULL"
+            end
+          end
           joins_sql
         end
       end
 
+      # This is only needed in relatively unusal cases, for example if you are
+      # using Postgres with schema-namespaced tables. But then it's required,
+      # and otherwise it's just a no-op, so why not do it?
+      def quote_table_name(table_name)
+        relation_class.connection.quote_table_name(table_name)
+      end
+
+      def parameterize(string)
+        if Rails.version < '5.0'
+          string.parameterize('_')
+        else
+          string.parameterize(separator: '_')
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: counter_culture
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Magnus von Koeller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-12 00:00:00.000000000 Z
+date: 2017-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: after_commit_action