letter_opener 1.1.1 → 1.1.2

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.1.2 ##
+
+  * Show formatted display names in html template (thanks [ClaireMcGinty](https://github.com/ClaireMcGinty))
+  * Use `file:///` uri scheme to fix Launchy on Windows.
+
 ## 1.1.1 ##
 
   * Handle cc and bcc as array of emails. (thanks [jordandcarter](https://github.com/jordandcarter))

data/lib/letter_opener/delivery_method.rb

@@ -12,7 +12,7 @@ module LetterOpener
     def deliver!(mail)
       location = File.join(settings[:location], "#{Time.now.to_i}_#{Digest::SHA1.hexdigest(mail.encoded)[0..6]}")
       messages = Message.rendered_messages(location, mail)
-      Launchy.open("file://#{URI.parse(URI.escape(messages.first.filepath))}")
+      Launchy.open("file:///#{URI.parse(URI.escape(messages.first.filepath))}")
     end
   end
 end

data/lib/letter_opener/message.rb

@@ -68,27 +68,27 @@ module LetterOpener
     end
 
     def from
-      @from ||= Array(@mail.from).join(", ")
+      @from ||= Array(@mail['from']).join(", ")
     end
 
     def sender
-      @sender ||= Array(@mail.sender).join(", ")
+      @sender ||= Array(@mail['sender']).join(", ")
     end
 
     def to
-      @to ||= Array(@mail.to).join(", ")
+      @to ||= Array(@mail['to']).join(", ")
     end
 
     def cc
-      @cc ||= Array(@mail.cc).join(", ")
+      @cc ||= Array(@mail['cc']).join(", ")
     end
 
     def bcc
-      @bcc ||= Array(@mail.bcc).join(", ")
+      @bcc ||= Array(@mail['bcc']).join(", ")
     end
 
     def reply_to
-      @reply_to ||= Array(@mail.reply_to).join(", ")
+      @reply_to ||= Array(@mail['reply-to']).join(", ")
     end
 
     def type

data/spec/letter_opener/delivery_method_spec.rb

@@ -4,7 +4,7 @@ describe LetterOpener::DeliveryMethod do
   let(:location)   { File.expand_path('../../../tmp/letter_opener', __FILE__) }
 
   let(:plain_file) { Dir["#{location}/*/plain.html"].first }
-  let(:plain)      { File.read(plain_file) }
+  let(:plain)      { CGI.unescape_html(File.read(plain_file)) }
 
   before do
     Launchy.stub(:open)
@@ -58,12 +58,12 @@ describe LetterOpener::DeliveryMethod do
         Launchy.should_receive(:open)
 
         Mail.deliver do
-          from     'Foo foo@example.com'
-          sender   'Baz baz@example.com'
-          reply_to 'No Reply no-reply@example.com'
-          to       'Bar bar@example.com'
-          cc       'Qux qux@example.com'
-          bcc      'Qux qux@example.com'
+          from     'Foo <foo@example.com>'
+          sender   'Baz <baz@example.com>'
+          reply_to 'No Reply <no-reply@example.com>'
+          to       'Bar <bar@example.com>'
+          cc       'Qux <qux@example.com>'
+          bcc      'Qux <qux@example.com>'
           subject  'Hello'
           body     'World! http://example.com'
         end
@@ -74,19 +74,19 @@ describe LetterOpener::DeliveryMethod do
       end
 
       it 'saves From field' do
-        plain.should include("Foo foo@example.com")
+        plain.should include("Foo <foo@example.com>")
       end
 
       it 'saves Sender field' do
-        plain.should include("Baz baz@example.com")
+        plain.should include("Baz <baz@example.com>")
       end
 
       it 'saves Reply-to field' do
-        plain.should include("No Reply no-reply@example.com")
+        plain.should include("No Reply <no-reply@example.com>")
       end
 
       it 'saves To field' do
-        plain.should include("Bar bar@example.com")
+        plain.should include("Bar <bar@example.com>")
       end
 
       it 'saves Subject field' do
@@ -100,7 +100,7 @@ describe LetterOpener::DeliveryMethod do
 
     context 'multipart' do
       let(:rich_file) { Dir["#{location}/*/rich.html"].first }
-      let(:rich) { File.read(rich_file) }
+      let(:rich) { CGI.unescape_html(File.read(rich_file)) }
 
       before do
         Launchy.should_receive(:open)
@@ -132,7 +132,7 @@ describe LetterOpener::DeliveryMethod do
       end
 
       it 'saves text part' do
-        plain.should include("This is &lt;plain&gt; text")
+        plain.should include("This is <plain> text")
       end
 
       it 'saves html part' do
@@ -140,11 +140,11 @@ describe LetterOpener::DeliveryMethod do
       end
 
       it 'saves escaped Subject field' do
-        plain.should include("Many parts with &lt;html&gt;")
+        plain.should include("Many parts with <html>")
       end
 
       it 'shows subject as title' do
-        rich.should include("<title>Many parts with &lt;html&gt;</title>")
+        rich.should include("<title>Many parts with <html></title>")
       end
     end
   end
@@ -156,7 +156,7 @@ describe LetterOpener::DeliveryMethod do
       Launchy.should_receive(:open)
 
       Mail.deliver do
-        from     'Foo foo@example.com'
+        from     'Foo <foo@example.com>'
         to       'bar@example.com'
         subject  'Hello'
         body     'World!'
@@ -168,7 +168,7 @@ describe LetterOpener::DeliveryMethod do
     end
 
     it 'saves From filed' do
-      plain.should include("Foo foo@example.com")
+      plain.should include("Foo <foo@example.com>")
     end
   end
 

data/spec/letter_opener/message_spec.rb

@@ -3,70 +3,149 @@ require 'spec_helper'
 describe LetterOpener::Message do
   let(:location) { File.expand_path('../../../tmp/letter_opener', __FILE__) }
 
+  def mail(options)
+    Mail.new(options)
+  end
+
   describe '#reply_to' do
     it 'handles one email as a string' do
-      message = described_class.new(location, mock(reply_to: 'test@example.com'))
+      mail    = mail(:reply_to => 'test@example.com')
+      message = described_class.new(location, mail)
       message.reply_to.should eq('test@example.com')
     end
 
+    it 'handles one email with display names' do
+      mail    = mail(:reply_to => 'test <test@example.com>')
+      message = described_class.new(location, mail)
+      message.reply_to.should eq('test <test@example.com>')
+    end
+
     it 'handles array of emails' do
-      message = described_class.new(location, mock(reply_to: ['test1@example.com', 'test2@example.com']))
+      mail    = mail(:reply_to => ['test1@example.com', 'test2@example.com'])
+      message = described_class.new(location, mail)
       message.reply_to.should eq('test1@example.com, test2@example.com')
     end
+
+    it 'handles array of emails with display names' do
+      mail    = mail(:reply_to => ['test1 <test1@example.com>', 'test2 <test2@example.com>'])
+      message = described_class.new(location, mail)
+      message.reply_to.should eq('test1 <test1@example.com>, test2 <test2@example.com>')
+    end
+
   end
 
   describe '#to' do
     it 'handles one email as a string' do
-      message = described_class.new(location, mock(to: 'test@example.com'))
+      mail   = mail(:to => 'test@example.com')
+      message = described_class.new(location, mail)
       message.to.should eq('test@example.com')
     end
 
+    it 'handles one email with display names' do
+      mail    = mail(:to => 'test <test@example.com>')
+      message = described_class.new(location, mail)
+      message.to.should eq('test <test@example.com>')
+    end
+
     it 'handles array of emails' do
-      message = described_class.new(location, mock(to: ['test1@example.com', 'test2@example.com']))
+      mail    = mail(:to => ['test1@example.com', 'test2@example.com'])
+      message = described_class.new(location, mail)
       message.to.should eq('test1@example.com, test2@example.com')
     end
+
+    it 'handles array of emails with display names' do
+      mail    = mail(:to => ['test1 <test1@example.com>', 'test2 <test2@example.com>'])
+      message = described_class.new(location, mail)
+      message.to.should eq('test1 <test1@example.com>, test2 <test2@example.com>')
+    end
+
   end
 
   describe '#cc' do
     it 'handles one cc email as a string' do
-      message = described_class.new(location, mock(cc: 'test@example.com'))
+      mail    = mail(:cc => 'test@example.com')
+      message = described_class.new(location, mail)
       message.cc.should eq('test@example.com')
     end
 
+    it 'handles one cc email with display name' do
+      mail    = mail(:cc => ['test <test1@example.com>', 'test2 <test2@example.com>'])
+      message = described_class.new(location, mail)
+      message.cc.should eq('test <test1@example.com>, test2 <test2@example.com>')
+    end
+
     it 'handles array of cc emails' do
-      message = described_class.new(location, mock(cc: ['test1@example.com', 'test2@example.com']))
+      mail    = mail(:cc => ['test1@example.com', 'test2@example.com'])
+      message = described_class.new(location, mail)
       message.cc.should eq('test1@example.com, test2@example.com')
     end
+
+    it 'handles array of cc emails with display names' do
+      mail    = mail(:cc => ['test <test1@example.com>', 'test2 <test2@example.com>'])
+      message = described_class.new(location, mail)
+      message.cc.should eq('test <test1@example.com>, test2 <test2@example.com>')
+    end
+
   end
 
   describe '#bcc' do
     it 'handles one bcc email as a string' do
-      message = described_class.new(location, mock(bcc: 'test@example.com'))
+      mail    = mail(:bcc => 'test@example.com')
+      message = described_class.new(location, mail)
       message.bcc.should eq('test@example.com')
     end
 
+    it 'handles one bcc email with display name' do
+      mail    = mail(:bcc => ['test <test1@example.com>', 'test2 <test2@example.com>'])
+      message = described_class.new(location, mail)
+      message.bcc.should eq('test <test1@example.com>, test2 <test2@example.com>')
+    end
+
     it 'handles array of bcc emails' do
-      message = described_class.new(location, mock(bcc: ['test1@example.com', 'test2@example.com']))
+      mail    = mail(:bcc => ['test1@example.com', 'test2@example.com'])
+      message = described_class.new(location, mail)
       message.bcc.should eq('test1@example.com, test2@example.com')
     end
+
+    it 'handles array of bcc emails with display names' do
+      mail    = mail(:bcc => ['test <test1@example.com>', 'test2 <test2@example.com>'])
+      message = described_class.new(location, mail)
+      message.bcc.should eq('test <test1@example.com>, test2 <test2@example.com>')
+    end
+
   end
 
   describe '#sender' do
     it 'handles one email as a string' do
-      message = described_class.new(location, mock(sender: 'sender@example.com'))
+      mail    = mail(:sender => 'sender@example.com')
+      message = described_class.new(location, mail)
       message.sender.should eq('sender@example.com')
     end
 
+    it 'handles one email as a string with display name' do
+      mail    = mail(:sender => 'test <test@example.com>')
+      message = described_class.new(location, mail)
+      message.sender.should eq('test <test@example.com>')
+    end
+
     it 'handles array of emails' do
-      message = described_class.new(location, mock(sender: ['sender1@example.com', 'sender2@example.com']))
+      mail    = mail(:sender => ['sender1@example.com', 'sender2@example.com'])
+      message = described_class.new(location, mail)
       message.sender.should eq('sender1@example.com, sender2@example.com')
     end
+
+    it 'handles array of emails with display names' do
+      mail    = mail(:sender => ['test <test1@example.com>', 'test2 <test2@example.com>'])
+      message = described_class.new(location, mail)
+      message.sender.should eq('test <test1@example.com>, test2 <test2@example.com>')
+    end
+
   end
 
   describe '#<=>' do
     it 'sorts rich type before plain type' do
       plain = described_class.new(location, mock(content_type: 'text/plain'))
-      rich = described_class.new(location, mock(content_type: 'text/html'))
+      rich  = described_class.new(location, mock(content_type: 'text/html'))
       [plain, rich].sort.should eq([rich, plain])
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: letter_opener
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-10 00:00:00.000000000 Z
+date: 2013-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: launchy
@@ -93,7 +93,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4228764792714323138
+      hash: -3398976380396960324
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: