destroyed_at 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 072d8f78b587daebb48a6fa406287342c2e1ee3a
-  data.tar.gz: 6e963e35a47e92e114fc14038e2e8cc0734bf4b0
+  metadata.gz: cb825af31fcc38174f287636b93d18b81e14304e
+  data.tar.gz: b3ff1f1fea7d4b1a7c6d08637f891cfdf069b122
 SHA512:
-  metadata.gz: 1fe52260f693cdd042dc38b26b55c51fbd2b1ee3043c5ef7273154fd78d3b91c54dc84a36a8a70e92498df6a5ec3b1dfd3a0628540cac6c35f66a8aceeb00171
-  data.tar.gz: 10eeacbd7a71381ddd8401d9069f4cc5d3b1a195b0338d4a46b33d780327b2a57041b3af1ced43e1fa193f25c741ed59c0e47c0bff86cc3e5511bba992d96be7
+  metadata.gz: 7d3261f0ff7ab631122308add947cdf6b6e3dccfcbb274453db7b8905b7888babbfda33b76bb412b5056ffbc4019d7b59d53f9423f930a8b14fa668279f55754
+  data.tar.gz: 7e3edf023b3691dd43033a61f3ee287b36e3f73ec3120f1f300dc3a0cb2681e16ee744e931a9aa9435a2d71c04ec5a2059dc762acba6948b86eb5f3715aec2cc

data/.travis.yml

@@ -1,2 +1,9 @@
 rvm:
-  - 2.0.0
+- 2.0.0
+
+notifications:
+  hipchat:
+    rooms:
+      secure: HD93T2k0sXQYPk/SLwROvvbQmMDqOxxdgd3eKhocYmH/nKcU/+p3xIls1qstnUh+G4kVwj2ZhWkYg7lfg4rmDfO7RlKWA9zTX3Aaed4cSF/Od54S1Dqwl12KGSITs/nrY2W5zQ+JJ5chFKRYuiRpqb4cPQeafJojccHdaYjYShM=
+    template:
+      - '@all %{repository}#%{build_number} (%{branch} - %{commit} : %{author}): %{message}'

data/CHANGELOG.md

@@ -0,0 +1,8 @@
+## 0.3.0
+
+* Fix issue with has_many destroy against regular models - Brian
+  Cardarella
+* Relation.destoyed removes the destoyed scope and adds a scope 
+  for records that have been destoyed - Dan McClain
+* Added /restore route for restorable resources - Brian Cardarella &
+  Romina Vargas

data/README.md

@@ -37,6 +37,15 @@ end
 Each model's table that is expected to have this behavior **must** have
 a `destroyed_at` column of type `DateTime`.
 
+It is recommended that you add an index on the model's `destroyed_at` column,
+so that your database does not have to do a table scan for every query.
+Only Postgres' query indexes will be of any benefit:
+
+```db
+CREATE INDEX ON users WHERE destroyed_at IS NULL;
+CREATE INDEX ON users WHERE destroyed_at IS NOT NULL;
+```
+
 ## Usage ##
 Allows you to "destroy" an object without deleting the record or
 associated records.
@@ -61,6 +70,16 @@ user.destroyed_at
 # => <DateTime>
 ```
 
+#### Warning: Dependent relations with destroy ####
+Be careful when destroying parent relationships that have `dependent:
+:destroy`. If the child
+relationship does not also `include DestroyedAt`, then when you call
+`#destroy` on the parent instance, you will delete the child record,
+rather than simply marking it `destroyed_at`.
+
+The same goes for destroying through relations that omit `include
+DestroyedAt`, even if the parent and child models include the mixin.
+
 ### Restoring ####
 When you'd like to "restore" a record, call the `#restore` method on
 the instance. This will set its `#destroyed_at` value to `nil`, thereby
