effective_trash 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 473e805a96b7c73933733dff9e8342b0f6e8eb3c
-  data.tar.gz: 4b4c0294ef97d0ed8545925cecb4810437c362f2
+  metadata.gz: b5861ff673da253d2c1b764bad5f96c21c4ede0f
+  data.tar.gz: 619b6e251bc29e258dfb2daddcb7e022a7efc4bd
 SHA512:
-  metadata.gz: dcfad56fc484fee2bf983b521011a3e54dbc28855fd0e500b7639b539022038642b65cf04320991f905ec40ec2765e79caf34cf6edd6b4367399d046dc172e52
-  data.tar.gz: 66704561125458f4a8c17ff18db6d8c06d5634dd7179160f345bcde95f6a1cb625aa83793272e7550bbf6eb319204483fb17b810cd5d4e0e9fda36fcb123f130
+  metadata.gz: 0cc1f9d9d136367ca6777e4f81733a4bc97e6518efee7f8186292a4eb106ae95c4f4f931350485f2d40eeb4369040904076316db05c9910cbc4016feaf267b8b
+  data.tar.gz: 198377e4829662be812a8bdbb21eafd8b4e8432954a2311347afc45eb64d38ec7e6f926331d3efb89217e4df695d9f3fea898ce668e649884d9af37878aaa9e3

data/app/models/concerns/acts_as_trashable.rb

@@ -23,7 +23,7 @@ module ActsAsTrashable
         trashed_to_s: to_s,
         trashed_extra: (trashed_extra if respond_to?(:trashed_extra)),
 
-        details: EffectiveTrash::ActiveRecordLogger.new(self, acts_as_trashable_options).attributes
+        details: EffectiveTrash::ActiveRecordSerializer.new(self, acts_as_trashable_options).attributes
       ).save!
     end
 

data/lib/effective_trash/active_record_serializer.rb

@@ -0,0 +1,61 @@
+module EffectiveTrash
+  class ActiveRecordSerializer
+    attr_accessor :resource, :options
+
+    def initialize(resource, options = {})
+      raise ArgumentError.new('options must be a Hash') unless options.kind_of?(Hash)
+
+      @resource = resource
+      @options = options
+    end
+
+    def attributes
+      attributes = { attributes: resource.attributes }
+
+      # Collect to_s representations of all belongs_to associations
+      (resource.class.try(:reflect_on_all_associations, :belongs_to) || []).each do |association|
+        attributes[association.name] = resource.send(association.name).to_s.presence
+      end
+
+      # Collect to_s representations for all has_one associations
+      (resource.class.try(:reflect_on_all_associations, :has_one) || []).each do |association|
+        next if association.name == :trash && resource.respond_to?(:acts_as_trashable_options) # We skip our own association
+        attributes[association.name] = resource.send(association.name).to_s.presence
+      end
+
+      # Collects attributes for all accepts_as_nested_parameters has_many associations
+      (resource.class.try(:reflect_on_all_autosave_associations) || []).each do |association|
+        attributes[association.name] = {}
+
+        Array(resource.send(association.name)).each_with_index do |child, index|
+          attributes[association.name][index+1] = ActiveRecordLogger.new(child, options).attributes
+        end
+      end
+
+      attributes.delete_if { |k, v| v.blank? }
+    end
+
+    private
+
+    # TODO: Make this work better with nested objects
+    def applicable(attributes)
+      atts = if options[:only].present?
+        attributes.slice(*options[:only])
+      elsif options[:except].present?
+        attributes.except(*options[:except])
+      else
+        attributes.except(:updated_at, :created_at)
+      end
+
+      (options[:additionally] || []).each do |attribute|
+        value = (resource.send(attribute) rescue :effective_trash_nope)
+        next if attributes[attribute].present? || value == :effective_trash_nope
+
+        atts[attribute] = value
+      end
+
+      atts
+    end
+
+  end
+end

data/lib/effective_trash/version.rb

@@ -1,3 +1,3 @@
 module EffectiveTrash
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.2.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_trash
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-08 00:00:00.000000000 Z
+date: 2017-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -106,7 +106,7 @@ files:
 - config/routes.rb
 - db/migrate/01_create_effective_trash.rb.erb
 - lib/effective_trash.rb
-- lib/effective_trash/active_record_logger.rb
+- lib/effective_trash/active_record_serializer.rb
 - lib/effective_trash/engine.rb
 - lib/effective_trash/set_current_user.rb
 - lib/effective_trash/version.rb

data/lib/effective_trash/active_record_logger.rb

