letter_opener 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b1abff977a3febac5c5c93d7198750e409730c8
-  data.tar.gz: 40c22d29d8eeb33e7d7ac5149d64dba2665eae60
+  metadata.gz: c17edf454562b845730e2bc785489ab61cc5d2a9
+  data.tar.gz: 9103feb34675d63486efea05fbb3cb0bcdc12ec0
 SHA512:
-  metadata.gz: 00ac078e821bebeb9b4dd1b909db43a96bda5df54bcc11f635ae0478cd6278b29ee127d1c668c5f6421af8b17a34d2cad5a083bc9f18d8632b0b5c006e63e83b
-  data.tar.gz: 061baa01266531a9c4fde77c43d04c76619d8232837f06502d4ab06b4a97e0849f88068e51af313521540ea554041eb524a5f644622f5f536d041128ae936315
+  metadata.gz: 0de0bce58674322df7867f93fdf3b01795c399bdec2dc68fc027ce299f656936159f6091a2063cc90cd1b0baf64ba0d1cd3e4e89d983ddb766265b10baf4f8b8
+  data.tar.gz: 1627f2a90df1e62f402cf015dd5ca8cb75049008f5afbea38bb96855408236e9abf2d0d91c364e3d35ff2f4c6090b2356893bcc5b838beab24589bd1fc2bde5a

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.4.0 ##
+ * Add base tag to the iframe so links work with X-Frame-Options set to SAMEORIGIN. (thanks [Jason Tokoph](https://github.com/jtokoph))
+ * Check delivery params before rendering an email to match SMTP behaviour.
+
 ## 1.3.0 ##
 
  * Fix message body encoding is observed correctly in QP CTE. (thanks [Mark Dodwell](https://github.com/mkdynamic))

data/README.rdoc

@@ -1,6 +1,6 @@
 = Letter Opener {<img src="https://secure.travis-ci.org/ryanb/letter_opener.png" />}[http://travis-ci.org/ryanb/letter_opener]
 
-Preview email in the browser instead of sending it. This means you do not need to set up email delivery in your development environment, and you no longer need to worry about accidentally sending a test email to someone else's address.
+Preview email in the default browser instead of sending it. This means you do not need to set up email delivery in your development environment, and you no longer need to worry about accidentally sending a test email to someone else's address.
 
 
 == Rails Setup

data/letter_opener.gemspec

@@ -0,0 +1,19 @@
+Gem::Specification.new do |s|
+  s.name        = "letter_opener"
+  s.version     = "1.4.0"
+  s.author      = "Ryan Bates"
+  s.email       = "ryan@railscasts.com"
+  s.homepage    = "http://github.com/ryanb/letter_opener"
+  s.summary     = "Preview mail in browser instead of sending."
+  s.description = "When mail is sent from your application, Letter Opener will open a preview in the browser instead of sending."
+
+  s.files        = Dir["{lib,spec}/**/*", "[A-Z]*"] - ["Gemfile.lock"]
+  s.require_path = "lib"
+
+  s.add_dependency 'launchy', '~> 2.2'
+  s.add_development_dependency 'rspec', '~> 2.14.0'
+  s.add_development_dependency 'mail', '~> 2.6.0'
+
+  s.rubyforge_project = s.name
+  s.required_rubygems_version = ">= 1.3.4"
+end

data/lib/letter_opener/delivery_method.rb

@@ -1,5 +1,12 @@
+begin
+  require 'mail/check_delivery_params'
+rescue LoadError => e
+end
+
 module LetterOpener
   class DeliveryMethod
+    include Mail::CheckDeliveryParams if defined?(Mail::CheckDeliveryParams)
+
     class InvalidOption < StandardError; end
 
     attr_accessor :settings
@@ -10,6 +17,8 @@ module LetterOpener
     end
 
     def deliver!(mail)
+      check_delivery_params(mail) if respond_to?(:check_delivery_params)
+
       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))}")

data/lib/letter_opener/message.rb

@@ -63,7 +63,7 @@ module LetterOpener
           body.gsub!(attachment.url, "attachments/#{attachment.filename}")
         end
 
-        body
+        base_tag + body
       end
     end
 
@@ -99,6 +99,11 @@ module LetterOpener
       body.respond_to?(:encoding) ? body.encoding : "utf-8"
     end
 
+    # To make links work in iframe with X-Frame-Options set to SAMEORIGIN
+    def base_tag
+      '<base target="_top">'
+    end
+
     def auto_link(text)
       text.gsub(URI.regexp(%W[https http])) do |link|
         "<a href=\"#{ link }\">#{ link }</a>"

data/spec/letter_opener/delivery_method_spec.rb

@@ -32,6 +32,7 @@ describe LetterOpener::DeliveryMethod do
         expect($stdout).to receive(:puts)
         expect {
           Mail.deliver do
+            to   'Bar bar@example.com'
             from 'Foo foo@example.com'
             body 'World! http://example.com'
           end
@@ -46,6 +47,7 @@ describe LetterOpener::DeliveryMethod do
         expect($stdout).to receive(:puts)
         expect {
           Mail.deliver do
+            to   'Bar bar@example.com'
             from 'Foo foo@example.com'
             body 'World! http://example.com'
           end
@@ -284,7 +286,6 @@ describe LetterOpener::DeliveryMethod do
     end
   end
 
-
   context 'subjectless mail' do
     before do
       expect(Launchy).to receive(:open)
@@ -301,4 +302,18 @@ describe LetterOpener::DeliveryMethod do
       expect(File.exist?(plain_file)).to be_true
     end
   end
+
+  context 'delivery params' do
+    it 'raises an exception if delivery params are not valid' do
+      expect(Launchy).not_to receive(:open)
+
+      expect {
+        Mail.deliver do
+          from     'Foo foo@example.com'
+          reply_to 'No Reply no-reply@example.com'
+          body     'World! http://example.com'
+        end
+      }.to raise_exception(ArgumentError)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: letter_opener
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Ryan Bates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-06 00:00:00.000000000 Z
+date: 2015-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: launchy
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.6.0
 description: When mail is sent from your application, Letter Opener will open a preview
   in the browser instead of sending.
 email: ryan@railscasts.com
@@ -64,6 +64,7 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
+- letter_opener.gemspec
 - lib/letter_opener.rb
 - lib/letter_opener/delivery_method.rb
 - lib/letter_opener/message.html.erb
@@ -91,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.4
 requirements: []
 rubyforge_project: letter_opener
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Preview mail in browser instead of sending.