paranoia 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07438f51e6a97736c8bbb1778bbb7b9cbe5c623c
-  data.tar.gz: 4456e34fe1c2988dfe9cb1014ca8002e288ec45c
+  metadata.gz: 74da60de8afe27c56c43f9a2ad74eec282f1d0d7
+  data.tar.gz: fc3b097f03211f08ba1ad711e82d7c6ef20231ab
 SHA512:
-  metadata.gz: 5d13573dc45ac55f6aaf478b20a3e74e2d209d37f6c17e826f293aec36ffc568b7952078eb42f9d63753ef42162993b127d11773e2a7afb9fe3558955faf15d1
-  data.tar.gz: 5b84920192ef0cd5e13acf1cc433753b3f6f1cc69ce6afa7369404e6ac2bd7394b96b33b22415d5e2de41928c5b0582f9498cbb592d1eb291a651ac6f0e6bb97
+  metadata.gz: 1b98a9b12106d88e02d0d059143b56d7fe63dfa12d0362a83da656aef59b5940e5e9e9514caa2c6f51881f2ad306e76977d75efc22a8dcf60a2df04bebe931ce
+  data.tar.gz: 29a1b849c690b46339e75e5bdd2761bd6f070025c55f543abc7603a1104ebb0feb59b4cc04d70d5ed363f2f38a04de50fc630c5a26d8e31ae1b61287f73d56e4

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0

data/README.md

@@ -4,6 +4,8 @@ Paranoia is a re-implementation of [acts\_as\_paranoid](http://github.com/techno
 
 You would use either plugin / gem if you wished that when you called `destroy` on an Active Record object that it didn't actually destroy it, but just "hid" the record. Paranoia does this by setting a `deleted_at` field to the current time when you `destroy` a record, and hides it by scoping all queries on your model to only include records which do not have a `deleted_at` field.
 
+If you wish to actually destroy an object you may call destroy! on it or simply call destroy twice on the same object.
+
 ## Installation & Usage
 
 For Rails 3, please use version 1 of Paranoia:
@@ -23,7 +25,7 @@ Of course you can install this from GitHub as well:
 ```ruby
 gem 'paranoia', :github => 'radar/paranoia', :branch => 'master'
 # or
-gem 'paranoia', :github => 'radar/paranoia', :branch => 'rails-4'
+gem 'paranoia', :github => 'radar/paranoia', :branch => 'rails4'
 ```
 
 Then run:

data/lib/paranoia.rb

@@ -1,18 +1,49 @@
 module Paranoia
   def self.included(klazz)
     klazz.extend Query
+    klazz.extend Callbacks
   end
 
   module Query
-    def paranoid? ; true ; end
-
-    def only_deleted
-      scoped.tap { |x| x.default_scoped = false }.where("#{self.table_name}.deleted_at is not null")
+    def paranoid?
+      true
     end
 
+
     def with_deleted
       scoped.tap { |x| x.default_scoped = false }
     end
+
+    def only_deleted
+      with_deleted.where("#{self.table_name}.deleted_at IS NOT NULL")
+    end
+    alias :deleted :only_deleted
+
+    def restore(id)
+      if id.is_a?(Array)
+        id.map { |one_id| restore(one_id) }
+      else
+        only_deleted.find(id).restore!
+      end
+    end
+  end
+
+  module Callbacks
+    def self.extended(klazz)
+      klazz.define_callbacks :restore
+
+      klazz.define_singleton_method("before_restore") do |*args, &block|
+        set_callback(:restore, :before, *args, &block)
+      end
+
+      klazz.define_singleton_method("around_restore") do |*args, &block|
+        set_callback(:restore, :around, *args, &block)
+      end
+
+      klazz.define_singleton_method("after_restore") do |*args, &block|
+        set_callback(:restore, :after, *args, &block)
+      end
+    end
   end
 
   def destroy
@@ -20,37 +51,46 @@ module Paranoia
   end
 
   def delete
-    return if new_record? or destroyed?
-    update_attribute_or_column :deleted_at, Time.now
+    return if new_record?
+    destroyed? ? destroy! : update_attribute_or_column(:deleted_at, Time.now)
   end
 
   def restore!
-    update_attribute_or_column :deleted_at, nil
+    run_callbacks(:restore) { update_column :deleted_at, nil }
   end
+  alias :restore :restore!
 
   def destroyed?
-    !self.deleted_at.nil?
+    !!deleted_at
   end
+
   alias :deleted? :destroyed?
 
   private
 
   # Rails 3.1 adds update_column. Rails > 3.2.6 deprecates update_attribute, gone in Rails 4.
   def update_attribute_or_column(*args)
-    respond_to?(:update_column) ? update_column(*args) : update_attribute(*args)
+    self.class.unscoped do
+      respond_to?(:update_column) ? update_column(*args) : update_attribute(*args)
+    end
   end
 end
 
 class ActiveRecord::Base
   def self.acts_as_paranoid
     alias :destroy! :destroy
-    alias :delete!  :delete
+    alias :delete! :delete
     include Paranoia
-    default_scope { where(:deleted_at => nil) }
+    default_scope { where(self.quoted_table_name + '.deleted_at IS NULL') }
+  end
+
+  def self.paranoid?
+    false
   end
 
-  def self.paranoid? ; false ; end
-  def paranoid? ; self.class.paranoid? ; end
+  def paranoid?
+    self.class.paranoid?
+  end
 
   # Override the persisted method to allow for the paranoia gem.
   # If a paranoid record is selected, then we only want to check

data/lib/paranoia/version.rb

@@ -1,3 +1,3 @@
 module Paranoia
-  VERSION = "1.3.1"
+  VERSION = '1.3.2'
 end

data/paranoia.gemspec

@@ -1,27 +1,26 @@
 # -*- encoding: utf-8 -*-
-require File.expand_path("../lib/paranoia/version", __FILE__)
+require File.expand_path('../lib/paranoia/version', __FILE__)
 
 Gem::Specification.new do |s|
-  s.name        = "paranoia"
-  s.version     = Paranoia::VERSION
-  s.platform    = Gem::Platform::RUBY
-  s.authors     = ["radarlistener@gmail.com"]
-  s.email       = []
-  s.homepage    = "http://rubygems.org/gems/paranoia"
-  s.summary     = "Paranoia is a re-implementation of acts_as_paranoid for Rails 3, using much, much, much less code."
+  s.name = 'paranoia'
+  s.version = Paranoia::VERSION
+  s.platform = Gem::Platform::RUBY
+  s.authors = %w(radarlistener@gmail.com)
+  s.email = []
+  s.homepage = 'http://rubygems.org/gems/paranoia'
+  s.summary = 'Paranoia is a re-implementation of acts_as_paranoid for Rails 3, using much, much, much less code.'
   s.description = "Paranoia is a re-implementation of acts_as_paranoid for Rails 3, using much, much, much less code. You would use either plugin / gem if you wished that when you called destroy on an Active Record object that it didn't actually destroy it, but just \"hid\" the record. Paranoia does this by setting a deleted_at field to the current time when you destroy a record, and hides it by scoping all queries on your model to only include records which do not have a deleted_at field."
 
-  s.required_rubygems_version = ">= 1.3.6"
-  s.rubyforge_project         = "paranoia"
-  
-  s.add_dependency "activerecord", "~> 3.2"
+  s.required_rubygems_version = '>= 1.3.6'
+  s.rubyforge_project = 'paranoia'
 
-  s.add_development_dependency "bundler", ">= 1.0.0"
-  s.add_development_dependency "sqlite3"
-  s.add_development_dependency "rake", "0.8.7"
-  s.add_development_dependency "pry"
-  
-  s.files        = `git ls-files`.split("\n")
-  s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact
+  s.add_dependency 'activerecord', '~> 3.2'
+
+  s.add_development_dependency 'bundler', '>= 1.0.0'
+  s.add_development_dependency 'sqlite3'
+  s.add_development_dependency 'rake'
+
+  s.files = `git ls-files`.split("\n")
+  s.executables = `git ls-files`.split("\n").map { |f| f =~ /^bin\/(.*)/ ? $1 : nil }.compact
   s.require_path = 'lib'
 end

data/test/paranoia_test.rb

@@ -1,6 +1,6 @@
 require 'test/unit'
 require 'active_record'
-require File.expand_path(File.dirname(__FILE__) + "/../lib/paranoia")
+require File.expand_path(File.dirname(__FILE__) + '/../lib/paranoia')
 
 DB_FILE = 'tmp/test_db'
 
@@ -71,7 +71,7 @@ class ParanoiaTest < Test::Unit::TestCase
     assert_equal 0, model.class.count
     assert_equal 1, model.class.unscoped.count
   end
-  
+
   def test_scoping_behavior_for_paranoid_models
     ParanoidModel.unscoped.delete_all
     parent1 = ParentModel.create
@@ -82,9 +82,10 @@ class ParanoiaTest < Test::Unit::TestCase
     p2.destroy
     assert_equal 0, parent1.paranoid_models.count
     assert_equal 1, parent1.paranoid_models.only_deleted.count
+    assert_equal 1, parent1.paranoid_models.deleted.count
     p3 = ParanoidModel.create(:parent_model => parent1)
     assert_equal 2, parent1.paranoid_models.with_deleted.count
-    assert_equal [p1,p3], parent1.paranoid_models.with_deleted
+    assert_equal [p1, p3], parent1.paranoid_models.with_deleted
   end
 
   def test_destroy_behavior_for_featureful_paranoid_models
@@ -102,9 +103,8 @@ class ParanoiaTest < Test::Unit::TestCase
 
   # Regression test for #24
   def test_chaining_for_paranoid_models
-    scope = FeaturefulModel.where(:name => "foo").only_deleted
-
-    assert_equal "foo", scope.where_values_hash["name"]
+    scope = FeaturefulModel.where(:name => 'foo').only_deleted
+    assert_equal 'foo', scope.where_values_hash['name']
     assert_equal 2, scope.where_values.count
   end
 
@@ -117,6 +117,7 @@ class ParanoiaTest < Test::Unit::TestCase
 
     assert_equal model, ParanoidModel.only_deleted.last
     assert_equal false, ParanoidModel.only_deleted.include?(model2)
+    assert_equal false, ParanoidModel.deleted.include?(model2)
   end
 
   def test_default_scope_for_has_many_relationships
@@ -189,25 +190,75 @@ class ParanoiaTest < Test::Unit::TestCase
     assert_equal false, model.destroyed?
   end
 
+  def test_destroy_twice
+    model = ParanoidModel.new
+    model.save
+    model.destroy
+    model.destroy
+
+    assert_equal 0, ParanoidModel.unscoped.where(id: model.id).count
+  end
+
+  def test_restore_behavior_for_callbacks
+    model = CallbackModel.new
+    model.save
+    id = model.id
+    model.destroy
+
+    assert model.destroyed?
+
+    model = CallbackModel.only_deleted.find(id)
+    model.restore!
+    model.reload
+
+    assert model.instance_variable_get(:@restore_callback_called)
+  end
+
   def test_real_destroy
     model = ParanoidModel.new
     model.save
     model.destroy!
 
-    assert_equal false, !!ParanoidModel.unscoped.exists?(model.id)
+    assert_equal 0, ParanoidModel.unscoped.where(id: model.id).count
   end
 
   def test_real_delete
     model = ParanoidModel.new
     model.save
     model.delete!
+    assert_equal 0, ParanoidModel.unscoped.where(id: model.id).count
+  end
+
+  def test_multiple_restore
+    a = ParanoidModel.new
+    a.save
+    a_id = a.id
+    a.destroy
+
+    b = ParanoidModel.new
+    b.save
+    b_id = b.id
+    b.destroy
+
+    c = ParanoidModel.new
+    c.save
+    c_id = c.id
+    c.destroy
+
+    ParanoidModel.restore([a_id, c_id])
+
+    a.reload
+    b.reload
+    c.reload
 
-    assert_equal false, !!ParanoidModel.unscoped.exists?(model.id)
+    refute a.destroyed?
+    assert b.destroyed?
+    refute c.destroyed?
   end
 
   private
   def get_featureful_model
-    FeaturefulModel.new(:name => "not empty")
+    FeaturefulModel.new(:name => 'not empty')
   end
 end
 
@@ -233,6 +284,7 @@ end
 class CallbackModel < ActiveRecord::Base
   acts_as_paranoid
   before_destroy {|model| model.instance_variable_set :@callback_called, true }
+  before_restore {|model| model.instance_variable_set :@restore_callback_called, true }
 end
 
 class ParentModel < ActiveRecord::Base

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paranoia
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - radarlistener@gmail.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-08 00:00:00.000000000 Z
+date: 2013-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -54,20 +54,6 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.8.7
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.8.7
-- !ruby/object:Gem::Dependency
-  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -92,6 +78,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
@@ -119,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: paranoia
-rubygems_version: 2.0.0
+rubygems_version: 2.1.0
 signing_key: 
 specification_version: 4
 summary: Paranoia is a re-implementation of acts_as_paranoid for Rails 3, using much,