rails_email_preview 0.2.21 → 0.2.22

data/app/helpers/rails_email_preview/emails_helper.rb

@@ -1,19 +1,19 @@
 module RailsEmailPreview::EmailsHelper
 
-  MIME_LABELS = { 'text/html' => 'HTML', 'text/plain' => 'Text', 'raw' => 'Raw'}
+  FORMAT_LABELS = { 'html' => 'HTML', 'plain' => 'Text', 'raw' => 'Raw'}
 
   def format_label(mime_type)
-    MIME_LABELS[mime_type]
+    FORMAT_LABELS[mime_type]
   end
 
   def change_locale_attr(locale)
-    {href:  rails_email_preview.rep_email_url(params.merge(part_type: @part_type, email_locale: locale)),
+    {href:  rails_email_preview.rep_email_path(preview_params.merge(part_type: @part_type, email_locale: locale)),
      class: rep_btn_class(@email_locale == locale.to_s)}
   end
 
-  def change_format_attr(mime)
-    {href: rails_email_preview.rep_email_url(params.merge(part_type: mime)),
-     class: rep_btn_class(@part_type == mime)}
+  def change_format_attr(format)
+    {href: rails_email_preview.rep_email_path(preview_params.merge(part_type: format)),
+     class: rep_btn_class(@part_type == format)}
   end
 
   def locale_name(locale)
@@ -24,28 +24,27 @@ module RailsEmailPreview::EmailsHelper
     end
   end
 
-  def attachment_links
-    @mail.attachments.map do |attachment|
+  def human_headers(mail, &block)
+    {t('rep.headers.subject')     => mail.subject || '(no subject)',
+     t('rep.headers.from')        => mail.from,
+     t('rep.headers.reply_to')    => mail.reply_to,
+     t('rep.headers.to')          => mail.to,
+     t('rep.headers.cc')          => mail.cc,
+     t('rep.headers.bcc')         => mail.bcc,
+     t('rep.headers.attachments') => attachment_links(mail)
+    }.each do |name, value|
+      block.call(name, format_header_value(value)) unless value.blank?
+    end
+  end
+
+  def attachment_links(mail)
+    mail.attachments.map do |attachment|
       url = rails_email_preview.rep_raw_email_attachment_path(params[:preview_id], attachment.filename)
       link_to(attachment.filename, url)
     end.join('').html_safe
   end
 
-  def headers_name_value
-    I18n.with_locale @email_locale do
-      {
-          'Subject'     => @mail.subject || '(no subject)',
-          'From'        => @mail.from,
-          'Reply to'    => @mail.reply_to,
-          'To'          => @mail.to,
-          'CC'          => @mail.cc,
-          'BCC'         => @mail.bcc,
-          'Attachments' => attachment_links
-      }.delete_if { |k, v| v.blank? }
-    end
-  end
-
-  def format_header(value)
+  def format_header_value(value)
     if value.is_a?(Array)
       value.map(&:to_s) * ', '
     else
@@ -53,25 +52,15 @@ module RailsEmailPreview::EmailsHelper
     end
   end
 
-  def split_in_halves(elements, &weight)
-    tot_w  = elements.map(&weight).sum
-    cols   = [elements.dup, []]
-    col2_w = 0
-    cols[0].reverse_each do |cl|
-      n = weight.call(cl)
-      break if col2_w + n > tot_w / 2
-      col2_w += n
-      cols[1] << cols[0].pop
-    end
-    cols[1].reverse!
-    cols
-  end
-
   # style
   def rep_style
     RailsEmailPreview.style
   end
 
+  def preview_params
+    params.except(*request.path_parameters.keys)
+  end
+
   def rep_btn_class(active = false)
     rep_style[:"btn_#{active ? 'active' : 'default'}_class"]
   end

data/app/models/rails_email_preview/preview.rb

@@ -1,5 +1,5 @@
 module RailsEmailPreview
-  # This class represents an email preview
+  # Preview for one mailer method
   class Preview
     attr_accessor :id, :preview_class_name, :preview_method
 
@@ -12,11 +12,14 @@ module RailsEmailPreview
     end
 
     def formats
-      %w(text/html text/plain raw)
+      %w(html plain raw)
     end
 
-    def preview_mail(run_hooks = false)
-      preview_class_name.constantize.new.send(preview_method).tap do |mail|
+    def preview_mail(run_hooks = false, search_query_params = {})
+      preview_instance = preview_class_name.constantize.new
+      setup_instance_variables(preview_instance, search_query_params)
+
+      preview_instance.send(preview_method).tap do |mail|
         RailsEmailPreview.run_before_render(mail, self) if run_hooks
       end
     end
@@ -40,7 +43,7 @@ module RailsEmailPreview
 
       alias_method :[], :find
 
-      attr_reader :all, :all_by_preview_class
+      attr_reader :all
 
       def mail_methods(mailer)
         mailer.public_instance_methods(false).map(&:to_s)
@@ -66,7 +69,14 @@ module RailsEmailPreview
           end
         end
         @all.sort_by!(&:name)
-        @all_by_preview_class = @all.group_by(&:preview_class_name)
+      end
+    end
+
+    private
+
+    def setup_instance_variables(object, params)
+      unless params.empty?
+        params.each { |k,v| object.instance_variable_set("@#{k}", v) }
       end
     end
   end

data/app/presenters/rails_email_preview/preview_list_presenter.rb

@@ -0,0 +1,36 @@
+module RailsEmailPreview
+  class PreviewListPresenter
+    attr_reader :previews
+
+    def initialize(previews)
+      @previews = previews
+    end
+
+    def columns(&block)
+      split_in_halves(groups) { |_k, v| v.length }.each do |column_groups|
+        block.call(column_groups)
+      end
+    end
+
+    def groups
+      @groups ||= by_class_name.inject({}) do |h, (_class_name, previews)|
+        h.update previews.first.group_name => previews
+      end
+    end
+
+    private
+
+    def split_in_halves(xs, &weight)
+      xs    = xs.to_a
+      ws    = xs.map(&weight)
+      col_w = ws.sum / 2
+      cur_w = 0
+      mid   = ws.find_index { |w| (cur_w += w) >= col_w + w }
+      [xs.first(mid), xs.from(mid)]
+    end
+
+    def by_class_name
+      @by_class_name ||= previews.group_by(&:preview_class_name)
+    end
+  end
+end

data/app/views/integrations/cms/_customize_cms_for_rails_email_preview.html.slim

@@ -3,14 +3,14 @@ ruby:
   adapter = ::RailsEmailPreview::Integrations::ComfortableMexicanSofa
   snippet = @snippet || (adapter.cms_snippet_class === @record && @record)
   if snippet && (p = adapter.rep_email_params_from_snippet(snippet))
-    show_url = rails_email_preview.rep_raw_email_url(p.merge part_type: 'text/html')
+    show_url = rails_email_preview.rep_raw_email_url(p)
   end
   customize_form = show_url.present? || snippet && !snippet.persisted?
 
 - if customize_form
   javascript:
-    jQuery(function($) {
-      if (window.parent && (new RegExp('#{rails_email_preview.rep_root_path}')).test(parent.location.href)) {
+    if (window.parent && window.parent.rep && (new RegExp('#{rails_email_preview.rep_root_path}')).test(parent.location.href)) {
+      jQuery(function($) {
         // Hide nav:
         $('.left-column,.right-column').hide();
         $('.center-column').css('margin', 0);
@@ -18,6 +18,9 @@ ruby:
         var showUrl = '#{show_url}';
 
         if (showUrl) {
+          var parentParams = parent.location.search;
+          if (!/\?/.test(showUrl)) showUrl += '?';
+          showUrl = showUrl.replace(/\?.*$/, parentParams);
           $('.page-header h2').html(
             "#{t '.edit_email'}" + " <a class='btn btn-primary' href='" + showUrl + "'>#{t '.view_link'}</a>");
         }
@@ -31,9 +34,16 @@ ruby:
 
         // hide identifier and categories
         control('identifier').hide();
-        control('category_ids').hide()
+        control('category_ids').hide();
 
         // Do not mess with identifier
         $('[data-slug]').removeAttr('data-slug');
-      }
-    });
+      });
+
+      // Schedule headers view refresh on next load
+      jQuery(window).on('load', function() {
+        setTimeout(function(){
+          window.parent.rep.fetchHeadersOnNextLoad = true;
+        })
+      });
+    }

data/app/views/layouts/rails_email_preview/email.html.slim

@@ -7,9 +7,11 @@ html
         font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
         word-break: break-word;
       }
