remove acts_as_paranoid, use .trash! , .recover! and .with_deleted as needed

makes upgrading to rails 4 possible

Author: SamSaffron

Gemfile

@@ -15,7 +15,6 @@ gem 'simple_handlebars_rails', path: 'vendor/gems/simple_handlebars_rails'
 
 gem 'redcarpet', require: false
 gem 'activerecord-postgres-hstore'
-gem 'acts_as_paranoid'
 gem 'active_attr' # until we get ActiveModel::Model with Rails 4
 gem 'airbrake', '3.1.2', require: false # errbit is broken with 3.1.3 for now
 gem 'clockwork', require: false

Gemfile.lock

@@ -120,8 +120,6 @@ GEM
     activesupport (3.2.12)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    acts_as_paranoid (0.4.1)
-      activerecord (~> 3.2)
     airbrake (3.1.2)
       activesupport
       builder
@@ -448,7 +446,6 @@ DEPENDENCIES
   active_attr
   active_model_serializers!
   activerecord-postgres-hstore
-  acts_as_paranoid
   airbrake (= 3.1.2)
   barber (= 0.3.0)
   better_errors

app/controllers/invites_controller.rb

@@ -33,7 +33,7 @@ def destroy
 
     invite = Invite.where(invited_by_id: current_user.id, email: params[:email]).first
     raise Discourse::InvalidParameters.new(:email) if invite.blank?
-    invite.destroy
+    invite.trash!
 
     render nothing: true
   end

app/controllers/posts_controller.rb

@@ -128,7 +128,7 @@ def destroy
   def recover
     post = find_post_from_params
     guardian.ensure_can_recover_post!(post)
-    post.recover
+    post.recover!
     render nothing: true
   end
 

app/controllers/topics_controller.rb

@@ -100,7 +100,7 @@ def unmute
   def destroy
     topic = Topic.where(id: params[:id]).first
     guardian.ensure_can_delete!(topic)
-    topic.destroy
+    topic.trash!
     render nothing: true
   end
 

app/models/invite.rb

@@ -1,4 +1,7 @@
+require_dependency 'trashable'
+
 class Invite < ActiveRecord::Base
+  include Trashable
 
   belongs_to :user
   belongs_to :topic
@@ -9,8 +12,6 @@ class Invite < ActiveRecord::Base
   validates_presence_of :email
   validates_presence_of :invited_by_id
 
-  acts_as_paranoid
-
   before_create do
     self.invite_key ||= SecureRandom.hex
   end

app/models/post.rb

@@ -3,19 +3,19 @@
 require_dependency 'rate_limiter'
 require_dependency 'post_revisor'
 require_dependency 'enum'
+require_dependency 'trashable'
 
 require 'archetype'
 require 'digest/sha1'
 
 class Post < ActiveRecord::Base
   include RateLimiter::OnCreateRecord
+  include Trashable
 
   versioned if: :raw_changed?
 
   rate_limit
-  acts_as_paranoid
 
-  after_recover :update_flagged_posts_count
 
   belongs_to :user
   belongs_to :topic, counter_cache: :posts_count
@@ -52,6 +52,11 @@ def self.types
     @types ||= Enum.new(:regular, :moderator_action)
   end
 
+  def recover!
+    super
+    update_flagged_posts_count
+  end
+
   def raw_quality
     sentinel = TextSentinel.body_sentinel(raw)
     errors.add(:raw, I18n.t(:is_invalid)) unless sentinel.valid?

app/models/post_action.rb

@@ -1,19 +1,19 @@
 require_dependency 'rate_limiter'
 require_dependency 'system_message'
+require_dependency 'trashable'
 
 class PostAction < ActiveRecord::Base
   class AlreadyActed < StandardError; end
 
   include RateLimiter::OnCreateRecord
+  include Trashable
 
   attr_accessible :post_action_type_id, :post_id, :user_id, :post, :user, :post_action_type, :message, :related_post_id
 
   belongs_to :post
   belongs_to :user
   belongs_to :post_action_type
 
-  acts_as_paranoid
-
   rate_limit :post_action_rate_limiter
 
   validate :message_quality
@@ -114,8 +114,7 @@ def self.act(user, post, post_action_type_id, message = nil)
 
   def self.remove_act(user, post, post_action_type_id)
     if action = where(post_id: post.id, user_id: user.id, post_action_type_id: post_action_type_id).first
-      action.destroy
-      action.deleted_at = Time.zone.now
+      action.trash!
       action.run_callbacks(:save)
     end
   end

app/models/topic.rb

@@ -4,10 +4,12 @@
 require_dependency 'rate_limiter'
 require_dependency 'text_sentinel'
 require_dependency 'text_cleaner'
+require_dependency 'trashable'
 
 class Topic < ActiveRecord::Base
   include ActionView::Helpers
   include RateLimiter::OnCreateRecord
+  include Trashable
 
   def self.max_sort_order
     2**31 - 1
@@ -18,9 +20,17 @@ def self.featured_users_count
   end
 
   versioned if: :new_version_required?
-  acts_as_paranoid
-  after_recover :update_flagged_posts_count
-  after_destroy :update_flagged_posts_count
+
+
+  def trash!
+    super
+    update_flagged_posts_count
+  end
+
+  def recover!
+    super
+    update_flagged_posts_count
+  end
 
   rate_limit :default_rate_limiter
   rate_limit :limit_topics_per_day

app/models/user.rb

@@ -442,11 +442,11 @@ def delete_all_posts!(guardian)
 
     posts.order("post_number desc").each do |p|
       if p.post_number == 1
-        p.topic.destroy
+        p.topic.trash!
         # TODO: But the post is not destroyed. Why?
       else
         # TODO: This should be using the PostDestroyer!
-        p.destroy
+        p.trash!
       end
     end
   end