email_reply_parser 0.5.7 → 0.5.8

data/README.md

@@ -21,7 +21,7 @@ To parse reply body:
 
 If you have a question about the behavior and formatting of email replies on GitHub, check out [support][support].  If you have a specific issue regarding this library, then hit up the [Issues][issues].
 
-[support]: http://support.github.com/
+[support]: https://github.com/support
 [issues]: https://github.com/github/email_reply_parser/issues
 
 ## Installation
@@ -52,14 +52,8 @@ The best way to get your changes merged back into core is as follows:
 
 ### Quoted Headers
 
-Quoted headers aren't picked up if there's an extra line break:
-
-    On <date>, <author> wrote:
-
-    > blah
-
-Also, they're not picked up if the email client breaks it up into
-multiple lines.  GMail breaks up any lines over 80 characters for you.
+Quoted headers aren't picked up if the email client breaks it up into multiple
+lines.  GMail breaks up any lines over 80 characters for you.
 
     On <date>, <author>
     wrote:
@@ -77,7 +71,7 @@ signatures:
 
     Hello
 
-    -- 
+    --
     Rick
 
 Not everyone follows this convention:
@@ -91,4 +85,3 @@ Not everyone follows this convention:
     **********************DISCLAIMER***********************************
     * Note: blah blah blah                                            *
     **********************DISCLAIMER***********************************
-

data/email_reply_parser.gemspec

@@ -67,6 +67,8 @@ Gem::Specification.new do |s|
     Rakefile
     email_reply_parser.gemspec
     lib/email_reply_parser.rb
+    script/release
+    script/test
     test/email_reply_parser_test.rb
     test/emails/correct_sig.txt
     test/emails/email_1_1.txt
@@ -86,6 +88,7 @@ Gem::Specification.new do |s|
     test/emails/email_one_is_not_on.txt
     test/emails/email_sent_from_my_not_signature.txt
     test/emails/email_sig_delimiter_in_middle_of_line.txt
+    test/emails/greedy_on.txt
     test/emails/pathological.txt
   ]
   # = MANIFEST =

data/lib/email_reply_parser.rb

@@ -30,7 +30,7 @@ require 'strscan'
 #
 # [mail]: https://github.com/mikel/mail
 class EmailReplyParser
-  VERSION = "0.5.7"
+  VERSION = "0.5.8"
 
   # Public: Splits an email body into a list of Fragments.
   #
@@ -84,7 +84,7 @@ class EmailReplyParser
 
       # Check for multi-line reply headers. Some clients break up
       # the "On DATE, NAME <EMAIL> wrote:" line into multiple lines.
-      if text =~ /^(On\s(.+?)wrote:)$/nm
+      if text =~ /^(?!On.*On\s.+?wrote:)(On\s(.+?)wrote:)$/nm
         # Remove all new lines from the reply header.
         text.gsub! $1, $1.gsub("\n", " ")
       end

data/script/release

@@ -0,0 +1,2 @@
+#!/bin/sh
+rake release

data/script/test

@@ -0,0 +1,2 @@
+#!/bin/sh
+rake test

data/test/email_reply_parser_test.rb

@@ -181,6 +181,15 @@ I am currently using the Java HTTP API.\n", reply.fragments[0].to_s
     assert_match /^On Oct 1, 2012/, reply.fragments[1].to_s
   end
 
+  def test_mulitple_on
+    reply = email("greedy_on")
+    assert_match /^On your remote host/, reply.fragments[0].to_s
+    assert_match /^On 9 Jan 2014/, reply.fragments[1].to_s
+    assert_equal [false, true, false], reply.fragments.map { |f| f.quoted? }
+    assert_equal [false, false, false], reply.fragments.map { |f| f.signature? }
+    assert_equal [false, true, true], reply.fragments.map { |f| f.hidden? }
+  end
+
   def test_pathological_emails
     t0 = Time.now
     reply = email("pathological")

data/test/emails/email_1_4.txt

@@ -2,4 +2,7 @@ Awesome! I haven't had another problem with it.
 
 On Aug 22, 2011, at 7:37 PM, defunkt<reply@reply.github.com> wrote:
 
+
+
+
 > Loader seems to be working well.

data/test/emails/greedy_on.txt

@@ -0,0 +1,16 @@
+On your remote host you can run:
+
+     telnet 127.0.0.1 52698
+
+This should connect to TextMate (on your Mac, via the tunnel). If that
+fails, the tunnel is not working.
+
+On 9 Jan 2014, at 2:47, George Plymale wrote:
+
+> I am having an odd issue wherein suddenly port forwarding stopped
+> working in a particular scenario for me.  By default I have ssh set to
+> use the following config (my ~/.ssh/config file):
+> […]
+> ---
+> Reply to this email directly or view it on GitHub:
+> https://github.com/textmate/rmate/issues/29

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: email_reply_parser
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-30 00:00:00.000000000 Z
+date: 2014-08-25 00:00:00.000000000 Z
 dependencies: []
 description: Long description. Maybe copied from the README.
 email: technoweenie@gmail.com
@@ -24,6 +24,8 @@ files:
 - Rakefile
 - email_reply_parser.gemspec
 - lib/email_reply_parser.rb
+- script/release
+- script/test
 - test/email_reply_parser_test.rb
 - test/emails/correct_sig.txt
 - test/emails/email_1_1.txt
@@ -43,6 +45,7 @@ files:
 - test/emails/email_one_is_not_on.txt
 - test/emails/email_sent_from_my_not_signature.txt
 - test/emails/email_sig_delimiter_in_middle_of_line.txt
+- test/emails/greedy_on.txt
 - test/emails/pathological.txt
 homepage: http://github.com/github/email_reply_parser
 licenses: []