awesome_delete 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a16663db45580e4f1a4faf0e97fd4b323020f238
-  data.tar.gz: ebeb2c214cb0f54345838c922d409c582c27ffa2
+  metadata.gz: ba9cbdeebc43e62ca6d10090a883590ce7dfe94e
+  data.tar.gz: ccdf455f9826f451a11a7cdae586068437949e74
 SHA512:
-  metadata.gz: 333c0ddd99204473a3c2081dfb59cf45cf9c0336aca9b6ea0eb16d2466145347dd464ef4193d3b4cfb09d99baf5f7dd4df7dd2c80e1d14154b35114e2f53d232
-  data.tar.gz: 7048b3cc09be57ecf2c157e1f1d13cf0a5f0adee7758d435cbe7dad9726b47b454d4d400430847087f52e84408907756d264c1cead60325b4b9e3d75cee4a58f
+  metadata.gz: 79fdb5020b7522a116b26dfd8738b82a96a160f64717a6c4fdf8348d120236554491bcdb1dff3bd7967b06e66d1f693b1969593570ce8b8db17ca168a813231a
+  data.tar.gz: a0147c17026f7a58745b2c0ed1ebe57c59681a79fdf6d86e1bb0ece74d8db8298b68fbec1b669b084dd8fd8ee26ee3c42758cc4be54203e54dff820f3d30db29

data/README.md

@@ -8,6 +8,12 @@ It thinks about the following
 - counter_cache, touch (avoid to unnecessary handle)
 - callbacks
 
+## Install
+
+```ruby
+gem install awesome_delete
+```
+
 ## Example
 
 ```ruby
@@ -25,13 +31,24 @@ Overwriting it maybe a better choice.
 eg:
 ```ruby
 class CloudFile < ActiveRecord::Base
+  before_destroy :test
   after_destroy :remove_file
 
   def self.execute_callbacks ids
+    # before_destroy
+    put 'someting'
+
+    where(id: ids).delete_all # delete self
+
+    # after_destroy
     keys = where(id: ids).pluck(:key)
     # do something with all keys
   end
 
+  def test
+    put 'someting'
+  end
+
   def remove_file key
     HttpClient.send_request key
   end

data/lib/awesome_delete/delete_extension.rb

@@ -3,24 +3,23 @@ module AwesomeDelete
     def delete_collection ids, all_associations_name = []
       return true if ids.blank?
 
+      #Need not to set value for all_associations_name
       #Not handle counter_cache or touch association in all_associations_name
-      @@all_associations_name = all_associations_name
-
-      if @@all_associations_name.blank?
-        @@all_associations_name = get_associations_name << self.name
+      if all_associations_name.blank?
+        all_associations_name = get_associations_name << self.name
       end
 
-      delete_assoicated_collection(ids, deleted_associations)
+      delete_assoicated_collection(ids, deleted_associations, all_associations_name)
 
       # STI
       if column_names.include? inheritance_column
         where(id: ids).pluck(inheritance_column).uniq.each do |type|
           subklass = type.constantize
-          subklass.delete_self_collection(ids)
-          delete_assoicated_collection(ids, subklass.deleted_associations - deleted_associations)
+          subklass.delete_self_collection(ids, all_associations_name)
+          delete_assoicated_collection(ids, subklass.deleted_associations - deleted_associations, all_associations_name)
         end
       else
-        delete_self_collection(ids)
+        delete_self_collection(ids, all_associations_name)
       end
     end
 
@@ -42,68 +41,34 @@ module AwesomeDelete
                                       end
     end
 
-    def delete_self_collection ids
+    def delete_self_collection ids, all_associations_name
       #touch
       need_handle_touch_associations = touch_associations.select do |asso|
-                                         !@@all_associations_name.include?(asso.class_name)
+                                         !all_associations_name.include?(asso.class_name)
                                        end
-      need_handle_touch_associations.each do |asso|
-        if asso.options[:polymorphic]
-          types_ids = where(id: ids).pluck(asso.foreign_type, asso.foreign_key).uniq
-          types = types_ids.map(&:first).uniq
-          types.each do |type|
-            type_ids = types_ids.select { |type_id| type_id.first == type }.map(&:last).uniq.compact
-            type.constantize.where(id: type_ids).update_all updated_at: Time.now
-          end
-        else
-          asso.klass.where(id: where(id: ids).pluck(asso.foreign_key)).update_all updated_at: Time.now
-        end
-      end
+      cache_ids_with_types_of_touch = get_ids_with_types(need_handle_touch_associations)
 
       #counter_cache
       need_handle_counter_cache_associations = counter_cache_associations.select do |asso|
-                                                 !@@all_associations_name.include?(asso.class_name)
+                                                 !all_associations_name.include?(asso.class_name)
                                                end
