custom_counter_cache 0.0.4 → 0.0.5

data/lib/custom_counter_cache/model.rb

@@ -32,25 +32,29 @@ module CustomCounterCache::Model
       end
     end
     
-    def update_counter_cache(association_id, cache_column, options = {}) 
-      association_id = association_id.to_sym
-      cache_column   = cache_column.to_sym
-      method_name    = "callback_#{cache_column}".to_sym
-      reflection     = reflect_on_association(association_id)
-      foreign_key    = reflection.options[:foreign_key] || reflection.association_foreign_key
+    def update_counter_cache(association, cache_column, options = {})
+      association  = association.to_sym
+      cache_column = cache_column.to_sym
+      method_name  = "callback_#{cache_column}".to_sym
+      reflection   = reflect_on_association(association)
+      foreign_key  = reflection.options[:foreign_key] || reflection.association_foreign_key
       # define callback
       define_method method_name do
         # update old association
-        if send("#{foreign_key}_changed?")
-          old_assoc_id = send("#{foreign_key}_was")
-          if ( old_assoc_id && old_assoc = reflection.klass.find(old_assoc_id))
-            old_assoc.send("update_#{cache_column}")
+        if send("#{foreign_key}_changed?") || ( !respond_to?("#{association}_type") || send("#{association}_type_changed?") )
+          old_id = send("#{foreign_key}_was")
+          klass = if reflection.options[:polymorphic]
+            ( send("#{association}_type_was") || send("#{association}_type") ).constantize
+          else
+            reflection.klass
+          end
+          if ( old_id && record = klass.find(old_id) )
+            record.send("update_#{cache_column}")
           end
         end
         # update new association
-        new_assoc_id = send(foreign_key)
-        if ( new_assoc_id && new_assoc = reflection.klass.find(new_assoc_id) )
-          new_assoc.send("update_#{cache_column}")
+        if ( record = send(association) )
+          record.send("update_#{cache_column}")
         end
       end
       # set callbacks

data/lib/custom_counter_cache/version.rb

@@ -1,5 +1,5 @@
 module CustomCounterCache
   
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
   
 end

data/test/test_helper.rb

@@ -1,13 +1,9 @@
-$: << File.join(File.dirname(__FILE__), '..', 'lib')
-$: << File.join(File.dirname(__FILE__))
-
 require 'rubygems'
 require 'test/unit'
 require 'sqlite3'
 require 'action_view'
 require 'active_record'
 require 'custom_counter_cache'
-require 'ruby-debug'
 
 ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: custom_counter_cache
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Cedric Howe
@@ -15,41 +15,25 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-13 00:00:00 Z
+date: 2012-08-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         hash: 5
         segments: 
-        - 2
         - 3
-        version: "2.3"
+        version: "3"
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
+  requirement: *id001
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: debugger
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  name: sqlite3
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -59,7 +43,8 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id003
+  requirement: *id002
+  prerelease: false
 description: ""
 email: cedric@howe.net
 executables: []