email_preview 1.2.1 → 1.3.0

data/app/controllers/email_preview_controller.rb

@@ -24,7 +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]]
+    @fixture = EmailPreview[params[:id]]
     @mail = EmailPreview.preview params[:id]
     @parts = @mail.multipart? ? @mail.parts : [@mail]
   end

data/app/helpers/email_preview_helper.rb

@@ -0,0 +1,5 @@
+module EmailPreviewHelper
+  def render_format(part)
+    (part.content_type && part.content_type.include?('text/html')) ? 'html' : 'txt'
+  end
+end

data/app/views/email_preview/details.html.erb

@@ -2,6 +2,7 @@
   h2, ul, li { margin:0; padding:0;  }
 
   h2 {
+    clear: both;
     margin: 5px;
   }
   .headers {
@@ -57,9 +58,8 @@
 <h2>Content</h2>
 <ul>
 <% @parts.each do |part| %>
-  <% render_format = (part.content_type && part.content_type.include?('text/html')) ? 'html' : 'txt' %>
   <li>
-    <%= link_to "View #{render_format} output", preview_email_preview_path(params[:id], :format => render_format), :target => 'preview' %>
+    <%= link_to "View #{render_format(part)} output", preview_email_preview_path(params[:id], :format => render_format(part)), :target => 'preview' %>
   </li>
 <% end %>
 </ul>

data/app/views/email_preview/navigation.html.erb

@@ -14,9 +14,8 @@
 <% EmailPreview.categories.each do |category| %>
   <h3><%= category %></h3>
   <ul>
-  <% EmailPreview.registry.values.sort_by {|o| o[:description]}.each do |options| %>
-    <% next unless options[:category] == category %>
-    <li><%= link_to options[:description], email_preview_path(options[:key]), :target => 'show' %>
-  <% end%>
+    <% EmailPreview.registry.select {|f| f.category == category }.sort_by(&:description).each do |fixture| %>
+      <li><%= link_to fixture.description, email_preview_path(EmailPreview.registry.index(fixture)), :target => 'show' %>
+    <% end%>
   </ul>
 <% end %>

data/app/views/email_preview/show.html.erb

@@ -5,6 +5,6 @@
 </head>
 <frameset rows="250px,*">
   <frame src="<%= details_email_preview_path(params[:id]) %>" name="details" />
-  <frame name="preview" />
+  <frame name="preview" src="<%= preview_email_preview_path(params[:id], :format => render_format(@parts.first)) %>" />
 </frameset>
 </html>

data/lib/email_preview.rb

@@ -1,5 +1,6 @@
 require 'mail'
 require 'email_preview/engine' if defined?(Rails)
+require 'email_preview/fixture'
 
 module EmailPreview
   class << self
@@ -10,25 +11,24 @@ module EmailPreview
     attr_accessor :before_preview_hook
 
     def register(description, options={}, &block)
-      key = self.registry.keys.length + 1
-      options[:key] = key
-      options[:category] ||= 'General'
-      options[:description] ||= description.to_s
-      options[:block] ||= block
-      self.registry[key] = options
+      fixture = EmailPreview::Fixture.new(description, options, &block)
+      self.registry << fixture
     end
     def categories
-      self.registry.values.collect {|f| f[:category] }.uniq
+      self.registry.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
+        mail = self[key].preview
         raise ActiveRecord::Rollback, "EmailPreview rollback" if EmailPreview.transactional?
       end
       mail
     end
+    def [](key)
+      self.registry[key.to_i]
+    end
     def transactional?
       !!self.transactional
     end
@@ -36,26 +36,10 @@ module EmailPreview
       @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
-  end
 end
 
 # initialize registry
-EmailPreview.registry = {}
+EmailPreview.registry = []
 
 # default to only run in development and test environment
 EmailPreview.allowed_environments = %w{ development test }

data/lib/email_preview/engine.rb

@@ -1,2 +1,4 @@
-class EmailPreviewEngine < Rails::Engine
+module EmailPreview
+  class Engine < Rails::Engine
+  end
 end

data/lib/email_preview/fixture.rb

@@ -0,0 +1,25 @@
+module EmailPreview
+  class Fixture
+    DEFAULT_CATEGORY = 'General'
+    attr_accessor :category, :description, :callback
+
+    def initialize(description, options = {}, &block)
+      self.category = options[:category] || DEFAULT_CATEGORY
+      self.description = options[:description] || description.to_s
+      self.callback = block
+    end
+    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
+  end
+
+end

data/lib/email_preview/version.rb

@@ -1,3 +1,3 @@
 module EmailPreview
-  VERSION = "1.2.1"
+  VERSION = "1.3.0"
 end

data/test/test_email_preview.rb

@@ -13,7 +13,7 @@ class TestEmailPreview < Test::Unit::TestCase
       end
     end
     should "have one entry in the configuration" do
-      assert_equal 1, EmailPreview.registry.keys.length
+      assert_equal 1, EmailPreview.registry.length
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: email_preview
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 1
-  - 2
-  - 1
-  version: 1.2.1
+  - 3
+  - 0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Ryan Sonnek
@@ -81,6 +81,7 @@ files:
 - README.md
 - Rakefile
 - app/controllers/email_preview_controller.rb
+- app/helpers/email_preview_helper.rb
 - app/views/email_preview/details.html.erb
 - app/views/email_preview/index.html.erb
 - app/views/email_preview/navigation.html.erb
@@ -89,6 +90,7 @@ files:
 - email_preview.gemspec
 - lib/email_preview.rb
 - lib/email_preview/engine.rb
+- lib/email_preview/fixture.rb
 - lib/email_preview/version.rb
 - test/helper.rb
 - test/test_email_preview.rb