axtro-ar_mailer 2.1.6 → 2.2.0

data/lib/action_mailer/ar_mailer.rb

@@ -3,29 +3,19 @@
 # ActionMailer.
 #
 
-class ActionMailer::Base
-
-  ##
-  # Set the email class for deliveries. Handle class reloading issues which prevents caching the email class.
-  #
-  @@email_class_name = 'Email'
-
-  def self.email_class=(klass)
-    @@email_class_name = klass.to_s
-  end
-
-  def self.email_class
-    @@email_class_name.constantize
+class ARMailer
+    
+  def initialize(options)
+    self.email_class = options[:email_class] || Email
   end
-
-  ##
-  # Adds +mail+ to the Email table.  Only the first From address for +mail+ is
-  # used.
-
-  def perform_delivery_activerecord(mail)
-    mail.destinations.each do |destination|
-      self.class.email_class.create :mail => mail.encoded, :to => destination, :from => mail.from.first
+  
+  attr_accessor :email_class_name, :email_class
+  
+  def deliver!(mail)
+    destinations = mail.destinations
+    sender = mail.return_path || mail.sender || mail.from_addrs.first
+    destinations.each do |destination|
+      self.email_class.create :mail => mail.encoded, :to => destination, :from => sender
     end
   end
-
 end

data/lib/action_mailer/ar_sendmail.rb

@@ -42,7 +42,7 @@ class ActionMailer::ARSendmail
   ##
   # The version of ActionMailer::ARSendmail you are running.
 
-  VERSION = '2.1.6'
+  VERSION = '2.2.0'
 
   ##
   # Maximum number of times authentication will be consecutively retried

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: axtro-ar_mailer
 version: !ruby/object:Gem::Version 
-  version: 2.1.6
+  prerelease: false
+  segments: 
+  - 2
+  - 2
+  - 0
+  version: 2.2.0
 platform: ruby
 authors: 
 - Eric Hodel
@@ -10,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-11 00:00:00 +01:00
+date: 2010-08-28 00:00:00 +02:00
 default_executable: ar_sendmail
 dependencies: []
 
@@ -54,21 +59,25 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: seattlerb
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A two-phase delivery agent for ActionMailer