effective_resources 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 435122fff68bc60412b461cd4eadf1b2a1c9543c
-  data.tar.gz: 4a5a64cc84f32cf948dfe3b69e799cfcd74b52bd
+  metadata.gz: 75c86fb082f32358410e49243ea61b344d1e691a
+  data.tar.gz: 5a54eba2d20082b290fdd59fb80ed54f934cca40
 SHA512:
-  metadata.gz: 6675a98f388897cf2b97cd93177f8fc15927b7d85eae40ed1be4b9ac5a45e4ea767c8232994609f469daaec3b84853e0a8dd153693a71a3d78fc9c8ebbdd2b9c
-  data.tar.gz: efc25566f103fd524994ccf0c7f1bd11578ff748311e75ea034e5ca49a15de60cfcbe0fb6080bb77f26615a368855831291076e12261bda73adb8251be788b5d
+  metadata.gz: ae81d6db6a9a2ee2059ba36177a93d92bafbfb2a33842f28b4c718c3c478e0a454eb474459a14e072a566c09bfb436769fe7d6e7e797dce77da2ecfccf0ce9d7
+  data.tar.gz: c17da71ef1ba9a6e64f65d7a5bc256f0b8ab7a0e4d1b3e08d10c0b486970a236e62f553e50300cdbb32cd83fd772ce779a9d1861c8b2b0e17832b33ba6476c7d

data/app/controllers/concerns/effective/flash_messages.rb

@@ -48,11 +48,13 @@ module Effective
       action = action.to_s.gsub('_', ' ')
       word = action.split(' ').first.to_s
 
-      if word == 'undo'
+      if word == 'destroy'
+        'deleted'
+      elsif word == 'undo'
         'undid'
       elsif word.end_with?('e')
         action.sub(word, word + 'd')
-      elsif ['a', 'i', 'o', 'u', 'y'].include?(word[-1])
+      elsif ['a', 'i', 'o', 'u'].include?(word[-1])
         action
       else
         action.sub(word, word + 'ed')

data/app/models/concerns/acts_as_archived.rb

@@ -86,7 +86,7 @@ module ActsAsArchived
 
   def unarchive!
     transaction do
-      update_column(:archived, false) # Does not run validations
+      update!(archived: false)
       acts_as_archived_options[:cascade].each { |obj| public_send(obj).update_all(archived: false) }
     end
   end

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

@@ -66,7 +66,7 @@ module Effective
       # It is used by datatables
       def resource_actions
         {}.tap do |actions|
-          (member_get_actions & crud_actions).each do |action|
+          (member_get_actions & crud_actions).reverse_each do |action|
             actions[action.to_s.titleize] = { action: action, default: true }
           end
 

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

@@ -11,61 +11,78 @@ module Effective
       end
 
       # called by effective_trash and effective_logging
-      def instance_attributes(include_associated: true, include_nested: true)
+      def instance_attributes(only: nil, except: nil)
         return {} unless instance.present?
 
-        attributes = { attributes: instance.attributes }
+        # Build up our only and except
+        only = Array(only).map(&:to_sym)
+        except = Array(except).map(&:to_sym) + BLACKLIST
+
+        # Simple Attributes
+        attributes = { attributes: instance.attributes.symbolize_keys }
+
+        attributes[:attributes] = attributes[:attributes].except(*except) if except.present?
+        attributes[:attributes] = attributes[:attributes].slice(*only) if only.present?
 
         # Collect to_s representations of all belongs_to associations
-        if include_associated
-          belong_tos.each do |association|
-            next if BLACKLIST.include?(association.name)
-            attributes[association.name] = instance.send(association.name).to_s
-          end
+        belong_tos.each do |association|
+          next if except.present? && except.include?(association.name)
+          next unless only.blank? || only.include?(association.name)
+
+          attributes[association.name] = instance.send(association.name).to_s
         end
 
-        if include_associated || include_nested
-          nested_resources.each do |association|
-            next if BLACKLIST.include?(association.name)
+        # Grab the instance attributes of each nested resource
+        nested_resources.each do |association|
+          next if except.present? && except.include?(association.name)
+          next unless only.blank? || only.include?(association.name)
 
-            attributes[association.name] ||= {}
+          next if association.options[:through]
 
-            next if association.options[:through]
+          attributes[association.name] ||= {}
 
-            Array(instance.send(association.name)).each_with_index do |child, index|
-              next unless child.present?
+          Array(instance.send(association.name)).each_with_index do |child, index|
+            next unless child.present?
 
-              resource = Effective::Resource.new(child)
-              attributes[association.name][index] = resource.instance_attributes(include_associated: include_associated, include_nested: include_nested)
-            end
+            resource = Effective::Resource.new(child)
+            attributes[association.name][index] = resource.instance_attributes(only: only, except: except)
           end
         end
 
-        if include_associated
-          has_ones.each do |association|
-            next if BLACKLIST.include?(association.name)
-            attributes[association.name] = instance.send(association.name).to_s
-          end
+        has_ones.each do |association|
+          next if except.present? && except.include?(association.name)
+          next unless only.blank? || only.include?(association.name)
 
-          has_manys.each do |association|
-            next if BLACKLIST.include?(association.name)
-            attributes[association.name] = instance.send(association.name).map { |obj| obj.to_s }
-          end
+          attributes[association.name] = instance.send(association.name).to_s
+        end
 
-          has_and_belongs_to_manys.each do |association|
-            next if BLACKLIST.include?(association.name)
-            attributes[association.name] = instance.send(association.name).map { |obj| obj.to_s }
-          end
+        has_manys.each do |association|
+          next if except.present? && except.include?(association.name)
+          next unless only.blank? || only.include?(association.name)
+
+          next if BLACKLIST.include?(association.name)
+          attributes[association.name] = instance.send(association.name).map { |obj| obj.to_s }
+        end
+
+        has_and_belongs_to_manys.each do |association|
+          next if except.present? && except.include?(association.name)
+          next unless only.blank? || only.include?(association.name)
+
+          attributes[association.name] = instance.send(association.name).map { |obj| obj.to_s }
         end
 
         attributes.delete_if { |_, value| value.blank? }
       end
 
       # used by effective_logging
-      def instance_changes
+      def instance_changes(only: nil, except: nil)
         return {} unless (instance.present? && instance.previous_changes.present?)
 
-        changes = instance.previous_changes.dup.delete_if do |attribute, (before, after)|
+        # Build up our only and except
+        only = Array(only).map(&:to_sym)
+        except = Array(except).map(&:to_sym) + BLACKLIST
+
+        changes = instance.previous_changes.symbolize_keys.delete_if do |attribute, (before, after)|
           begin
             (before.kind_of?(ActiveSupport::TimeWithZone) && after.kind_of?(ActiveSupport::TimeWithZone) && before.to_i == after.to_i) ||
             (before == nil && after == false) || (before == nil && after == ''.freeze)
@@ -74,8 +91,14 @@ module Effective
           end
         end
 
+        changes = changes.except(*except) if except.present?
+        changes = changes.slice(*only) if only.present?
+
         # Log to_s changes on all belongs_to associations
         belong_tos.each do |association|
+          next if except.present? && except.include?(association.name)
+          next unless only.blank? || only.include?(association.name)
+
           if (change = changes.delete(association.foreign_key)).present?
             changes[association.name] = [(association.klass.find_by_id(change.first) if changes.first), instance.send(association.name)]
           end

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.2.1'.freeze
+  VERSION = '1.2.2'.freeze
 end

metadata

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