counter_culture 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/counter_culture.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "counter_culture"
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Magnus von Koeller"]
-  s.date = "2012-05-30"
+  s.date = "2012-05-31"
   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.rb

@@ -38,6 +38,9 @@ module CounterCulture
       # on original data; if the counter cache is incorrect, sets it to the correct
       # count
       #
+      # options:
+      #   { :exclude => list of relations to skip when fixing counts,
+      #     :only => only these relations will have their counts fixed }
       # returns: a list of fixed record as an array of hashes of the form:
       #   { :entity => which model the count was fixed on,
       #     :id => the id of the model that had the incorrect count,
@@ -45,9 +48,17 @@ module CounterCulture
       #     :wrong => the previously saved, incorrect count,
       #     :right => the newly fixed, correct count }
       #
-      def counter_culture_fix_counts
+      def counter_culture_fix_counts(options = {})
+        options[:exclude] = [options[:exclude]] if options[:exclude] && !options[:exclude].is_a?(Enumerable)
+        options[:exclude] = options[:exclude].try(:map) {|x| x.is_a?(Enumerable) ? x : [x] }
+        options[:only] = [options[:only]] if options[:only] && !options[:only].is_a?(Enumerable)
+        options[:only] = options[:only].try(:map) {|x| x.is_a?(Enumerable) ? x : [x] }
+
         fixed = []
-        @after_commit_counter_cache.map do |hash|
+        @after_commit_counter_cache.each do |hash|
+          next if options[:exclude] && options[:exclude].include?(hash[:relation])
+          next if options[:only] && !options[:only].include?(hash[:relation])
+
           # which class does this relation ultimately point to? that's where we have to start
           klass = relation_klass(hash[:relation])
 
@@ -55,6 +66,8 @@ module CounterCulture
           query = klass.select("#{klass.table_name}.id, COUNT(#{self.table_name}.id) AS count")
           query = query.group("#{klass.table_name}.id")
 
+          raise "Fixing counter caches is not supported when using :foreign_key_values" if hash[:foreign_key_values]
+
           # if we're provided a custom set of column names with conditions, use them; just use the
           # column name otherwise
           raise "Must provide :column_names option for relation #{hash[:relation].inspect} when :counter_cache_name is a Proc" if hash[:counter_cache_name].is_a?(Proc) && !hash[:column_names]
@@ -83,7 +96,7 @@ module CounterCulture
             # now that we know what the correct counts are, we need to iterate over all instances
             # and check whether the count is correct; if not, we correct it
             klass.find_each do |model|
-              if model.send(column_name) != counts[model.id].to_i
+              if model.read_attribute(column_name) != counts[model.id].to_i
                 # keep track of what we fixed, e.g. for a notification email
                 fixed<< {
                   :entity => klass.name,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: counter_culture
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-30 00:00:00.000000000 Z
+date: 2012-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -216,7 +216,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3220703569858199407
+      hash: -1949241983326778340
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: