letter_opener 1.1.0 → 1.1.1

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 1.1.1 ##
+
+  * Handle cc and bcc as array of emails. (thanks [jordandcarter](https://github.com/jordandcarter))
+  * Use `file://` uri scheme since Launcy can't open escaped URL without it. (thanks [Adrian2112](https://github.com/Adrian2112))
+  * Update Launchy dependency to `~> 2.2` (thanks [JeanMertz](https://github.com/JeanMertz))
+  * Change all nonword chars in filename of attachment to underscore so
+    it can be saved on all platforms. (thanks [phallstrom](https://github.com/phallstrom))
+
 ## 1.1.0 ##
 
   * Update Launchy dependency to `~> 2.2.0` (thanks [webdevotion](https://github.com/webdevotion))

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(URI.escape(messages.first.filepath))
+      Launchy.open("file://#{URI.parse(URI.escape(messages.first.filepath))}")
     end
   end
 end

data/lib/letter_opener/message.html.erb

@@ -79,14 +79,14 @@
       <dd><%= h to %></dd>
     <% end %>
 
-    <% if mail.cc %>
+    <% unless cc.empty? %>
       <dt>CC:</dt>
-      <dd><%= h mail.cc.join(", ") %></dd>
+      <dd><%= h cc %></dd>
     <% end %>
 
-    <% if mail.bcc %>
+    <% unless bcc.empty? %>
       <dt>BCC:</dt>
-      <dd><%= h mail.bcc.join(", ") %></dd>
+      <dd><%= h bcc %></dd>
     <% end %>
 
     <% if @attachments.any? %>

data/lib/letter_opener/message.rb

@@ -27,13 +27,14 @@ module LetterOpener
         attachments_dir = File.join(@location, 'attachments')
         FileUtils.mkdir_p(attachments_dir)
         mail.attachments.each do |attachment|
-          path = File.join(attachments_dir, attachment.filename)
+          filename = attachment.filename.gsub(/[^\w.]/, '_')
+          path = File.join(attachments_dir, filename)
 
           unless File.exists?(path) # true if other parts have already been rendered
             File.open(path, 'wb') { |f| f.write(attachment.body.raw_source) }
           end
 
-          @attachments << [attachment.filename, "attachments/#{URI.escape(attachment.filename)}"]
+          @attachments << [attachment.filename, "attachments/#{URI.escape(filename)}"]
         end
       end
 
@@ -78,6 +79,14 @@ module LetterOpener
       @to ||= Array(@mail.to).join(", ")
     end
 
+    def cc
+      @cc ||= Array(@mail.cc).join(", ")
+    end
+
+    def bcc
+      @bcc ||= Array(@mail.bcc).join(", ")
+    end
+
     def reply_to
       @reply_to ||= Array(@mail.reply_to).join(", ")
     end

data/spec/letter_opener/delivery_method_spec.rb

@@ -21,6 +21,37 @@ describe LetterOpener::DeliveryMethod do
     lambda { LetterOpener::DeliveryMethod.new(location: "foo") }.should_not raise_exception
   end
 
+  context 'integration' do
+    before do
+      Launchy.unstub(:open)
+      ENV['LAUNCHY_DRY_RUN'] = 'true'
+    end
+
+    context 'normal location path' do
+      it 'opens email' do
+        expect {
+          Mail.deliver do
+            from 'Foo foo@example.com'
+            body 'World! http://example.com'
+          end
+        }.not_to raise_error(Launchy::ApplicationNotFoundError)
+      end
+    end
+
+    context 'with spaces in location path' do
+      let(:location) { File.expand_path('../../../tmp/letter_opener with space', __FILE__) }
+
+      it 'opens email' do
+        expect {
+          Mail.deliver do
+            from 'Foo foo@example.com'
+            body 'World! http://example.com'
+          end
+        }.not_to raise_error(Launchy::ApplicationNotFoundError)
+      end
+    end
+  end
+
   context 'content' do
     context 'plain' do
       before do
@@ -31,6 +62,8 @@ describe LetterOpener::DeliveryMethod do
           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
@@ -225,6 +258,31 @@ describe LetterOpener::DeliveryMethod do
     end
   end
 
+  context 'attachments with non-word characters in the filename' do
+    before do
+      Mail.deliver do
+        from      'foo@example.com'
+        to        'bar@example.com'
+        subject   'With attachments'
+        text_part do
+          body 'This is <plain> text'
+        end
+        attachments['non word:chars/used,01.txt'] = File.read(__FILE__)
+      end
+    end
+
+    it 'creates attachments dir with attachment' do
+      attachment = Dir["#{location}/*/attachments/non_word_chars_used_01.txt"].first
+      File.exists?(attachment).should be_true
+    end
+
+    it 'saves attachment name' do
+      plain = File.read(Dir["#{location}/*/plain.html"].first)
+      plain.should include('non_word_chars_used_01.txt')
+    end
+  end
+
+
   context 'subjectless mail' do
     before do
       Launchy.should_receive(:open)

data/spec/letter_opener/message_spec.rb

@@ -27,6 +27,30 @@ describe LetterOpener::Message do
     end
   end
 
+  describe '#cc' do
+    it 'handles one cc email as a string' do
+      message = described_class.new(location, mock(cc: 'test@example.com'))
+      message.cc.should eq('test@example.com')
+    end
+
+    it 'handles array of cc emails' do
+      message = described_class.new(location, mock(cc: ['test1@example.com', 'test2@example.com']))
+      message.cc.should eq('test1@example.com, 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'))
+      message.bcc.should eq('test@example.com')
+    end
+
+    it 'handles array of bcc emails' do
+      message = described_class.new(location, mock(bcc: ['test1@example.com', 'test2@example.com']))
+      message.bcc.should eq('test1@example.com, 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'))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: letter_opener
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-08 00:00:00.000000000 Z
+date: 2013-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: launchy
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -93,7 +93,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4310965530759568709
+      hash: 4228764792714323138
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: