permanent_records 3.0.1 → 3.0.2

data/VERSION

@@ -1 +1 @@
-3.0.1
+3.0.2

data/lib/permanent_records.rb

@@ -43,15 +43,27 @@ module PermanentRecords
   end
 
   def destroy(force = nil)
-    if !is_permanent? || (:force == force)
+    if !is_permanent? || PermanentRecords.should_force_destroy?(force)
       return permanently_delete_records_after { super() }
     end
     destroy_with_permanent_records force
   end
 
+  def self.should_force_destroy?(force)
+    if Hash === force
+      force[:force]
+    else
+      :force == force
+    end
+  end
+
+  def self.should_ignore_validations?(force)
+    Hash === force && false == force[:validate]
+  end
+
   protected
 
-  def set_deleted_at(value)
+  def set_deleted_at(value, force = nil)
     return self unless is_permanent?
     record = self.class.unscoped.find(id)
     record.deleted_at = value
@@ -59,7 +71,11 @@ module PermanentRecords
       # we call save! instead of update_attribute so an ActiveRecord::RecordInvalid
       # error will be raised if the record isn't valid. (This prevents reviving records that
       # disregard validation constraints,)
-      record.save!
+      if PermanentRecords.should_ignore_validations?(force)
+        record.save(:validate => false)
+      else
+        record.save!
+      end
       @attributes, @attributes_cache = record.attributes, record.attributes
     rescue Exception => e
       # trigger dependent record destruction (they were revived before this record,
@@ -71,7 +87,7 @@ module PermanentRecords
 
   def destroy_with_permanent_records(force = nil)
     _run_destroy_callbacks do
-      deleted? || new_record? ? save : set_deleted_at(Time.now)
+      deleted? || new_record? ? save : set_deleted_at(Time.now, force)
     end
     self
   end

data/spec/permanent_records_spec.rb

@@ -45,6 +45,34 @@ describe PermanentRecords do
       end
     end
 
+    context 'with hash-style :force argument' do
+      let(:should_force) {{ force: true }}
+
+      it 'does really remove the record' do
+        expect { subject }.to change { record.class.count }.by(-1)
+      end
+    end
+
+    context 'when validations fail' do
+      before {
+        Hole.any_instance.stub(:valid?).and_return(false)
+      }
+      it 'raises' do
+        expect { subject }.to raise_error(ActiveRecord::RecordInvalid)
+      end
+
+      context 'with validation opt-out' do
+        let(:should_force) {{ validate: false }}
+        it 'doesnt raise' do
+          expect { subject }.to_not raise_error
+        end
+        it 'soft-deletes the invalid record' do
+          subject.should be_deleted
+        end
+      end
+    end
+
+
     context 'when model has no deleted_at column' do
       let(:record) { kitty }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: permanent_records
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -90,7 +90,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2162955961777207463
+      hash: 1685930428738744402
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: