soft_deletion 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6855f96870005cede7cfeaae61e86e0237cc075b
-  data.tar.gz: 0092dce9bbfddf91784f9f104155ac3103d5b3df
+  metadata.gz: 7136f033c5ffee183ad6ef6951cc6ebfa3293a51
+  data.tar.gz: 7f909e3a9392a86672828f7eca998302d341043c
 SHA512:
-  metadata.gz: b5058d815865c22705f7754da6ea025563e1ffc0717789c00303c94337e28aa2a229ff820cc51eb4007e588672678fce6ac27b6ef4ef202f83fca18ecc6a6e71
-  data.tar.gz: 343476ea636c0e0bcd4b583ca5c542889eddca443a73b589688c0b6eecd1282ea6a8bfac4cde0c75f2df7fb569bb3f342f5e1e2271c20a91a32747819c3b0a2a
+  metadata.gz: e2c5be8c5f2f13716fbaddb33cc5b9b5436672b91309df44aafff9066ad0850b0f376cda1fdeb85267ca2151bf4d48293313a38381ddbd0bb60c04bf48390ecf
+  data.tar.gz: 40b2fe532e615c6f5333cc181b93c5b833123af1ffae8441eecc07c97b4936e317974eab1c450dc5d746c9ac5ac9587aea2805589efa1044bf229452025e63c3

data/lib/soft_deletion/core.rb

@@ -6,17 +6,8 @@ module SoftDeletion
       end
       base.extend(ClassMethods)
 
-      # backport after_soft_delete so we can safely upgrade to rails 3
-      if ActiveRecord::VERSION::MAJOR > 2
-        base.define_model_callbacks :soft_delete
-        base.define_model_callbacks :soft_undelete
-      else
-        base.define_callbacks :before_soft_delete
-        base.define_callbacks :after_soft_delete
-
-        base.define_callbacks :before_soft_undelete
-        base.define_callbacks :after_soft_undelete
-      end
+      base.define_model_callbacks :soft_delete
+      base.define_model_callbacks :soft_undelete
     end
 
     module ClassMethods
@@ -61,7 +52,7 @@ module SoftDeletion
 
           models.each do |model|
             model.soft_delete_dependencies.each(&:soft_delete!)
-            model.run_callbacks ActiveRecord::VERSION::MAJOR > 2 ? :soft_delete : :after_soft_delete
+            model.run_callbacks :soft_delete
           end
         end
       end
@@ -106,13 +97,7 @@ module SoftDeletion
       end
 
       self.class.transaction do
-        if ActiveRecord::VERSION::MAJOR > 2
-          run_callbacks :soft_delete, &internal
-        else
-          return false if !run_callbacks(:before_soft_delete) { |result, object| result == false }
-          internal.call
-          run_callbacks :after_soft_delete
-        end
+        run_callbacks :soft_delete, &internal
       end
 
       result
@@ -130,13 +115,7 @@ module SoftDeletion
       end
 
       self.class.transaction do
-        if ActiveRecord::VERSION::MAJOR > 2
-          run_callbacks :soft_undelete, &internal
-        else
-          return false if !run_callbacks(:before_soft_undelete) { |result, object| result == false }
-          internal.call
-          run_callbacks :after_soft_undelete
-        end
+        run_callbacks :soft_undelete, &internal
       end
 
       result

data/lib/soft_deletion/dependency.rb

@@ -28,13 +28,7 @@ module SoftDeletion
 
     def nullify_dependencies
       dependencies.each do |dependency|
-        foreign_key = if association.respond_to?(:foreign_key) # rails 3.1+
-          association.foreign_key
-        else
-          association.primary_key_name
-        end
-        method = (ActiveRecord::VERSION::STRING >= "3.1" ? :update_column : :update_attribute)
-        dependency.send(method, foreign_key, nil)
+        dependency.update_column(association.foreign_key, nil)
       end
     end
 

data/lib/soft_deletion/setup.rb

@@ -20,15 +20,7 @@ module SoftDeletion
         include SoftDeletion::Core
 
         options = default_options.merge(options)
-
-        if options[:default_scope]
-          conditions = {:deleted_at => nil}
-          if ActiveRecord::VERSION::STRING < "3.1"
-            default_scope :conditions => conditions
-          else
-            default_scope { where(conditions) }
-          end
-        end
+        default_scope { where(:deleted_at => nil) } if options[:default_scope]
       end
     end
   end

data/lib/soft_deletion/version.rb

@@ -1,3 +1,3 @@
 module SoftDeletion
-  VERSION = '0.6.1'
+  VERSION = '0.7.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soft_deletion
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Zendesk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-27 00:00:00.000000000 Z
+date: 2015-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,7 +19,7 @@ dependencies:
         version: 3.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 4.3.0
+        version: 5.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 3.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 4.3.0
+        version: 5.1.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -76,16 +76,16 @@ dependencies:
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: bump
   requirement: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="