effective_trash 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd64b9818e00706023f8e7756ceaa5dcdfd6ef01
-  data.tar.gz: afd0d089858ce9067dfc015e4df141d55f808411
+  metadata.gz: c0d2f4720fc5c9eab98d6f37af76dd186969899b
+  data.tar.gz: 1c24401c5cb30fbdd9954e48c84b65a74ff61b96
 SHA512:
-  metadata.gz: b6c67bc50bda291c33831e20fc0a2680929abe593d2d6515a2311ff9867cb6492901a159467b4e3261bf326488d4432516c3548f92d3a3fd43fba8a85484dc72
-  data.tar.gz: 9b5d9185ff36a93efacd8eca43777901e89ce07dfad4cbe19f1747edd4fc086b0656ac080f6a049d6dfdb8709d71dd5b923fef20c6252d0a5ab89d0c92da6028
+  metadata.gz: 322a4d6d987aaa52a181afcc16225b4f01537d430194f8ab81a6b8a22c557fbb8db86213044ea06e3217c153f0e1197926e4926aad228a40975adbf73137ffd9
+  data.tar.gz: 5d03c55908dad4827371a2edb199a2aea6c8724637bcfc86decbc57f3bf0a2adc1553468b1d9e0561365a6460be1108284ae80026b4869917508bea46a47722d

data/app/models/concerns/acts_as_trashable.rb

@@ -6,7 +6,11 @@ module ActsAsTrashable
       @acts_as_trashable_options = options.try(:first) || {}
 
       unless @acts_as_trashable_options.kind_of?(Hash)
-        raise ArgumentError.new("invalid arguments passed to (effective_trash) acts_as_trashable. Expecting no options.")
+        raise ArgumentError.new("invalid arguments passed to (effective_trash) acts_as_trashable.")
+      end
+
+      if (unknown = (@acts_as_trashable_options.keys - [:only, :except])).present?
+        raise ArgumentError.new("unknown keyword: #{unknown.join(', ')}")
       end
 
       include ::ActsAsTrashable
@@ -22,11 +26,8 @@ module ActsAsTrashable
 
     # Parse Options
     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 },
-      include_associated: @acts_as_trashable_options.fetch(:include_associated, true),
-      include_nested: @acts_as_trashable_options.fetch(:include_nested, true)
+      only: Array(@acts_as_trashable_options[:only]),
+      except: Array(@acts_as_trashable_options[:except]),
     }
 
     self.send(:define_method, :acts_as_trashable_options) { acts_as_trashable_options }

data/lib/effective_trash.rb

@@ -44,11 +44,7 @@ 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
+    args = (obj.respond_to?(:acts_as_trashable_options) ? obj.acts_as_trashable_options : {})
 
     trash = Effective::Trash.new(
       trashed: obj,

data/lib/effective_trash/version.rb

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

metadata

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