audited_change_set 0.0.3 → 0.0.4

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/audited_change_set.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{audited_change_set}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Chelimsky", "Brian Tatnall", "Nate Jackson", "Corey Haines"]

data/lib/audited_change_set/change.rb

@@ -33,6 +33,8 @@ module AuditedChangeSet
     class Field
       include Hooks
 
+      @@display_methods = %w[field_name name to_s]
+
       attr_reader :name, :old_value, :new_value
 
       def initialize(change_type, name, new_val, old_val=nil)
@@ -42,7 +44,12 @@ module AuditedChangeSet
       end
 
       def transform_value(val)
-        hook(:transform_value, val) || (association_field? ? get_associated_object(val).to_s : val.to_s)
+        hook(:transform_value, val) || (association_field? ? associated_value(val) : val.to_s)
+      end
+
+      def associated_value(val)
+        object = get_associated_object(val)
+        object.send(display_method(object))
       end
 
       def association_class
@@ -72,6 +79,11 @@ module AuditedChangeSet
       def name_without_id
         name.chomp "_id"
       end
+
+      private
+      def display_method(object)
+        @@display_methods.detect { |m| object.respond_to?(m) }
+      end
     end
 
     class << self

data/spec/audited_change_set/change_spec.rb

@@ -205,38 +205,59 @@ module AuditedChangeSet
       end
 
       context "field is an association" do
+        context "finds associated object" do
+          before :each do
+            Person.stub(:find_by_id).and_return(nil)
+            Person.stub(:find_by_id).with("1").and_return(double(Person, :to_s => 'to_s_ified'))
+          end
 
-        before :each do
-          Person.stub(:find_by_id).and_return(nil)
-          Person.stub(:find_by_id).with("1").and_return(double(Person, :to_s => 'to_s_ified'))
-        end
+          it "for new value" do
+            changes = { "person_id" => "1"}
+            yielded_fields ={"person_id" => ["", "to_s_ified"]}
 
-        it "uses associated object for new value" do
-          changes = { "person_id" => "1"}
-          yielded_fields ={"person_id" => ["", "to_s_ified"]}
+            audit.stub(:[]).and_return(changes)
+            Change.new(audit).should yield_these(yielded_fields)
+          end
 
-          audit.stub(:action).and_return("create")
-          audit.stub(:[]).and_return(changes)
-          Change.new(audit).should yield_these(yielded_fields)
-        end
+          it "for old value" do
+            changes = { "person_id" => ["1", nil]}
+            yielded_fields ={"person_id" => ["to_s_ified", ""]}
 
-        it "uses associated object for old value" do
-          changes = { "person_id" => ["1", nil]}
-          yielded_fields ={"person_id" => ["to_s_ified", ""]}
+            audit.stub(:[]).and_return(changes)
+            Change.new(audit).should yield_these(yielded_fields)
+          end
 
-          audit.stub(:action).and_return("create")
-          audit.stub(:[]).and_return(changes)
-          Change.new(audit).should yield_these(yielded_fields)
+          it "by reflecting on belongs_to association" do
+            changes = { "parent_id" => ["1", nil]}
+            yielded_fields ={"parent_id" => ["to_s_ified", ""]}
+
+            audit.stub(:[]).and_return(changes)
+            Change.new(audit).should yield_these(yielded_fields)
+          end
         end
 
-        it "reflects on association for belongs_to" do
-          changes = { "parent_id" => ["1", nil]}
-          yielded_fields ={"parent_id" => ["to_s_ified", ""]}
+        context "display" do
+          before :each do
+            Person.stub(:find_by_id).with("1").and_return(double(Person, :to_s => 'to_sified'))
+            Person.stub(:find_by_id).with("2").and_return(double(Person, :name => 'name_method', :to_s => 'to_sified'))
+            Person.stub(:find_by_id).with("3").and_return(double(Person, :field_name => 'field_name_method', :name => 'name_method'))
+          end
 
-          audit.stub(:action).and_return("create")
-          audit.stub(:[]).and_return(changes)
+          it "uses name before to_s" do
+            changes = { "parent_id" => ["1", "2"]}
+            yielded_fields = {"parent_id" => ["to_sified", "name_method"]}
+            audit.stub(:[]).and_return(changes)
 
-          Change.new(audit).should yield_these(yielded_fields)
+            Change.new(audit).should yield_these(yielded_fields)
+          end
+
+          it "uses field name before name" do
+            changes = { "parent_id" => ["3", "2"]}
+            yielded_fields = {"parent_id" => ["field_name_method", "name_method"]}
+            audit.stub(:[]).and_return(changes)
+
+            Change.new(audit).should yield_these(yielded_fields)
+          end
         end
       end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - David Chelimsky