rails_soft_deletable 0.0.8 → 0.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDZmNGI1OTVjYjkzYTE2ZTMzNzdhZmE4MzMyN2JmYzAzZDliZDcwMQ==
+    ODMyMTMzMDAxMzgyMTg2MGUxNzFhODRjNmQ5ZWFhYTY2ZDUxNDc2Nw==
   data.tar.gz: !binary |-
-    NWY5NzdmMjYzZGIwY2UxMDJlODNiYjFiMmYzZTY1MTQ4MDliNWI2Yg==
+    M2ZiZmQyNTZmMjZkZDE5Mjk3YWMxZjA4YzM3ODllNTZjZDg3NDA0YQ==
 SHA512:
   metadata.gz: !binary |-
-    Zjc0NDE5YTI1Yjg4NjgzMTRjNmFjZjI0ODY5OTM1ODA2ZjE1YmQ0YjFkNTk2
-    ODZkMGZjNWUyOTJkNTg3NWQ1YjVhYmExMDA1MTBlYjhiMWJjODI0MThmZDY4
-    Y2M5MjRkYWE4MDQ1MzE0NTcwNmIzNWJmMGNiMGM1ZTdhNmRmMjU=
+    YjI2NjU4NWRmYTJhNGNhNzhiMWZhNzlhODkzNDE4Nzc4ZTVkYTI0MzdiZDFj
+    ZjRiN2VhYzg4NDFhMzY3MjA5NTAxYjkyZGRjZDYyYWQ1M2YyMDI3YTZjNDEz
+    ODkwMzNiNDc5MGU2ZDIxOGYyYWFlNTQwMmNhMmVkZjBjZTZiZjU=
   data.tar.gz: !binary |-
-    OWY5YzEwODI2MTRmMjI2Y2FhMDMyNjI3NTU3ZGJiNDExNTk0MTdkNmUxYzVi
-    NjBmMDMyMmNiMTg2YjJkOWU5N2RiYzZhOGQ1NDc0MDM5ZWRlMjk1ZjEwYjFh
-    MDY4OTFkY2JjZmVkNDc1YmUzOTYyYTEwY2Q4MjdjNjg1OWFkNjg=
+    N2Y3ZDZkYWViMDI5MWY2MGM2M2E5MWU0ODcwMDE4MDBjZmMwMjk2N2Q2NmQz
+    MWVkM2ZiYjg3MmM5NWM1NTBiMjhjMzg2YzZjYzdiYmQwNzM5M2NlNThmYTdk
+    ZWRlODFkNTcwNzkzMWYwYzdmMmZjNzUxZTc5NmUyZThiMTA1ZWU=

data/lib/rails_soft_deletable/callbacks.rb

@@ -59,7 +59,7 @@ module RailsSoftDeletable
         #   update_column(soft_deletable_column, 0)
 
         name = soft_deletable_column.to_s
-        updated_count = self.class.unscoped.update_all({ name => 0 }, self.class.primary_key => id)
+        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,11 @@ module RailsSoftDeletable
       end
 
       def with_deleted
-        scoped.tap { |x| x.default_scoped = false }
+        if ::ActiveRecord::VERSION::STRING >= "4.0"
+          all.tap { |x| x.default_scoped = false }
+        else
+          scoped.tap { |x| x.default_scoped = false }
+        end
       end
 
       def only_deleted

data/lib/rails_soft_deletable/rails/railtie.rb

@@ -8,9 +8,13 @@ module RailsSoftDeletable
       ActiveSupport.on_load(:active_record) do
         include(RailsSoftDeletable::ActiveRecord)
         ::ActiveRecord::Associations::Association.send(:include, RailsSoftDeletable::Associations)
-        ::ActiveRecord::Associations::Builder::BelongsTo.valid_options << :with_deleted
-        ::ActiveRecord::Associations::Builder::HasMany.valid_options << :with_deleted
-        ::ActiveRecord::Associations::Builder::HasOne.valid_options << :with_deleted
+        if ::ActiveRecord::VERSION::STRING >= "4.0"
+          ::ActiveRecord::Associations::Builder::Association.valid_options << :with_deleted
+        else
+          ::ActiveRecord::Associations::Builder::BelongsTo.valid_options << :with_deleted
+          ::ActiveRecord::Associations::Builder::HasMany.valid_options << :with_deleted
+          ::ActiveRecord::Associations::Builder::HasOne.valid_options << :with_deleted
+        end
       end
     end
   end

data/lib/rails_soft_deletable/version.rb

@@ -1,3 +1,3 @@
 module RailsSoftDeletable
-  VERSION = "0.0.8"
+  VERSION = "0.1.0"
 end

data/spec/dummy/config/environments/test.rb

@@ -26,9 +26,7 @@ Dummy::Application.configure do
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
-  # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
-
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
+  config.eager_load = false
 end