paranoid2 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41f8a90b29f702033ddfbcd98b0a63efa4f92a9e
-  data.tar.gz: 8e4db488f8d9fa3b829be3f3408c8eebc8999ca9
+  metadata.gz: b04b2e1f16af33f9e96a486529e7bee5daba9b5f
+  data.tar.gz: 28a01ac65b8d54aa2272aa1e90a66357bd468ef7
 SHA512:
-  metadata.gz: 85c9bef842a3c280a85ad375ef80e8586ef87397092dc8b15a32a3bac7fbf66af4445583d28b743b3ae88423e033eee9ce21c7b7ad64482c7ea55c24ae2ef0cc
-  data.tar.gz: b0533d5734434f3d0d21bc07c7789326b201dbfc55748198209899040e491122d7858745c553f9efbe8fe4a23dea488e2abae725ab36e88eea1cd9b0a31e450f
+  metadata.gz: 524da4b320a355f902faad7c29714f3ba89bdc666d899eaec636e81169c9c597c6b3fbed1f5b6abb64a4771bf15d550e02268738c499ddf601cff2bfc86818e7
+  data.tar.gz: 8ba87e39f81286a35b3033418de91de74fc6dbf39200539067eafa3807fd25094d778715ab298e9029eeaadc5cefb8926763464337c4c393e6ba53f2740c0489

data/lib/paranoid2/scoping.rb

@@ -16,9 +16,18 @@ module Paranoid2
         with_deleted.where.not(deleted_at: nil)
       end
 
-      def with_deleted
-        all.tap { |s| s.default_scoped = false }
+
+      if ActiveRecord::Base.respond_to?(:unscope)
+        # Rails >= 4.1
+        def with_deleted
+          unscope(where: :deleted_at)
+        end
+      else
+        # Rails < 4.1
+        def with_deleted
+          all.tap {|s| s.default_scope = false}
+        end
       end
     end
   end
-end
+end

data/lib/paranoid2/version.rb

@@ -1,3 +1,3 @@
 module Paranoid2
-  VERSION = '1.1.4'
+  VERSION = '1.1.5'
 end

data/paranoid2.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'activerecord', '>= 4.0.0'
+  gem.add_dependency 'activerecord', '>= 4.1.0'
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "sqlite3"

data/spec/paranoid2_spec.rb

@@ -116,6 +116,7 @@ describe Paranoid2 do
       a.destroy
       b.destroy
       parent1.paranoid_models.count.must_equal 0
+      puts parent1.paranoid_models.only_deleted.inspect
       parent1.paranoid_models.only_deleted.count.must_equal 1
 
       c = model.create(parent_model: parent1)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paranoid2
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - yury
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-19 00:00:00.000000000 Z
+date: 2014-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement