acts_as_removable 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40644a9e4bae02831511dbbb1517df55c23ec01d
-  data.tar.gz: f5009cf18a4fae3a2ba273a09c82bf070a415543
+  metadata.gz: dcc13acf0ef4676070b9c1b58df18af874be7940
+  data.tar.gz: f25399054b7cab95fd0489cd0e88a6685a90997d
 SHA512:
-  metadata.gz: 2fa89d369aabf5c7ad13b6012c11fa6236c40cba1a041550b49526d99a12c74c85a4c5626fd10624f0d60a125b73dd96e192c1ad4edd01ef0d01f5c9f47e40a7
-  data.tar.gz: 3c3d9df0798534c7cd997c1d309602d1f885d754433113e11de79f015cae09727002d65674627653e9cde0e5c829267cfaf5c0e356dafe08ba1e0c3ec468686e
+  metadata.gz: d390b4ccf8503d4554d1efb90a750675d83af09a65cb25b578d04996031f328ef904f3a82721bbde4727f4919a7b06d28ab97f87b2d3869a9693bc80088e8daa
+  data.tar.gz: 0e79c8d9d8ec1ac4d9e56aa111b16965aaa4455d734e0c057ca8dda37d541073ea3226d81093a231f6b2da1ad5d28375b18a71040b899117f4d035f38d58ffda

data/acts_as_removable.gemspec

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

data/lib/acts_as_removable/version.rb

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

data/lib/acts_as_removable.rb

@@ -29,15 +29,15 @@ module ActsAsRemovable
         end
 
         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
+          removed_at_column_name = self._acts_as_removable_column_name
+          query = where(all.table[removed_at_column_name].not_eq(nil).to_sql)
+          ::ActsAsRemovable.removable_where_values(query, removed_at_column_name, all.table[removed_at_column_name].eq(nil).to_sql)
         }
 
         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
+          removed_at_column_name = self._acts_as_removable_column_name
+          query = where(all.table[removed_at_column_name].eq(nil).to_sql)
+          ::ActsAsRemovable.removable_where_values(query, removed_at_column_name, all.table[removed_at_column_name].not_eq(nil).to_sql)
         }
 
         default_scope -> {where(all.table[self._acts_as_removable_column_name].eq(nil).to_sql)} unless options[:without_default_scope]
@@ -92,6 +92,12 @@ module ActsAsRemovable
     end
   end
 
+  # Helps deleting where statements from query
+  def self.removable_where_values(query, column_name, remove_where)
+    query = query.with_default_scope if query.respond_to?(:with_default_scope)
+    query.where_values.delete(remove_where)
+    query
+  end
 end
 
 ActiveRecord::Base.send(:include, ActsAsRemovable)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_removable
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Florian Schwab
@@ -9,34 +9,34 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-20 00:00:00.000000000 Z
+date: 2014-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>'
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>'
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>'
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>'
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
@@ -134,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Simplifies handling of pseudo removed records