bounce_email 0.2.2 → 0.2.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 9fe2e41f68b363d56e006effeefda2677e50efc2
+  data.tar.gz: e49e1d1201f050555dd8698f501e24bb1e5d0c9f
+SHA512:
+  metadata.gz: dac46158c4ec4666b8a94a2c3cde4ae426e5865e52d8e9117356f04103fe569d551a363c912f21df6fd2358867892dd9b7d20725cc27acb7424d13e752b0bd1f
+  data.tar.gz: 0fbffdd4385603a275a871f5e77471c7454364b5cc8e949869cc4300ae1aced6a0703637249c6d308db90eb2de6a8534cc93d7376e87c7958152103e004317cf

data/.gitignore

@@ -1,3 +1,4 @@
+.bundle
 doc
 pkg
 .rvmrc

data/.travis.yml

@@ -0,0 +1,7 @@
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.1.0
+  - 2.2.0
+
+script: "bundle exec rake test"

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in bounce-email2.gemspec
 gemspec

data/HISTORY.md

@@ -1,4 +1,21 @@
+## 0.2.3
+
+* add support for Gmail bounces (@saghaulor, livebg/bounce_email#4)
+
+## 0.2.2
+
+* fix a failure when an email has no subject header
+
+## 0.2.1
+
+* fix Ruby 1.8.7 compatibility
+
+## 0.2.0
+
+* new versioning due to new gem being published
+
 ## 0.1.1 2011-09-01
+
 * extended #bounced? to consider error_status and diagnostic_code as well
 * updated external gems
 

data/README.md

@@ -2,6 +2,8 @@
 
 This Ruby library is for determining the bounce type of an email message. It determines whether the bounce is hard or soft, if is an "out of office mail", etc.
 
+[![Build Status](https://api.travis-ci.org/livebg/bounce_email.png)](https://travis-ci.org/livebg/bounce_email)
+
 ## SYNOPSIS:
 
 Follow this tutorial to handle bounce-emails: [http://keakaj.com/wisdom/2007/08/08/verp-on-rails](http://keakaj.com/wisdom/2007/08/08/verp-on-rails/)
@@ -19,10 +21,19 @@ Basic usage:
      bounce.type  #  "Permanent Failure", "Persistent Transient Failure", "Success" -- BounceEmail::TYPE_HARD_FAIL, TYPE_SOFT_FAIL, TYPE_SUCCESS
 
 
+## Compatibility
+
+Compatible with Ruby 1.9.x, 2.0.0, 2.1.0, and 2.2.0.
+
+It is no longer tested under 1.8.7, but it should work there as well, if you use it with an older version of the `mime-types` gem (from the 1.x branch). `mime-types` is a dependency of the `mail` gem, which currently works with `mime-types` 1.6+, so it should be possible.
+
 ## REQUIREMENTS:
 
-Ruby 1.9 & Ruby Gem Mail is required. The gem is used for primary bounce handling, which catches about 50% of all bounces.
-For most other bounces, this gem comes in. See discussion here: [https://github.com/mikel/mail/issues/103](https://github.com/mikel/mail/issues/103)
+[mail](http://rubygems.org/gems/mail) gem is required with `bounce_email` gem.
+The `mail` gem is used for primary bounce handling, which catches about 50% of
+all bounces. `bounce_email` tries to catch remaining bounce emails.
+
+See discussion here: [https://github.com/mikel/mail/issues/103](https://github.com/mikel/mail/issues/103)
 
 ## Other implementations:
 
@@ -31,11 +42,11 @@ For most other bounces, this gem comes in. See discussion here: [https://github.
 
 ## TODO:
 
-  * code cleanup!!! Oh yes!
-  * don't hardcode comparison strings, move to external file which can be extended easily
-  * more test: extend for more bounces
-  * is OUT of office type needed? if yes implement as optional part
-  * merge into Mail Gem??
+  * Mode code cleanup.
+  * Don't hardcode comparison strings, move to external file which can be extended easily.
+  * More test: extend for more bounces.
+  * Is OUT of office type needed? If yes, implement as an optional part.
+  * Merge into Mail Gem?
 
 ## CONTRIBUTIONS:
 

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/bounce_email.gemspec

@@ -19,5 +19,9 @@ Gem::Specification.new do |s|
   ["mail"].each do |gem|
     s.add_dependency *gem.split(' ')
   end
+
+  ["rake"].each do |gem|
+    s.add_development_dependency *gem.split(' ')
+  end
 end
 

data/lib/bounce_email.rb

@@ -1,10 +1,16 @@
-# encoding: UTF-8
+# encoding: utf-8
 require 'mail'
 
 module BounceEmail
   TYPE_HARD_FAIL = 'Permanent Failure'
   TYPE_SOFT_FAIL = 'Persistent Transient Failure'
   TYPE_SUCCESS   = 'Success'
+  INLINE_MESSAGE_BEGIN_DELIMITERS = [
+    'Original message',
+    'Below this line is a copy of the message.',
+    'Message header follows'
+  ].map { |delimiter| Regexp.new(/^[-\s]*#{delimiter}[\s-]*$/) }
+  INLINE_MESSAGE_END_DELIMITER = /^[-\s]*End of message[\s-]*$/
 
   #qmail
   # Status codes are defined in rfc3463, http://www.ietf.org/rfc/rfc3463.txt
@@ -212,15 +218,24 @@ module BounceEmail
       false
     end
 
-    def get_original_mail(mail) #worked alright for me, for sure this as to be extended
-      parts = mail.body.to_s.split(/--- Below this line is a copy of the message.(\r\n\r\n|\n\n)/)
-      if parts.size > 1
-        ::Mail.new(parts.last)
-      elsif mail.parts
-        ::Mail.new(mail.parts[2].body)
+    def get_original_mail(mail) #worked alright for me, for sure this has to be extended
+      if mail.multipart?
+        ::Mail.new(mail.parts.last)
+      elsif i = index_of_original_message_delimiter(mail)
+        ::Mail.new(extract_original_message_after_delimiter(mail, i))
       end
     rescue => e
       nil
     end
+
+    def index_of_original_message_delimiter(mail)
+      INLINE_MESSAGE_BEGIN_DELIMITERS.find_index { |delimiter| self.body.to_s.match delimiter }
+    end
+
+    def extract_original_message_after_delimiter(mail, delimiter_index)
+      delimiter = INLINE_MESSAGE_BEGIN_DELIMITERS[delimiter_index]
+      message = mail.body.to_s.split(delimiter).last
+      message.split(INLINE_MESSAGE_END_DELIMITER).first.strip if message.match(INLINE_MESSAGE_END_DELIMITER)
+    end
   end
-end
+end

data/test/bounce_email_test.rb

@@ -107,11 +107,27 @@ class BounceEmailTest < Test::Unit::TestCase
     assert_not_nil bounce.original_mail
   end
 
-  #Test regexp in when parsing the original email
-  def test_multipart
-   bounce = test_bounce('tt_bounce_25')
-    assert bounce.bounced?
-    assert_not_nil bounce.original_mail
+  def test_original_message_with_multipart_mails
+    multipart_mails = %w(03 04 05 07 10 11 13 15 16 23 24)
+    multipart_mails.map do |file|
+      mail = File.join(File.dirname(__FILE__), 'bounces', "tt_bounce_#{file}.txt")
+      bounce = BounceEmail::Mail.new Mail.read(mail)
+      assert_not_nil bounce.original_mail
+    end
+  end
+
+  def test_original_message_without_inline_original_message
+    bounce = test_bounce('tt_bounce_01')
+    assert_nil bounce.original_mail
+  end
+
+  def test_original_message_with_inline_original_message
+    mails_with_inline_original_message = %w(06 08 09 12_soft 14 17 18 19 20 21 22 25)
+    mails_with_inline_original_message.map do |file|
+      mail = File.join(File.dirname(__FILE__), 'bounces', "tt_bounce_#{file}.txt")
+      bounce = BounceEmail::Mail.new Mail.read(mail)
+      assert_not_nil bounce.original_mail
+    end
   end
 
   private

metadata

@@ -1,15 +1,9 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: bounce_email
-version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 2
-  version: 0.2.2
+version: !ruby/object:Gem::Version
+  version: 0.2.3
 platform: ruby
-authors: 
+authors:
 - Tobias Bielohlawek
 - Agris Ameriks
 - Pedro Visintin
@@ -17,34 +11,45 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-28 00:00:00 +03:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2015-04-01 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: mail
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-description: fork of whatcould/bounce-email incl. patches from wakiki, peterpunk, agowan & rngtng
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: fork of whatcould/bounce-email incl. patches from wakiki, peterpunk,
+  agowan & rngtng
 email: tobi@rngtng.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .gitignore
+files:
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - HISTORY.md
 - Manifest.txt
@@ -101,41 +106,30 @@ files:
 - test/non_bounces/tt_1234211024.txt
 - test/non_bounces/tt_1234241664.txt
 - test/test_helper.rb
-has_rdoc: true
 homepage: http://github.com/mitio/bounce_email
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Detect kind of bounced email
-test_files: 
+test_files:
 - test/bounce_email_test.rb
 - test/bounces/malformed_bounce_01.txt
 - test/bounces/tt_1234175799.txt