app/models/active_mailer/base.rb in active_mailer-0.0.9 vs app/models/active_mailer/base.rb in active_mailer-0.0.10

@@ -1,10 +1,5 @@
-# require 'email_user'
-# require 'email_user_association'
-# require 'action_controller'
-# require 'application_helper'
-# require 'action_controller/url_writer'
 module ActiveMailer #:nodoc:
   class Base < ActiveRecord::Base
     self.abstract_class = true
 
     has_many    :email_user_associations, :as => :emailable
@@ -165,11 +160,10 @@
             options = args[0]
             options = options.with_indifferent_access
             attachments_to_set = (options[:attachments] || [])
             options.keys.each do |k|
               self.instance_eval("@#{k.to_s} = options[k]") if options[k]
-#              instance_variable_set(k.to_s, options[k])
             end
 
             attachments_to_set.each do |att|
               attachment(
                          :content_type => (att[:content_type]  || att.content_type),
@@ -187,10 +181,10 @@
           end
         end
       end
 
       def default_email_method_name
-        "#{self.name.underscore}"
+        name.underscore
       end
     end
   end
 end