rails_email_preview 0.2.25 → 0.2.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c6956392e26974e226939cbce3cdedcbfbc4b7d
-  data.tar.gz: 6591321d5cc54aeedcf4cfc85546b51a5d2b981c
+  metadata.gz: f86b81c3f482a9dd5c94b239ca17d84f2f696580
+  data.tar.gz: c25d3d93bcc0bd66e0707154de88fc8349ca8fa1
 SHA512:
-  metadata.gz: 816b1dcf2f151e63452cd4b066117be76ce03fd3bc4d932528fdbb640eb562ca248f7ecaa4ace978329694ea4f7df10de355a8a1ed3f6fb4d78c351152084288
-  data.tar.gz: 9dfe3aee7e8708a8b8fc1ec8e5a93bf02af73f931464e359304e34fc61acc376a9f7a0ba9d4e125706d1b47604914a6357e51ee4fadbd2bcca271b2a09a402cc
+  metadata.gz: 6b27657005e0fcd5c93bb7d6752815c42aa719f6025248772eab87e2d53b0789f1eb054d63108478f95740e66c7a4770906b2c722b400414555890dfea00290d
+  data.tar.gz: bd0d7e1a79ae9c5c90c07011f2a43fa0b3d76e6701ba1452111405c26f97f7906064f2591a299d25bbfec557be49cbbeb075e496185112fd322208a6b6054051

data/README.md

@@ -16,7 +16,7 @@ REP can use your application styles, markup is compatible with [bootstrap 3][rep
 Add [![Gem Version][gem-badge]][gem] to Gemfile:
 
 ```ruby
-gem 'rails_email_preview', '~> 0.2.25'
+gem 'rails_email_preview', '~> 0.2.26'
 ```
 
 Add an initializer and the routes:

data/app/controllers/rails_email_preview/emails_controller.rb

@@ -103,7 +103,7 @@ module RailsEmailPreview
                   else
                     mail
                   end
-      return "<pre id='error'>#{html_escape(t('rep.errors.email_missing_format'))}</pre>" if !body_part
+      return "<pre id='error'>#{html_escape(t('rep.errors.email_missing_format', locale: @ui_locale))}</pre>" if !body_part
       if body_part.content_type =~ /plain/
         "<pre id='message_body'>#{html_escape(body_part.body.to_s)}</pre>".html_safe
       else
@@ -122,18 +122,20 @@ module RailsEmailPreview
       I18n.with_locale @email_locale, &block
     end
 
+    # Email content locale
     def set_email_preview_locale
       @email_locale = (params[:email_locale] || RailsEmailPreview.default_email_locale || I18n.default_locale).to_s
     end
 
+    # UI locale
     def set_locale
-      config_locale = RailsEmailPreview.locale
-      if !I18n.available_locales.map(&:to_s).include?(config_locale.to_s)
-        config_locale = :en
+      @ui_locale = RailsEmailPreview.locale
+      if !I18n.available_locales.map(&:to_s).include?(@ui_locale.to_s)
+        @ui_locale = :en
       end
       begin
         locale_was  = I18n.locale
-        I18n.locale = config_locale
+        I18n.locale = @ui_locale
         yield if block_given?
       ensure
         I18n.locale = locale_was

data/app/presenters/rails_email_preview/preview_list_presenter.rb

@@ -7,8 +7,9 @@ module RailsEmailPreview
     end
 
     def columns(&block)
+      return to_enum(:columns) unless block_given?
       split_in_halves(groups) { |_k, v| v.length }.each do |column_groups|
-        block.call(column_groups)
+        block.yield(column_groups)
       end
     end
 
@@ -23,9 +24,9 @@ module RailsEmailPreview
     def split_in_halves(xs, &weight)
       xs    = xs.to_a
       ws    = xs.map(&weight)
-      col_w = ws.sum / 2
+      col_w = (ws.sum + 1) / 2
       cur_w = 0
-      mid   = ws.find_index { |w| (cur_w += w) >= col_w + w }
+      mid   = ws.find_index { |w| (cur_w += w) >= col_w + w } || [ws.length - 1, 0].max
       [xs.first(mid), xs.from(mid)]
     end
 

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

@@ -20,8 +20,9 @@ javascript:
     }
 
     function getBodyHeight(body) {
-      // browser compat
-      return Math.max(body.scrollHeight, body.offsetHeight, body.clientHeight);
+      // firefox sometimes returns the wrong value for all of these and needs a bit of extra height
+      return (/Firefox/.test(navigator.userAgent) ? 50 : 0) +
+        Math.max(body.scrollHeight, body.offsetHeight, body.clientHeight);
     }
 
     function fetchHeaders() {
@@ -62,11 +63,11 @@ javascript:
     // Only show progress bar after some time to avoid flashing
     setTimeout(function() {
       doc.getElementById('email-progress-bar').style.display = 'block';
-    }, 200);
+    }, 350);
   })(document);
 
 
-div style='min-height: 400px; position: relative'
+div style='min-height: 450px; 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'

data/lib/rails_email_preview/version.rb

@@ -1,3 +1,3 @@
 module RailsEmailPreview
-  VERSION = '0.2.25'
+  VERSION = '0.2.26'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_email_preview
 version: !ruby/object:Gem::Version
-  version: 0.2.25
+  version: 0.2.26
 platform: ruby
 authors:
 - Gleb Mazovetskiy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-22 00:00:00.000000000 Z
+date: 2014-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails