acts_as_removable 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d64a4e7fa07f7ffa3872fc9e3e39c86b1b6b1cc4
-  data.tar.gz: 37b0cad5a652328df6dc52fdd80879b16cca0253
+  metadata.gz: 40644a9e4bae02831511dbbb1517df55c23ec01d
+  data.tar.gz: f5009cf18a4fae3a2ba273a09c82bf070a415543
 SHA512:
-  metadata.gz: 3d73905579c97e93fe7f7743fb4304b7729116830b8f19af1ba793e87c1f5bc6aaa66cc0fff336ac1f2e3820efc01700b10b11b7fec49b68dedcf6996b226dd7
-  data.tar.gz: 23123253e8b3e88c184f47066b6d9948ced41868beeb5d4c8b2cfb72b5cdc5b454079818ab6ddb04c3d545ea2966560f2feaaa92d933b413af397cb708d9f19b
+  metadata.gz: 2fa89d369aabf5c7ad13b6012c11fa6236c40cba1a041550b49526d99a12c74c85a4c5626fd10624f0d60a125b73dd96e192c1ad4edd01ef0d01f5c9f47e40a7
+  data.tar.gz: 3c3d9df0798534c7cd997c1d309602d1f885d754433113e11de79f015cae09727002d65674627653e9cde0e5c829267cfaf5c0e356dafe08ba1e0c3ec468686e

data/acts_as_removable.gemspec

@@ -6,7 +6,7 @@ require 'acts_as_removable/version'
 Gem::Specification.new do |spec|
   spec.name          = "acts_as_removable"
   spec.version       = ActsAsRemovable::VERSION
-  spec.authors       = ["Florian Schwab"]
+  spec.authors       = ["Florian Schwab", "Erik Ernst"]
   spec.email         = ["florian.schwab@sic-software.com"]
   spec.description   = %q{Simplifies handling of pseudo removed records}
   spec.summary       = %q{Simplifies handling of pseudo removed records}

data/lib/acts_as_removable/version.rb

@@ -1,3 +1,3 @@
 module ActsAsRemovable
-  VERSION = "0.9.2"
+  VERSION = "0.9.3"
 end

data/lib/acts_as_removable.rb

@@ -28,11 +28,21 @@ module ActsAsRemovable
           @_acts_as_removable_column_name
         end
 
-        scope :removed, -> {unscoped.where("#{self.table_name}.#{self._acts_as_removable_column_name} IS NOT NULL")}
-        scope :actives, -> {unscoped.where("#{self.table_name}.#{self._acts_as_removable_column_name} IS NULL")}
-        default_scope -> {actives} unless options[:without_default_scope]
+        scope :removed, -> {
+          s = where(all.table[self._acts_as_removable_column_name].not_eq(nil).to_sql).with_default_scope
+          s.where_values.delete(all.table[self._acts_as_removable_column_name].eq(nil).to_sql)
+          s
+        }
 
-        define_callbacks :remove, :unremove
+        scope :actives, -> {
+          s = where(all.table[self._acts_as_removable_column_name].eq(nil).to_sql).with_default_scope
+          s.where_values.delete(all.table[self._acts_as_removable_column_name].not_eq(nil).to_sql)
+          s
+        }
+
+        default_scope -> {where(all.table[self._acts_as_removable_column_name].eq(nil).to_sql)} unless options[:without_default_scope]
+
+        define_model_callbacks :remove, :unremove
 
         def self.before_remove(*args, &block)
           set_callback :remove, :before, *args, &block

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_removable
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Florian Schwab
+- Erik Ernst
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-04 00:00:00.000000000 Z
+date: 2013-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport