imap-backup 1.2.3 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55d07b2ed9eae209a118323f3e8c494b831183468ef92e05cfe2ae139177f82b
-  data.tar.gz: c76ad04b8363dd146fc2abdc5ba6243fe3cd446a107f946187bf45bf16689906
+  metadata.gz: 8155050ded00ceecc4a76cf608612f7ba1ef32a51c3985441ad00a247e170140
+  data.tar.gz: f91b55a88b6dc3eeddccd3bfa515e7056896dd166f2760d4c337256fbbd50d64
 SHA512:
-  metadata.gz: cd396bf6b70d293ef00ac83bc4e3f3ac0efdfdbf56c835484abf5c503ec84d5690537c0f36c5d23cf9e18f27f64372b66157b45491954fa6dfd0c2779b8b7aac
-  data.tar.gz: 1af9c675e2641debc9e897b4a4ae1a13834550e234887bcdd8ef75cafd3aadde58b296fdd903c377bddf142b340f9ed32fd8e8d6305d673e7fde5a7acb4437a5
+  metadata.gz: 24d3ee8534b607abbb10e1345205ca8142e3701190ef8d8ef79128f0bfe6d620c2f275dc58b4e3dc39a0ebae3c1ea48c634ddff48d2d8dbed3ef85f2ad736abc
+  data.tar.gz: 8ff7e5f6c757e4866b93ba2621941d38bbaa809cb4be7a08c7307dfdcc4d47b6a59bacd30dfd62c6f294a3fd6b9237cdc91c752a8c1cba3e077a62cbaee013e6

data/lib/email/mboxrd/message.rb

@@ -22,21 +22,17 @@ module Email::Mboxrd
     end
 
     def best_from
-      if parsed.from.is_a? Enumerable
+      if parsed.from.is_a?(Enumerable)
         parsed.from.each do |addr|
-          if addr
-            return addr
-          end
+          return addr if addr
         end
       end
-      if parsed.envelope_from
-        return parsed.envelope_from
-      end
-      if parsed.return_path
-        return parsed.return_path
-      end
 
-      return ''
+      return parsed.sender if parsed.sender
+      return parsed.envelope_from if parsed.envelope_from
+      return parsed.return_path if parsed.return_path
+
+      return ""
     end
 
     def from
@@ -44,10 +40,12 @@ module Email::Mboxrd
     end
 
     def mboxrd_body
-      return @mboxrd_body if @mboxrd_body
-      @mboxrd_body = supplied_body.gsub(/\n(>*From)/, "\n>\\1")
-      @mboxrd_body += "\n" unless @mboxrd_body.end_with?("\n")
-      @mboxrd_body
+      @mboxrd_body ||=
+        begin
+          @mboxrd_body = supplied_body.gsub(/\n(>*From)/, "\n>\\1")
+          @mboxrd_body += "\n" if !@mboxrd_body.end_with?("\n")
+          @mboxrd_body
+        end
     end
 
     def asctime

data/lib/imap/backup/version.rb

@@ -2,7 +2,7 @@ module Imap; end
 
 module Imap::Backup
   MAJOR    = 1
-  MINOR    = 2
-  REVISION = 3
+  MINOR    = 3
+  REVISION = 0
   VERSION  = [MAJOR, MINOR, REVISION].map(&:to_s).join(".")
 end

data/spec/unit/email/mboxrd/message_spec.rb

@@ -8,8 +8,7 @@ Subject: Re: no subject|
 msg_bad_from = %Q|Delivered-To: you@example.com
 from: "FirstName LastName (TEXT)" <"TEXT*" <no-reply@example.com>>
 To: FirstName LastName <you@example.com>
-Subject: Re: no subject
-Sender: FistName LastName <"TEXT*"no-reply=example.com@example.com>|
+Subject: Re: no subject|
 
 msg_no_from_but_return_path = %Q|Delivered-To: you@example.com
 From: example <www.example.com>
@@ -17,6 +16,11 @@ To: FirstName LastName <you@example.com>
 Return-Path: <me@example.com>
 Subject: Re: no subject|
 
+msg_no_from_but_sender = %Q|Delivered-To: you@example.com
+To: FirstName LastName <you@example.com>
+Subject: Re: no subject
+Sender: FistName LastName <me@example.com>|
+
 describe Email::Mboxrd::Message do
   let(:from) { "me@example.com" }
   let(:date) { DateTime.new(2012, 12, 13, 18, 23, 45) }
@@ -77,6 +81,7 @@ describe Email::Mboxrd::Message do
 
     context "when original message 'from' is a string but not an address" do
       let(:message_body) { msg_bad_from }
+
       it "'from' is empty string" do
         expect(subject.to_s).to start_with("From  \n")
       end
@@ -84,9 +89,18 @@ describe Email::Mboxrd::Message do
 
     context "when original message 'from' is nil and 'envelope from' is nil and 'return path' is available" do
       let(:message_body) { msg_no_from_but_return_path }
+
       it "'return path' is used as 'from'" do
         expect(subject.to_s).to start_with("From " + from + " \n")
       end
     end
+
+    context "with no from and a 'Sender'" do
+      let(:message_body) { msg_no_from_but_sender }
+
+      it "Sender is used as 'from'" do
+        expect(subject.to_s).to start_with("From " + from + " \n")
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: imap-backup
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.3.0
 platform: ruby
 authors:
 - Joe Yates