zombie_record 0.4.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8fffbb5b3d7304492d0999ef54eb7db4fc783cb5
-  data.tar.gz: 121cc7d9627e7450500d076f025b501b52f31687
+  metadata.gz: c54fbb089be314efff0a17095023ff80ac9c68fe
+  data.tar.gz: a515209fd43f48a0f360eb60382d8ad8c00fdc10
 SHA512:
-  metadata.gz: e45075a3ee932ef550c34120d0be0d92d601e7839a16e06d418e949e4fba0673738a7f8e830e6d4be35aaca08f3ea5aa6bd95d66db594a22fd09258d794222a1
-  data.tar.gz: 38833db59a21a4bba05c96ba4d31fb34aefea3cd4d85912b9e5cbc1a3a71fa2dd3bb5d8c6217f82aa39d764a0b03f5c6144daf34d0f03bac67ad773d4b730dd3
+  metadata.gz: bd0b9759920d3fda72aef62f1e0ccde2ad618209922dc3fae568bd35310832e43d510871691a9f667b82491154a5e39b25d63859b464a21ae1173319aab9a685
+  data.tar.gz: 99901a30dc8e1d48c9066d05699529dbde1869c3e1e156c6368e8f43f9eebb3330a5ef447cf6a7f51fe7c04ee93b85f6817803558e826fd09c2ae5f10be99800

data/.travis.yml

@@ -1,3 +1,8 @@
 language: ruby
 rvm:
   - 2.0.0
+gemfile:
+  - gemfiles/rails4.0.gemfile
+  - gemfiles/rails4.1.gemfile
+bundler_args: ""
+script: "bundle exec rake spec"

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+###### Unreleased
+
+###### v1.1.0
+
+* Add compatibility with Rails 4.1.
+
+###### v1.0.0
+
+* Remove compatibility with Rails 3, instead adding compatibility with
+  Rails 4.0.
+
 ###### v0.4.0
 
 * Allow accessing associated records on deleted objects, even if they themselves

data/Gemfile

@@ -2,5 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in zombie_record.gemspec
 gemspec
-
-gem "byebug"

data/README.md

@@ -2,6 +2,8 @@
 
 Allows restoring your Active Records from the dead!
 
+[![Build Status](https://travis-ci.org/zendesk/zombie_record.svg?branch=master)](https://travis-ci.org/zendesk/zombie_record)
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -42,6 +44,10 @@ book.restore!
 Book.find(42) # returns the Book record.
 ```
 
+## Compatibility
+
+Zombie Record only works with Active Record 4. For Active Record 3 compatibility, check out the activerecord-3 branch of this gem.
+
 ## Contributing
 
 1. Fork it

data/Rakefile

@@ -1,6 +1,7 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
+require "wwtd/tasks"
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task :default => "wwtd:local"

data/gemfiles/rails4.0.gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gemspec path: "../"
+
+gem "activerecord", "~> 4.0.12"

data/gemfiles/rails4.0.gemfile.lock

@@ -0,0 +1,65 @@
+PATH
+  remote: ../
+  specs:
+    zombie_record (1.0.0)
+      activerecord (~> 4.0)
+      mysql2
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (4.0.12)
+      activesupport (= 4.0.12)
+      builder (~> 3.1.0)
+    activerecord (4.0.12)
+      activemodel (= 4.0.12)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.12)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activesupport (4.0.12)
+      i18n (~> 0.6, >= 0.6.9)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    arel (4.0.2)
+    builder (3.1.4)
+    byebug (3.5.1)
+      columnize (~> 0.8)
+      debugger-linecache (~> 1.2)
+      slop (~> 3.6)
+    columnize (0.8.9)
+    debugger-linecache (1.2.0)
+    diff-lcs (1.2.5)
+    i18n (0.6.11)
+    minitest (4.7.5)
+    multi_json (1.10.1)
+    mysql2 (0.3.17)
+    rake (10.3.2)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.8)
+    rspec-expectations (2.14.5)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.6)
+    slop (3.6.0)
+    thread_safe (0.3.4)
+    timecop (0.7.1)
+    tzinfo (0.3.42)
+    wwtd (0.5.5)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 4.0.12)
+  bundler (~> 1.3)
+  byebug
+  rake
+  rspec (~> 2.14.1)
+  timecop (~> 0.7.0)
+  wwtd (>= 0.5.3)
+  zombie_record!

data/gemfiles/rails4.1.gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gemspec path: "../"
+
+gem "activerecord", "~> 4.1.8"

data/gemfiles/rails4.1.gemfile.lock

@@ -0,0 +1,64 @@
+PATH
+  remote: ../
+  specs:
+    zombie_record (1.0.0)
+      activerecord (~> 4.0)
+      mysql2
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (4.1.8)
+      activesupport (= 4.1.8)
+      builder (~> 3.1)
+    activerecord (4.1.8)
+      activemodel (= 4.1.8)
+      activesupport (= 4.1.8)
+      arel (~> 5.0.0)
+    activesupport (4.1.8)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    arel (5.0.1.20140414130214)
+    builder (3.2.2)
+    byebug (3.5.1)
+      columnize (~> 0.8)
+      debugger-linecache (~> 1.2)
+      slop (~> 3.6)
+    columnize (0.8.9)
+    debugger-linecache (1.2.0)
+    diff-lcs (1.2.5)
+    i18n (0.6.11)
+    json (1.8.1)
+    minitest (5.4.3)
+    mysql2 (0.3.17)
+    rake (10.3.2)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.8)
+    rspec-expectations (2.14.5)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.6)
+    slop (3.6.0)
+    thread_safe (0.3.4)
+    timecop (0.7.1)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    wwtd (0.5.5)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 4.1.8)
+  bundler (~> 1.3)
+  byebug
+  rake
+  rspec (~> 2.14.1)
+  timecop (~> 0.7.0)
+  wwtd (>= 0.5.3)
+  zombie_record!

data/lib/zombie_record/restorable.rb

@@ -8,26 +8,6 @@ module ZombieRecord
       define_callbacks :restore
     end
 
-    # Override Rails' #destroy for soft-delete functionality
-    # When changing to Rails 4, override #destroy_row with a one-liner instead.
-    def destroy
-      run_callbacks :destroy do
-        destroy_associations
-
-        if persisted?
-          time = current_time_from_proper_timezone
-          update_column(:deleted_at, time)
-
-          if self.class.column_names.include?("updated_at")
-            update_column(:updated_at, time)
-          end
-        end
-
-        @destroyed = true
-        freeze
-      end
-    end
-
     # Restores a destroyed record.
     #
     # Returns nothing.
@@ -71,6 +51,16 @@ module ZombieRecord
 
     private
 
+    # Override Rails' #destroy_row for soft-delete functionality
+    def destroy_row
+      time = current_time_from_proper_timezone
+      update_column(:deleted_at, time)
+
+      if self.class.column_names.include?("updated_at")
+        update_column(:updated_at, time)
+      end
+    end
+
     def restore_associated_records!
       self.class.reflect_on_all_associations.each do |association|
         # Only restore associations that are automatically destroyed alongside
@@ -186,9 +176,15 @@ module ZombieRecord
       #
       # Returns an ActiveRecord::Relation.
       def with_deleted
-        scoped.
-          tap {|relation| relation.default_scoped = false }.
-          extending(WithDeletedAssociationsWrapper)
+        if ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR == 0
+          all.
+            tap {|relation| relation.default_scoped = false }.
+            extending(WithDeletedAssociationsWrapper)
+        else
+          all.
+            unscope(where: :deleted_at).
+            extending(WithDeletedAssociationsWrapper)
+        end
       end
     end
   end

data/lib/zombie_record/version.rb

@@ -1,3 +1,3 @@
 module ZombieRecord
-  VERSION = "0.4.0"
+  VERSION = "1.1.0"
 end

data/spec/restorable_spec.rb

@@ -9,7 +9,7 @@ describe ZombieRecord::Restorable do
       book.destroy
       book = Book.with_deleted.first
 
-      book.cover.should == cover.reload
+      book.cover.should_not be_nil
     end
 
     it "allows accessing deleted belongs_to associations" do

data/zombie_record.gemspec

@@ -18,11 +18,13 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activerecord", "~> 3.2.15"
+  spec.add_dependency "activerecord", "~> 4.0"
   spec.add_dependency "mysql2"
 
   spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "byebug"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rspec", "~> 2.14.1"
   spec.add_development_dependency "timecop", "~> 0.7.0"
+  spec.add_development_dependency "wwtd", ">= 0.5.3"
 end

metadata

@@ -1,99 +1,127 @@
 --- !ruby/object:Gem::Specification
 name: zombie_record
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Daniel Schierbeck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-26 00:00:00.000000000 Z
+date: 2014-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.15
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.15
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.14.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.7.0
+- !ruby/object:Gem::Dependency
+  name: wwtd
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.3
 description: Allows restoring your Active Records from the dead!
 email:
 - dasch@zendesk.com
@@ -101,14 +129,18 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- gemfiles/rails4.0.gemfile
+- gemfiles/rails4.0.gemfile.lock
+- gemfiles/rails4.1.gemfile
+- gemfiles/rails4.1.gemfile.lock
 - lib/zombie_record.rb
 - lib/zombie_record/restorable.rb
 - lib/zombie_record/version.rb
@@ -125,21 +157,20 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Allows restoring your Active Records from the dead!
 test_files:
 - spec/restorable_spec.rb
 - spec/spec_helper.rb
-has_rdoc: