email_reply_trimmer 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b811566baddd01572925692005213b5c6818ddd
-  data.tar.gz: f3bf620c832f78d05644e65ddcfc96def645d45e
+  metadata.gz: 6da75911e9abd808e0f27b0fe0207fb5cd2e6a7d
+  data.tar.gz: 0ff5da3a54857c4822579fb5f4489915558eb335
 SHA512:
-  metadata.gz: 091e91ca51915f1c129b17774e69f314baa092d02cde3048fa8437250554d6cd37390c06b9693a37a8d9be6f6ee73ce690399d7530958e9d2178356b74458a89
-  data.tar.gz: 86b8cffde68a6c8d7470b5514574733420afa908161087700aad494cd88fa32c232b03bc31607c166b57e7808cd3c8f109ddc25f0ef17c3e116e174b8f5e40b9
+  metadata.gz: 8002eea84ed92894029cd6a690405d9db0c40bd2249acaa19adcd51ba319d27c117e0e32a5a8ea0e231fadd1a85ba9283550c6e857a2e057182e9c86d3e5f823
+  data.tar.gz: 54165dc327a4425716f62c7bc0f21bacce2b4c29462bc5d801bd73938cc74b49de20e268dbd659cd443568284b810264f10599a24f569806466e6b6db2975239

data/lib/email_reply_trimmer.rb

@@ -6,7 +6,7 @@ require_relative "email_reply_trimmer/email_header_matcher"
 require_relative "email_reply_trimmer/quote_matcher"
 
 class EmailReplyTrimmer
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 
   DELIMITER    = "d"
   EMBEDDED     = "b"
@@ -34,8 +34,9 @@ class EmailReplyTrimmer
 
     # fix embedded email markers that might span over multiple lines
     EmbeddedEmailMatcher::ON_DATE_SOMEONE_WROTE_REGEXES.each do |r|
-      next unless text =~ r
-      text.gsub!($1, $1.gsub(/\n[[:space:]>\-]*/, " "))
+      if text =~ r
+        text.gsub!(r) { |m| m.gsub(/\n[[:space:]>\-]*/, " ") }
+      end
     end
 
     removed = []

data/test/elided/embedded_ception.txt

@@ -2,8 +2,7 @@ On Mon, Feb 1, 2016 at 6:32 PM, Jeff Atwood <info@discourse.org> wrote:
 
 > This is Jeff's reply.
 >
-> On Mon, Feb 1, 2016 at 7:50 AM, Some One <foo@bar.com
-> > wrote:
+> On Mon, Feb 1, 2016 at 7:50 AM, Some One <foo@bar.com wrote:
 >
 >> Great!
 >>
@@ -15,8 +14,7 @@ On Mon, Feb 1, 2016 at 6:32 PM, Jeff Atwood <info@discourse.org> wrote:
 >>
 >>> WAT?
 >>>
->>> On Wed, Jan 27, 2016 at 10:48 PM, Some One <
->>> foo@bar.com> wrote:
+>>> On Wed, Jan 27, 2016 at 10:48 PM, Some One < foo@bar.com> wrote:
 >>>
 >>>> Hi Team,
 >>>>
@@ -24,8 +22,7 @@ On Mon, Feb 1, 2016 at 6:32 PM, Jeff Atwood <info@discourse.org> wrote:
 >>>>
 >>>> Some One
 >>>>
->>>> On Wed, Jan 27, 2016 at 10:10 AM Discourse Team <team@discourse.org>
->>>> wrote:
+>>>> On Wed, Jan 27, 2016 at 10:10 AM Discourse Team <team@discourse.org> wrote:
 >>>>
 >>>>> Hello :waves_hand:
 >>>>>

data/test/elided/embedded_email_12.txt

@@ -0,0 +1,8 @@
+On Thu, 31 Mar 2016 at 11:16 Some One < mailto:Some One <some.one@foo.bar> wrote:
+
+
+Two 2
+
+On Thu, 31 Mar 2016 at 10:05 Jeff Atwood < mailto:Jeff Atwood <team@discourse.org> wrote:
+
+Three 3

data/test/emails/embedded_email_12.txt

@@ -0,0 +1,18 @@
+One 1
+
+On Thu, 31 Mar 2016 at 11:16 Some One
+
+<
+mailto:Some One <some.one@foo.bar>
+> wrote:
+
+
+Two 2
+
+On Thu, 31 Mar 2016 at 10:05 Jeff Atwood
+
+<
+mailto:Jeff Atwood <team@discourse.org>
+> wrote:
+
+Three 3

data/test/test_email_reply_trimmer.rb

@@ -8,19 +8,19 @@ class TestEmailReplyTrimmer < Minitest::Unit::TestCase
   ELIDED  = Dir["test/elided/*.txt"].map { |path| File.basename(path) }
 
   def test_all_emails_have_a_matching_reply
-    assert_equal EMAILS, TRIMMED, "Files in /emails and /trimmed folders should match 1-to-1."
-    assert_equal EMAILS, ELIDED, "Files in /emails and /elided folders should match 1-to-1."
+    assert_equal(EMAILS, TRIMMED, "Files in /emails and /trimmed folders should match 1-to-1.")
+    assert_equal(EMAILS, ELIDED, "Files in /emails and /elided folders should match 1-to-1.")
   end
 
   def test_normalize_line_endings_email_has_windows_line_endings
-    assert_match /\r\n/, File.read("test/emails/normalize_line_endings.txt")
+    assert_match(/\r\n/, File.read("test/emails/normalize_line_endings.txt"))
   end
 
   EMAILS.each do |filename|
     name = File.basename(filename, ".txt")
     define_method("test_#{name}") do
-      assert_equal trim(filename), trimmed(filename), "[TRIMMED] EMAIL: #{filename}"
-      assert_equal elide(filename), elided(filename), "[ELIDED] EMAIL: #{filename}"
+      assert_equal(trim(filename), trimmed(filename), "[TRIMMED] EMAIL: #{filename}")
+      assert_equal(elide(filename), elided(filename), "[ELIDED] EMAIL: #{filename}")
     end
   end
 

data/test/trimmed/embedded_email_12.txt

@@ -0,0 +1 @@
+One 1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: email_reply_trimmer
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Régis Hanol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-29 00:00:00.000000000 Z
+date: 2016-03-31 00:00:00.000000000 Z
 dependencies: []
 description: EmailReplyTrimmer is a small library to trim replies from plain text
   email.
@@ -38,6 +38,7 @@ files:
 - test/elided/embedded_email_1.txt
 - test/elided/embedded_email_10.txt
 - test/elided/embedded_email_11.txt
+- test/elided/embedded_email_12.txt
 - test/elided/embedded_email_2.txt
 - test/elided/embedded_email_3.txt
 - test/elided/embedded_email_4.txt
@@ -76,6 +77,7 @@ files:
 - test/emails/embedded_email_1.txt
 - test/emails/embedded_email_10.txt
 - test/emails/embedded_email_11.txt
+- test/emails/embedded_email_12.txt
 - test/emails/embedded_email_2.txt
 - test/emails/embedded_email_3.txt
 - test/emails/embedded_email_4.txt
@@ -115,6 +117,7 @@ files:
 - test/trimmed/embedded_email_1.txt
 - test/trimmed/embedded_email_10.txt
 - test/trimmed/embedded_email_11.txt
+- test/trimmed/embedded_email_12.txt
 - test/trimmed/embedded_email_2.txt
 - test/trimmed/embedded_email_3.txt
 - test/trimmed/embedded_email_4.txt