zombie_record 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fcd4f52b9d5d55985cfbdbe559120d7893df768
-  data.tar.gz: d2349915fe48d65dcd8c67e1a7ff4582023fbe5f
+  metadata.gz: 5e85b5f05f1f16bf87dd233fffc48ce5de64b287
+  data.tar.gz: 9fd0bbbceb85da7aa8059ddec935ae64d396ae71
 SHA512:
-  metadata.gz: b8248ef72aee0d1b52a52559463f31f764a47438892636d60205aa9ac2ac81f747f0cd698074daed3374579d7ee4cc810ff4377e3933937cbd9a158310bc04ad
-  data.tar.gz: f3dbf5c2833aedb5996ee75ca47a58e2cdef2f2097e849c2999fc808bd0d0e51039d1863e68a2e34ffc9c686764720da97ab589fa76aa664c6f952e4243114e5
+  metadata.gz: a3410a21df7c423829dc0256d411196aa6ac6a9db75d7ed85eaef31bfa32cec609a1bccca047d83873e9d11efc53884cc6cb3f1f882165335f2598cd5696a14a
+  data.tar.gz: ef0ecdbc21fc042297e195a999efb8fe27cc10513f89761ee60b3af0ae77d4326b9e7dc71d32b2ea07c0568742e8ffd8087421c8bfcb6fdc6daed56270acc526

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ###### Unreleased
 
+###### v1.2.0
+
+* Fix counter_cache behavior in Rails 4.2.
+
 ###### v1.1.2
 
 * Fewer queries when soft deleting.

data/gemfiles/rails4.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    zombie_record (1.1.2)
+    zombie_record (1.2.0)
       activerecord (~> 4.0)
       mysql2
 
@@ -35,7 +35,7 @@ GEM
     i18n (0.6.11)
     minitest (4.7.5)
     multi_json (1.10.1)
-    mysql2 (0.3.17)
+    mysql2 (0.3.19)
     rake (10.3.2)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
@@ -63,3 +63,6 @@ DEPENDENCIES
   timecop (~> 0.7.0)
   wwtd (>= 0.5.3)
   zombie_record!
+
+BUNDLED WITH
+   1.10.6

data/gemfiles/rails4.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    zombie_record (1.1.2)
+    zombie_record (1.2.0)
       activerecord (~> 4.0)
       mysql2
 
@@ -33,7 +33,7 @@ GEM
     i18n (0.6.11)
     json (1.8.1)
     minitest (5.4.3)
-    mysql2 (0.3.17)
+    mysql2 (0.3.19)
     rake (10.3.2)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
@@ -62,3 +62,6 @@ DEPENDENCIES
   timecop (~> 0.7.0)
   wwtd (>= 0.5.3)
   zombie_record!
+
+BUNDLED WITH
+   1.10.6

data/gemfiles/rails4.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    zombie_record (1.1.2)
+    zombie_record (1.2.0)
       activerecord (~> 4.0)
       mysql2
 
@@ -33,7 +33,7 @@ GEM
     i18n (0.7.0)
     json (1.8.1)
     minitest (5.5.0)
-    mysql2 (0.3.17)
+    mysql2 (0.3.19)
     rake (10.4.2)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
@@ -62,3 +62,6 @@ DEPENDENCIES
   timecop (~> 0.7.0)
   wwtd (>= 0.5.3)
   zombie_record!
+
+BUNDLED WITH
+   1.10.6

data/lib/zombie_record/restorable.rb

@@ -51,18 +51,6 @@ module ZombieRecord
 
     private
 
-    # Override Rails' #destroy_row for soft-delete functionality
-    def destroy_row
-      time = current_time_from_proper_timezone
-
-      update_params = { deleted_at: time }
-      if self.class.column_names.include?("updated_at")
-        update_params[:updated_at] = time
-      end
-
-      update_columns(update_params)
-    end
-
     def restore_associated_records!
       self.class.reflect_on_all_associations.each do |association|
         # Only restore associations that are automatically destroyed alongside

data/lib/zombie_record/version.rb

@@ -1,3 +1,3 @@
 module ZombieRecord
-  VERSION = "1.1.2"
+  VERSION = "1.2.0"
 end

data/lib/zombie_record.rb

@@ -5,3 +5,25 @@ module ZombieRecord
 end
 
 require 'zombie_record/restorable'
+
+module ActiveRecord
+  module Persistence
+    alias_method :zombie_record_alias_destroy_row, :destroy_row
+
+    # Maybe override Rails' #destroy_row for soft-delete functionality
+    def destroy_row
+      if self.class.include?(ZombieRecord::Restorable)
+        time = current_time_from_proper_timezone
+
+        update_params = { deleted_at: time }
+        if self.class.column_names.include?("updated_at")
+          update_params[:updated_at] = time
+        end
+
+        update_columns(update_params) ? 1 : 0
+      else
+        zombie_record_alias_destroy_row
+      end
+    end
+  end
+end

data/spec/restorable_spec.rb

@@ -91,6 +91,17 @@ describe ZombieRecord::Restorable do
       bookmark = Timecop.travel(2.days.ago) { Bookmark.create! }
       expect { bookmark.destroy }.to_not raise_exception
     end
+
+    it "updates the counter cache" do
+      book = Book.create!
+      bookmark = book.bookmarks.create!
+
+      expect(book.reload.bookmarks_count).to eq(1)
+
+      bookmark.destroy!
+
+      expect(book.reload.bookmarks_count).to eq(0)
+    end
   end
 
   describe "#restore!" do

data/spec/spec_helper.rb

@@ -27,7 +27,7 @@ end
 class Bookmark < ActiveRecord::Base
   include ZombieRecord::Restorable
 
-  belongs_to :book
+  belongs_to :book, counter_cache: true
 end
 
 class Note < ActiveRecord::Base
@@ -85,6 +85,7 @@ RSpec.configure do |config|
       create_table :books do |t|
         t.integer :author_id
         t.integer :library_id
+        t.integer :bookmarks_count
         t.timestamps null: false
         t.string :title
         t.timestamp :deleted_at

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zombie_record
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Daniel Schierbeck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-23 00:00:00.000000000 Z
+date: 2015-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord