undeletable 1.0.0 → 1.0.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjI3YzE0ZTIyZjIxODVkYTVlOGY2NDlmNTMwMjY5NmE4ZmRhYWE1Yw==
+    MDE0YzUzYWUxM2U1ODcwOWQyNWYzYWJmNWJjMDExM2RmNmE2NDc1Ng==
   data.tar.gz: !binary |-
-    ZmUxOTc4OTNjZDMzZjRjZDRkNTMxNjAwZDRjMzk1YTY2ODkzNzJhNA==
+    Y2YzNTk1ZTFkZDBlYWEwNjc3OTdiNTJjMTA4NjljZDM2MTdkNDIyNA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NDhjMzQwM2Q4ZDUyYjhiYzllMGU4ZTRiYTc4MWQzZjI5MTk3Nzc5OWNkYjMz
-    MWE4OGY0ZmZmMGVlMmM2YzdkMmQwYjA0Mjg5MzdhZDVmNjkwM2Y1ZDMxODU1
-    MDEzODUzM2EzY2U1YjZmZDM0MDg1NzY3ODUzNDk5YzNiZDhlMmY=
+    ZjdlMDRlMmFiOGE3OGI4NzgwYzhiYzI1ZDhlZjRkNzU0YWZiMzUyOWY1ODU2
+    Y2MzNzZkNjk3ZTRkMmYzZjgwZTljMzI0NmFjYWJmN2U3Y2E3NWFlNGU0YzY3
+    ZGFlODFlNWRlZTZjZTZkZWY1YjA0MzhlYTAzZDlmNGQwZmExZTA=
   data.tar.gz: !binary |-
-    ODZmYjIxNjA1OGI0M2JlZTI4ZWU3ZDU3NGQzYWE2M2YwMjNkZjkzMjYxMmJi
-    ZTlhN2UxM2JlNTJhMDdmMzkxZGQ3ODdmZjA3Yzc1NDYyZjYyZGU0MzQ4ZDFk
-    ZTU5MTdlZjhlM2FhNDY1MzVjNTJjNzBjMDUxMjNjZmRmZjM1NmQ=
+    MmQxOTE5MjZiZTM4YzIyY2MzMzliMjYzOWUyN2Q1NjdlMzc2OGY2YTVhYzVi
+    ZWJjMTI2YjM1YWI1MjNlNjllOWExYTA0YzU1NzczYzYwMjY2NjYxZWUxMTY5
+    OGQzNDAzNDE5NDc3MTU2ZGQ3NzUyOTE5NzIwZGRjYjBlNDMzZmY=

data/lib/undeletable.rb

@@ -73,8 +73,12 @@ class ActiveRecord::Relation
     if klass.respond_to?(:undeletable?) && klass.undeletable?
       raise ActiveRecord::ReadOnlyRecord.new("#{self} is undeletable") if klass.raise_on_delete?
       logger.debug("will not #{self}.destroy_all", e) if Undeletable.debug
-      if conditions
+      if args.length > 0 && block_given?
         where(*args, &block).to_a.each {|object| object.run_callbacks(:destroy) { delete } }.tap { reset }
+      elsif args.length > 0 && !block_given?
+        where(*args).to_a.each {|object| object.run_callbacks(:destroy) { delete } }.tap { reset }
+      elsif args.length == 0 && block_given?
+        where(&block).to_a.each {|object| object.run_callbacks(:destroy) { delete } }.tap { reset }
       else
         to_a.each {|object| object.run_callbacks(:destroy) { delete } }.tap { reset }
       end
@@ -113,8 +117,6 @@ class ActiveRecord::Base
 private
 
   def self.undeletable_init(raise_on_delete_val)
-    class_attribute :undeletable_enabled, instance_writer: true
-    self.undeletable_enabled = true
     class_attribute :raise_on_delete, instance_writer: true
     self.raise_on_delete = raise_on_delete_val
     class << self

data/lib/undeletable/version.rb

@@ -1,3 +1,3 @@
 module Undeletable
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: undeletable
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Gary S. Weaver