RubyGems - effective_logging - Versions diffs - 1.10.15 → 1.10.16 - Mend

effective_logging 1.10.15 → 1.10.16

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

checksums.yaml +4 -4
data/app/datatables/effective_logs_datatable.rb +1 -1
data/app/helpers/effective_logging_helper.rb +21 -60
data/app/models/concerns/acts_as_loggable.rb +1 -1
data/app/models/effective/datatables/logs.rb +1 -1
data/lib/effective_logging/version.rb +1 -1
metadata +2 -2

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0682646a2c7421ae64c51f60d4ab6cd87e1fba68
-  data.tar.gz: fde030b741ec05381269623ef3e9e51e5efb923c
+  metadata.gz: fcaff27699ddd3c334777ddd01aedcf1c2d5bc9f
+  data.tar.gz: 67b5881b597afefe2a8e8898431ecaa69b1c72a7
 SHA512:
-  metadata.gz: a846b9f6c2e242dbc8415fc851cdf366a9e5c21fadd399262cd9d7b29afa011f4287c93f38cc725c6e696b13dc8e77c4081c25255ff45eb4bb77ad176e0d657a
-  data.tar.gz: 5d535d0026e1adcda96b8e62153104eab7d074661b87b3afac2f7987b1a14eb4e4e4083a97c2daf97ebac28b17b3e2a99509b5524627a8a5c79482a35663a835
+  metadata.gz: 6b5bb0f1e5b0a5c9a66b683585788868d9d3bac8443445dd48f58bb196f959f465c581c7b96714c5d50df55b19009c8904d960d7da2046df9712b0cc531b571c
+  data.tar.gz: d48f46e7133f5dfb3a5b90de83a576d098f100c182a5c7c9a88682beed2598da19d859957f89cd0ddaca66612689aee07c395ee6e6b61dabfbb82a830f7e278e

data/app/datatables/effective_logs_datatable.rb CHANGED

@@ -37,7 +37,7 @@ unless Gem::Version.new(EffectiveDatatables::VERSION) < Gem::Version.new('3.0')
       col :logs_count, visible: false
       col :details, visible: false, sort: false do |log|
-        tableize_hash(log.details.except(:email), th: true, sub_th: false, width: '100%')
+        tableize_hash(log.details.except(:email))
       end
       unless attributes[:actions] == false

data/app/helpers/effective_logging_helper.rb CHANGED

@@ -1,6 +1,4 @@
 module EffectiveLoggingHelper
-  ALLOWED_TAGS = ActionView::Base.sanitized_allowed_tags.to_a + ['table', 'thead', 'tbody', 'tfoot', 'tr', 'td', 'th']
-  ALLOWED_ATTRIBUTES = ActionView::Base.sanitized_allowed_attributes.to_a + ['colspan', 'rowspan']
   def bootstrap_class_for_status(status)
     case status
@@ -23,33 +21,6 @@ module EffectiveLoggingHelper
     parents.compact.reverse
   end
-  # Call me with :th => true, :sub_th => false
-  # Any other options are sent to the table tag
-  def tableize_hash(hash, options = {})
-    if hash.present? && hash.kind_of?(Hash)
-      content_tag(:table, class: options[:class]) do
-        content_tag(:tbody) do
-          hash.map do |k, v|
-            content_tag(:tr) do
-              content_tag((options[:th] ? :th : :td), k) +
-              content_tag(:td) do
-                if v.kind_of?(Hash)
-                  tableize_hash(v, options.merge({class: 'table table-hover', th: (options.key?(:sub_th) ? options[:sub_th] : options[:th])}))
-                elsif v.kind_of?(Array)
-                  '[' + v.join(', ') + ']'
-                else
-                  v.to_s
-                end
-              end
-            end
-          end.join('').html_safe
-        end
-      end.html_safe
-    else
-      hash.to_s.html_safe
-    end
-  end
   # This is called on the Logs#show Admin page, and is intended for override by the application
   def effective_logging_object_link_to(obj, action = :show)
     if obj.kind_of?(User)
@@ -63,40 +34,30 @@ module EffectiveLoggingHelper
     end
   end
+  # tabelize_hash and format_resource_value are from effective_resources
   def format_log_details_value(log, key)
     value = log.details[key]
-    if value.kind_of?(Hash)
-      tableize_hash(value, class: 'table table-hover', th: true)
-    elsif value.kind_of?(Array)
-      value.map { |value| effective_logging_simple_format(value) }.join.html_safe
-    else
-      value = value.to_s
-      open = value.index('<!DOCTYPE html') || value.index('<html')
-      close = value.rindex('</html>') if open.present?
-      return effective_logging_simple_format(value) unless (open.present? && close.present?)
-      before = value[0...open]
-      after = value[(close+7)..-1]
-      divide = before.sub!('<hr>', '').present?
-      [
-        h(before).gsub("\n", '<br>'),
-        (content_tag(:hr) if divide),
-        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 + 30) + 'px';",
-          scrolling: 'no'),
-        h(after).gsub("\n", '<br>')
-      ].compact.join.html_safe
-    end
+    return tableize_hash(value) unless value.kind_of?(String)
+    open = value.index('<!DOCTYPE html') || value.index('<html')
+    close = value.rindex('</html>') if open.present?
+    return format_resource_value(value) unless (open.present? && close.present?)
+    before = value[0...open]
+    after = value[(close+7)..-1]
+    divide = before.sub!('<hr>', '').present?
+    [
+      h(before).gsub("\n", '<br>'),
+      (content_tag(:hr) if divide),
+      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 + 30) + 'px';",
+        scrolling: 'no'),
+      h(after).gsub("\n", '<br>')
+    ].compact.join.html_safe
   end
-  def effective_logging_simple_format(value)
-    simple_format(sanitize(value.to_s, :tags => ALLOWED_TAGS, :attributes => ALLOWED_ATTRIBUTES), {}, :sanitize => false)
-  end
 end

data/app/models/concerns/acts_as_loggable.rb CHANGED

@@ -14,7 +14,7 @@ module ActsAsLoggable
   end
   included do
-    has_many :logged_changes, -> { where(status: EffectiveLogging.log_changes_status) }, as: :associated, class_name: Effective::Log
+    has_many :logged_changes, -> { where(status: EffectiveLogging.log_changes_status) }, as: :associated, class_name: 'Effective::Log'
     around_save do |_, block|
       @acts_as_loggable_new_record = new_record?

data/app/models/effective/datatables/logs.rb CHANGED

@@ -41,7 +41,7 @@ if Gem::Version.new(EffectiveDatatables::VERSION) < Gem::Version.new('3.0')
           table_column :logs_count, visible: false
           table_column :details, visible: false, sortable: false do |log|
-            tableize_hash(log.details.except(:email), th: true, sub_th: false, width: '100%')
+            tableize_hash(log.details.except(:email), th: true, sub_th: false)
           end
           unless attributes[:actions] == false

data/lib/effective_logging/version.rb CHANGED

@@ -1,3 +1,3 @@
 module EffectiveLogging
-  VERSION = '1.10.15'.freeze
+  VERSION = '1.10.16'.freeze
 end

metadata CHANGED

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_logging
 version: !ruby/object:Gem::Version
-  version: 1.10.15
+  version: 1.10.16
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-06-05 00:00:00.000000000 Z
+date: 2017-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails