rails_email_preview 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b46366e1472a3041b34ca170b5cc29825c9f5ed1
-  data.tar.gz: 8ba5c7bacfdfaef09c530d75672ff78f70690f11
+  metadata.gz: 3376d78dc76c05caad12ed8edfd10561f2bbe26a
+  data.tar.gz: 60d4ed9e76ac494ccb6525e5a473f2588c1b2a36
 SHA512:
-  metadata.gz: 87929034726a606ffa0d438c3f91f99a4a89dbf760487d2c140e98d18fd46bb988f3cb4642012755612db68138706dd6dc4af7ab0f4ec1811ae9c524eba63233
-  data.tar.gz: beee657162ebe47a1e601e236fe12ff8f3c142136385c4a17b62a3fccc824ed18e76a3c1854a9754b976d36481a414e7f967a0ab9d8b501e0e0b17800233ebba
+  metadata.gz: f70eea7d48c43bdb6cde8dd0c0eeceae3da57710befdbbdd832dc51f7c31b6d338737147128b546653396cb9316876df5471c0b4447a208af56234008d670046
+  data.tar.gz: 63ee7f56d47814232ccce50a0a1f5f0cd5de127f65247008b2806bc311f8bb5836a9d2209b5ccc942238bba3f2d462d3d83df9b7af9ed0c050baa9f63d7c8578

data/README.md

@@ -3,10 +3,14 @@ Rails Email Preview
 
 A Rails Engine to preview plain text and html email in your browser. Compatible with Rails 3 and 4.
 
+Preview:
 ![screenshot][rep-show-screenshot]
+
+List:
 ![screenshot][rep-nav-screenshot]
 
-*styles are provided by the application, above is [Zuigo](http://zuigo.com/), a platform to organize & discover events*
+REP can use the application styles and comes with simple defaults (default markup for [twbs/bootstrap](twbs/bootstrap) 3).
+*These screenshots are from [Zuigo](http://zuigo.com/), a platform to organize & discover events.*
 
 How to
 -----
@@ -63,14 +67,14 @@ You can access REP urls like this:
     # email show:
     rails_email_preview.rep_email_url(mail_class: "user_mailer", mail_action: "welcome")
 
-Sending test emails
+Send Emails
 -------------------
 
 You can send emails via REP. This is especially useful when testing with limited clients (Blackberry, Outlook, etc.).
 This will use the environment's mailer settings, but the handler will `perform_deliveries`.
 Uncomment this line in the initializer to disable sending test emails:
 
-  config.enable_send_email = false
+    config.enable_send_email = false
 
 Email editing 
 -------------
@@ -78,7 +82,7 @@ Email editing
 You can use [comfortable_mexican_sofa](https://github.com/comfy/comfortable-mexican-sofa) for storing and editing emails.
 REP comes with an integration for it -- see [CMS Guide](https://github.com/glebm/rails_email_preview/wiki/Edit-Emails-with-Comfortable-Mexican-Sofa).
 
-![screenshot][rep-edit-sofa-screenshot]
+[![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
@@ -148,4 +152,3 @@ This project rocks and uses MIT-LICENSE.
 
   [rep-nav-screenshot]: https://raw.github.com/glebm/rails_email_preview/master/doc/img/rep-nav.png "Email List Screenshot"
   [rep-show-screenshot]: https://raw.github.com/glebm/rails_email_preview/master/doc/img/rep-show.png "Show Email Screenshot"
-  [rep-edit-sofa-screenshot]: https://raw.github.com/glebm/rails_email_preview/master/doc/img/rep-edit-sofa.png "Edit Email with Comfortable Mexican Sofa Screenshot"

data/app/controllers/rails_email_preview/emails_controller.rb

@@ -23,7 +23,7 @@ class RailsEmailPreview::EmailsController < ::RailsEmailPreview::ApplicationCont
   # render actual email content
   def show_raw
     I18n.with_locale @email_locale do
-      @mail = preview_mail
+      @mail = preview_mail(edit_links: (@part_type == 'text/html'))
       RailsEmailPreview.run_before_render(@mail, @preview_class.name, @mail_action)
       if @part_type == 'raw'
         body = "<pre id='raw_message'>#{html_escape(@mail.to_s)}</pre>"
@@ -48,14 +48,13 @@ class RailsEmailPreview::EmailsController < ::RailsEmailPreview::ApplicationCont
       redirect_to redirect_url, alert: t('rep.test_deliver.provide_email')
       return
     end
-    if !(delivery_method = Rails.application.config.action_mailer.delivery_method)
-      redirect_to redirect_url, alert: t('rep.test_deliver.no_delivery_method', environment: Rails.env)
-      return
-    end
     I18n.with_locale @email_locale do
       delivery_handler = RailsEmailPreview::DeliveryHandler.new(preview_mail, to: address, cc: nil, bcc: nil)
       deliver_email!(delivery_handler.mail)
-
+    end
+    if !(delivery_method = Rails.application.config.action_mailer.delivery_method)
+      redirect_to redirect_url, alert: t('rep.test_deliver.no_delivery_method', environment: Rails.env)
+    else
       redirect_to redirect_url, notice: t('rep.test_deliver.sent_notice', address: address, delivery_method: delivery_method)
     end
   end
@@ -71,8 +70,10 @@ class RailsEmailPreview::EmailsController < ::RailsEmailPreview::ApplicationCont
     end
   end
 
-  def preview_mail
-    @preview_class.new.send(@mail_action)
+  def preview_mail(opt = {})
+    RequestStore.store[:rep_edit_links] = true if opt[:edit_links]
+    mail = @preview_class.new.send(@mail_action)
+    mail
   end
 
   def set_email_preview_locale

data/lib/rails_email_preview.rb

@@ -6,6 +6,7 @@ require 'rails_email_preview/delivery_handler'
 
 require 'slim'
 require 'slim-rails'
+require 'request_store'
 
 module RailsEmailPreview
 

data/lib/rails_email_preview/integrations/comfortable_mexica_sofa.rb

@@ -35,6 +35,11 @@ module RailsEmailPreview
         '(no subject)'
       end
 
+      # show edit link?
+      def cms_email_edit_link?
+        RequestStore.store[:rep_edit_links]
+      end
+
       # Will return snippet content, passing through Kramdown
       # Will also render an "✎ Edit text" link if used from
       def cms_email_snippet(snippet_id = self.cms_email_id)
@@ -49,7 +54,7 @@ module RailsEmailPreview
         result = (content || fallback_content).to_s
 
         # If rendering in preview from admin, add edit/create lnk
-        if caller.grep(/rails_email_preview\/emails_controller/).present? && !caller.grep(/rails_email_preview\/delivery_handler/).present?
+        if cms_email_edit_link?
           snippet = site.snippets.find_by_identifier(snippet_id)
 
 

data/lib/rails_email_preview/version.rb

@@ -1,3 +1,3 @@
 module RailsEmailPreview
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_email_preview
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Gleb Mazovetskiy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-30 00:00:00.000000000 Z
+date: 2013-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -94,6 +94,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: request_store
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |-
   Implemented as a rails engine with a simple UI for previewing your app emails,
   I18n support, easy premailer integration and editing integration via comfortable_mexican_sofa CMS.