adzap-ar_mailer 2.1.1 → 2.1.2

data/History.txt

@@ -1,9 +1,19 @@
+= 2.1.2
+
+* Bugs fixed
+  * Require ar_mailer in ar_sendmail since the change to remove TableName and use email_class
+
+= 2.1.1
+ 
+ * Force gem rebuild
+
 = 2.1.0
 
 * Switched to using a Rails generator for migration and model files. The ar_sendmail options have been removed.
 
 = 2.0.2
 
+* Removed TableName option from ar_sendmail options as its redundant. The Rails environment gets loaded so the settings for email class also get loaded
 * Bugs fixed
   * Email class reloading issue in development mode causing AR email class defaults to be lost when cached
 

data/Rakefile

@@ -17,7 +17,7 @@ ar_mailer_gemspec = Gem::Specification.new do |s|
   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/action_mailer.rb", "test/test_armailer.rb", "test/test_arsendmail.rb"]
+  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.has_rdoc = true
   s.homepage = %q{http://github.com/adzap/ar_mailer}
   s.rdoc_options = ["--main", "README.rdoc"]
@@ -53,6 +53,6 @@ task :default => :test
 desc 'Test the ar_mailer gem.'
 Rake::TestTask.new(:test) do |t|
   t.libs << 'lib' << 'test'
-  t.pattern = 'test/**/test_*.rb'
+  t.test_files = FileList['test/**/test_*.rb'].exclude("test/test_helper.rb")
   t.verbose = true
 end

data/lib/action_mailer/ar_sendmail.rb

@@ -2,6 +2,8 @@ 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
@@ -21,8 +23,6 @@ class SMTP # :nodoc:
 end
 end
 
-module ActionMailer; end # :nodoc:
-
 ##
 # ActionMailer::ARSendmail delivers email from the email table to the
 # SMTP server configured in your application's config/environment.rb.
@@ -43,7 +43,7 @@ class ActionMailer::ARSendmail
   ##
   # The version of ActionMailer::ARSendmail you are running.
 
-  VERSION = '2.1.1'
+  VERSION = '2.1.2'
 
   ##
   # Maximum number of times authentication will be consecutively retried

data/test/{action_mailer.rb → resources/action_mailer.rb}

@@ -18,8 +18,7 @@ class Net::SMTP
     attr_reader :send_message_block
     attr_accessor :reset_called
 
-    send :remove_method, :start
-
+    # send :remove_method, :start
   end
 
   def self.on_send_message(&block)
@@ -184,9 +183,7 @@ class Email
 
 end
 
-Mail = Email
-
-class Newsletter < Email; end
+Newsletter = Email
 
 class String
   def classify
@@ -198,4 +195,3 @@ class String
   end
 
 end
-

data/test/test_armailer.rb

@@ -1,11 +1,4 @@
-require 'test/unit'
-require 'rubygems'
-require 'active_support'
-require 'action_mailer'
-require 'action_mailer/ar_mailer'
-
-##
-# Pretend mailer
+require File.expand_path(File.dirname(__FILE__) + '/test_helper')
 
 class Mailer < ActionMailer::Base
   self.delivery_method = :activerecord
@@ -25,15 +18,15 @@ class TestARMailer < Test::Unit::TestCase
     Mailer.email_class = Email
 
     Email.records.clear
-    Mail.records.clear
+    Newsletter.records.clear
   end
 
   def test_self_email_class_equals
-    Mailer.email_class = Mail
+    Mailer.email_class = Newsletter
 
     Mailer.deliver_mail
 
-    assert_equal 2, Mail.records.length
+    assert_equal 2, Newsletter.records.length
   end
 
   def test_perform_delivery_activerecord

data/test/test_arsendmail.rb

@@ -1,9 +1,4 @@
-require 'test/unit'
-require 'action_mailer'
-require 'action_mailer/ar_sendmail'
-require 'rubygems'
-require 'minitest/autorun'
-require 'mocha'
+require File.expand_path(File.dirname(__FILE__) + '/test_helper')
 
 class ActionMailer::ARSendmail
   attr_accessor :slept

data/test/test_helper.rb

@@ -0,0 +1,9 @@
+require 'test/unit'
+require 'rubygems'
+require 'active_support'
+require 'resources/action_mailer'
+require 'minitest/autorun'
+require 'mocha'
+
+require 'action_mailer/ar_mailer'
+require 'action_mailer/ar_sendmail'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: adzap-ar_mailer
 version: !ruby/object:Gem::Version 
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors: 
 - Eric Hodel
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-29 00:00:00 -07:00
+date: 2009-06-30 00:00:00 -07:00
 default_executable: ar_sendmail
 dependencies: []
 
@@ -41,9 +41,10 @@ files:
 - share/bsd/ar_sendmail
 - share/linux/ar_sendmail
 - share/linux/ar_sendmail.conf
-- test/action_mailer.rb
+- test/resources/action_mailer.rb
 - test/test_armailer.rb
 - test/test_arsendmail.rb
+- test/test_helper.rb
 has_rdoc: false
 homepage: http://github.com/adzap/ar_mailer
 post_install_message: