soft_deletion 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d768fe694354f87d751e12148a4080d10532ad73bdf2abcbcbad97e9f3a70672
-  data.tar.gz: 0fb8a7dfb165c0be7ecfd61b2715d91231eb774b25c0e38b46515a71865067da
+  metadata.gz: eb38e89312439df81fdb57dd5be332d8e23f1daea98e0bc6433ae3970ae25d2f
+  data.tar.gz: 60086929f21fbb26f458b4621bfd80623b64b9235a48d3c95ed4ef7931d4f6af
 SHA512:
-  metadata.gz: 551529703446c22ee5d359a71e70fe9bc1fa4691b09e59d063b1c09eab22dc3abaa596d26a96aab504a45f39de6263e500ff789c36d7c2aa438183415f3ac372
-  data.tar.gz: 9c955baab6ecf86f363e21df8858f913d7000bab60ec34c061db58903f483ecaa7ded5c4cbafdebf85de42fa0b90ee6719fa6fd60a9b76ac9222a40137f54ed5
+  metadata.gz: d91633a4a6a91922464990c2afbbd5900ac0fc37c9318cc82627fb4b3b7907b6ffe69c12846ec1743b08ebf681b08afe5da09c021ece62e973a8959bee3d6237
+  data.tar.gz: 748dace888a26d27f1ef87a1b9376c5cff7572f5ce191c453c0429d99c9962978cdc1bcccd0d093074b0ee619ef6d9af12cf1b21f17a55c03a9017405950deaf

data/lib/soft_deletion/core.rb

@@ -38,19 +38,11 @@ module SoftDeletion
           models = ids_or_models
         else
           ids = ids_or_models
-          models = if ActiveRecord::VERSION::MAJOR >= 4
-            where(:id => ids)
-          else
-            all(:conditions => { :id => ids })
-          end
+          models = where(:id => ids)
         end
 
         transaction do
-          if ActiveRecord::VERSION::MAJOR >= 4
-            where(:id => ids).update_all(mark_as_soft_deleted_sql)
-          else
-            update_all(mark_as_soft_deleted_sql, :id => ids)
-          end
+          where(:id => ids).update_all(mark_as_soft_deleted_sql)
 
           models.each do |model|
             model.soft_delete_dependencies.each { |dep| dep.execute_soft_delete(:soft_delete!, []) }
@@ -94,16 +86,9 @@ module SoftDeletion
 
     protected
 
-    if ActiveRecord::VERSION::MAJOR < 4
-      def each_counter_cached_associations
-        reflections.each do |name, reflection|
-          yield association(name.to_sym) if reflection.belongs_to? && reflection.counter_cache_column
-        end
-      end
-    end
-
     def update_soft_delete_counter_caches(value)
       each_counter_cached_associations do |association|
+        association.load_target unless association.loaded?
         if association.target
           target = association.target
           target.class.update_counters(target.id, association.reflection.counter_cache_column => value)

data/lib/soft_deletion/version.rb

@@ -1,3 +1,3 @@
 module SoftDeletion
-  VERSION = '1.3.1'
+  VERSION = '1.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soft_deletion
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
-- Zendesk
+- Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-19 00:00:00.000000000 Z
+date: 2019-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -166,15 +166,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Explicit soft deletion for ActiveRecord via deleted_at and default scope.