effective_logging 1.5.6 → 1.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c6cfe7794beee622fae50374ddc4da4aa22409c
-  data.tar.gz: d77f88acf0c15747c5e850a9822eea54289f79fb
+  metadata.gz: dba3d7067bb00cdfd22bf82b4e2d22b5eb93c510
+  data.tar.gz: d0c1fcd66775d2429ff202a9456c17d704ecb56b
 SHA512:
-  metadata.gz: 955c515d6f371d0ac10daee34b9d63303861e1bde2ed6c562d0ad14fb505ec36bf3dceb23554402d6eb85ec982bbb2dcd633dd1ca8d2fcf2ed2b9282340ebd95
-  data.tar.gz: 6a5037baf8e2217f29c914f4be606c824fcae22151f722e798fe7e5232ae1f763bc045ed53e050d78d8ce4f6d646e9cd3863bf69472bf2d35d050403bc967d3f
+  metadata.gz: 3e3dae72ea8a9be3248c387de264f5dc764e34de170e2b6972b5498eb1cf3ceaff850101bfd30b0c46a7137476f1e475ec15ac93e71bf1f1ee98495bbe599bb7
+  data.tar.gz: 2f71d15d724c34eb6c34025def23b8e7912d55174bc6e6ecc519c16ea9af3a388f4948b2fbb964b72a56d96be4b210f8af757ffdaf2b9b0b63ea159af88ab841

data/app/controllers/admin/logs_controller.rb

@@ -1,6 +1,6 @@
 module Admin
   class LogsController < ApplicationController
-    before_filter :authenticate_user!   # This is devise, ensure we're logged in.
+    respond_to?(:before_action) ? before_action(:authenticate_user!) : before_filter(:authenticate_user!) # Devise
 
     layout (EffectiveLogging.layout.kind_of?(Hash) ? EffectiveLogging.layout[:admin_logs] : EffectiveLogging.layout)
 

data/app/controllers/effective/logs_controller.rb

@@ -1,7 +1,13 @@
 module Effective
   class LogsController < ApplicationController
     skip_log_page_views quiet: true
-    before_filter :authenticate_user!, :only => [:index, :show] # Devise ensure logged in
+
+    if respond_to?(:before_action) # Devise
+      before_action :authenticate_user!, only: [:index, :show]
+    else
+      before_filter :authenticate_user!, only: [:index, :show]
+    end
+
 
     # This is a post from our Javascript
     def create

data/app/helpers/effective_logging_helper.rb

@@ -84,7 +84,7 @@ module EffectiveLoggingHelper
         content_tag(:iframe, '',
           src: effective_logging.html_part_log_path(log, key: key),
           style: 'frameborder: 0; border: 0; width: 100%; height: 100%;',
-          onload: "this.style.height=this.contentDocument.body.scrollHeight + 'px';",
+          onload: "this.style.height=(this.contentDocument.body.scrollHeight + 30) + 'px';",
           scrolling: 'no'),
         h(after).gsub("\n", '<br>')
       ].compact.join.html_safe

data/lib/effective_logging/email_logger.rb

@@ -16,7 +16,9 @@ module EffectiveLogging
         message.header['log'] = nil
       end
 
-      logged_fields[:email] = "#{message.header}<hr>#{message.body}"
+      body = (message.body.try(:parts) || []).find { |part| part.content_type.to_s.downcase.include?('text/html') }
+
+      logged_fields[:email] = "#{message.header}<hr>#{(body.presence || message.body)}"
 
       (message.to || []).each do |to|
         logged_fields[:to] = to

data/lib/effective_logging/version.rb

@@ -1,3 +1,3 @@
 module EffectiveLogging
-  VERSION = '1.5.6'.freeze
+  VERSION = '1.5.7'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_logging
 version: !ruby/object:Gem::Version
-  version: 1.5.6
+  version: 1.5.7
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-18 00:00:00.000000000 Z
+date: 2016-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails