paranoia 1.1.0 → 1.2.0

data/.gitignore

@@ -1,3 +1,5 @@
 pkg/*
 *.gem
 .bundle
+tmp
+.rvmrc

data/Gemfile.lock

@@ -7,22 +7,24 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.8)
-      activesupport (= 3.0.8)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.8)
-      activemodel (= 3.0.8)
-      activesupport (= 3.0.8)
-      arel (~> 2.0.10)
-      tzinfo (~> 0.3.23)
-    activesupport (3.0.8)
-    arel (2.0.10)
-    builder (2.1.2)
-    i18n (0.5.0)
+    activemodel (3.2.0)
+      activesupport (= 3.2.0)
+      builder (~> 3.0.0)
+    activerecord (3.2.0)
+      activemodel (= 3.2.0)
+      activesupport (= 3.2.0)
+      arel (~> 3.0.0)
+      tzinfo (~> 0.3.29)
+    activesupport (3.2.0)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    arel (3.0.0)
+    builder (3.0.0)
+    i18n (0.6.0)
+    multi_json (1.0.4)
     rake (0.8.7)
-    sqlite3 (1.3.3)
-    tzinfo (0.3.28)
+    sqlite3 (1.3.5)
+    tzinfo (0.3.31)
 
 PLATFORMS
   ruby

data/LICENSE

@@ -0,0 +1,17 @@
+Permission is hereby granted, without written agreement and without
+license or royalty fees, to use, copy, modify, and distribute this
+software and its documentation for any purpose, provided that the
+above copyright notice and the following two paragraphs appear in
+all copies of this software.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.

data/README.md

@@ -8,7 +8,9 @@ You would use either plugin / gem if you wished that when you called `destroy` o
 
 Put this in your Gemfile:
 
-    gem 'paranoia'
+```ruby
+gem 'paranoia'
+```
 
 Then run `bundle`. Done.
 
@@ -18,69 +20,85 @@ Updating is as simple as `bundle update paranoia`.
 
 In your _Gemfile_:
 
-    gem 'paranoia'
+```ruby
+gem 'paranoia'
+```
 
 Then run:
 
-    bundle install
+```shell
+bundle install
+```
 
 #### Rails 2:
 
 In your _config/environment.rb_:
 
-    config.gem 'paranoia'
+```ruby
+config.gem 'paranoia'
+```
 
 Then run:
 
-    rake gems:install
+```shell
+rake gems:install
+```
 
 #### Run your migrations for the desired models
 
-    class AddDeletedAtToClient < ActiveRecord::Migration
-      def self.up
-        add_column :clients, :deleted_at, :datetime
-      end
-
-      def self.down
-        remove_column :clients, :deleted_at
-      end
-    end
+```ruby
+class AddDeletedAtToClient < ActiveRecord::Migration
+  def self.up
+    add_column :clients, :deleted_at, :datetime
+  end
+
+  def self.down
+    remove_column :clients, :deleted_at
+  end
+end
+```
     
 ### Usage
 
 #### In your model:
 
-    class Client < ActiveRecord::Base
-      acts_as_paranoid
+```ruby
+class Client < ActiveRecord::Base
+  acts_as_paranoid
 
-      ...
-    end
+  ...
+end
+```
 
 Hey presto, it's there!
 
 If you want a method to be called on destroy, simply provide a _before\_destroy_ callback:
 
-    class Client < ActiveRecord::Base
-      acts_as_paranoid
+```ruby
+class Client < ActiveRecord::Base
+  acts_as_paranoid
 
-      before_destroy :some_method
+  before_destroy :some_method
 
-      def some_method
-        # do stuff
-      end
+  def some_method
+    # do stuff
+  end
 
-      ...
-    end
+  ...
+end
+```
 
 You can replace the older acts_as_paranoid methods as follows:
 
-    find_with_deleted(:all)       # => unscoped
-    find_with_deleted(:first)     # => unscoped.first
-    find_with_deleted(id)         # => unscoped.find(id)
+```ruby
+find_with_deleted(:all)       # => with_deleted
+find_with_deleted(:first)     # => with_deleted.first
+find_with_deleted(id)         # => with_deleted.find(id)
 
-    find_only_deleted(:all)       # => only_deleted
-    find_only_deleted(:first)     # => only_deleted.first
-    find_only_deleted(id)         # => only_deleted.find(id)
+find_only_deleted(:all)       # => only_deleted
+find_only_deleted(:first)     # => only_deleted.first
+find_only_deleted(id)         # => only_deleted.find(id)
+```
 
 ## License
 

data/Rakefile

@@ -5,4 +5,6 @@ task :test do
   Dir['test/*_test.rb'].each do |testfile|
     load testfile
   end
-end
+end
+
+task :default => :test

data/lib/paranoia/version.rb

@@ -1,3 +1,3 @@
 module Paranoia
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/lib/paranoia.rb

@@ -7,9 +7,11 @@ module Paranoia
     def paranoid? ; true ; end
 
     def only_deleted
-      unscoped {
-        where("deleted_at is not null")
-      }
+      scoped.tap { |x| x.default_scoped = false }.where("#{self.table_name}.deleted_at is not null")
+    end
+
+    def with_deleted
+      scoped.tap { |x| x.default_scoped = false }
     end
   end
 
@@ -17,19 +19,26 @@ module Paranoia
     _run_destroy_callbacks { delete }
   end
 
-  def delete    
-    self.update_attribute(:deleted_at, Time.now) if !deleted? && persisted?
+  def delete
+    update_attribute_or_column(:deleted_at, Time.now) if !deleted? && persisted?
     freeze
   end
-  
+
   def restore!
-    update_attribute :deleted_at, nil
+    update_attribute_or_column :deleted_at, nil
   end
 
   def destroyed?
     !self.deleted_at.nil?
   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)
+  end
 end
 
 class ActiveRecord::Base
@@ -42,4 +51,11 @@ class ActiveRecord::Base
 
   def self.paranoid? ; false ; 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
+  # if it's a new record, not if it is "destroyed".
+  def persisted?
+    paranoid? ? !new_record? : super
+  end
 end

data/paranoia.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |s|
   s.authors     = ["radarlistener@gmail.com"]
   s.email       = []
   s.homepage    = "http://rubygems.org/gems/paranoia"
-  s.summary     = "acts_as_paranoid, without the clusterfuck"
-  s.description = "acts_as_paranoid, without the clusterfuck"
+  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"

data/test/paranoia_test.rb

@@ -8,10 +8,15 @@ FileUtils.mkdir_p File.dirname(DB_FILE)
 FileUtils.rm_f DB_FILE
 
 ActiveRecord::Base.establish_connection :adapter => 'sqlite3', :database => DB_FILE
-ActiveRecord::Base.connection.execute 'CREATE TABLE paranoid_models (id INTEGER NOT NULL PRIMARY KEY, deleted_at DATETIME)'
+ActiveRecord::Base.connection.execute 'CREATE TABLE parent_models (id INTEGER NOT NULL PRIMARY KEY, deleted_at DATETIME)'
+ActiveRecord::Base.connection.execute 'CREATE TABLE paranoid_models (id INTEGER NOT NULL PRIMARY KEY, parent_model_id INTEGER, deleted_at DATETIME)'
 ActiveRecord::Base.connection.execute 'CREATE TABLE featureful_models (id INTEGER NOT NULL PRIMARY KEY, deleted_at DATETIME, name VARCHAR(32))'
 ActiveRecord::Base.connection.execute 'CREATE TABLE plain_models (id INTEGER NOT NULL PRIMARY KEY, deleted_at DATETIME)'
 ActiveRecord::Base.connection.execute 'CREATE TABLE callback_models (id INTEGER NOT NULL PRIMARY KEY, deleted_at DATETIME)'
+ActiveRecord::Base.connection.execute 'CREATE TABLE related_models (id INTEGER NOT NULL PRIMARY KEY, parent_model_id INTEGER NOT NULL, deleted_at DATETIME)'
+ActiveRecord::Base.connection.execute 'CREATE TABLE employers (id INTEGER NOT NULL PRIMARY KEY, deleted_at DATETIME)'
+ActiveRecord::Base.connection.execute 'CREATE TABLE employees (id INTEGER NOT NULL PRIMARY KEY, deleted_at DATETIME)'
+ActiveRecord::Base.connection.execute 'CREATE TABLE jobs (id INTEGER NOT NULL PRIMARY KEY, employer_id INTEGER NOT NULL, employee_id INTEGER NOT NULL, deleted_at DATETIME)'
 
 class ParanoiaTest < Test::Unit::TestCase
   def test_plain_model_class_is_not_paranoid
@@ -30,6 +35,17 @@ class ParanoiaTest < Test::Unit::TestCase
     assert_equal true, ParanoidModel.new.paranoid?
   end
 
+  def test_paranoid_models_to_param
+    model = ParanoidModel.new
+    model.save
+    to_param = model.to_param
+
+    model.destroy
+
+    assert_not_equal nil, model.to_param
+    assert_equal to_param, model.to_param
+  end
+
   def test_destroy_behavior_for_plain_models
     model = PlainModel.new
     assert_equal 0, model.class.count
@@ -56,7 +72,21 @@ 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
+    parent2 = ParentModel.create
+    p1 = ParanoidModel.create(:parent_model => parent1)
+    p2 = ParanoidModel.create(:parent_model => parent2)
+    p1.destroy
+    p2.destroy
+    assert_equal 0, parent1.paranoid_models.count
+    assert_equal 1, parent1.paranoid_models.only_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
   end
 
   def test_destroy_behavior_for_featureful_paranoid_models
@@ -72,6 +102,13 @@ class ParanoiaTest < Test::Unit::TestCase
     assert_equal 1, model.class.unscoped.count
   end
 
+  # 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]
+    assert_equal 2, scope.where_values.count
+  end
+
   def test_only_destroyed_scope_for_paranoid_models
     model = ParanoidModel.new
     model.save
@@ -82,48 +119,89 @@ class ParanoiaTest < Test::Unit::TestCase
     assert_equal model, ParanoidModel.only_deleted.last
     assert_equal false, ParanoidModel.only_deleted.include?(model2)
   end
-  
+
+  def test_default_scope_for_has_many_relationships
+    parent = ParentModel.create
+    assert_equal 0, parent.related_models.count
+
+    child = parent.related_models.create
+    assert_equal 1, parent.related_models.count
+
+    child.destroy
+    assert_equal false, child.deleted_at.nil?
+
+    assert_equal 0, parent.related_models.count
+    assert_equal 1, parent.related_models.unscoped.count
+  end
+
+  def test_default_scope_for_has_many_through_relationships
+    employer = Employer.create
+    employee = Employee.create
+    assert_equal 0, employer.jobs.count
+    assert_equal 0, employer.employees.count
+    assert_equal 0, employee.jobs.count
+    assert_equal 0, employee.employers.count
+
+    job = Job.create :employer => employer, :employee => employee
+    assert_equal 1, employer.jobs.count
+    assert_equal 1, employer.employees.count
+    assert_equal 1, employee.jobs.count
+    assert_equal 1, employee.employers.count
+
+    employee2 = Employee.create
+    job2 = Job.create :employer => employer, :employee => employee2
+    employee2.destroy
+    assert_equal 2, employer.jobs.count
+    assert_equal 1, employer.employees.count
+
+    job.destroy
+    assert_equal 1, employer.jobs.count
+    assert_equal 0, employer.employees.count
+    assert_equal 0, employee.jobs.count
+    assert_equal 0, employee.employers.count
+  end
+
   def test_delete_behavior_for_callbacks
     model = CallbackModel.new
     model.save
     model.delete
     assert_equal nil, model.instance_variable_get(:@callback_called)
   end
-  
+
   def test_destroy_behavior_for_callbacks
     model = CallbackModel.new
     model.save
     model.destroy
     assert model.instance_variable_get(:@callback_called)
   end
-  
+
   def test_restore
     model = ParanoidModel.new
     model.save
     id = model.id
     model.destroy
-    
+
     assert model.destroyed?
-    
+
     model = ParanoidModel.only_deleted.find(id)
     model.restore!
-    
+
     assert_equal false, model.destroyed?
   end
-  
+
   def test_real_destroy
     model = ParanoidModel.new
     model.save
     model.destroy!
-    
+
     assert_equal false, ParanoidModel.unscoped.exists?(model.id)
   end
-  
+
   def test_real_delete
     model = ParanoidModel.new
     model.save
     model.delete!
-    
+
     assert_equal false, ParanoidModel.unscoped.exists?(model.id)
   end
 
@@ -135,7 +213,12 @@ end
 
 # Helper classes
 
+class ParentModel < ActiveRecord::Base
+  has_many :paranoid_models
+end
+
 class ParanoidModel < ActiveRecord::Base
+  belongs_to :parent_model
   acts_as_paranoid
 end
 
@@ -151,3 +234,31 @@ class CallbackModel < ActiveRecord::Base
   acts_as_paranoid
   before_destroy {|model| model.instance_variable_set :@callback_called, true }
 end
+
+class ParentModel < ActiveRecord::Base
+  acts_as_paranoid
+  has_many :related_models
+end
+
+class RelatedModel < ActiveRecord::Base
+  acts_as_paranoid
+  belongs_to :parent_model
+end
+
+class Employer < ActiveRecord::Base
+  acts_as_paranoid
+  has_many :jobs
+  has_many :employees, :through => :jobs
+end
+
+class Employee < ActiveRecord::Base
+  acts_as_paranoid
+  has_many :jobs
+  has_many :employers, :through => :jobs
+end
+
+class Job < ActiveRecord::Base
+  acts_as_paranoid
+  belongs_to :employer
+  belongs_to :employee
+end

metadata

@@ -1,108 +1,124 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: paranoia
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.2.0
   prerelease: 
-  version: 1.1.0
 platform: ruby
-authors: 
+authors:
 - radarlistener@gmail.com
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-11 00:00:00 +10:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-11-22 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 0.8.7
   type: :development
-  version_requirements: *id004
-description: acts_as_paranoid, without the clusterfuck
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.8.7
+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.
 email: []
-
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - Gemfile.lock
+- LICENSE
 - README.md
 - Rakefile
 - lib/paranoia.rb
 - lib/paranoia/version.rb
 - paranoia.gemspec
 - test/paranoia_test.rb
-has_rdoc: true
 homepage: http://rubygems.org/gems/paranoia
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: paranoia
-rubygems_version: 1.6.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: acts_as_paranoid, without the clusterfuck
+summary: Paranoia is a re-implementation of acts_as_paranoid for Rails 3, using much,
+  much, much less code.
 test_files: []
-