@@ -1,160 +0,0 @@
-module EffectiveTrash
-  class ActiveRecordLogger
-    attr_accessor :resource, :logger, :depth, :options
-
-    BLANK = "''"
-
-    def initialize(resource, options = {})
-      raise ArgumentError.new('options must be a Hash') unless options.kind_of?(Hash)
-
-      @resource = resource
-      @logger = options.delete(:logger) || resource
-      @depth = options.delete(:depth) || 0
-      @options = options
-
-      unless @logger.respond_to?(:logged_changes) || @logger.respond_to?(:trash)
-        raise ArgumentError.new('logger must respond to logged_changes or trash')
-      end
-    end
-
-    # execute! is called when we recurse, otherwise the following methods are best called individually
-    def execute!
-      if resource.new_record?
-        created!
-      elsif resource.marked_for_destruction?
-        destroyed!
-      else
-        changed!
-      end
-    end
-
-    # before_destroy
-    def trashed!
-      log_trash((resource.to_s rescue ''), details: applicable(attributes))
-    end
-
-    # before_destroy
-    def destroyed!
-      log('Deleted', details: applicable(attributes))
-    end
-
-    # after_commit
-    def created!
-      log('Created', details: applicable(attributes))
-    end
-
-    # after_commit
-    def updated!
-      log('Updated', details: applicable(attributes))
-    end
-
-    # before_save
-    def changed!
-      applicable(changes).each do |attribute, (before, after)|
-        if resource.respond_to?(:log_changes_formatted_value)
-          before = resource.log_changes_formatted_value(attribute, before) || before
-          after = resource.log_changes_formatted_value(attribute, after) || after
-        end
-
-        attribute = if resource.respond_to?(:log_changes_formatted_attribute)
-          resource.log_changes_formatted_attribute(attribute)
-        end || attribute.titleize
-
-        if after.present?
-          log("#{attribute} changed from #{before.presence || BLANK} to #{after.presence || BLANK}", details: { attribute: attribute, before: before, after: after })
-        else
-          log("#{attribute} set to #{before || BLANK}", details: { attribute: attribute, value: before })
-        end
-      end
-
-      # Log changes on all accepts_as_nested_parameters has_many associations
-      (resource.class.try(:reflect_on_all_autosave_associations) || []).each do |association|
-        child_name = association.name.to_s.singularize.titleize
-
-        Array(resource.send(association.name)).each_with_index do |child, index|
-          ActiveRecordLogger.new(child, options.merge(logger: logger, depth: (depth + 1), prefix: "#{child_name} ##{index+1}: ")).execute!
-        end
-      end
-    end
-
-    def attributes
-      attributes = { attributes: resource.attributes }
-
-      # Collect to_s representations of all belongs_to associations
-      (resource.class.try(:reflect_on_all_associations, :belongs_to) || []).each do |association|
-        attributes[association.name] = resource.send(association.name).to_s.presence || 'nil'
-      end
-
-      # Collect to_s representations for all has_one associations
-      (resource.class.try(:reflect_on_all_associations, :has_one) || []).each do |association|
-        next if association.name == :trash && resource.respond_to?(:acts_as_trashable_options) # We skip our own association
-        attributes[association.name] = resource.send(association.name).to_s.presence || 'nil'
-      end
-
-      # Collects attributes for all accepts_as_nested_parameters has_many associations
-      (resource.class.try(:reflect_on_all_autosave_associations) || []).each do |association|
-        attributes[association.name] = {}
-
-        Array(resource.send(association.name)).each_with_index do |child, index|
-          attributes[association.name][index+1] = ActiveRecordLogger.new(child, options.merge(logger: logger)).attributes
-        end
-      end
-
-      attributes
-    end
-
-    def changes
-      changes = resource.changes
-
-      # Log to_s changes on all belongs_to associations
-      (resource.class.try(:reflect_on_all_associations, :belongs_to) || []).each do |association|
-        if (change = changes.delete(association.foreign_key)).present?
-          changes[association.name] = [association.klass.find_by_id(change.first), resource.send(association.name)]
-        end
-      end
-
-      changes
-    end
-
-    private
-
-    def log(message, details: {})
-      logger.logged_changes.build(
-        user: EffectiveTrash.current_user,
-        status: EffectiveTrash.log_changes_status,
-        message: "#{"\t" * depth}#{options[:prefix]}#{message}",
-        details: details
-      ).tap { |log| log.save }
-    end
-
-    def log_trash(message, details: {})
-      logger.build_trash(
-        user: EffectiveTrash.current_user,
-        status: EffectiveTrash.trashable_status,
-        message: "#{"\t" * depth}#{options[:prefix]}#{message}",
-        details: details
-      ).tap { |log| log.save }
-    end
-
-    # TODO: Make this work better with nested objects
-    def applicable(attributes)
-      atts = if options[:only].present?
-        attributes.slice(*options[:only])
-      elsif options[:except].present?
-        attributes.except(*options[:except])
-      else
-        attributes.except(:updated_at, :created_at)
-      end
-
-      (options[:additionally] || []).each do |attribute|
-        value = (resource.send(attribute) rescue :effective_trash_nope)
-        next if attributes[attribute].present? || value == :effective_trash_nope
-
-        atts[attribute] = value
-      end
-
-      atts
-    end
-
-  end
-end