astrotrain 0.6.1 → 0.6.2

data/astrotrain.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'astrotrain'
-  s.version           = '0.6.1'
-  s.date              = '2012-04-13'
+  s.version           = '0.6.2'
+  s.date              = '2012-04-18'
   s.rubyforge_project = 'astrotrain'
 
   ## Make sure your summary is short. The description may be as long
@@ -65,6 +65,7 @@ Gem::Specification.new do |s|
     test/fixtures/bad_email_format.txt
     test/fixtures/basic.txt
     test/fixtures/custom.txt
+    test/fixtures/email_in_body.txt
     test/fixtures/fwd.txt
     test/fixtures/gb2312_encoding.txt
     test/fixtures/gb2312_encoding_invalid.txt

data/lib/astrotrain.rb

@@ -1,5 +1,5 @@
 module Astrotrain
-  VERSION = '0.6.1'
+  VERSION = '0.6.2'
 
   require 'utf8'
   require 'charlock_holmes'
@@ -21,7 +21,7 @@ module Astrotrain
   def self.deliver(message, destination, options = {})
     uri   = Addressable::URI.parse(destination.to_s)
     klass = Transports.load(uri.scheme)
-    klass.deliver(message, destination, 
+    klass.deliver(message, destination,
                   :recipient => options[:recipient],
                   :extra     => options[:payload])
   end

data/lib/astrotrain/message.rb

@@ -6,7 +6,7 @@ require 'set'
 module Astrotrain
   # Wrapper around a TMail object
   class Message
-    EMAIL_REGEX = /[\w\.\_\%\+\-]+[^\.]@[\w\-\_\.]+/
+    EMAIL_REGEX = /[\w\.\_\%\+\-]+[^\s\.]@[\w\-\_\.]+/
 
     # Reference to the internal Mail object that parsed the raw email.
     attr_reader :mail
@@ -23,7 +23,8 @@ module Astrotrain
       x-original-to received)
 
     # This is the default order that Astrotrain will search for a matching
-    # recipient.
+    # recipient.  Set this to a different order.  Add "body" to the list if
+    # you want to scan the body for email addresses with EMAIL_REGEX.
     self.recipient_header_order = %w(original_to delivered_to to)
 
     # Public: Parses the raw email headers into a Astrotrain::Message instance.
@@ -63,7 +64,6 @@ module Astrotrain
     def recipients(order = nil)
       if !@recipients.key?(order)
         order = self.class.recipient_header_order if order.blank?
-        order.push :body
         recipients = []
 
         emails = order.inject([]) do |memo, key|
@@ -183,7 +183,9 @@ module Astrotrain
     def recipients_from_body
       @recipients_from_body ||= begin
         emails_from_body = body.scan(EMAIL_REGEX)
-        address_list_for(emails_from_body)
+        address_list_for(emails_from_body, true)
+      rescue Mail::Field::ParseError
+        []
       end
     end
 
@@ -224,17 +226,22 @@ module Astrotrain
 
     # Uses Mail::AddressList to parse the given comma separated emails.
     #
-    # emails - Array of String emails (foo@example.com, Bar <bar@example.com...)
+    # emails - Array of String email headers.
+    #          Example: ["foo@example.com, Bar <bar@example.com>", ...]
     #
     # Returns Array of Mail::Address objects
-    def address_list_for(emails)
+    def address_list_for(emails, retried = false)
       emails = emails * ", "
       list   = Mail::AddressList.new(self.class.unescape(emails))
       addrs  = list.addresses.each { |a| a.decoded }
       addrs.uniq!
       addrs
     rescue Mail::Field::ParseError
-      address_list_for(emails.scan(EMAIL_REGEX))
+      if retried
+        raise
+      else
+        address_list_for(emails.scan(EMAIL_REGEX), true)
+      end
     end
 
     # Stolen from Rack/Camping, remove the "+" => " " translation

data/test/fixtures/email_in_body.txt

@@ -0,0 +1,19 @@
+Delivered-To: "Processor" <processor@astrotrain.com>
+Message-ID: <a16be7390810161014n52b603e9k1aa6bb803c6735aa@mail.gmail.com>
+Received: by 10.231.149.194 with SMTP id u2mr924086ibv.32.1298067999839; Fri, 18 Feb 2011 14:26:39 -0800
+Received: by 10.231.153.2 with HTTP; Fri, 18 Feb 2011 14:26:39 -0800
+Date: Thu, 16 Oct 2008 10:14:18 -0700
+From: Bob <user@example.com>
+To: Processor <processor@astrotrain.com>
+Cc: Fred <fred@example.com>
+Subject: Fwd: blah blah
+MIME-Version: 1.0
+X-Custom: reply
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 7bit
+Content-Disposition: inline
+
+---------- Forwarded message ----------
+booya. @technoweenie
+foo@bar.com
+

data/test/message_test.rb

@@ -124,7 +124,7 @@ class MessageParsingTest < Test::Unit::TestCase
     msg = astrotrain(:multiple_with_body_recipients)
 
     assert_equal %w(processor@astrotrain.com other@example.com processor+foobar@astrotrain.com processor+blah@astrotrain.com), 
-      msg.recipients
+      msg.recipients(Astrotrain::Message.recipient_header_order + %w(body))
   end
 
   test "with only HTML body in a multipart message" do
@@ -173,6 +173,11 @@ class MessageParsingTest < Test::Unit::TestCase
     assert_equal([], msg.recipients_from_to)
   end
 
+  test "parsing emails from body" do
+    msg = astrotrain :email_in_body
+    assert_equal %w(foo@bar.com), msg.recipients_from_body.map(&:address)
+  end
+
   test "saves path of parsed email" do
     path = mail(:basic)
     msg  = Astrotrain::Message.read(path)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: astrotrain
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-13 00:00:00.000000000 Z
+date: 2012-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: utf8
-  requirement: &70182998287440 !ruby/object:Gem::Requirement
+  requirement: &70356752937340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.1.8
   type: :runtime
   prerelease: false
-  version_requirements: *70182998287440
+  version_requirements: *70356752937340
 - !ruby/object:Gem::Dependency
   name: mail
-  requirement: &70182998286960 !ruby/object:Gem::Requirement
+  requirement: &70356752936700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70182998286960
+  version_requirements: *70356752936700
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70182998286480 !ruby/object:Gem::Requirement
+  requirement: &70356752936160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70182998286480
+  version_requirements: *70356752936160
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70182998286000 !ruby/object:Gem::Requirement
+  requirement: &70356752935300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70182998286000
+  version_requirements: *70356752935300
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &70182998285520 !ruby/object:Gem::Requirement
+  requirement: &70356752934040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 2.2.4
   type: :runtime
   prerelease: false
-  version_requirements: *70182998285520
+  version_requirements: *70356752934040
 - !ruby/object:Gem::Dependency
   name: charlock_holmes
-  requirement: &70182998285040 !ruby/object:Gem::Requirement
+  requirement: &70356752922600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.6.8
   type: :runtime
   prerelease: false
-  version_requirements: *70182998285040
+  version_requirements: *70356752922600
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &70182998284660 !ruby/object:Gem::Requirement
+  requirement: &70356752919900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70182998284660
+  version_requirements: *70356752919900
 description: email => http post
 email: technoweenie@gmail.com
 executables: []
@@ -108,6 +108,7 @@ files:
 - test/fixtures/bad_email_format.txt
 - test/fixtures/basic.txt
 - test/fixtures/custom.txt
+- test/fixtures/email_in_body.txt
 - test/fixtures/fwd.txt
 - test/fixtures/gb2312_encoding.txt
 - test/fixtures/gb2312_encoding_invalid.txt
@@ -146,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: astrotrain
-rubygems_version: 1.8.11
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 2
 summary: email => http post