paranoid 0.0.3 → 0.0.4

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:minor: 0
-:patch: 3
+:patch: 4
 :major: 0
 :build: 
+:minor: 0

data/lib/paranoid/base.rb

@@ -15,16 +15,35 @@ module Paranoid
     # === Options
     #
     # [:field]
-    #   Must be a 3 element array in the form
-    #   [:field_name, 'destroyed value', 'not destroyed value']
-    #   Default: [:deleted_at, Proc.new{Time.now.utc}, nil]
+    #   The field used to recognize a record as destroyed.
+    #   Default: :deleted_at
+    #   IsParanoid Compatibility: Also accepts an Array of form
+    #   [field_name, destroyed_value, not_destroyed_value]
+    #   however :destroyed_value and :not_destroyed_value will
+    #   be ignored
+    #
+    # [:destroyed_value]
+    #   The value to set the paranoid field to on destroy.
+    #   Can be either a static value or a Proc which will be
+    #   evaluated when destroy is called.
+    #   Default: Proc.new{Time.now.utc}
+    #
+    # [:not_destroyed_value]
+    #   The value used to recognize a record as not destroyed.
+    #   Default: nil
     def paranoid(opts = {})
       return if paranoid?
       @paranoid = true
 
       opts[:field] ||= [:deleted_at, Proc.new{Time.now.utc}, nil]
       class_inheritable_accessor :destroyed_field, :field_destroyed, :field_not_destroyed
-      self.destroyed_field, self.field_destroyed, self.field_not_destroyed = opts[:field]
+      if opts[:field].is_a?(Array)
+        self.destroyed_field, self.field_destroyed, self.field_not_destroyed = opts[:field]
+      else
+        self.destroyed_field = opts.key?(:field) ? opts[:field] : :deleted_at
+        self.field_destroyed = opts.key?(:destroyed_value) ? opts[:destroyed_value] : Proc.new{Time.now.utc}
+        self.field_not_destroyed = opts.key?(:not_destroyed_value) ? opts[:not_destroyed_value] : nil
+      end
 
       include Paranoid::ParanoidMethods
 

data/lib/paranoid/relation.rb

@@ -51,7 +51,7 @@ module Paranoid
 
     # Returns a new relation scoped to include soft deleted records
     def with_destroyed
-      spawn.tap {|relation| relation.skip_paranoid_condition }
+      clone.tap {|relation| relation.skip_paranoid_condition }
     end
 
     # Returns a new relation scoped to include only deleted records

