rails_email_preview 0.2.28 → 0.2.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3eea5a363eacaf047fa5d45576e2c6a8974045f3
-  data.tar.gz: 3f16c30b8760475706771c7f4cca33b7576b9b9c
+  metadata.gz: 8523c66c8e487eed84770be9fc491a6a3b9a448c
+  data.tar.gz: 65ab97ef66c3aec2ecc63a43ea2e42b37525bbab
 SHA512:
-  metadata.gz: d8eea3701e432683bc5a622aeb2004a8fd5987d1e0df33a5541bcf72063e43ca9343de38db0017bd1ec472af683c820847592e4a41866731c2df974b36bffba2
-  data.tar.gz: 81913ae6de44753cc22ad40a294663b1dd92cabeab369a813f8ba2b613db7001b1bb2da3ce4c8d5120588a0bfe175a86a511259a5c364038cb3c3b6b074c233e
+  metadata.gz: 3581f045147cdbaa028ffd1cc9913a1be4e41ab4cb5b08111706ff239c5ee8813568cb4f76a26357f6baa7a46e2ac2349b320f3161679c116cd79fd9d397c6c1
+  data.tar.gz: 4d173271dbd4511bb18b06a9bb048521f22a8b7751256c4342f34c565337a25cc9c79a9f4c26cdd2f25b15b4204080e6ebe976081a9286368f55428bc71a346c

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.28'
+gem 'rails_email_preview', '~> 0.2.29'
 ```
 
 Add an initializer and the routes:
@@ -49,7 +49,7 @@ class UserMailerPreview
 
   private
   # You can put all your mock helpers in a module
-  # or you can use your factories / fabricators, just make sure you are not creating anythin
+  # or you can use your factories / fabricators, just make sure you are not creating anything
   def mock_user(name = 'Bill Gates')
     fake_id User.new(name: name, email: "user#{rand 100}@test.com")
   end

data/app/controllers/rails_email_preview/emails_controller.rb

@@ -70,8 +70,11 @@ module RailsEmailPreview
     private
 
     def deliver_email!(mail)
-      # support deliver! if present
-      if mail.respond_to?(:deliver!)
+      if mail.respond_to?(:deliver_now!)
+        # Rails 4.2+
+        mail.deliver_now!
+      elsif mail.respond_to?(:deliver!)
+        # support deliver! if present (resque-mailer etc)
         mail.deliver!
       else
         mail.deliver

data/lib/rails_email_preview/integrations/comfortable_mexica_sofa.rb

@@ -21,7 +21,7 @@ module RailsEmailPreview
         snippet_id = "email-#{cms_email_id}"
         return '(no subject)' unless cms_snippet_class.where(identifier: snippet_id).exists?
         [I18n.locale, I18n.default_locale].compact.each do |locale|
-          site    = cms_site_class.find_by_locale(locale.to_s)
+          site = cms_site_class.find_by_locale(locale.to_s)
           unless site
             raise "rails_email_preview: #{t 'integrations.cms.errors.site_missing', locale: locale}"
           end
@@ -47,7 +47,7 @@ module RailsEmailPreview
       end
 
       def cms_email_edit_link(site, default_site, snippet_id)
-        snippet  = site.snippets.find_by_identifier(snippet_id) || cms_snippet_class.new(
+        snippet   = site.snippets.find_by_identifier(snippet_id) || cms_snippet_class.new(
             label:      "#{snippet_id.sub('-', ' / ').humanize}",
             identifier: snippet_id,
             site:       site
@@ -56,7 +56,7 @@ module RailsEmailPreview
         edit_path = if snippet.persisted?
                       p[:id] = snippet.id
                       if snippet.content.blank? && default_site && (default_snippet = default_site.snippets.find_by_identifier(snippet_id))
-                        p[:snippet] = {
+                        p[:snippet]         = {
                             content: default_snippet.content
                         }
                         p[:snippet][:label] = default_snippet.label unless snippet.label.present?
@@ -87,7 +87,7 @@ module RailsEmailPreview
         if cms_snippet_class.where(identifier: snippet_id).exists?
           # Prefill from default locale if no content
           content = send(cms_snippet_render_method, snippet_id, site)
-          result = (content.presence || send(cms_snippet_render_method, snippet_id, default_site)).to_s
+          result  = (content.presence || send(cms_snippet_render_method, snippet_id, default_site)).to_s
         else
           result = ''
         end
@@ -113,8 +113,7 @@ module RailsEmailPreview
 
       module CmsVersionsCompatibility
         def cms_admin_site_snippet_route
-          if respond_to?(:new_comfy_admin_cms_site_snippet_path)
-            # cms >= 1.11
+          if cms_version_gte?('1.11.0')
             :comfy_admin_cms_site_snippet
           else
             :admin_cms_site_snippet
@@ -138,11 +137,11 @@ module RailsEmailPreview
         end
 
         def cms_snippet_render_method
-          [
-              # cms >= 1.11
-              :cms_snippet_render,
-              :cms_snippet_content
-          ].detect { |m| respond_to? m }
+          if cms_version_gte?('1.12.0')
+            :cms_snippet_render
+          else
+            :cms_snippet_content
+          end
         end
 
         private
@@ -150,8 +149,10 @@ module RailsEmailPreview
           (::ComfortableMexicanSofa::VERSION.split('.').map(&:to_i) <=> version.split('.').map(&:to_i)) >= 0
         end
       end
+
       extend CmsVersionsCompatibility
       include CmsVersionsCompatibility
+      include ::Comfy::CmsHelper if cms_version_gte?('1.12.4')
     end
   end
 end

data/lib/rails_email_preview/version.rb

@@ -1,3 +1,3 @@
 module RailsEmailPreview
-  VERSION = '0.2.28'
+  VERSION = '0.2.29'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_email_preview
 version: !ruby/object:Gem::Version
-  version: 0.2.28
+  version: 0.2.29
 platform: ruby
 authors:
 - Gleb Mazovetskiy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-21 00:00:00.000000000 Z
+date: 2015-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -161,10 +161,10 @@ files:
 - README.md
 - Rakefile
 - app/assets/javascripts/rails_email_preview/application.js.coffee
-- app/assets/stylesheets/rails_email_preview/_bootstrap.css.scss
-- app/assets/stylesheets/rails_email_preview/_bootstrap_theme.css.scss
-- app/assets/stylesheets/rails_email_preview/_layout.css.sass
-- app/assets/stylesheets/rails_email_preview/application.css.sass
+- app/assets/stylesheets/rails_email_preview/_bootstrap.scss
+- app/assets/stylesheets/rails_email_preview/_bootstrap_theme.scss
+- app/assets/stylesheets/rails_email_preview/_layout.sass
+- app/assets/stylesheets/rails_email_preview/application.sass
 - app/controllers/rails_email_preview/application_controller.rb
 - app/controllers/rails_email_preview/emails_controller.rb
 - app/helpers/rails_email_preview/emails_helper.rb