rails_soft_deletable 0.2.0 → 0.2.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjQyMzFlNDJkNjk3MDYyN2M4ODBkYTllOWUxOWI1MDg2YWU1OGZlYw==
+    YzMzYzk5MzBhMWI5OTM3ZjI4MGNmNWY2M2YzNTNlNjI1ZjMwMTZlMQ==
   data.tar.gz: !binary |-
-    Y2RlYzY3YTNmYjA4ZjQ0ZTc4MTFkZWY1NzNjYWE2MmEyMWEzYThmNg==
+    Y2EyOTgzYmQ5ZmQ0OGE0MTA4MDQxMWY4YWRlMTMzODBhMGEwYTk3MA==
 SHA512:
   metadata.gz: !binary |-
-    YjVlYTJkN2EyNzk4MTY4ZTNkMjFlYmJkYWQ5Y2I5NzNhNmFkZTQ1NjdhZjNj
-    NGQ2ODM5MzNlMzc2OTRkNzg1ZGVhNDlhYjJkMzFmODg1NTM0YWQzYWJiOTgz
-    ZmJmMTgwOWJlY2E3YzJjMDQ2MTY2Y2EwYzYzMmEyYjYzZDIyOWM=
+    YWNiN2EyMWY0YTNlZTZjYzgwMTkzZDYxMTgwODIxODY2MmFmZGVjNjRmNTYx
+    YTdiZDRlZjllNWFiZmY2NzA2NDAzZmJkMDZmNWIxZjg4MDUyMDYxNzhkNjFl
+    ZDRiZGRkZjAwODcyYTlhN2Y1ZDAwMjM5MmMyY2RmNmJhY2VlMzM=
   data.tar.gz: !binary |-
-    OGRmYjE0MWQxYjBkODcxMGYxYjU0ZWM1YmY5MjA5YmRhMmQ4MmE1YWE1MTdj
-    NDU1NGMxODk0NTAxZDYyNTlhZWUwYjRjNTRhYTYwZDk1NmI0MDI3MzQzNzZj
-    YzA3ZTg5ZTUxYjM1ZDRlZTc5Y2RiNGExZGIyMTRhYmQ5YWNlYzM=
+    NDAzZjUxODlkMzBjMDEwOTMzZmIzZjY3YTlhODdjYjA2NTQwOTZjYWM4ZmQ0
+    ZWY0NjgyYjRhNjA5MWE2YmM2ODQzOWQ5NTM5MDk3NzAwMjU3ZDJiOTJiM2Nh
+    ODdjYWQzNjAzOTAyMTM5YWMyZjM5MTUyOGYzY2UwODNmMjJiYWY=

data/lib/rails_soft_deletable/callbacks.rb

@@ -7,16 +7,16 @@ module RailsSoftDeletable
     included do
       define_callbacks :restore
 
-      define_singleton_method("before_restore") do |*args, &block|
-        set_callback(:restore, :before, *args, &block)
+      define_singleton_method("before_restore") do |*args, block|
+        set_callback(:restore, :before, *args, block)
       end
 
-      define_singleton_method("around_restore") do |*args, &block|
-        set_callback(:restore, :around, *args, &block)
+      define_singleton_method("around_restore") do |*args, block|
+        set_callback(:restore, :around, *args, block)
       end
 
-      define_singleton_method("after_restore") do |*args, &block|
-        set_callback(:restore, :after, *args, &block)
+      define_singleton_method("after_restore") do |*args, block|
+        set_callback(:restore, :after, *args, block)
       end
     end
 
@@ -54,7 +54,7 @@ module RailsSoftDeletable
         #   update_column(soft_deletable_column, 0)
 
         name = soft_deletable_column.to_s
-        updated_count = self.class.unscoped.where(self.class.primary_key => id).update_all(name => 0 )
+        updated_count = self.class.unscoped.where(self.class.primary_key => id).update_all(name => 0)
         raw_write_attribute(name, 0)
 
         updated_count == 1

data/lib/rails_soft_deletable/query.rb

@@ -10,7 +10,9 @@ module RailsSoftDeletable
       end
 
       def with_deleted
-        if ::ActiveRecord::VERSION::STRING >= "4.0"
+        if ::ActiveRecord::VERSION::STRING >= "4.1"
+          self.unscope(where: soft_deletable_column).all
+        elsif ::ActiveRecord::VERSION::STRING >= "4.0"
           all.tap { |x| x.default_scoped = false }
         else
           scoped.tap { |x| x.default_scoped = false }

data/lib/rails_soft_deletable/rails/active_record.rb

@@ -23,7 +23,7 @@ module RailsSoftDeletable
         class_attribute :soft_deletable_column
 
         self.soft_deletable_column = options[:column] || :deleted_at
-        default_scope { where(self.quoted_table_name + ".#{soft_deletable_column} = 0") }
+        default_scope { where(soft_deletable_column => 0) }
       end
 
       def soft_deletable?

data/lib/rails_soft_deletable/version.rb

@@ -1,3 +1,3 @@
 module RailsSoftDeletable
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/dummy/app/models/decimal_model.rb

@@ -4,4 +4,6 @@ class DecimalModel < ActiveRecord::Base
   soft_deletable
 
   include SoftDeletableModelCallbacks
+
+  belongs_to :integer_model
 end

data/spec/dummy/app/models/integer_model.rb

@@ -4,4 +4,7 @@ class IntegerModel < ActiveRecord::Base
   soft_deletable
 
   include SoftDeletableModelCallbacks
+
+  has_many :decimal_models
+  has_many :decimal_models_with_deleted, -> { unscope where: :deleted_at }, class_name: "DecimalModel"
 end