+      body {
+        background-color:white;
+      }
 
     = yield(:head)
   body
     #content.container
-      = render 'layouts/rails_email_preview/flash_notices'
       = yield

data/app/views/rails_email_preview/emails/_email_iframe.html.slim

@@ -1,31 +1,70 @@
 javascript:
-  (function(doc){
-    var rep = window.rep = window['rep'] || {
-       resizeIframe: function(id) {
-          var el = doc.getElementById(id);
-          if (!el) return;
-          var w = el.parentNode.clientWidth,
-              h = el.contentWindow.document.body.scrollHeight;
-          el.height = (h) + "px";
-          el.width  = (w) + "px";
-        },
-        iframeLoad: function(id){
-          document.getElementById('loading-el').style.display = 'none';
-          setTimeout(function() { rep.resizeIframe(id); rep.loaded = true; });
-        },
-        resizeAttached: false
-    };
+  (function(doc) {
+    var rep = window['rep'] || (window['rep'] = { resizeAttached: false });
     rep.loaded = false;
+
+    function findIframe() {
+      return doc.getElementById('src-iframe');
+    }
+
+    function resizeIframe() {
+      var el = findIframe();
+      if (!el) {
+        rep.loaded = false;
+        return;
+      }
+      var iframeBody = el.contentWindow.document.body;
+      if (iframeBody) {
+        el.style.height = (getBodyHeight(iframeBody)) + "px";
+      }
+    }
+
+    function getBodyHeight(body) {
+      // browser compat
+      return Math.max(body.scrollHeight, body.offsetHeight, body.clientHeight);
+    }
+
+    // This is only called back once the iframe has finished loading everything, including images
+    rep.iframeOnLoad = function() {
+      rep.loaded = true;
+      resizeIframe();
+
+      // CMS refresh headers hook
+      if (rep.fetchHeadersOnNextLoad) {
+        rep.fetchHeadersOnNextLoad = false;
+        var headersView = doc.getElementById('email-headers'),
+            xhr = new XMLHttpRequest();
+        xhr.open('GET', headersView.getAttribute('data-url'), true);
+        xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
+        xhr.send(null);
+        xhr.onreadystatechange = function() {
+          if (xhr.readyState === 4) {
+            headersView.innerHTML = xhr.responseText;
+          }
+        }
+      }
+    };
+
+    // Resize on window resize
     if (!rep.resizeAttached) {
       window.addEventListener('resize', function() {
-        if (rep.loaded) rep.resizeIframe('src-iframe');
-      });
+        if (rep.loaded) resizeIframe();
+      }, true);
       rep.resizeAttached = true
     }
-  })(document)
 
-pre#loading-el.lead
-  i.icon-spinner.icon-spin
-  |  #{t 'rep.base.loading'}
-iframe#src-iframe[src=rails_email_preview.rep_raw_email_url(params.slice(:preview_id, :part_type).merge(email_locale: @email_locale))
-  width="100%" height=1 onLoad="rep.iframeLoad('src-iframe')" style="border:none;padding:0;margin:0"]
+    // Only show progress bar after some time to avoid flashing
+    setTimeout(function() {
+      doc.getElementById('email-progress-bar').style.display = 'block';
+    }, 200);
+  })(document);
+
+
+div style='min-height: 400px; position: relative'
+  #email-progress-bar.progress style='display: none; position: absolute; z-index: -1; width: 100%; text-align: center'
+    .progress-bar.progress-bar-striped.active style='width:100%'
+      = t 'rep.base.loading'
+
+  iframe#src-iframe[
+    srcdoc=(@mail_body_html.to_str) seamless="seamless" onload='rep.iframeOnLoad()'
+    style='width:100%;border:none;padding:0;margin:0;height:0;']

data/app/views/rails_email_preview/emails/_format_nav.html.slim

@@ -1,5 +1,5 @@
-div class=rep_btn_group_class
+span class=rep_btn_group_class
   - @preview.formats.each do |format|
-    a.btn-xs *change_format_attr(format)
+    a *change_format_attr(format)
       = format_label format
 

data/app/views/rails_email_preview/emails/_headers.html.slim

@@ -1,4 +1,4 @@
 dl.rep-headers-list.dl-horizontal
-  - headers_name_value.each do |name, value|
+  - human_headers mail do |name, value|
     dt = name
-    dd = format_header value
+    dd = value

data/app/views/rails_email_preview/emails/_i18n_nav.html.slim

@@ -1,5 +1,4 @@
-div class=rep_btn_group_class
+span class=rep_btn_group_class
   - @preview.locales.each do |locale|