data/paranoid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{paranoid}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Genord II"]
-  s.date = %q{2010-02-22}
+  s.date = %q{2010-03-23}
   s.description = %q{}
   s.email = %q{github@xspond.com}
   s.extra_rdoc_files = [
@@ -38,7 +38,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/xspond/paranoid/}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Enable soft delete of ActiveRecord records. Based off defunct ActsAsParanoid and IsParanoid}
   s.test_files = [
     "spec/models.rb",

data/spec/models.rb

@@ -30,7 +30,7 @@ class Dent < ActiveRecord::Base #:nodoc:
 end
 
 class Ding < ActiveRecord::Base #:nodoc:
-  paranoid :field => [:not_deleted, true, false]
+  paranoid :field => :not_deleted, :destroyed_value => true, :not_destroyed_value => false
   belongs_to :dent
 end
 
@@ -83,6 +83,13 @@ end
 class Place < ActiveRecord::Base #:nodoc:
   paranoid
   has_and_belongs_to_many :androids
+
+  # this code is to ensure that our destroy and restore methods
+  # work without triggering before/after_update callbacks
+  before_update :raise_hell
+  def raise_hell
+    raise "hell"
+  end
 end
 
 class AndroidsPlaces < ActiveRecord::Base #:nodoc:
@@ -91,17 +98,31 @@ end
 class Ninja < ActiveRecord::Base #:nodoc:
   validates_uniqueness_of :name, :scope => :visible
   paranoid :field => [:visible, false, true]
-  
+
   alias_method :vanish, :destroy
+
+  # this code is to ensure that our destroy and restore methods
+  # work without triggering before/after_update callbacks
+  before_update :raise_hell
+  def raise_hell
+    raise "hell"
+  end
 end
 
 class Pirate < ActiveRecord::Base #:nodoc:
-  paranoid :field => [:alive, false, true]
+  paranoid :field => :alive, :destroyed_value => false, :not_destroyed_value => true
+
+  # this code is to ensure that our destroy and restore methods
+  # work without triggering before/after_update callbacks
+  before_update :raise_hell
+  def raise_hell
+    raise "hell"
+  end
 end
 
 class DeadPirate < ActiveRecord::Base #:nodoc:
   set_table_name :pirates
-  paranoid :field => [:alive, true, false]
+  paranoid :field => :alive, :destroyed_value => true, :not_destroyed_value => false
 end
 
 class RandomPirate < ActiveRecord::Base #:nodoc:
@@ -115,7 +136,7 @@ end
 
 class UndestroyablePirate < ActiveRecord::Base #:nodoc:
   set_table_name :pirates
-  paranoid :field => [:alive, false, true]
+  paranoid :field => :alive, :destroyed_value => false, :not_destroyed_value => true
 
   before_destroy :ret_false
   def ret_false

data/spec/paranoid_spec.rb

@@ -35,17 +35,17 @@ describe Paranoid do
     end
 
     it 'should hide destroyed records' do
-      @tatooine.update_attribute('deleted_at', Time.now)
+      @tatooine.destroy
       Place.first(:conditions => {:name => 'Tatooine'}).should be_nil
     end
 
     it 'should reveal destroyed records when with_destroyed' do
-      @tatooine.update_attribute('deleted_at', Time.now)
+      @tatooine.destroy
       Place.with_destroyed.first(:conditions => {:name => 'Tatooine'}).should_not be_nil
     end
 
     it 'should restore the destroyed record' do
-      @tatooine.update_attribute('deleted_at', Time.now)
+      @tatooine.destroy
 
       @tatooine = Place.with_destroyed.first(:conditions => {:name => 'Tatooine'})
       @tatooine.restore
@@ -89,6 +89,58 @@ describe Paranoid do
   end
 
   describe 'for alternate field information' do
+    before(:each) do
+      Pirate.delete_all
+      @roberts, @jack, @hook = Pirate.create([{:name => 'Roberts'}, {:name => 'Jack'}, {:name => 'Hook'}])
+    end
+
+    it 'should have 3 alive pirates' do
+      Pirate.all.size.should == 3
+    end
+
+    it 'should kill the pirate' do
+      @roberts.destroy
+
+      record = Pirate.first(:conditions => {:name => 'Roberts'})
+      record.should be_nil
+    end
+
+    it 'should not remove the pirate record' do
+      @roberts.destroy
+
+      record = Pirate.with_destroyed.first(:conditions => {:name => 'Roberts'})
+      record.should_not be_nil
+      record.alive.should be_false
+    end
+
+    it 'should mark the pirate dead' do
+      @roberts.destroy
+      @roberts.destroyed?.should be_true
+    end
+
+    it 'should set alive to false' do
+      @roberts.destroy
+      @roberts.alive.should be_false
+    end
+
+    it 'should show deleted_only' do
+      @roberts.destroy
+      destroyed = Pirate.with_destroyed_only.all
+      destroyed.size.should == 1
+      destroyed[0].should == @roberts
+    end
+
+    it 'should properly count records' do
+      Pirate.count.should == 3
+
+      @roberts.destroy
+      Pirate.count.should == 2
+      Pirate.with_destroyed.count.should == 3
+      Pirate.with_destroyed_only.count.should == 1
+    end
+  end
+
+  describe 'for alternate field information with is_paranoid format field information' do
     before(:each) do
       Ninja.delete_all
       @steve, @bob, @tim = Ninja.create([{:name => 'Steve', :visible => true}, {:name => 'Bob', :visible => true}, {:name => 'Tim', :visible => true}])
@@ -192,4 +244,25 @@ describe Paranoid do
       @nil.should be_nil
     end
   end
+
+  describe 'callbacks' do
+    before(:each) do
+      Pirate.delete_all
+    end
+
+    it 'should not destroy the record when before_destroy returns false' do
+      pirate = UndestroyablePirate.create!(:name => 'Roberts')
+      lambda { pirate.destroy }.should_not change(UndestroyablePirate, :count)
+    end
+
+    it 'should run after_destroy callbacks' do
+      pirate = RandomPirate.create!(:name => 'Roberts')
+      lambda { pirate.destroy }.should raise_error(/after_destroy works/)
+    end
+
+    it 'should rollback on after_destroy error' do
+      pirate = RandomPirate.create!(:name => 'Roberts')
+      lambda { pirate.destroy rescue nil }.should_not change(RandomPirate, :count)
+    end
+  end
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: paranoid
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - David Genord II
@@ -9,19 +14,24 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-22 00:00:00 -05:00
+date: 2010-03-23 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        - 0
+        - beta
         version: 3.0.0.beta
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: ""
 email: github@xspond.com
 executables: []
@@ -62,18 +72,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Enable soft delete of ActiveRecord records. Based off defunct ActsAsParanoid and IsParanoid