email_preview 1.1.0 → 1.2.0

data/app/controllers/email_preview_controller.rb

@@ -1,8 +1,9 @@
 class EmailPreviewController < ApplicationController
   unloadable
+  layout nil
+
   before_filter :enforce_allowed_environments
   before_filter :build_email, :only => [:show, :deliver, :details, :preview]
-  layout nil
 
   def deliver
     @mail.to params[:to]
@@ -23,6 +24,7 @@ class EmailPreviewController < ApplicationController
     raise "'#{Rails.env}' is not in the supported list of environments from EmailPreview.allowed_environments: #{EmailPreview.allowed_environments.inspect}" unless EmailPreview.allowed_environments.include?(Rails.env)
   end
   def build_email
+    @fixture = EmailPreview.registry[params[:id]]
     @mail = EmailPreview.preview params[:id]
     @parts = @mail.multipart? ? @mail.parts : [@mail]
   end

data/lib/email_preview/version.rb

@@ -1,3 +1,3 @@
 module EmailPreview
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/lib/email_preview.rb

@@ -1,14 +1,17 @@
 require 'mail'
 require 'email_preview/engine' if defined?(Rails)
+require 'active_support/secure_random'
 
 module EmailPreview
   class << self
     attr_accessor :registry
     attr_accessor :allowed_environments
     attr_accessor :transactional
+    attr_accessor :logger
+    attr_accessor :before_preview_hook
 
     def register(description, options={}, &block)
-      key = description.hash.abs
+      key = self.registry.keys.length + 1 #ActiveSupport::SecureRandom.hex
       options[:key] = key
       options[:category] ||= 'General'
       options[:description] ||= description
@@ -19,6 +22,7 @@ module EmailPreview
       self.registry.values.collect {|f| f[:category] }.uniq
     end
     def preview(key)
+      EmailPreview.before_preview_hook.call
       mail = nil
       ActiveRecord::Base.transaction do
         mail = self.registry[key.to_i][:block].call
@@ -29,6 +33,26 @@ module EmailPreview
     def transactional?
       !!self.transactional
     end
+    def before_preview(&block)
+      @before_preview_hook = block
+    end
+  end
+
+  class Fixture
+    attr_accessor :id, :category, :description, :callback
+    def preview
+      @mail ||= self.callback.call
+    end
+    def preview_with_transaction
+      return preview_without_transaction unless EmailPreview.transactional?
+      mail = nil
+      ActiveRecord::Base.transaction do
+        mail = preview_without_transaction
+        raise ActiveRecord::Rollback, "EmailPreview rollback"
+      end
+      mail
+    end
+    # alias_method_chain :preview, :transaction
   end
 end
 
@@ -40,3 +64,9 @@ EmailPreview.allowed_environments = %w{ development test }
 
 # default to rollback transactions after previewing email
 EmailPreview.transactional = true
+
+EmailPreview.logger = Logger.new(STDOUT)
+
+# default before_preview hook to noop
+EmailPreview.before_preview do
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: email_preview
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 31
   prerelease: 
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Ryan Sonnek
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-10 00:00:00 Z
+date: 2011-06-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mail