email_preview 1.5.1 → 1.5.2

data/.rvmrc

@@ -1 +1 @@
-rvm use ree-1.8.7-2011.03@email_preview --create
+rvm use ruby-1.9.3@email_preview --create

data/app/controllers/email_preview_controller.rb

@@ -3,18 +3,12 @@ class EmailPreviewController < ApplicationController
   layout false
 
   before_filter :enforce_allowed_environments
+  around_filter :set_delivery_method, :only => :deliver
   before_filter :build_email, :only => [:show, :deliver, :details, :preview]
 
   def deliver
     @mail.to params[:to]
-    
-    previous_delivery_method = ActionMailer::Base.delivery_method
-    begin
-      ActionMailer::Base.delivery_method = EmailPreview.delivery_method if EmailPreview.delivery_method
-      @mail.deliver
-    ensure
-      ActionMailer::Base.delivery_method = previous_delivery_method
-    end
+    @mail.respond_to?(:deliver_now) ? @mail.deliver_now : @mail.deliver
     redirect_to details_email_preview_path(params[:id])
   end
   def preview
@@ -34,4 +28,11 @@ class EmailPreviewController < ApplicationController
     @mail = EmailPreview.preview params[:id]
     @parts = @mail.multipart? ? @mail.parts : [@mail]
   end
+  def set_delivery_method
+    previous_delivery_method = ActionMailer::Base.delivery_method
+    ActionMailer::Base.delivery_method = EmailPreview.delivery_method if EmailPreview.delivery_method
+    yield
+  ensure
+    ActionMailer::Base.delivery_method = previous_delivery_method
+  end
 end

data/lib/email_preview/version.rb

@@ -1,3 +1,3 @@
 module EmailPreview
-  VERSION = "1.5.1"
+  VERSION = "1.5.2"
 end

metadata

@@ -1,93 +1,88 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: email_preview
-version: !ruby/object:Gem::Version 
-  hash: 1
+version: !ruby/object:Gem::Version
+  version: 1.5.2
   prerelease: 
-  segments: 
-  - 1
-  - 5
-  - 1
-  version: 1.5.1
 platform: ruby
-authors: 
+authors:
 - Ryan Sonnek
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-05-18 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
-  requirement: *id001
-  prerelease: false
+date: 2012-10-09 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  type: :runtime
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id002
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
   name: shoulda
-  type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 9
-        - 2
-        version: 0.9.2
-  requirement: *id003
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rake
-  type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 3
-        - 4
-        version: 1.3.4
-  requirement: *id004
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+- !ruby/object:Gem::Dependency
   name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.4
   type: :development
-description: render and send sample html and plain text emails to see what they will *really* look like
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.4
+description: render and send sample html and plain text emails to see what they will
+  *really* look like
+email:
 - ryan@codecrate.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .document
 - .gitignore
 - .rvmrc
@@ -143,40 +138,37 @@ files:
 - test/dummy/script/rails
 - test/helper.rb
 - test/test_email_preview.rb
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -3068805024756900553
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -3068805024756900553
 requirements: []
-
 rubyforge_project: email_preview
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: simple tool to preview emails in development environment
-test_files: 
+test_files:
 - test/dummy/Rakefile
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css