-      cache_ids_with_possible_types = []
-      need_handle_counter_cache_associations.each do |asso|
-        if asso.options[:polymorphic]
-          cache_ids_with_possible_types << where(id: ids).pluck(asso.foreign_type, asso.foreign_key).uniq
-        else
-          cache_ids_with_possible_types << where(id: ids).pluck(asso.foreign_key).uniq
-        end
-      end
+      cache_ids_with_types_of_counter_cache = get_ids_with_types(need_handle_counter_cache_associations)
 
       execute_callbacks(ids)
 
-      #counter_cache
-      need_handle_counter_cache_associations.each_with_index do |asso, index|
-        if asso.options[:polymorphic]
-          types_ids = cache_ids_with_possible_types[index]
-          types = types_ids.map(&:first).uniq
-          types.each do |type|
-            ids = types_ids.select { |type_id| type_id.first == type }.map(&:last).uniq.compact
-            ids.each do |id|
-              type.constantize.where(id: id).update_all asso.counter_cache_column => where(asso.foreign_key => id).count
-            end
-          end
-        else
-          asso_ids = cache_ids_with_possible_types[index]
-          asso_ids.each do |id|
-            asso.klass.where(id: id).update_all asso.counter_cache_column => where(asso.foreign_key => id).count
-          end
-        end
-      end
+      handle_touch(need_handle_touch_associations, cache_ids_with_types_of_touch)
+      handle_counter_cache(need_handle_counter_cache_associations, cache_ids_with_types_of_counter_cache)
     end
 
-    def delete_assoicated_collection ids, associations
+    def delete_assoicated_collection ids, associations, all_associations_name
       associations.each do |association|
         association_class = association.klass
 
         #polymorphic
         if association.type
-          association_class.delete_collection association_class.where(association.foreign_key => ids, association.type => self.name).pluck(:id), @@all_associations_name
+          association_class.delete_collection association_class.where(association.foreign_key => ids, association.type => self.name).pluck(:id), all_associations_name
         else
-          association_class.delete_collection association_class.where(association.foreign_key => ids).pluck(:id), @@all_associations_name
+          association_class.delete_collection association_class.where(association.foreign_key => ids).pluck(:id), all_associations_name
         end
       end
     end
@@ -119,6 +84,16 @@ module AwesomeDelete
       associations_name
     end
 
+    def get_ids_with_types associations
+      associations.map do |asso|
+        if asso.options[:polymorphic]
+          where(id: ids).pluck(asso.foreign_type, asso.foreign_key).uniq
+        else
+          where(id: ids).pluck(asso.foreign_key).uniq
+        end
+      end
+    end
+
     def execute_callbacks ids
       #overwriting this method may be a better choice
       collection = where(id: ids).to_a
@@ -149,5 +124,41 @@ module AwesomeDelete
         end
       end
     end
+
+    def handle_touch associations, ids_with_types
+      associations.each_with_index do |asso, index|
+        if asso.options[:polymorphic]
+          types_ids = ids_with_types[index]
+          types = types_ids.map(&:first).uniq
+          types.each do |type|
+            type_ids = types_ids.select { |type_id| type_id.first == type }.map(&:last).uniq.compact
+            type.constantize.where(id: type_ids).map(&:touch)
+          end
+        else
+          asso_ids = ids_with_types[index]
+          asso.klass.where(id: asso_ids).map(&:touch)
+        end
+      end
+    end
+
+    def handle_counter_cache associations, ids_with_types
+      associations.each_with_index do |asso, index|
+        if asso.options[:polymorphic]
+          types_ids = ids_with_types[index]
+          types = types_ids.map(&:first).uniq
+          types.each do |type|
+            type_ids = types_ids.select { |type_id| type_id.first == type }.map(&:last).uniq.compact
+            type_ids.each do |id|
+              type.constantize.where(id: id).update_all asso.counter_cache_column => where(asso.foreign_key => id).count
+            end
+          end
+        else
+          asso_ids = ids_with_types[index]
+          asso_ids.each do |id|
+            asso.klass.where(id: id).update_all asso.counter_cache_column => where(asso.foreign_key => id).count
+          end
+        end
+      end
+    end
   end
 end

data/lib/awesome_delete/version.rb

@@ -1,3 +1,3 @@
 module AwesomeDelete
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/spec/support/models.rb

@@ -58,7 +58,7 @@ end
 class ActiveRecord::Relation
   def update_all updates
     #for test
-    if updates[:updated_at]
+    if updates[:updated_at] || updates['updated_at']
       Logger.send "#{model.name.downcase}_touch", 'Touching'
     elsif updates.keys.find { |key| key =~ /.*_count$/ }
       Logger.send "#{model.name.downcase}_update_counter", 'Updating counter'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awesome_delete
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - hw93
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-23 00:00:00.000000000 Z
+date: 2015-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord