rails_email_preview 0.2.9 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37429c25c79cc3521d73fd094b946a741c9637b2
-  data.tar.gz: 794cf5bcd0462c1017692c7ff6a05480dd840ad3
+  metadata.gz: d66ba0f93f6cd3a1832c10f9b0ee96d264cbcc1c
+  data.tar.gz: 5e2869ecf1bf1882d35c0717b30d2eeac3611ec1
 SHA512:
-  metadata.gz: 8b53a55a392237946c38ca1a4c10e859fa7dd8127be1d2dd944717cbf0c6db32e59eeea55ccf91d6a7ba7628a0e5f9d23321b0e7aa771b1aa7e07dec254515c9
-  data.tar.gz: b7deed111d4fd2c3c04e8823cf3cae7efbebbf5cf54c27f4dc13c7fe712e9e2f9a55fb665f57975d44ece9feb1d8ddf713ced42e3fef12126692d799933ad692
+  metadata.gz: ea278d1bc029a4691f8e1ade7943b62f7685c4f44fda6599c310776d9fa1d5f153abcd8c92a180ac8a6503eb6f329c394c5591af4329d6a2619d05ca57eb3708
+  data.tar.gz: 60d526c9f9686bd64ce7cac42d71b908d991fca59a7efca29555779c3881cb70f7c7ce640904f2559df643d755d6f80871de09046c880643ad1f1c8a6c232a96

data/README.md

@@ -17,7 +17,7 @@ How to
 
 Add to Gemfile
 
-    gem 'rails_email_preview', '~> 0.2'
+    gem 'rails_email_preview', '~> 0.2.10'
 
 REP handles setup for you:
 
@@ -119,10 +119,10 @@ Views
 
 You can render all REP views inside your app layout (this will need styling to look nice if you don't use bootstrap):
 
-    # # Use admin layout with REP:
-    # RailsEmailPreview::EmailsController.layout 'admin'
-    # # If you are using a custom layout, you will want to make app routes available to REP:
-    # Rails.application.config.to_prepare { RailsEmailPreview.inline_main_app_routes! }
+    Rails.application.config.to_prepare do
+      # Use admin layout with REP (this will also make app routes accessible within REP):
+      RailsEmailPreview.layout = 'admin'
+    end
 
 REP allows you to customize some of the element classes via `RailsEmailPreview.style`:
 
@@ -150,7 +150,7 @@ Authentication & authorization
 ------------------------------
 
 You can specify the parent controller for REP controller, and it will inherit all before filters.
-Note that this must be placed before any other references to REP application controller in the initializer:
+Note that this must be placed before any other references to REP application controller in the initializer (and before `layout=` call):
 
     RailsEmailPreview.parent_controller = 'Admin::ApplicationController' # default: '::ApplicationController'
 

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

@@ -1,33 +1,34 @@
 -# When rendering inside rails_email_preview hide nav, and hide irrelevant things from the form
 ruby:
   snippet = @snippet || @record.is_a?(Cms::Snippet) && @record
-  if snippet
-    p = ::RailsEmailPreview::Integrations::ComfortableMexicanSofa.rep_email_params_from_snippet(snippet)
+  if snippet && (p = ::RailsEmailPreview::Integrations::ComfortableMexicanSofa.rep_email_params_from_snippet(snippet))
     show_url = rails_email_preview.rep_raw_email_url(p.merge part_type: 'text/html')
   end
-javascript:
-  jQuery(function($) {
-    if (window.parent && /email/.test(parent.location.href)) {
-      // Hide nav:
-      $('.left-column,.right-column').hide();
-      $('.center-column').css('margin', 0);
-      $('.page-header h2').html(
-        "Editing email" +
-        " <a class='btn btn-primary' href='#{show_url}'>#{t 'rep.view_link'}</a>"
-      )
 
-      // Snippet form:
-      var control = function(name) { return $('[name^="snippet[' + name + ']"]').closest('.control-group'); };
+- if show_url.present?
+  javascript:
+    jQuery(function($) {
+      if (window.parent && (new RegExp('#{rails_email_preview.rep_root_path}')).test(parent.location.href)) {
+        // Hide nav:
+        $('.left-column,.right-column').hide();
+        $('.center-column').css('margin', 0);
+        $('.page-header h2').html(
+          "Editing email" +
+          " <a class='btn btn-primary' href='#{show_url}'>#{t 'rep.view_link'}</a>"
+        )
 
-      // retext labels
-      control('label').find('.control-label').text("Subject");
-      control('content').find('.control-label').text("Body");
+        // Snippet form:
+        var control = function(name) { return $('[name^="snippet[' + name + ']"]').closest('.control-group'); };
 
-      // hide identifier and categories
-      control('identifier').hide();
-      control('category_ids').hide()
+        // retext labels
+        control('label').find('.control-label').text("Subject");
+        control('content').find('.control-label').text("Body");
 
-      // Do not mess with identifier
-      $('[data-slug]').removeAttr('data-slug');
-    }
-  });
+        // hide identifier and categories
+        control('identifier').hide();
+        control('category_ids').hide()
+
+        // Do not mess with identifier
+        $('[data-slug]').removeAttr('data-slug');
+      }
+    });

data/config/initializers/rails_email_preview.rb

@@ -13,6 +13,9 @@ require 'rails_email_preview'
 #
 #  # do not show Send Email button
 #  config.enable_send_email = false
+#
+#  # You can specify a controller for RailsEmailPreview::ApplicationController to inherit from:
+#  config.parent_controller = 'Admin::ApplicationController' # default: '::ApplicationController'
 #end
 
 #= REP + Comfortable Mexican Sofa integration
@@ -20,17 +23,10 @@ require 'rails_email_preview'
 # # enable comfortable_mexican_sofa integration:
 # require 'rails_email_preview/integrations/comfortable_mexica_sofa'
 
-#= Application-specific (layout, permissions, customizations)
-#
-# # You can specify a controller for RailsEmailPreview::ApplicationController to inherit from:
-# RailsEmailPreview.parent_controller = 'Admin::ApplicationController' # default: '::ApplicationController'
-#
-# # Render REP inside a custom layout (set to 'application' to use app layout, default is REP's own layout)
-# RailsEmailPreview::EmailsController.layout 'admin'
-
 Rails.application.config.to_prepare do
-  # # If you use a *custom layout*, make route helpers available to REP:
-  # RailsEmailPreview.inline_main_app_routes!
+  # Render REP inside a custom layout (set to 'application' to use app layout, default is REP's own layout)
+  # This will also make application routes accessible from within REP:
+  # RailsEmailPreview.layout = 'admin'
 
   # Auto-load preview classes from:
   RailsEmailPreview.preview_classes = Dir[Rails.root.join 'app/mailer_previews/*_preview.rb'].map { |p|

data/lib/rails_email_preview.rb

@@ -37,6 +37,14 @@ module RailsEmailPreview
   }
 
   class << self
+    def layout=(layout)
+      [::RailsEmailPreview::ApplicationController, ::RailsEmailPreview::EmailsController].each { |ctrl| ctrl.layout layout }
+      if layout && layout !~ %r(^rails_email_preview/)
+        # inline application routes if using an app layout
+        inline_main_app_routes!
+      end
+    end
+
     def run_before_render(mail, preview_class_name, mailer_action)
       (defined?(@hooks) && @hooks[:before_render] || []).each do |block|
         block.call(mail, preview_class_name, mailer_action)
@@ -48,7 +56,10 @@ module RailsEmailPreview
     end
 
     def inline_main_app_routes!
-      ::RailsEmailPreview::ApplicationController.helper ::RailsEmailPreview::MainAppRouteDelegator
+      unless ::RailsEmailPreview::EmailsController.instance_variable_get(:@inlined_routes)
+        ::RailsEmailPreview::EmailsController.helper ::RailsEmailPreview::MainAppRouteDelegator
+        ::RailsEmailPreview::EmailsController.instance_variable_set(:@inlined_routes, true)
+      end
     end
 
     def setup

data/lib/rails_email_preview/integrations/comfortable_mexica_sofa.rb

@@ -17,6 +17,7 @@ module RailsEmailPreview
       #      cms_email_subject(name: "Alice") #=> "Welcome, Alice!"
       def cms_email_subject(interpolation = {})
         snippet_id = "email-#{cms_email_id}"
+        return '(no subject)' unless Cms::Snippet.where(identifier: snippet_id).exists?
         [I18n.locale, I18n.default_locale].compact.each do |locale|
           site    = Cms::Site.find_by_locale(locale)
           snippet = site.snippets.find_by_identifier(snippet_id)
@@ -44,14 +45,17 @@ module RailsEmailPreview
       # Will also render an "✎ Edit text" link if used from
       def cms_email_snippet(snippet_id = self.cms_email_id)
         snippet_id = "email-#{snippet_id}"
-        site       = Cms::Site.find_by_locale(I18n.locale)
-
-        # Fallback default locale: (# prefill)
-        unless (content = cms_snippet_content(snippet_id, site).presence)
-          default_site     = Cms::Site.find_by_locale(I18n.default_locale)
-          fallback_content = cms_snippet_content(snippet_id, default_site).presence
+        if Cms::Snippet.where(identifier: snippet_id).exists?
+          site       = Cms::Site.find_by_locale(I18n.locale)
+          # Fallback default locale: (# prefill)
+          unless (content = cms_snippet_content(snippet_id, site).presence)
+            default_site     = Cms::Site.find_by_locale(I18n.default_locale)
+            fallback_content = cms_snippet_content(snippet_id, default_site).presence
+          end
+          result = (content || fallback_content).to_s
+        else
+          result = ''
         end
-        result = (content || fallback_content).to_s
 
         # If rendering in preview from admin, add edit/create lnk
         if cms_email_edit_link?
@@ -73,10 +77,8 @@ module RailsEmailPreview
                        })
                      end
 
-          result = safe_join ["<table class='rep-edit-link'><tr><td>".html_safe,
-                              cms_edit_email_snippet_link(cms_path),
-                              "</td></tr></table>".html_safe,
-                              "\n\n", result]
+          result = safe_join ["<table class='rep-edit-link'><tr><td>".html_safe, cms_edit_email_snippet_link(cms_path),
+                              "</td></tr></table>".html_safe, "\n\n", result]
         end
         result
       end
@@ -87,7 +89,7 @@ module RailsEmailPreview
 
       def self.rep_email_params_from_snippet(snippet)
         id_prefix = 'email-'
-        return unless snippet && snippet.identifier.starts_with?(id_prefix)
+        return unless snippet && snippet.identifier && snippet.identifier.starts_with?(id_prefix)
         mailer_cl, act = snippet.identifier[id_prefix.length..-1].split('-')
         mailer_cl += '_preview'
         { mail_class: mailer_cl,

data/lib/rails_email_preview/version.rb

@@ -1,3 +1,3 @@
 module RailsEmailPreview
-  VERSION = '0.2.9'
+  VERSION = '0.2.10'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_email_preview
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
 platform: ruby
 authors:
 - Gleb Mazovetskiy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-22 00:00:00.000000000 Z
+date: 2013-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -136,8 +136,8 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: A Rails Engine to preview plain text and html email in your browser.
-  Test send, i18n support, premailer integration, etc...
+description: Rails engine to preview, test send, and edit application email in browser.
+  i18n support, premailer integration, and more.
 email: glex.spb@gmail.com
 executables: []
 extensions: []