effective_resources 1.7.2 → 1.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3a189848d1642d5a68d1bbae816eddf3bd4d51513d28bd369a02aa1843b5b9a
-  data.tar.gz: ab0af0abaefa639595858f4eee2356d2ba2b96434c3d493d6a1e1cdd49877bf1
+  metadata.gz: a63a4abae27e2b70ac922d2f3eca07c701842b9ef2482677d200236f05a05dc8
+  data.tar.gz: 136206e80f42d5c019f9113d46c3260d19115f7f40ef58f0064f74b57283167f
 SHA512:
-  metadata.gz: 660470293ca5400697b468ea97a95458a46b323ba6399ce35dea43dc2f535afdf86cae6c7f341cfea69a8ca13f54cbd156bc80fcb0d9fe11ec3c97e5c1aafbc7
-  data.tar.gz: 7e479eef9412d2195465f1cf4194f594dba7bcb5ec47179730098042cda8d151cc855fe52d09972ef9fad0e70a104ec982af49f13ea5e9e7b6d3c9f77bc35e02
+  metadata.gz: 2b08dd74cfa1605c8dcf8e8082612b078ff20b93f9bfbb931f41b8d58ec2795f4a6ca0ed13f837860df4b3166c2069136ab26e0b19a46fa812af2293674bb56a
+  data.tar.gz: a64adaf287722c737951827174f1074ad0580688540944551f406d66fb28dadf74ca7c845c57f008aea6036c355655674328c37c89cc90be36f40738753db436

data/app/models/concerns/acts_as_slugged.rb

@@ -58,8 +58,7 @@ module ActsAsSlugged
   end
 
   def to_param
-    slug
+    slug_was || slug
   end
 
 end
-

data/app/models/effective/resources/associations.rb

@@ -69,12 +69,12 @@ module Effective
         active_storage_has_ones.map { |ass| ass.name.to_s.gsub(/_attachment\z/, '').to_sym }
       end
 
-      def active_texts
+      def action_texts
         klass.reflect_on_all_associations(:has_one).select { |ass| ass.class_name == 'ActionText::RichText' }
       end
 
-      def active_texts_has_ones_ids
-        active_texts.map { |ass| ass.name.to_s.gsub(/\Arich_text_/, '').to_sym }
+      def action_texts_has_ones_ids
+        action_texts.map { |ass| ass.name.to_s.gsub(/\Arich_text_/, '').to_sym }
       end
 
       def nested_resources

data/app/models/effective/resources/attributes.rb

@@ -54,7 +54,7 @@ module Effective
 
       def active_text_attributes
         {}.tap do |retval|
-          active_texts_has_ones_ids.each { |k, v| retval[k] = [:string] }
+          action_texts_has_ones_ids.each { |k, v| retval[k] = [:string] }
         end
       end
 

data/app/models/effective/resources/instance.rb

@@ -49,7 +49,7 @@ module Effective
           end
         end
 
-        has_ones.each do |association|
+        (action_texts + has_ones).each do |association|
           next if except.present? && except.include?(association.name)
           next unless only.blank? || only.include?(association.name)
 
@@ -74,9 +74,22 @@ module Effective
         attributes.delete_if { |_, value| value.blank? }
       end
 
+      def instance_action_texts_previous_changes
+        return {} unless instance.present? && action_texts.present?
+
+        action_texts
+          .map { |ass| instance.send(ass.name) }
+          .compact
+          .select { |obj| obj.previous_changes['body'].present? }
+          .inject({}) { |h, obj| h[obj.name.to_sym] = obj.previous_changes['body']; h }
+      end
+
       # used by effective_logging
       def instance_changes(only: nil, except: nil)
-        return {} unless (instance.present? && instance.previous_changes.present?)
+        return {} unless instance.present?
+
+        action_texts_changes = instance_action_texts_previous_changes()
+        return {} unless instance.previous_changes.present? || action_texts_changes.present?
 
         # Build up our only and except
         only = Array(only).map(&:to_sym)
@@ -94,6 +107,13 @@ module Effective
         changes = changes.except(*except) if except.present?
         changes = changes.slice(*only) if only.present?
 
+        action_texts_changes.each do |name, (before, after)|
+          next if except.present? && except.include?(name)
+          next unless only.blank? || only.include?(name)
+
+          changes[name] = [before.to_s, after.to_s]
+        end
+
         # Log to_s changes on all belongs_to associations
         belong_tos.each do |association|
           next if except.present? && except.include?(association.name)
@@ -110,7 +130,3 @@ module Effective
     end
   end
 end
-
-
-
-

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.7.2'.freeze
+  VERSION = '1.7.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 1.7.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-21 00:00:00.000000000 Z
+date: 2021-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails