Cleaning up HasStateMailer

app/mailers/has_state_mailer.rb

@@ -1,9 +1,9 @@
 class HasStateMailer < ApplicationMailer
 
-  def state(to, state_machine, state_name, state_updated_at)
+  def state(to, state_machine)
     @machine = state_machine
-    @state_name = state_name
-    @updated_at = state_updated_at
+    @state_name = @machine.human_state_name
+    @updated_at = @machine.state_updated_at
     @change = @machine.state_changes.newest_first.first
     mail(:to => to,  :subject => t(:mailer_subject_state, :machine => @machine.title))
   end

app/models/concerns/has_state.rb

@@ -41,7 +41,7 @@ def in_final_state?
   # the role designed using the macro method assign_state
   def notify_state
     people = ([self.user, :tsp, :assistant] + self.class.roles_assigned_to(state)).uniq - [:requester]
-    HasStateMailer::notify_to(people, :state, self, self.human_state_name, self.state_updated_at)
+    HasStateMailer::notify_to(people, :state, self)
   end
 
   # Sets the state to 'canceled'
@@ -173,7 +173,7 @@ def roles_assigned_to(state)
     def notify_inactive_since(date)
       where(["state in (?) and state_updated_at < ?", @assigned_roles.keys, date]).joins(:user).each do |m|
         people = roles_assigned_to(m.state).map {|i| i.to_sym == :requester ? m.user : i }
-        HasStateMailer::notify_to(people, :state, m, m.human_state_name, m.state_updated_at)
+        HasStateMailer::notify_to(people, :state, m)
       end
     end
   end