audited_change_set 0.0.1 → 0.0.3

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.3

data/audited_change_set.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{audited_change_set}
-  s.version = "0.0.1"
+  s.version = "0.0.3"
 
   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"]
-  s.date = %q{2010-05-13}
+  s.date = %q{2010-05-19}
   s.description = %q{change_set for acts_as_audited}
   s.email = %q{dchelimsky@gmail.com}
   s.extra_rdoc_files = [
@@ -40,9 +40,9 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.6}
   s.summary = %q{change_set for acts_as_audited}
   s.test_files = [
-    "spec/audited_change_set/change_set_spec.rb",
+    "spec/db/schema.rb",
      "spec/audited_change_set/change_spec.rb",
-     "spec/db/schema.rb",
+     "spec/audited_change_set/change_set_spec.rb",
      "spec/spec_helper.rb"
   ]
 

data/lib/audited_change_set/change.rb

@@ -35,7 +35,8 @@ module AuditedChangeSet
 
       attr_reader :name, :old_value, :new_value
 
-      def initialize(name, new_val, old_val=nil)
+      def initialize(change_type, name, new_val, old_val=nil)
+        @change_type = change_type
         @name = name.to_s
         @new_value, @old_value = [new_val, old_val].map {|val| transform_value(val) }
       end
@@ -46,11 +47,20 @@ module AuditedChangeSet
 
       def association_class
         @association_class ||= begin
-          name.to_s =~ /(.*)_id$/
-          $1.camelize.constantize
+          if reflection && class_name = reflection.options[:class_name]
+            class_name.constantize
+          else
+            name.to_s =~ /(.*)_id$/
+            $1.camelize.constantize
+          end
         end
       end
 
+      def reflection
+        change_class = @change_type.constantize
+        @reflection ||= change_class.reflect_on_association(name_without_id.to_sym) if change_class.respond_to?(:reflect_on_association)
+      end
+
       def get_associated_object(id)
         hook(:get_associated_object, id) || association_class.find_by_id(id)
       end
@@ -58,6 +68,10 @@ module AuditedChangeSet
       def association_field?
         name.ends_with? "_id"
       end
+
+      def name_without_id
+        name.chomp "_id"
+      end
     end
 
     class << self
@@ -85,7 +99,7 @@ module AuditedChangeSet
     end
 
     def create_field(name, changes)
-      Field.new(name,*[changes].flatten.reverse) 
+      Field.new(@audit.auditable_type, name, *[changes].flatten.reverse)
     end
 
     delegate :id, :to => :@audit

data/lib/audited_change_set.rb

@@ -1,3 +1,4 @@
+require "rubygems"
 require "active_record"
 require "active_record/base"
 require "acts_as_audited"

data/spec/audited_change_set/change_set_spec.rb

@@ -35,7 +35,7 @@ module AuditedChangeSet
     end
 
     context "change_set for an auditable model" do
-      let(:auditable_model) { stub(AuditableModel, :name => 'irrelevant') }
+      let(:auditable_model) { stub(Person, :name => 'irrelevant') }
       let(:change_set) { ChangeSet.new(auditable_model) } 
 
       describe "#each" do

data/spec/audited_change_set/change_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 module AuditedChangeSet
   describe Change do
 
-    let(:audit) { double(Audit) }
+    let(:audit) { double(Audit, :auditable_type => "Person") }
 
     describe "::for_audits" do
       let(:audits) {[double(Audit), double(Audit)]}
@@ -207,13 +207,13 @@ module AuditedChangeSet
       context "field is an association" do
 
         before :each do
-          AuditableModel.stub(:find_by_id).and_return(nil)
-          AuditableModel.stub(:find_by_id).with("1").and_return(double(AuditableModel, :to_s => 'to_s_ified'))
+          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 "uses associated object for new value" do
-          changes = { "auditable_model_id" => "1"}
-          yielded_fields ={"auditable_model_id" => ["", "to_s_ified"]}
+          changes = { "person_id" => "1"}
+          yielded_fields ={"person_id" => ["", "to_s_ified"]}
 
           audit.stub(:action).and_return("create")
           audit.stub(:[]).and_return(changes)
@@ -221,13 +221,23 @@ module AuditedChangeSet
         end
 
         it "uses associated object for old value" do
-          changes = { "auditable_model_id" => ["1", nil]}
-          yielded_fields ={"auditable_model_id" => ["to_s_ified", ""]}
+          changes = { "person_id" => ["1", nil]}
+          yielded_fields ={"person_id" => ["to_s_ified", ""]}
 
           audit.stub(:action).and_return("create")
           audit.stub(:[]).and_return(changes)
           Change.new(audit).should yield_these(yielded_fields)
         end
+
+        it "reflects on association for belongs_to" do
+          changes = { "parent_id" => ["1", nil]}
+          yielded_fields ={"parent_id" => ["to_s_ified", ""]}
+
+          audit.stub(:action).and_return("create")
+          audit.stub(:[]).and_return(changes)
+
+          Change.new(audit).should yield_these(yielded_fields)
+        end
       end
 
       context "fields are specified" do
@@ -251,19 +261,19 @@ module AuditedChangeSet
 
         it "uses only the relevant fields that are associations" do
           models = [
-            double(AuditableModel, :to_s => "more revenue"),
-            double(AuditableModel, :to_s => "less cost")
+            double(Person, :to_s => "more revenue"),
+            double(Person, :to_s => "less cost")
           ]
-          AuditableModel.stub(:find_by_id) do |options|
+          Person.stub(:find_by_id) do |options|
             models.shift
           end
             
-          changes = { "title" => "irrelevant", "auditable_model_id" => ["1", "2"]}
-          yielded_fields ={"auditable_model_id" => ["less cost", "more revenue"]}
+          changes = { "title" => "irrelevant", "person_id" => ["1", "2"]}
+          yielded_fields ={"person_id" => ["less cost", "more revenue"]}
 
           audit.stub(:action).and_return("create")
           audit.stub(:[]).and_return(changes)
-          Change.new(audit, ["auditable_model_id"]).should yield_these(yielded_fields)
+          Change.new(audit, ["person_id"]).should yield_these(yielded_fields)
         end
       end
     end
@@ -280,7 +290,7 @@ module AuditedChangeSet
             yielded_args << block_arg
           end
 
-          field_class.new("anything", "new", "old")
+          field_class.new("Person", "anything", "new", "old")
           yielded_args.should == ["new", "old"]
         end
 
@@ -290,7 +300,7 @@ module AuditedChangeSet
               "#{block_arg} modified by callback"
             end
 
-            field = field_class.new("anything", "new value", "old value")
+            field = field_class.new("Person", "anything", "new value", "old value")
 
             field.new_value.should == "new value modified by callback"
             field.old_value.should == "old value modified by callback"
@@ -303,7 +313,7 @@ module AuditedChangeSet
               nil
             end
 
-            field = field_class.new("anything", "new value", "old value")
+            field = field_class.new("Person", "anything", "new value", "old value")
 
             field.new_value.should == "new value"
             field.old_value.should == "old value"
@@ -319,7 +329,7 @@ module AuditedChangeSet
             yielded_args << block_arg
           end
 
-          field_class.new("audited_model_id", 37, 42)
+          field_class.new("Person", "anything_id", 37, 42)
           yielded_args.should == [37, 42]
         end
 
@@ -329,7 +339,7 @@ module AuditedChangeSet
               "#{block_arg} returned by callback"
             end
 
-            field = field_class.new("anything_id", "new value", "old value")
+            field = field_class.new("Person", "anything_id", "new value", "old value")
 
             field.new_value.should == "new value returned by callback"
             field.old_value.should == "old value returned by callback"
@@ -339,12 +349,12 @@ module AuditedChangeSet
         context "given the callback returns nil" do
           it "uses the default strategy to find the associated object" do
             returned_object = Object.new
-            AuditableModel.stub(:find_by_id).with(37) { returned_object }
+            Person.stub(:find_by_id).with(37) { returned_object }
             field_class::hook(:get_associated_object) do |block_arg|
               nil
             end
 
-            field = field_class.new("auditable_model_id", 37)
+            field = field_class.new("Person", "person_id", 37)
             field.new_value.should == returned_object.to_s
           end
         end

data/spec/db/schema.rb

@@ -11,5 +11,7 @@ ActiveRecord::Schema.define(:version => 0) do
     t.column :created_at, :datetime
   end
 
-  create_table :auditable_models do; end
+  create_table :people do |t|
+    t.integer :parent_id
+  end
 end

data/spec/spec_helper.rb

@@ -11,5 +11,6 @@ ActiveRecord::Base.establish_connection(
 ActiveRecord::Migration.verbose = false
 load(File.dirname(__FILE__) + "/db/schema.rb")
 
-class AuditableModel < ActiveRecord::Base; end
-
+class Person < ActiveRecord::Base
+  belongs_to :parent, :class_name => name, :foreign_key => "parent_id"
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - David Chelimsky
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-13 00:00:00 -05:00
+date: 2010-05-19 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -121,7 +121,7 @@ signing_key:
 specification_version: 3
 summary: change_set for acts_as_audited
 test_files: 
-- spec/audited_change_set/change_set_spec.rb
-- spec/audited_change_set/change_spec.rb
 - spec/db/schema.rb
+- spec/audited_change_set/change_spec.rb
+- spec/audited_change_set/change_set_spec.rb
 - spec/spec_helper.rb