rails_email_preview 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a586d7cf77f0bdcdeebffa23d9b0346196ae0277
-  data.tar.gz: 6725bf049c7b76b8cebe6e0a57385d67101ce83e
+  metadata.gz: b6595d136da9bdf30c3a5482ea8c57000f7615bb
+  data.tar.gz: c07d82a4300334cb80f05bb465ed93bcbd8f055b
 SHA512:
-  metadata.gz: e75aa9aea3ecd4c3782ecf8608afebe6f5073570e5161ee6ffd3cb28d8a38d8835e7c895d7645cb7a3d7414886c616f7a8c7d5f640d140d87727c42f7dde93a3
-  data.tar.gz: 31c10088387e24bf73252d76a3ec9407cee17913df1507e17fd47a09cc5a94ec48cc1f7ac9e997d0bc9363a77c086d83d9e6049b63d65d33ce01fd02f1b6170e
+  metadata.gz: ed1b766dea0908a99e87a9f277d65c987b902611cb99c930fa16db5cf661730e26ab1198f0bfa7b4cea073112857c962281941438b2f6b4021123a541dfe690a
+  data.tar.gz: ad4dc222663aae25b1288bed9f157fdab5db8be5de54e5d29a8776fd17bbb574525c2c60ed87a8261054c8c9378a5e8a4af20f03266b36bb068980c4a551ca42

data/README.md

@@ -1,4 +1,4 @@
-# Rails Email Preview [![Build Status][travis-badge]][travis] [![Test Coverage][coverage-badge]][coverage] [![Code Climate][codeclimate-badge]][codeclimate] [![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/glebm/rails_email_preview?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+# Rails Email Preview [![Build Status][travis-badge]][travis] [![Test Coverage][coverage-badge]][coverage] [![Code Climate][codeclimate-badge]][codeclimate] [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/glebm/rails_email_preview?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 Preview email in the browser with this Rails engine. Compatible with Rails 4.2+.
 
@@ -113,12 +113,30 @@ REP works with [Comfortable Mexican Sofa CMS](https://github.com/comfy/comfortab
 
 [![screenshot](https://raw.github.com/glebm/rails_email_preview/master/doc/img/rep-edit-sofa.png)](https://github.com/glebm/rails_email_preview/wiki/Edit-Emails-with-Comfortable-Mexican-Sofa)
 
-### Premailer
+### CSS inlining
 
-[Premailer](https://github.com/alexdunae/premailer) automatically translates standard CSS rules into old-school inline styles. Integration can be done by using the <code>before_render</code> hook.
+For CSS inlining, REP supports [Roadie](https://github.com/Mange/roadie) and
+[Premailer](https://github.com/alexdunae/premailer).
+Both of these automatically translate CSS rules into inline styles and turn
+relative URLs into absolute ones.
+
+Roadie additionally extracts styles that cannot be inlined into a separate
+`<style>` tag that is supported by some email clients. For this reason I
+recommend Roadie over Premailer.
+
+Unlike Premailer, Roadie does **not** automatically generate a plain text
+version for HTML emails, but you can use another gem for this, such as
+[plain-david](https://github.com/lucaspiller/plain-david).
+
+#### Roadie
+
+To integrate Roadie with your Rails app, use [roadie-rails](https://github.com/Mange/roadie-rails).
+To integrate roadie-rails with REP, uncomment the relevant option in [the initializer](https://github.com/glebm/rails_email_preview/blob/master/config/initializers/rails_email_preview.rb). *initializer is generated during `rails g rails_email_preview:install`*
+
+#### Premailer
 
 To integrate Premailer with your Rails app you can use either [actionmailer_inline_css](https://github.com/ndbroadbent/actionmailer_inline_css) or [premailer-rails](https://github.com/fphilipe/premailer-rails).
-Simply uncomment the relevant options in [the initializer](https://github.com/glebm/rails_email_preview/blob/master/config/initializers/rails_email_preview.rb). *initializer is generated during `rails g rails_email_preview:install`*
+To integrate either with REP, uncomment the relevant options in [the initializer](https://github.com/glebm/rails_email_preview/blob/master/config/initializers/rails_email_preview.rb). *initializer is generated during `rails g rails_email_preview:install`*
 
 ### I18n
 

data/app/assets/javascripts/rails_email_preview/application.js

@@ -0,0 +1 @@
+//= require turbolinks

data/app/assets/stylesheets/rails_email_preview/application.sass

@@ -108,7 +108,7 @@ $rep-text-color-secondary: #263238 !default
       clear: left
       margin-right: 0.4em
       text-align: right
-      width: 4.8em
+      width: 6em
   dd
     width: auto
     margin-left: 0

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

@@ -20,9 +20,15 @@
     }
 
     function getBodyHeight(body) {
-      // 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);
+      var boundingRect = body.getBoundingClientRect();
+      var style = body.ownerDocument.defaultView.getComputedStyle(body);
+      var marginY = parseInt(style['margin-bottom'], 10) +
+          parseInt(style['margin-top'], 10);
+      // There may be a horizontal scrollbar adding to the height.
+      var scrollbarHeight = 17;
+      return scrollbarHeight + marginY + Math.max(
+          body.scrollHeight, body.offsetHeight, body.clientHeight,
+          boundingRect.height + boundingRect.top);
     }
 
     function fetchHeaders() {

data/config/initializers/rails_email_preview.rb

@@ -5,9 +5,11 @@ require 'rails_email_preview'
 #
 #  # hook before rendering preview:
 #  config.before_render do |message, preview_class_name, mailer_action|
-#    # apply premailer-rails:
+#    # Use roadie-rails:
+#    Roadie::Rails::MailInliner.new(message, message.roadie_options).execute
+#    # Use premailer-rails:
 #    Premailer::Rails::Hook.delivering_email(message)
-#    # or actionmailer-inline-css:
+#    # Use actionmailer-inline-css:
 #    ActionMailer::InlineCssHook.delivering_email(message)
 #  end
 #

data/lib/rails_email_preview/version.rb

@@ -1,3 +1,3 @@
 module RailsEmailPreview
-  VERSION = '2.0.1'
+  VERSION = '2.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_email_preview
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Gleb Mazovetskiy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-12 00:00:00.000000000 Z
+date: 2017-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -132,7 +132,7 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
-- app/assets/javascripts/rails_email_preview/application.js.coffee
+- app/assets/javascripts/rails_email_preview/application.js
 - app/assets/stylesheets/rails_email_preview/application.sass
 - app/assets/stylesheets/rails_email_preview/bootstrap3.sass
 - app/controllers/rails_email_preview/application_controller.rb
@@ -190,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Preview emails in browser (rails engine)

data/app/assets/javascripts/rails_email_preview/application.js.coffee

@@ -1 +0,0 @@
-#= require turbolinks