diff --git a/lib/state_machine/audit_trail/transition_auditing.rb b/lib/state_machine/audit_trail/transition_auditing.rb index 96ad4e1..5c72a34 100644 --- a/lib/state_machine/audit_trail/transition_auditing.rb +++ b/lib/state_machine/audit_trail/transition_auditing.rb @@ -12,22 +12,28 @@ module StateMachine::AuditTrail::TransitionAuditing def store_audit_trail(options = {}) state_machine = self state_machine.transition_class_name = (options[:to] || default_transition_class_name).to_s + state_machine.setup_backend(options[:context_to_log]) + state_machine.after_transition do |object, transition| - state_machine.audit_trail(options[:context_to_log]).log(object, transition.event, transition.from, transition.to) + state_machine.backend.log(object, transition.event, transition.from, transition.to) end unless state_machine.action == nil state_machine.owner_class.after_create do |object| if !object.send(state_machine.attribute).nil? - state_machine.audit_trail(options[:context_to_log]).log(object, nil, nil, object.send(state_machine.attribute)) + state_machine.backend.log(object, nil, nil, object.send(state_machine.attribute)) end end end end + def setup_backend(context_to_log = nil) + @backend = StateMachine::AuditTrail::Backend.create_for_transition_class(transition_class, self.owner_class, context_to_log) + end + # Public returns an instance of the class which does the actual audit trail logging - def audit_trail(context_to_log = nil) - @transition_auditor ||= StateMachine::AuditTrail::Backend.create_for_transition_class(transition_class, self.owner_class, context_to_log) + def backend + @backend end private diff --git a/spec/helpers/active_record.rb b/spec/helpers/active_record.rb index d07975a..8d5a9a1 100644 --- a/spec/helpers/active_record.rb +++ b/spec/helpers/active_record.rb @@ -153,6 +153,10 @@ class ActiveRecordTestModelWithMultipleStateMachines < ActiveRecord::Base end module SomeNamespace + class ActiveRecordTestModelStateTransition < ActiveRecord::Base + belongs_to :test_model + end + class ActiveRecordTestModel < ActiveRecord::Base state_machine :state, :initial => :waiting do # log initial state? @@ -169,13 +173,6 @@ class ActiveRecordTestModel < ActiveRecord::Base end end -module SomeNamespace - class ActiveRecordTestModelStateTransition < ActiveRecord::Base - belongs_to :test_model - end -end - - def create_transition_table(owner_class, state, add_context = false) class_name = "#{owner_class.name}#{state.to_s.camelize}Transition" ActiveRecord::Base.connection.create_table(class_name.tableize) do |t|