-    -# href, active class from change_locale_attr(locale)
-    a.btn *change_locale_attr(locale)
-      = locale_name(locale)
+    a *change_locale_attr(locale)
+      = locale_name locale

data/app/views/rails_email_preview/emails/_send_form.html.slim

@@ -1,6 +1,6 @@
-.clearfix: .pull-right style="max-width: 250px"
-  = form_tag rails_email_preview.rep_test_deliver_url, method: :post do
+.rep-send-to-wrapper style='max-width: 290px; display: inline-block'
+  = form_tag rails_email_preview.rep_test_deliver_url(params: preview_params), method: :post do
     = hidden_field_tag :email_locale, @email_locale
-    .input-group
+    span.input-group.input-group-sm
       span.input-group-btn: button.btn.btn-danger type='submit' data-confirm=t('.send_are_you_sure') #{t('.send_btn')}
       = text_field_tag :recipient_email, '', class: 'form-control', placeholder: t('.send_recipient_placeholder')

data/app/views/rails_email_preview/emails/index.html.slim

@@ -1,17 +1,20 @@
+ruby:
+  list     = @list
+  previews = @previews
+
 h1 = t '.list_title'
 
 div class=rep_row_class
-  - split_in_halves(@previews_by_class.keys) { |c| @previews_by_class[c].length }.each do |classes|
+  - list.columns do |groups|
     div class=rep_col_class(6)
-      - classes.map { |c| @previews_by_class[c] }.each do |previews|
-        h2 = previews[0].group_name
+      - groups.each do |title, group_previews|
+        h2 = title
         div class=rep_style[:list_group_class]
-          - previews.each do |p|
-            a class=rep_style[:list_group_item_class] href=rails_email_preview.rep_email_url(preview_id: p.id, email_locale: @email_locale)
+          - group_previews.each do |p|
+            a class=rep_style[:list_group_item_class] href=rails_email_preview.rep_email_path(preview_id: p.id, email_locale: @email_locale)
               = p.method_name
-
 hr
 p.text-center.text-small.text-info
-  | #{t 'rep.base.email', count: @previews.length} #{t 'rep.base.in'} #{t 'rep.base.mailer', count: @previews_by_class.values.length }
+  | #{t 'rep.base.email', count: previews.length} #{t 'rep.base.in'} #{t 'rep.base.mailer', count: list.groups.length }
   br
   a href="https://github.com/glebm/rails_email_preview" target='_blank' REP #{RailsEmailPreview::VERSION}

data/app/views/rails_email_preview/emails/show.html.slim

@@ -2,24 +2,24 @@
   div class=rep_row_class
     .pull-left
       ul.breadcrumb
-        li: a href=rails_email_preview.rep_emails_url(email_locale: @email_locale) #{t '.breadcrumb_list'}
-        li.active: a href=(request.url) = @preview.name
+        li: a href=rails_email_preview.rep_emails_path(email_locale: @email_locale) #{t '.breadcrumb_list'}
+        li.active: a href=(request.path) = @preview.name
 
   div class=rep_style[:panel_class]
     div class=rep_style[:panel_body_class]
       div class=rep_style[:row_class]
         -# From, To, Subject and other headers
-        div class=rep_col_class(8)
-          = render 'rails_email_preview/emails/headers'
+        #email-headers data-url=rails_email_preview.rep_email_headers_path(preview_params) class=rep_col_class(8)
+          = render 'rails_email_preview/emails/headers', mail: @mail
         -# Locale, format and actions
-        div class=rep_col_class(4)
-          ul.list-unstyled.text-right.rep-email-options
+        .text-right class=rep_col_class(4)
+          .rep-email-options.text-right
             - if I18n.available_locales.length > 1
-              li= render 'rails_email_preview/emails/i18n_nav'
+              p= render 'rails_email_preview/emails/i18n_nav'
+            p= render 'rails_email_preview/emails/format_nav'
             - if RailsEmailPreview.enable_send_email
-              li= render 'rails_email_preview/emails/send_form'
-            li= render 'rails_email_preview/emails/format_nav'
+              = render 'rails_email_preview/emails/send_form'
+
 
   -# actual email content, rendered in an iframe to prevent browser styles from interfering
-  .margin-right
-    = render 'rails_email_preview/emails/email_iframe'
+  = render 'rails_email_preview/emails/email_iframe'