trackable 0.3.0 → 0.4.0

data/.gitignore

@@ -0,0 +1,2 @@
+pkg/*
+test/debug.log

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/lib/trackable/acts_as_trackable.rb

@@ -2,13 +2,13 @@ module ActsAsTrackable
   def self.included(base)
     base.send :extend, ClassMethods
     base.instance_eval{
-      cattr_accessor :eventable_options
+      class_inheritable_accessor :eventable_options
     } 
   end
 
   module ClassMethods
 
-    def trackable(options)
+    def trackable(options={})
       instance_eval{
         self.eventable_options = options
       }
@@ -20,7 +20,7 @@ module ActsAsTrackable
 
   module InstanceMethods
     def record_events
-      active_keys = changes.keys.reject{ |key| %w{id created_at updated_at}.include?(key)}
+      active_keys = changes.keys.reject{ |key| %w{id created_at created_on updated_at updated_on}.include?(key)}
       active_keys.map do |key|
         old_val, new_val = changes[key]
         attrs = Event.attributes_from(self, key, old_val, new_val)

data/lib/trackable/event.rb

@@ -1,26 +1,25 @@
 class Event < ActiveRecord::Base
   
   def self.attributes_from(model, key, old_val, new_val)
-    return if old_val.blank? && new_val.blank? #not something we need to track.
+    return if old_val.blank? && new_val.blank? # not something we need to track.
     eventable_options = model.class.eventable_options
-    return if [eventable_options[:exclude]].flatten.include?(key.to_sym)
-    msg = if eventable_options[:events][key.to_sym] && eventable_options[:events][key.to_sym][new_val]
-      eventable_options[:events][key.to_sym][new_val]
-    elsif eventable_options[:events][key.to_sym] && eventable_options[:events][key.to_sym][:message]
-      the_proc = eventable_options[:events][key.to_sym][:message]
-      if key.ends_with?("_id") # hackish, but this is a convention
-        reference = key[0..-4].to_sym
-        the_proc.call(model.send(reference).to_s)
-      else
-        the_proc.call(new_val)
-      end
-    elsif key.ends_with?("_id") # hackish, but this is a convention
-      reference = key[0..-4].to_sym
+    return if Array(eventable_options[:exclude]).include?(key.to_sym)
+    
+    events       = eventable_options[:events]
+    attr_options = events[key.to_sym] if events
+    reference    = key.ends_with?("_id") ? key[0..-4].to_sym : key.to_sym
+    association  = model.class.reflect_on_association(reference)
+    
+    message = if attr_options && attr_options[new_val]
+      attr_options[new_val]
+    elsif attr_options && msg_proc = attr_options[:message]
+      association ? msg_proc.call(model.send(reference).to_s) : msg_proc.call(new_val)
+    elsif association
       "#{key.humanize} changed to #{model.send(reference).to_s}"
     else
       "#{key.humanize} changed to #{new_val}"
     end
-    {:field_name => key, :message => msg, :whodunnit => Trackable.whodunnit}
+    {:field_name => key, :message => message, :whodunnit => Trackable.whodunnit}
   end
   
 end

data/test/schema.rb

@@ -7,6 +7,7 @@ ActiveRecord::Schema.define(:version => 0) do
     t.string :do_not_track
     t.integer :bar_id
     t.integer :custom_bar_id    
+    t.integer :not_association_id    
 
     t.timestamps
   end

data/test/trackable_test.rb

@@ -134,5 +134,18 @@ class TrackableTest < Test::Unit::TestCase
     foo.update_attribute(:do_not_track, "Untracked")
     assert_equal 0, foo.events.size    
   end
+  
+  def test_checks_for_associations_when_creating_message
+    foo = Foo.create
+    assert_nothing_raised { foo.update_attribute(:not_association_id, 1) }
+    assert_equal "Not association changed to 1", foo.events.first.message
+  end
+  
+  def test_dropping_trackable_on_model_works
+    assert_nothing_raised { Bar.trackable }
+    bar = Bar.create
+    bar.update_attribute(:name, "Megatron")
+    assert_equal "Name changed to Megatron", bar.events.first.message
+  end
     
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - bigfleet
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-24 00:00:00 -05:00
+date: 2010-05-06 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -38,6 +38,7 @@ extensions: []
 extra_rdoc_files: 
 - README.textile
 files: 
+- .gitignore
 - MIT-LICENSE
 - README.textile
 - Rakefile