trackable 0.1.1 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/lib/trackable/acts_as_trackable.rb

@@ -23,7 +23,8 @@ module ActsAsTrackable
       active_keys = changes.keys.reject{ |key| %w{id created_at updated_at}.include?(key)}
       active_keys.map do |key|
         old_val, new_val = changes[key]
-        events.create(Event.attributes_from(self, key, old_val, new_val))
+        attrs = Event.attributes_from(self, key, old_val, new_val)
+        events.create(attrs) if attrs
       end
     end
   end

data/lib/trackable/event.rb

@@ -1,18 +1,19 @@
 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.
     eventable_options = model.class.eventable_options
     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.index("_id") # hackish, but this is a convention
+      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.index("_id") # hackish, but this is a convention
+    elsif key.ends_with?("_id") # hackish, but this is a convention
       reference = key[0..-4].to_sym
       "#{key.humanize} changed to #{model.send(reference).to_s}"
     else
@@ -20,4 +21,5 @@ class Event < ActiveRecord::Base
     end
     {:field_name => key, :message => msg, :whodunnit => Trackable.whodunnit}
   end
+  
 end

data/test/schema.rb

@@ -2,7 +2,8 @@ ActiveRecord::Schema.define(:version => 0) do
   create_table :foos, :force => true do |t|
     t.boolean :no_homers
     t.string :status
-    t.string :custom_status    
+    t.string :custom_status
+    t.string :alternate_identification
     t.integer :bar_id
     t.integer :custom_bar_id    
 

data/test/trackable_test.rb

@@ -48,6 +48,32 @@ class TrackableTest < Test::Unit::TestCase
     assert_equal "Status changed to New", foo.events.first.message
   end
   
+  def test_desired_nil_string_messaging
+    foo = Foo.create
+    foo.update_attribute(:status, nil)
+    assert_equal 0, foo.events.size
+  end
+  
+  def test_desired_new_blank_string_messaging
+    foo = Foo.new(:status => "")
+    foo.save
+    assert_equal 0, foo.events.size
+  end
+  
+  def test_desired_existing_nil_string_messaging
+    foo = Foo.create(:status => "bazzed")
+    assert_equal 1, foo.events.size    
+    foo.update_attribute(:status, nil)
+    assert_equal 2, foo.events.size
+  end 
+  
+  def test_desired_existing_nil_string_messaging
+    foo = Foo.create(:status => "bazzed")
+    assert_equal 1, foo.events.size    
+    foo.update_attribute(:status, nil)
+    assert_equal 2, foo.events.size
+  end   
+    
   def test_desired_string_stackability
     foo = Foo.create
     foo.update_attribute(:status, "Old")
@@ -68,16 +94,7 @@ class TrackableTest < Test::Unit::TestCase
     foo.update_attribute(:custom_status, "New")
     assert_equal "The value of a custom string field changed to New", foo.events.first.message
   end
-  
-  def test_desired_custom_string_stackability
-    foo = Foo.create
-    foo.update_attribute(:custom_status, "Old")
-    sleep 1 #mur    
-    foo.update_attribute(:custom_status, "New")    
-    assert_equal "The value of a custom string field changed to New", foo.events.first.message
-    assert_equal "The value of a custom string field changed to Old", foo.events.last.message    
-  end  
-  
+    
   def test_desired_reference_change_trigger
     foo = Foo.create
     bar = Bar.create(:name => "Baloney")
@@ -92,17 +109,12 @@ class TrackableTest < Test::Unit::TestCase
     assert_equal "Bar changed to Baloney", foo.events.first.message
   end
   
-  def test_desired_reference_stackability
+  def test_desired_reference_like_messaging
     foo = Foo.create
-    bar1 = Bar.create(:name => "Peanut Butter")
-    bar2 = Bar.create(:name => "Jelly")
-    foo.bar = bar1; foo.save
-    sleep 1 #mur    
-    foo.bar = bar2; foo.save
-    assert_equal "Bar changed to Jelly", foo.events.first.message
-    assert_equal "Bar changed to Peanut Butter", foo.events.last.message    
-  end
-  
+    foo.update_attribute(:alternate_identification, "Only a string")
+    assert_equal "Alternate identification changed to Only a string", foo.events.first.message
+  end  
+    
   def test_desired_custom_reference_change_trigger
     foo = Foo.create
     bar = Bar.create(:name => "Baloney")
@@ -116,16 +128,5 @@ class TrackableTest < Test::Unit::TestCase
     foo.custom_bar = bar; foo.save
     assert_equal "Active Bar set to Baloney", foo.events.first.message
   end
-  
-  def test_desired_custom_reference_stackability
-    foo = Foo.create
-    bar1 = Bar.create(:name => "Peanut Butter")
-    bar2 = Bar.create(:name => "Jelly")
-    foo.custom_bar = bar1; foo.save
-    sleep 1 #mur    
-    foo.custom_bar = bar2; foo.save
-    assert_equal "Active Bar set to Jelly", foo.events.first.message
-    assert_equal "Active Bar set to Peanut Butter", foo.events.last.message    
-  end  
-  
+    
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - bigfleet