@@ -83,15 +102,25 @@ user.destroyed_at
 # => nil
 ```
 
+### Destroyed Scope ###
+When you include the `DestroyedAt` module, it sets a default scope of 
+`where(destroyed_at: nil)`. It also defines a scope called `.destroyed`
+which removes the default scope and finds the records of a relation
+`where.not(destroyed_at: nil)`. This is different than calling `unscoped`
+on the class/relation. Where unscoped will remove all scoping from a
+relation, `.destroyed` only removes the default scope generated by the
+`DestroyedAt` module, making it safe to call on relations.
+
 ### Callbacks ###
-`before_restore` and `after_restore` callbacks are added to your
-model. They work similarly to the `before_destroy` and `after_destroy`
+`before_restore`, `after_restore` and `around_restore` callbacks are added to your
+model. They work similarly to the `before_destroy`, `after_destroy` and `around_restore`
 callbacks.
 
 ```ruby
 class User < ActiveRecord::Base
   before_restore :before_restore_action
   after_restore  :after_restore_action
+  around_restore :around_restore_action
   
   private
   
@@ -102,6 +131,11 @@ class User < ActiveRecord::Base
   def after_restore_action
     ...
   end
+
+  def around_restore_action
+    # before around
+    yield # restoring...
+    # after around
 end
 ```
 

data/destroyed_at.gemspec

@@ -19,9 +19,11 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.0'
 
+  spec.add_runtime_dependency "activerecord", "~> 4.0.0"
+  spec.add_runtime_dependency 'actionpack', '~> 4.0.0'
+
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "activerecord", "~> 4.0.0"
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "m"
   spec.add_development_dependency "sqlite3"

data/lib/destroyed_at.rb

@@ -2,6 +2,7 @@ require 'destroyed_at/version'
 require 'destroyed_at/belongs_to_association'
 require 'destroyed_at/has_many_association'
 require 'destroyed_at/has_one_association'
+require 'destroyed_at/mapper'
 
 module DestroyedAt
   def self.included(klass)
@@ -9,6 +10,17 @@ module DestroyedAt
       default_scope { where(destroyed_at: nil) }
       after_initialize :_set_destruction_state
       define_model_callbacks :restore
+      extend ClassMethods
+    end
+  end
+
+  module ClassMethods
+    def destroyed
+      query = all.with_default_scope
+      query.where_values.reject! do |node|
+        Arel::Nodes::Equality === node && node.left.name == 'destroyed_at' && node.right.nil?
+      end
+      query.where.not(destroyed_at: nil)
     end
   end
 

data/lib/destroyed_at/has_many_association.rb

@@ -2,7 +2,13 @@ module DestroyedAt
   module HasManyAssociation
     def delete_records(records, method)
       if method == :destroy
-        records.each { |r| r.destroy(owner.destroyed_at) }
+        records.each do |r|
+          if r.respond_to?(:destroyed_at)
+            r.destroy(owner.destroyed_at)
+          else
+            r.destroy
+          end
+        end
         update_counter(-records.length) unless inverse_updates_counter_cache?
       else
         super

data/lib/destroyed_at/mapper.rb

@@ -0,0 +1,26 @@
+require 'action_dispatch'
+
+module DestroyedAt::Routes
+  def set_member_mappings_for_resource
+    member do
+      put :restore if parent_resource.actions.include?(:restore)
+    end
+    super
+  end
+end
+
+ActionDispatch::Routing::Mapper.send(:prepend, DestroyedAt::Routes)
+
+module DestroyedAt::Resource
+  def default_actions
+    actions = super
+    if self.name.camelcase.singularize.constantize.included_modules.include?(DestroyedAt)
+      actions << :restore
+    end
+
+    actions
+  end
+end
+
+ActionDispatch::Routing::Mapper::Resources::SingletonResource.send(:prepend, DestroyedAt::Resource)
+ActionDispatch::Routing::Mapper::Resource.send(:prepend, DestroyedAt::Resource)

data/lib/destroyed_at/routes.rb

@@ -0,0 +1,26 @@
+require 'action_dispatch'
+
+module DestroyedAt::Mapper
+  module Routes
+    def set_member_mappings_for_resource
+      member do
+        put :restore if parent_resource.actions.include?(:restore)
+      end
+      super
+    end
+  end
+
+  module Resource
+    def default_actions
+      actions = super
+      if self.name.camelcase.singularize.constantize.included_modules.include?(DestroyedAt)
+        actions << :restore
+      end
+
+      actions
+    end
+  end
+end
+
+ActionDispatch::Routing::Mapper.send(:prepend, DestroyedAt::Mapper::Routes)
+ActionDispatch::Routing::Mapper::Resource.send(:prepend, DestroyedAt::Mapper::Resource)

data/lib/destroyed_at/version.rb

@@ -1,3 +1,3 @@
 module DestroyedAt
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/test/destroyed_at_test.rb

@@ -1,200 +1,175 @@
 require 'test_helper'
 
-describe 'Destroying AR models' do
-  it 'Calling destroy on a model should only safe destroy record' do
-    user = User.create
-    user.destroy
-    User.all.must_be_empty
-    User.unscoped.load.wont_be_empty
-  end
+describe 'destroying an activerecord instance' do
+  let(:post) { Post.create }
 
-  it 'Destroying a model will set the timestamp it was destroyed at' do
+  it 'sets the timestamp it was destroyed at' do
     time = Time.now
     Timecop.freeze(time) do
-      user = User.create
-      user.destroy
-      user.destroyed_at.must_equal time
+      post = Post.create
+      post.destroy
+      post.destroyed_at.must_equal time
     end
   end
 
-  it 'can restore records' do
-    user = User.create(:destroyed_at => DateTime.current)
-    User.all.must_be_empty
-    user.reload
-    user.restore
-    user.destroyed_at.must_be_nil
-    User.all.wont_be_empty
-  end
-
-  it 'will run destroy callbacks' do
-    person = Person.create
-    person.before_flag.wont_equal true
-    person.after_flag.wont_equal true
-    person.destroy
-    person.before_flag.must_equal true
-    person.after_flag.must_equal true
-  end
-
-  it 'will run restore callbacks' do
-    person = Person.create(:destroyed_at => DateTime.current)
-    person.before_flag.wont_equal true
-    person.after_flag.wont_equal true
-    person.restore
-    person.before_flag.must_equal true
-    person.after_flag.must_equal true
-  end
-
-  it 'will properly destroy relations' do
-    user = User.create(:profile => Profile.new, :car => Car.new)
-    user.reload
-    user.profile.wont_be_nil
-    user.car.wont_be_nil
-    user.destroy
-    Profile.count.must_equal 0
-    Profile.unscoped.count.must_equal 1
-    Car.count.must_equal 0
-    Car.unscoped.count.must_equal 0
-  end
-
-  it 'can restore relationships' do
-    timestamp = DateTime.current
-    user = User.create(:destroyed_at => timestamp)
-    Profile.create(:destroyed_at => timestamp, :user => user)
-    Profile.count.must_equal 0
-    user.reload
-    user.restore
-    Profile.count.must_equal 1
-  end
-
-  it 'will not restore relationships that have no destroy dependency' do
-    user = User.create(:destroyed_at => DateTime.current, :show => Show.new(:destroyed_at => DateTime.current))
-    Show.count.must_equal 0
-    user.restore
-    Show.count.must_equal 0
-  end
-
-  it 'will respect has many associations' do
-    timestamp = DateTime.current
-    user = User.create(:destroyed_at => timestamp)
-    Dinner.create(:destroyed_at => timestamp, :user => user)
-    Dinner.count.must_equal 0
-    user.reload
-    user.restore
-    Dinner.count.must_equal 1
-  end
-
-  it 'will respect has many through associations' do
-    timestamp = DateTime.current
-    user = User.create(:destroyed_at => timestamp)
-    car = Car.create
-    fleet = Fleet.create(:destroyed_at => timestamp, :car => car)
-    user.fleets = [fleet]
-    user.cars.count.must_equal 0
-    user.reload
-    user.restore
-    user.cars.count.must_equal 1
-  end
-
-  it 'properly sets #destroyed?' do
-    user = User.create
-    user.destroy
-    user.destroyed?.must_equal true
-    user = User.unscoped.last
-    user.destroyed?.must_equal true
-    user.restore
-    user.destroyed?.must_equal false
-  end
-
-  it 'properly selects columns' do
-    User.create
-    User.select(:id).must_be_kind_of ActiveRecord::Relation
-  end
-
-  it 'only destroys and restores related dependents' do
-    2.times do
-       User.create(dinners: [Dinner.create, Dinner.create, Dinner.create])
-    end
+  it 'does not delete the record' do
+    post.destroy
+    Post.all.must_be_empty
+    Post.unscoped.load.wont_be_empty
+  end
 
-    User.first.destroy
-    Dinner.count.must_equal 3
-    User.first.destroy
-    Dinner.count.must_equal 0
-    User.unscoped.first.restore
-    Dinner.count.must_equal 3
+  it 'sets #destroyed?' do
+    post.destroy
+    post.destroyed?.must_equal true
+    post = Post.unscoped.last
+    post.destroyed?.must_equal true
+    post.restore
+    post.destroyed?.must_equal false
   end
 
-  it 'skips callbacks' do
-    user = User.create
-    user.destroy
-    user.before_update_count.must_equal nil
-    user.restore
-    user.before_update_count.must_equal nil
+  it 'runs destroy callbacks' do
+    post.destroy_callback_count.must_equal nil
+    post.destroy
+    post.destroy_callback_count.must_equal 1
   end
 
-  it 'skips validations on restore' do
-    user = User.create
-    user.validation_count.must_equal 1
-    user.destroy
-    user.validation_count.must_equal 1
-    user.restore
-    user.validation_count.must_equal 1
+  it 'does not run update callbacks' do
+    post.destroy
+    post.update_callback_count.must_equal nil
+    post.restore
+    post.update_callback_count.must_equal nil
   end
 
   it 'stays persisted after destruction' do
-    user = User.create
-    user.destroy
-    user.persisted?.must_equal true
+    post.destroy
+    post.persisted?.must_equal true
   end
 
-  it 'does not allow new records with destroyed_at columns present to be marked persisted' do
-    user = User.new(destroyed_at: Time.now)
-    user.persisted?.must_equal false
+  it 'destroys dependent relation with DestroyedAt' do
+    post.comments.create
+    Post.count.must_equal 1
+    Comment.count.must_equal 1
+    post.destroy
+    Post.count.must_equal 0
+    Comment.count.must_equal 0
+  end
+
+  it 'destroys dependent through relation with DestroyedAt' do
+    commenter = Commenter.create
+    Comment.create(:post => post, :commenter => commenter)
+
+    Commenter.count.must_equal 1
+    Comment.count.must_equal 1
+    post.destroy
+    Commenter.count.must_equal 1
+    Comment.count.must_equal 0
+  end
+
+  it 'deletes dependent relations without DestroyedAt' do
+    category = Category.create
+    Categorization.create(:category => category, :post => post)
+    post.categorizations.count.must_equal 1
+    post.destroy
+    Categorization.unscoped.count.must_equal 0
+  end
+end
+
+describe 'restoring an activerecord instance' do
+  let(:author) { Author.create }
+  let(:timestamp) { DateTime.current }
+  let(:post) { Post.create(:destroyed_at => timestamp) }
+
+  it 'restores the record' do
+    Post.all.must_be_empty
+    post.reload
+    post.restore
+    post.destroyed_at.must_be_nil
+    Post.all.wont_be_empty
+  end
+
+  it 'runs the restore callbacks' do
+    post.restore_callback_count.must_equal nil
+    post.restore
+    post.restore_callback_count.must_equal 1
+  end
+
+  it 'does not run restore validations' do
+    initial_count = post.validation_count
+    post.restore
+    initial_count.must_equal post.validation_count
   end
 
+  it 'restores a dependent has_many relation with DestroyedAt' do
+    Comment.create(:destroyed_at => timestamp, :post => post)
+    Comment.count.must_equal 0
+    post.reload
+    post.restore
+    Comment.count.must_equal 1
+  end
+
+  it 'does not restore a non-dependent relation with DestroyedAt' do
+    Post.count.must_equal 0
+    Author.count.must_equal 0
+    post.reload
+    post.restore
+    Post.count.must_equal 1
+    Author.count.must_equal 0
+  end
+
+  it 'restores a dependent through relation with DestroyedAt' do
+    commenter = Commenter.create
+    Comment.create(:post => post, :commenter => commenter, :destroyed_at => timestamp)
+
+    Commenter.count.must_equal 1
+    Comment.count.must_equal 0
+    post.reload
+    post.restore
+    Commenter.count.must_equal 1
+    Comment.count.must_equal 1
+  end
+
+  it 'restores only the dependent relationships destroyed when the parent was destroyed' do
+    post = Post.create
+    comment_1 = Comment.create(post: post, destroyed_at: Time.now - 1.day)
+    comment_2 = Comment.create(post: post)
+    post.destroy
+    post.reload # We have to reload the object before restoring in the test
+                # because the in memory object has greater precision than
+                # the database records
+    post.restore
+    post.comments.wont_include comment_1
+    post.comments.must_include comment_2
+  end
+end
+
+describe 'deleting a record' do
   it 'is not persisted after deletion' do
-    user = User.create
-    user.delete
-    user.persisted?.must_equal false
+    post = Post.create
+    post.delete
+    post.persisted?.must_equal false
   end
 
   it 'can delete destroyed records and they are marked as not persisted' do
-    user = User.create
-    user.destroy
-    user.persisted?.must_equal true
-    user.delete
-    user.persisted?.must_equal false
-  end
-
-  it 'only restores dependencies destroyed with parent with has many' do
-    user = User.create
-    dinner_one = Dinner.create(user: user, destroyed_at: Time.now - 1.day)
-    dinner_two = Dinner.create(user: user)
-    user.destroy
-    user.restore
-    user.dinners.include?(dinner_one).must_equal false
-    user.dinners.include?(dinner_two).must_equal true
-  end
-
-  it 'only restores dependencies destroyed with parent with has one' do
-    user = User.create
-    profile_1 = Profile.create(user: user, destroyed_at: Time.now - 1.day)
-    profile_2 = Profile.create(user: user)
-    user.destroy
-    user.restore
-    user.profile.must_equal profile_2
-    profile_1.reload
-    profile_1.destroyed_at.wont_equal nil
-  end
-
-  it 'destroys and restores dependencies in a belongs_to relationship' do
-    user = User.create
-    show = Show.create(user: user)
-    show.destroy
-    show.reload
-    user.reload
-    user.destroyed_at.wont_equal nil
-    show.restore
-    user.reload
-    user.destroyed_at.must_equal nil
+    post = Post.create
+    post.destroy
+    post.persisted?.must_equal true
+    post.delete
+    post.persisted?.must_equal false
+  end
+end
+
+describe 'destroying an activerecord instance without DestroyedAt' do
+  it 'does not impact ActiveRecord::Relation.destroy' do
+    post = Post.create
+    categorization  = Categorization.create(post: post)
+    post.categorizations.destroy(categorization.id)
+    post.categorizations.must_be_empty
+  end
+end
+
+describe 'creating a destroyed record' do
+  it 'does not allow new records with destroyed_at columns present to be marked persisted' do
+    post = Post.new(destroyed_at: Time.now)
+    post.persisted?.must_equal false
   end
 end

data/test/mapper_test.rb

@@ -0,0 +1,72 @@
+require 'test_helper'
+require 'action_dispatch'
+require 'action_dispatch/routing/route_set'
+require 'action_controller'
+
+class CommentsController < ActionController::Base; end
+
+class MapperTest < ActiveSupport::TestCase
+  setup do
+    @set = ActionDispatch::Routing::RouteSet.new
+  end
+
+  test 'adds restore route for DestroyedAt model plural resource' do
+    draw do
+      resources :comments
+    end
+
+    params = @set.recognize_path('/comments/:id/restore', method: 'put')
+    assert_equal params[:controller], 'comments'
+    assert_equal params[:action], 'restore'
+  end
+
+  test 'adds restore route for DestroyedAt model singular resource' do
+    draw do
+      resource :comment
+    end
+
+    params = @set.recognize_path('/comment/restore', method: 'put')
+    assert_equal params[:controller], 'comments'
+    assert_equal params[:action], 'restore'
+  end
+
+  test 'does not add restore route for non DestroyedAt plural resource' do
+    draw do
+      resources :authors
+    end
+
+    begin
+      params = @set.recognize_path('/authors/:id/restore', method: 'put')
+      assert false, 'this should not be reached'
+    rescue ActionController::RoutingError
+      assert true, 'path not recognized'
+    end
+  end
+
+  test 'does not add restore route for non DestroyedAt singular resource' do
+    draw do
+      resource :author
+    end
+
+    begin
+      params = @set.recognize_path('/author/restore', method: 'put')
+      assert false, 'this should not be reached'
+    rescue ActionController::RoutingError
+      assert true, 'path not recognized'
+    end
+  end
+
+  private
+
+  def draw(&block)
+    @set.draw(&block)
+  end
+
+  def url_helpers
+    @set.url_helpers
+  end
+
+  def clear!
+    @set.clear!
+  end
+end

data/test/scope_test.rb

@@ -0,0 +1,52 @@
+require 'test_helper'
+
+describe 'Scopes' do
+  let(:post)     { Post.create! }
+  let(:comment_1)  { post.comments.create! }
+  let(:comment_2)  { post.comments.create! }
+  let(:comment_3)  { Comment.create! }
+  let(:comment_4)  { Comment.create! }
+
+  before do
+    comment_1
+    comment_2.destroy
+    comment_3
+    comment_4.destroy
+  end
+
+  describe '.destroyed' do
+    context 'Called on model' do
+      let(:destroyed_comments) { Comment.destroyed }
+
+      it 'returns records that have been destroyed' do
+        destroyed_comments.must_include comment_2
+        destroyed_comments.must_include comment_4
+      end
+
+      it 'does not return current records' do
+        destroyed_comments.wont_include comment_1
+        destroyed_comments.wont_include comment_3
+      end
+    end
+
+    context 'Called on relation' do
+      let(:destroyed_comments) { post.comments.destroyed }
+
+      it 'returns destroyed records beloning in the relation' do
+        destroyed_comments.must_include comment_2
+      end
+
+      it 'does not return destroyed records that are outside the relation' do
+        destroyed_comments.wont_include comment_4
+      end
+
+      it 'does not return current records in the relation' do
+        destroyed_comments.wont_include comment_1
+      end
+
+      it 'does not return current records that are outside the relation' do
+        destroyed_comments.wont_include comment_3
+      end
+    end
+  end
+end

data/test/test_helper.rb

@@ -27,79 +27,76 @@ ActiveRecord::Base.establish_connection(
 
 DatabaseCleaner.strategy = :truncation
 
-ActiveRecord::Base.connection.execute(%{CREATE TABLE users (id INTEGER PRIMARY KEY, destroyed_at DATETIME, type STRING);})
-ActiveRecord::Base.connection.execute(%{CREATE TABLE profiles (id INTEGER PRIMARY KEY, destroyed_at DATETIME, user_id INTEGER);})
-ActiveRecord::Base.connection.execute(%{CREATE TABLE cars (id INTEGER PRIMARY KEY, user_id INTEGER);})
-ActiveRecord::Base.connection.execute(%{CREATE TABLE dinners (id INTEGER PRIMARY KEY, destroyed_at DATETIME, user_id INTEGER);})
-ActiveRecord::Base.connection.execute(%{CREATE TABLE shows (id INTEGER PRIMARY KEY, destroyed_at DATETIME, user_id INTEGER);})
-ActiveRecord::Base.connection.execute(%{CREATE TABLE fleets (id INTEGER PRIMARY KEY, destroyed_at DATETIME, user_id INTEGER, car_id INTEGER);})
-
-class User < ActiveRecord::Base
-  include DestroyedAt
-  has_one :profile, :dependent => :destroy
-  has_one :car, :dependent => :destroy
-  has_many :dinners, :dependent => :destroy
-  has_one :show
-  has_many :fleets
-  has_many :cars, :through => :fleets, :dependent => :destroy
-  before_update :increment_callback_counter
-  validate :increment_validation_counter
+ActiveRecord::Base.connection.execute(%{CREATE TABLE authors (id INTEGER PRIMARY KEY);})
+ActiveRecord::Base.connection.execute(%{CREATE TABLE categories (id INTEGER PRIMARY KEY);})
+ActiveRecord::Base.connection.execute(%{CREATE TABLE categorizations (id INTEGER PRIMARY KEY, category_id INTEGER, post_id INTEGER);})
+ActiveRecord::Base.connection.execute(%{CREATE TABLE comments (id INTEGER PRIMARY KEY, commenter_id INTEGER, post_id INTEGER, destroyed_at DATETIME);})
+ActiveRecord::Base.connection.execute(%{CREATE TABLE commenters (id INTEGER PRIMARY KEY, destroyed_at DATETIME);})
+ActiveRecord::Base.connection.execute(%{CREATE TABLE images (id INTEGER PRIMARY KEY, post_id INTEGER);})
+ActiveRecord::Base.connection.execute(%{CREATE TABLE posts (id INTEGER PRIMARY KEY, author_id INTEGER, destroyed_at DATETIME);})
+
+class Author < ActiveRecord::Base
+  has_many :posts
+end
 
-  attr_accessor :before_update_count, :validation_count
+class Category < ActiveRecord::Base
+  has_many :categorizations
+  has_many :posts, through: :categorizations
+end
 
-  private
+class Categorization < ActiveRecord::Base
+  belongs_to :category
+  belongs_to :post
+end
 
-  def increment_callback_counter
-    self.before_update_count ||= 0
-    self.before_update_count = self.before_update_count + 1
-  end
+class Comment < ActiveRecord::Base
+  include DestroyedAt
+  belongs_to :post
+  belongs_to :commenter
+end
 
-  def increment_validation_counter
-    self.validation_count ||= 0
-    self.validation_count = self.validation_count + 1
-  end
+class Commenter < ActiveRecord::Base
+  include DestroyedAt
+  has_many :comments, dependent: :destroy
+  has_many :posts, through: :comments
 end
 
-class Person < User
-  before_destroy :set_before_flag
-  after_destroy  :set_after_flag
+class Post < ActiveRecord::Base
+  include DestroyedAt
 
-  before_restore :set_before_flag
-  after_restore  :set_after_flag
+  belongs_to :author
+  has_many :categories, through: :categorizations
+  has_many :categorizations, dependent: :destroy
+  has_many :comments, dependent: :destroy
+  has_many :commenters, through: :comments
 
-  attr_accessor :before_flag, :after_flag
+  before_destroy :increment_destroy_callback_counter
+  before_restore :increment_restore_callback_counter
+  before_update :increment_update_callback_counter
 
-  def set_before_flag
-    self.before_flag = true
-  end
+  validate :increment_validation_counter
 
-  def set_after_flag
-    self.after_flag = true
-  end
-end
+  attr_accessor :destroy_callback_count, :restore_callback_count, :update_callback_count, :validation_count
 
-class Profile < ActiveRecord::Base
-  include DestroyedAt
-  belongs_to :user
-end
+  private
 
-class Car < ActiveRecord::Base
-  belongs_to :user
-  has_many :fleets
-end
+  def increment_restore_callback_counter
+    self.restore_callback_count ||= 0
+    self.restore_callback_count = self.restore_callback_count + 1
+  end
 
-class Dinner < ActiveRecord::Base
-  include DestroyedAt
-  belongs_to :user
-end
+  def increment_destroy_callback_counter
+    self.destroy_callback_count ||= 0
+    self.destroy_callback_count = self.destroy_callback_count + 1
+  end
 
-class Show < ActiveRecord::Base
-  include DestroyedAt
-  belongs_to :user, :dependent => :destroy
-end
+  def increment_update_callback_counter
+    self.update_callback_count ||= 0
+    self.update_callback_count = self.update_callback_count + 1
+  end
 
-class Fleet < ActiveRecord::Base
-  include DestroyedAt
-  belongs_to :user
-  belongs_to :car
+  def increment_validation_counter
+    self.validation_count ||= 0
+    self.validation_count = self.validation_count + 1
+  end
 end

metadata

@@ -1,57 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: destroyed_at
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Michael Dupuis Jr.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-04 00:00:00.000000000 Z
+date: 2013-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
+        version: 4.0.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 4.0.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  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: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -145,6 +159,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
+- CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
 - README.md
@@ -155,8 +170,12 @@ files:
 - lib/destroyed_at/belongs_to_association.rb
 - lib/destroyed_at/has_many_association.rb
 - lib/destroyed_at/has_one_association.rb
+- lib/destroyed_at/mapper.rb
+- lib/destroyed_at/routes.rb
 - lib/destroyed_at/version.rb
 - test/destroyed_at_test.rb
+- test/mapper_test.rb
+- test/scope_test.rb
 - test/test_helper.rb
 homepage: https://github.com/dockyard/destroyed_at
 licenses:
@@ -178,10 +197,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Safe destroy for ActiveRecord.
 test_files:
 - test/destroyed_at_test.rb
+- test/mapper_test.rb
+- test/scope_test.rb
 - test/test_helper.rb
+has_rdoc: