adzap-ar_mailer 2.1.2 → 2.1.3

data/History.txt

@@ -1,3 +1,10 @@
+= 2.1.3
+
+* Tests now pass on gem install
+* Removed deprecated ActionMailer::ARMailer class
+* Bugs fixed
+  * Fixed issue with pre-loading ActionMailer. No use ActionMailer::Base.email_class directly rather than store in ARSendmail instance var so no need to pre-load ActionMailer.
+
 = 2.1.2
 
 * Bugs fixed

data/Rakefile

@@ -16,8 +16,8 @@ ar_mailer_gemspec = Gem::Specification.new do |s|
   s.description = %q{Even delivering email to the local machine may take too long when you have to send hundreds of messages.  ar_mailer allows you to store messages into the database for later delivery by a separate process, ar_sendmail.}
   s.email = %q{adam.meehan@gmail.com}
   s.executables = ["ar_sendmail"]
-  s.extra_rdoc_files = ["History.txt", "LICENSE.txt", "Manifest.txt", "README.rdoc"]
-  s.files = ["History.txt", "LICENSE.txt", "Manifest.txt", "README.rdoc", "Rakefile", "bin/ar_sendmail", "generators/ar_mailer/ar_mailer_generator.rb", "generators/ar_mailer/templates/migration.rb", "generators/ar_mailer/templates/model.rb", "lib/action_mailer/ar_mailer.rb", "lib/action_mailer/ar_sendmail.rb", "lib/smtp_tls.rb", "share/bsd/ar_sendmail", "share/linux/ar_sendmail", "share/linux/ar_sendmail.conf", "test/resources/action_mailer.rb", "test/test_armailer.rb", "test/test_arsendmail.rb", "test/test_helper.rb"]
+  s.extra_rdoc_files = ["History.txt", "LICENSE.txt", "README.rdoc"]
+  s.files = ["History.txt", "LICENSE.txt", "README.rdoc", "Rakefile", "bin/ar_sendmail", "generators/ar_mailer/ar_mailer_generator.rb", "generators/ar_mailer/templates/migration.rb", "generators/ar_mailer/templates/model.rb", "lib/action_mailer/ar_mailer.rb", "lib/action_mailer/ar_sendmail.rb", "lib/smtp_tls.rb", "share/bsd/ar_sendmail", "share/linux/ar_sendmail", "share/linux/ar_sendmail.conf", "test/resources/action_mailer.rb", "test/test_armailer.rb", "test/test_arsendmail.rb", "test/test_helper.rb"]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/adzap/ar_mailer}
   s.rdoc_options = ["--main", "README.rdoc"]
@@ -31,20 +31,16 @@ Rake::GemPackageTask.new(ar_mailer_gemspec) do |pkg|
   pkg.gem_spec = ar_mailer_gemspec
 end
  
-namespace :gem do
-  namespace :spec do
-    desc "Update ar_mailer.gemspec"
-    task :generate do
-      File.open("ar_mailer.gemspec", "w") do |f|
-        f.puts(ar_mailer_gemspec.to_ruby)
-      end
-    end
+desc "Update ar_mailer.gemspec"
+task :make_spec do
+  File.open("ar_mailer.gemspec", "w") do |f|
+    f.puts(ar_mailer_gemspec.to_ruby)
   end
 end
  
 desc "Build packages and install"
 task :install => :package do
-  sh %{sudo gem install --local pkg/ar_mailer-#{ActionMailer::ARSendmail::VERSION}}
+  sh %{sudo gem install --local --test pkg/ar_mailer-#{ActionMailer::ARSendmail::VERSION}}
 end
 
 desc 'Default: run unit tests.'

data/lib/action_mailer/ar_mailer.rb

@@ -1,18 +1,8 @@
-require 'action_mailer'
-
 ##
 # Adds sending email through an ActiveRecord table as a delivery method for
 # ActionMailer.
 #
 
-class ActionMailer::ARMailer < ActionMailer::Base
-
-  def self.inherited(sub)
-    logger.warn('The ActionMailer::ARMailer class has been deprecated. Will be removed in version 2.1. Just use ActionMailer::Base.')
-  end
-
-end
-
 class ActionMailer::Base
 
   ##

data/lib/action_mailer/ar_sendmail.rb

@@ -2,8 +2,6 @@ require 'optparse'
 require 'net/smtp'
 require 'smtp_tls' unless Net::SMTP.instance_methods.include?("enable_starttls_auto")
 require 'rubygems'
-require 'action_mailer'
-require 'action_mailer/ar_mailer'
 
 ##
 # Hack in RSET
@@ -38,12 +36,14 @@ end
 # * --daemon
 # * --mailq
 
+module ActionMailer; end
+
 class ActionMailer::ARSendmail
 
   ##
   # The version of ActionMailer::ARSendmail you are running.
 
-  VERSION = '2.1.2'
+  VERSION = '2.1.3'
 
   ##
   # Maximum number of times authentication will be consecutively retried
@@ -70,10 +70,6 @@ class ActionMailer::ARSendmail
 
   attr_accessor :verbose
  
-  ##
-  # ActiveRecord class that holds emails
-
-  attr_reader :email_class
 
   ##
   # True if only one delivery attempt will be made per call to run
@@ -337,7 +333,6 @@ class ActionMailer::ARSendmail
 
     @batch_size = options[:BatchSize]
     @delay = options[:Delay]
-    @email_class = ActionMailer::Base.email_class
     @once = options[:Once]
     @verbose = options[:Verbose]
     @max_age = options[:MaxAge]
@@ -353,7 +348,7 @@ class ActionMailer::ARSendmail
     return if @max_age == 0
     timeout = Time.now - @max_age
     conditions = ['last_send_attempt > 0 and created_on < ?', timeout]
-    mail = @email_class.destroy_all conditions
+    mail = ActionMailer::Base.email_class.destroy_all conditions
 
     log "expired #{mail.length} emails from the queue"
   end
@@ -432,7 +427,7 @@ class ActionMailer::ARSendmail
   def find_emails
     options = { :conditions => ['last_send_attempt < ?', Time.now.to_i - 300] }
     options[:limit] = batch_size unless batch_size.nil?
-    mail = @email_class.find :all, options
+    mail = ActionMailer::Base.email_class.find :all, options
 
     log "found #{mail.length} emails to send"
     mail

data/test/test_arsendmail.rb

@@ -73,7 +73,6 @@ Last send attempt: Thu Aug 10 11:40:05 %s 2006
     @sm = ActionMailer::ARSendmail.new
 
     assert_equal 60, @sm.delay
-    assert_equal Email, @sm.email_class
     assert_equal nil, @sm.once
     assert_equal nil, @sm.verbose
     assert_equal nil, @sm.batch_size
@@ -82,19 +81,9 @@ Last send attempt: Thu Aug 10 11:40:05 %s 2006
                                        :Once => true, :BatchSize => 1000
 
     assert_equal 75, @sm.delay
-    assert_equal Email, @sm.email_class
     assert_equal true, @sm.once
     assert_equal true, @sm.verbose
     assert_equal 1000, @sm.batch_size
-
-    ActionMailer::Base.email_class = Newsletter
-    @sm = ActionMailer::ARSendmail.new
-
-    assert_equal 60, @sm.delay
-    assert_equal Newsletter, @sm.email_class
-    assert_equal nil, @sm.once
-    assert_equal nil, @sm.verbose
-    assert_equal nil, @sm.batch_size
   end
 
   def test_class_parse_args_batch_size

data/test/test_helper.rb

@@ -1,7 +1,7 @@
 require 'test/unit'
 require 'rubygems'
 require 'active_support'
-require 'resources/action_mailer'
+require 'test/resources/action_mailer'
 require 'minitest/autorun'
 require 'mocha'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: adzap-ar_mailer
 version: !ruby/object:Gem::Version 
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors: 
 - Eric Hodel
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-30 00:00:00 -07:00
+date: 2009-07-06 00:00:00 -07:00
 default_executable: ar_sendmail
 dependencies: []
 
@@ -23,12 +23,10 @@ extensions: []
 extra_rdoc_files: 
 - History.txt
 - LICENSE.txt
-- Manifest.txt
 - README.rdoc
 files: 
 - History.txt
 - LICENSE.txt
-- Manifest.txt
 - README.rdoc
 - Rakefile
 - bin/ar_sendmail

data/Manifest.txt

@@ -1,15 +0,0 @@
-History.txt
-LICENSE.txt
-Manifest.txt
-README.txt
-Rakefile
-bin/ar_sendmail
-lib/action_mailer/ar_mailer.rb
-lib/action_mailer/ar_sendmail.rb
-lib/smtp_tls.rb
-share/bsd/ar_sendmail
-share/linux/ar_sendmail
-share/linux/ar_sendmail.conf
-test/action_mailer.rb
-test/test_armailer.rb
-test/test_arsendmail.rb