effective_trash 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b542e2929ae9716df6b09a9a482657b25fcebf17
-  data.tar.gz: caf41ba9a378738c5916d969c45280f4c33c3bd9
+  metadata.gz: fd64b9818e00706023f8e7756ceaa5dcdfd6ef01
+  data.tar.gz: afd0d089858ce9067dfc015e4df141d55f808411
 SHA512:
-  metadata.gz: a7c3a8f18344b204dadef5bb6225a24d0857dd4180803cc3e5302e7e6a07c941b626b2ecec06a7568c8dbe0ccede8c9acf8f8be50e82687d0ed2c50305dae579
-  data.tar.gz: 4ff53ef056b81d4f18fd333aeddf446f500172c261fc92878074ac51c4bd2bda818b30241811e342b6a02a0c552bf131ebd8441cd157ac3055bb583302876365
+  metadata.gz: b6c67bc50bda291c33831e20fc0a2680929abe593d2d6515a2311ff9867cb6492901a159467b4e3261bf326488d4432516c3548f92d3a3fd43fba8a85484dc72
+  data.tar.gz: 9b5d9185ff36a93efacd8eca43777901e89ce07dfad4cbe19f1747edd4fc086b0656ac080f6a049d6dfdb8709d71dd5b923fef20c6252d0a5ab89d0c92da6028

data/README.md

@@ -58,6 +58,10 @@ It also serializes the attributes of any `belongs_to`, `has_one`, and `has_many`
 
 Restoring only works with the single base object right now.
 
+`acts_as_trashable include_associated: false` for cheaper trashes that don't to_s every object.
+
+`acts_as_trashable include_nested: false` will ignore any nested_attributes, but careful you can lose data when true.
+
 ## Routes
 
 Visit `/trash`, or `/admin/trash` for an interface to view and restore Trash.

data/app/models/concerns/acts_as_trashable.rb

@@ -24,7 +24,9 @@ module ActsAsTrashable
     acts_as_trashable_options = {
       only: Array(@acts_as_trashable_options[:only]).map { |attribute| attribute.to_s },
       except: Array(@acts_as_trashable_options[:except]).map { |attribute| attribute.to_s },
-      additionally: Array(@acts_as_trashable_options[:additionally]).map { |attribute| attribute.to_s }
+      additionally: Array(@acts_as_trashable_options[:additionally]).map { |attribute| attribute.to_s },
+      include_associated: @acts_as_trashable_options.fetch(:include_associated, true),
+      include_nested: @acts_as_trashable_options.fetch(:include_nested, true)
     }
 
     self.send(:define_method, :acts_as_trashable_options) { acts_as_trashable_options }

data/lib/effective_trash.rb

@@ -44,12 +44,18 @@ module EffectiveTrash
   # Trash it - Does not delete the original object.
   # This is run in a before_destroy, or through a script.
   def self.trash!(obj)
+    args = if obj.respond_to?(:acts_as_trashable_options)
+      obj.acts_as_trashable_options.slice(:include_associated, :include_nested)
+    else
+      { include_associated: true, include_nested: true }
+    end
+
     trash = Effective::Trash.new(
       trashed: obj,
       user: EffectiveTrash.current_user,
       trashed_to_s: obj.to_s,
       trashed_extra: (trashed_extra if obj.respond_to?(:trashed_extra)),
-      details: Effective::Resource.new(obj).instance_attributes
+      details: Effective::Resource.new(obj).instance_attributes(args)
     ).save!
   end
 

data/lib/effective_trash/version.rb

@@ -1,3 +1,3 @@
 module EffectiveTrash
-  VERSION = '0.3.1'.freeze
+  VERSION = '0.3.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_trash
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-02 00:00:00.000000000 Z
+date: 2018-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails