action_mailer_verp 0.2.1 → 0.3.0

data/Rakefile

@@ -11,7 +11,7 @@ begin
     gem.homepage = "http://github.com/jamesgolick/action_mailer_verp"
     gem.authors = ["James Golick"]
     gem.add_development_dependency "rspec", ">= 1.2.9"
-    gem.add_dependency "actionmailer", "~> 2.3.1"
+    gem.add_dependency "actionmailer", "~> 3.0.5"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/action_mailer_verp.gemspec

@@ -1,49 +1,47 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{action_mailer_verp}
-  s.version = "0.2.1"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James Golick"]
-  s.date = %q{2010-10-04}
+  s.date = %q{2011-03-21}
   s.description = %q{Send VERP emails with actionmailer.}
   s.email = %q{jamesgolick@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "action_mailer_verp.gemspec",
-     "lib/action_mailer_verp.rb",
-     "lib/action_mailer_verp/bounce_processor.rb",
-     "lib/action_mailer_verp/pop_fetcher.rb",
-     "spec/action_mailer_verp_spec.rb",
-     "spec/bounce_processor_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb",
-     "spec/templates/my_mailer/multiple_froms.erb",
-     "spec/templates/my_mailer/multiple_recipients.erb",
-     "spec/templates/my_mailer/some_mail.erb"
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "action_mailer_verp.gemspec",
+    "lib/action_mailer_verp.rb",
+    "lib/action_mailer_verp/bounce_processor.rb",
+    "lib/action_mailer_verp/pop_fetcher.rb",
+    "spec/action_mailer_verp_spec.rb",
+    "spec/bounce_processor_spec.rb",
+    "spec/spec.opts",
+    "spec/spec_helper.rb",
+    "spec/templates/my_mailer/multiple_froms.erb",
+    "spec/templates/my_mailer/multiple_recipients.erb",
+    "spec/templates/my_mailer/some_mail.erb"
   ]
   s.homepage = %q{http://github.com/jamesgolick/action_mailer_verp}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Send VERP emails with actionmailer.}
   s.test_files = [
     "spec/action_mailer_verp_spec.rb",
-     "spec/bounce_processor_spec.rb",
-     "spec/spec_helper.rb"
+    "spec/bounce_processor_spec.rb",
+    "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -52,14 +50,14 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_runtime_dependency(%q<actionmailer>, ["~> 2.3.1"])
+      s.add_runtime_dependency(%q<actionmailer>, ["~> 3.0.5"])
     else
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_dependency(%q<actionmailer>, ["~> 2.3.1"])
+      s.add_dependency(%q<actionmailer>, ["~> 3.0.5"])
     end
   else
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
-    s.add_dependency(%q<actionmailer>, ["~> 2.3.1"])
+    s.add_dependency(%q<actionmailer>, ["~> 3.0.5"])
   end
 end
 

data/lib/action_mailer_verp.rb

@@ -1,4 +1,4 @@
-require 'actionmailer'
+require 'action_mailer'
 require 'action_mailer_verp/bounce_processor'
 require 'action_mailer_verp/pop_fetcher'
 
@@ -7,14 +7,10 @@ module ActionMailerVerp
     class MultipleFromsError < ArgumentError; end
     class MultipleRecipientsError < ArgumentError; end
 
-    def self.included(klass)
-      klass.send(:alias_method_chain, :create_mail, :verp)
-    end
-
-    def create_mail_with_verp
-      create_mail_without_verp
-      verpify(@mail)
-      @mail
+    def mail(*args, &block)
+      m = super
+      verpify(m)
+      m
     end
 
     private
@@ -27,9 +23,11 @@ module ActionMailerVerp
           raise MultipleRecipientsError, "Multiple recipients not supported."
         end
 
-        from                = mail.from_addrs.first
-        local               = "#{from.local}+#{mail.to.first.gsub("@", "=")}"
-        return_path         = "#{local}@#{from.domain}"
+        from_parts          = mail.from_addrs.first.split(/@/)
+        from_local          = from_parts.first
+        from_domain         = from_parts.last
+        local               = "#{from_local}+#{mail.to.first.gsub("@", "=")}"
+        return_path         = "#{local}@#{from_domain}"
         mail['return-path'] = return_path
       end
   end

data/spec/action_mailer_verp_spec.rb

@@ -3,44 +3,44 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 describe "ActionMailerVerp" do
   class MyMailer < ActionMailer::Base
     include ActionMailerVerp::VERPMail
-    self.template_root = File.dirname(__FILE__) + "/templates"
+    prepend_view_path File.dirname(__FILE__) + "/templates"
 
     def some_mail(address)
-      from "MyCompany <donotreply@mycompany.com>"
-      recipients address
-      subject "An exciting new email from MyCompany"
+      mail :from    => "MyCompany <donotreply@mycompany.com>",
+           :to      => address,
+           :subject => "An exciting new email from MyCompany"
     end
 
     def multiple_froms
-      from ["MyCompany <donotreply@mycompany.com>", "AnotherFrom <asdf@bsdf.com>"]
-      recipients "asdf@bsdf.com"
-      subject "An exciting new email from MyCompany"
+      mail :from    => ["MyCompany <donotreply@mycompany.com>", "AnotherFrom <asdf@bsdf.com>"],
+           :to      => "asdf@bsdf.com",
+           :subject => "An exciting new email from MyCompany"
     end
 
     def multiple_recipients
-      from "MyCompany <donotreply@mycompany.com>"
-      recipients ["asdf@bsdf.com", "bsdf@csdf.com"]
-      subject "An exciting new email from MyCompany"
+      mail :from    => "MyCompany <donotreply@mycompany.com>",
+           :to      => ["asdf@bsdf.com", "bsdf@csdf.com"],
+           :subject => "An exciting new email from MyCompany"
     end
   end
 
   describe "ActionMailerVerp::VERPMail" do
     describe "with one from address" do
       before do
-        @mail = MyMailer.create_some_mail("james@example.com")
+        @mail = MyMailer.some_mail("james@example.com")
       end
 
       it "sets the return-path to the VERP address" do
-        addr = @mail['return-path'].addr
-        addr.local.should == "donotreply+james=example.com"
-        addr.domain.should == "mycompany.com"
+        addr = @mail['return-path'].value.split(/@/)
+        addr.first.should == "donotreply+james=example.com"
+        addr.last.should == "mycompany.com"
       end
     end
-    
+
     describe "with multiple from addresses" do
       it "raises an error because that is not supported" do
         lambda {
-          MyMailer.create_multiple_froms
+          MyMailer.multiple_froms
         }.should raise_error(ActionMailerVerp::VERPMail::MultipleFromsError)
       end
     end
@@ -48,7 +48,7 @@ describe "ActionMailerVerp" do
     describe "with multiple recipients" do
       it "raises an error because that is not supported" do
         lambda {
-          MyMailer.create_multiple_recipients
+          MyMailer.multiple_recipients
         }.should raise_error(ActionMailerVerp::VERPMail::MultipleRecipientsError)
       end
     end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: action_mailer_verp
 version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 1
-  version: 0.2.1
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - James Golick
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-04 00:00:00 -07:00
+date: 2011-03-21 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,6 +26,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 1
         - 2
@@ -40,11 +42,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
-        - 2
         - 3
-        - 1
-        version: 2.3.1
+        - 0
+        - 5
+        version: 3.0.5
   type: :runtime
   version_requirements: *id002
 description: Send VERP emails with actionmailer.
@@ -58,7 +61,6 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -79,8 +81,8 @@ homepage: http://github.com/jamesgolick/action_mailer_verp
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -88,6 +90,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -96,6 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC