delete_paranoid 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6364ec095e36d9f9111d01ad59cea774ec4f28cc
-  data.tar.gz: e007bafd8d2968d9767d8e24c23ae7cfc9f7cfb3
+  metadata.gz: 36e825a8483cb73e7f0beb5b20b332132e613379
+  data.tar.gz: ee1dd296733937f19f6a6d2b439c70ff1a5eda23
 SHA512:
-  metadata.gz: 6bd18535e8ee59e98a727d1eb6eb7012894f9371db76c079073d237286d473088c0502237033263f093be0c7460c0332b619085dc2fa690ede6eb63183aaf2d2
-  data.tar.gz: 71df17e6558d76b208aa27547e979f09473fe80edc813967eb0ccfff5c0cffa08de254379224952ca0da94cf68335be5d8e0f0ca67d2992969ef86da00ebccae
+  metadata.gz: 310386ee0526f9270ae1ce2dc73656f31ec2cf422feca673c16f6e3d0f13c994f5c9fcdd8a68d9cb78ab1a0d0c0863042ca871a417adde5999e45176906aef3f
+  data.tar.gz: 4ee2d7def7f6c91fc2ed0fb6e6e9f04452571833239a936e8abc80173e11b778a48de594ec427618375a4cd38efd933305fbc576a6b32aac5520c010e0152f3c

data/.ruby-gemset

@@ -0,0 +1 @@
+delete_paranoid

data/.ruby-version

@@ -0,0 +1 @@
+2.3.1

data/.travis.yml

@@ -1,7 +1,5 @@
 rvm:
-  - 1.9.3
+  - 2.3.1
 env:
-  - "activerecord=3.1.0"
-  - "activerecord=3.2.0"
-  - "activerecord=4.0.0"
-  - "activerecord=4.1.0.beta1"
+  - "activerecord=4.2.7.1"
+  - "activerecord=5.0.0.1"

data/delete_paranoid.gemspec

@@ -14,16 +14,8 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "delete_paranoid"
 
-  %w[activerecord].each do |lib|
-    dep = case ENV[lib]
-          when 'stable', nil then nil
-          when /beta/ then ["= " + ENV[lib]]
-          when /(\d+\.)+\d+/ then ["~> " + ENV[lib]]
-          else [">= 3.0"]
-          end
-    s.add_runtime_dependency(lib, dep)
-  end
-  s.add_development_dependency(%q<rspec>, [">= 0"])
+  s.add_runtime_dependency(%q<activerecord>, [">= 4.2.7.1"])
+  s.add_development_dependency(%q<rspec>, [">= 3.5"])
   s.add_development_dependency(%q<bundler>, [">= 0"])
   s.add_development_dependency(%q<sqlite3-ruby>, ["~> 1.3.2"])
   s.add_development_dependency(%q<rake>, [">= 0.9.2.2"])

data/lib/delete_paranoid.rb

@@ -48,6 +48,15 @@ module DeleteParanoid
     # permanently delete this specific instance from the database
     def destroy_permanently
       result = destroy
+      return result unless result
+      self.class.with_deleted do
+        self.class.delete_permanently self.id
+      end
+      result
+    end
+    # permanently delete this specific instance from the database, using the AR #destroy! method
+    def destroy_permanently!
+      result = destroy!
       self.class.with_deleted do
         self.class.delete_permanently self.id
       end

data/lib/delete_paranoid/version.rb

@@ -1,3 +1,3 @@
 module DeleteParanoid
-  VERSION = "2.0.0"
+  VERSION = "3.0.0"
 end

data/spec/database_setup.rb

@@ -23,8 +23,14 @@ end
 class Blog < ActiveRecord::Base
   has_many :comments, :dependent => :destroy
   has_many :links, :dependent => :destroy
+  before_destroy :before_destroy_callback
   acts_as_paranoid
   include CallbackMatcher::ActiveRecordHooks
+
+  private
+
+  def before_destroy_callback
+  end
 end
 
 class Comment < ActiveRecord::Base

data/spec/delete_paranoid_spec.rb

@@ -4,28 +4,28 @@ describe DeleteParanoid do
 
   shared_examples_for "soft-deleted" do
     it do
-      subject.class.where(:id => subject.id).should_not exist
+      expect(subject.class.where(:id => subject.id)).not_to exist
       subject.class.with_deleted do
-        subject.class.where(:id => subject.id).should exist
+        expect(subject.class.where(:id => subject.id)).to exist
       end
     end
   end
 
   shared_examples_for "permanently-deleted" do
     it do
-      subject.class.where(:id => subject.id).should_not exist
+      expect(subject.class.where(:id => subject.id)).not_to exist
       subject.class.with_deleted do
-        subject.class.where(:id => subject.id).should_not exist
+        expect(subject.class.where(:id => subject.id)).not_to exist
       end
     end
   end
 
   context 'with non-paranoid activerecord class' do
-    it { Link.should_not be_paranoid }
+    it { expect(Link).not_to be_paranoid }
   end
 
   context 'with paranoid activerecord class' do
-    it { Blog.should be_paranoid }
+    it { expect(Blog).to be_paranoid }
   end
 
   let!(:blog) { Blog.create! :title => 'foo' }
@@ -35,10 +35,10 @@ describe DeleteParanoid do
     context 'when destroying instance with instance.destroy' do
       before { blog.destroy }
       it do
-        should be_destroyed
-        should be_frozen
-        should trigger_callbacks_for :destroy
-        should_not trigger_callbacks_for :update
+        is_expected.to be_destroyed
+        is_expected.to be_frozen
+        is_expected.to trigger_callbacks_for :destroy
+        is_expected.to_not trigger_callbacks_for :update
       end
       it_behaves_like "soft-deleted"
     end
@@ -61,16 +61,44 @@ describe DeleteParanoid do
       before { blog.destroy_permanently }
       it_behaves_like "permanently-deleted"
       it do
-        should trigger_callbacks_for :destroy
-        should_not trigger_callbacks_for :update
+        is_expected.to trigger_callbacks_for :destroy
+        is_expected.not_to trigger_callbacks_for :update
+      end
+    end
+    context 'when destroying instance with instance.destroy_permanently and a before_destroy callback returns false' do
+      before do
+        expect(blog).to receive(:before_destroy_callback).and_return false
+        blog.destroy_permanently
+      end
+      it do
+        is_expected.not_to trigger_callbacks_for :update
+        expect(Blog.where(:id => blog.id)).to exist
+      end
+    end
+    context 'when destroying instance with instance.destroy_permanently!' do
+      before { blog.destroy_permanently! }
+      it_behaves_like "permanently-deleted"
+      it do
+        is_expected.to trigger_callbacks_for :destroy
+        is_expected.not_to trigger_callbacks_for :update
+      end
+    end
+    context 'when destroying instance with instance.destroy_permanently! and a before_destroy callback returns false' do
+      before { expect(blog).to receive(:before_destroy_callback).and_return false }
+      it do
+        expect do
+          blog.destroy_permanently!
+        end.to raise_error ActiveRecord::RecordNotDestroyed
+
+        expect(Blog.where(:id => blog.id)).to exist
       end
     end
     context 'when destroying instance with instance.delete_permanently' do
       before { blog.delete_permanently }
       it_behaves_like "permanently-deleted"
       it do
-        should_not trigger_callbacks_for :destroy
-        should_not trigger_callbacks_for :update
+        is_expected.not_to trigger_callbacks_for :destroy
+        is_expected.not_to trigger_callbacks_for :update
       end
     end
   end
@@ -82,19 +110,19 @@ describe DeleteParanoid do
     context 'when destroying parent paranoid instance with destroy' do
       before { blog.destroy }
       it do
-        should be_destroyed
-        should be_frozen
-        should trigger_callbacks_for :destroy
-        should_not trigger_callbacks_for :update
+        is_expected.to be_destroyed
+        is_expected.to be_frozen
+        is_expected.to trigger_callbacks_for :destroy
+        is_expected.not_to trigger_callbacks_for :update
       end
     end
     context 'when destroying parent paranoid instance with delete_all_permanently' do
       before { Blog.where(:id => blog.id).delete_all_permanently }
       it do
-        should_not be_destroyed
-        should_not be_frozen
-        should_not trigger_callbacks_for :destroy
-        Comment.where(:id => comment.id).should exist
+        is_expected.not_to be_destroyed
+        is_expected.not_to be_frozen
+        is_expected.not_to trigger_callbacks_for :destroy
+        expect(Comment.where(:id => comment.id)).to exist
       end
     end
   end
@@ -106,21 +134,21 @@ describe DeleteParanoid do
     context 'when destroying parent paranoid instance with destroy' do
       before { blog.destroy }
       it do
-        should be_destroyed
-        should be_frozen
-        should trigger_callbacks_for :destroy
-        should_not trigger_callbacks_for :update
-        Link.where(:id => link.id).should_not exist
+        is_expected.to be_destroyed
+        is_expected.to be_frozen
+        is_expected.to trigger_callbacks_for :destroy
+        is_expected.not_to trigger_callbacks_for :update
+        expect(Link.where(:id => link.id)).not_to exist
       end
     end
 
     context 'when destroying parent paranoid instance with delete_all_permanently' do
       before { Blog.where(:id => blog.id).delete_all_permanently }
       it do
-        should_not be_destroyed
-        should_not be_frozen
-        should_not trigger_callbacks_for :destroy
-        Link.where(:id => link.id).should exist
+        is_expected.not_to be_destroyed
+        is_expected.not_to be_frozen
+        is_expected.not_to trigger_callbacks_for :destroy
+        expect(Link.where(:id => link.id)).to exist
       end
     end
   end

data/spec/matchers/callback_matcher.rb

@@ -4,7 +4,6 @@ class CallbackMatcher
   CALLBACK_TYPES = [:create, :update, :destroy, :save, :commit]
 
   module ActiveRecordHooks
-
     def self.included(base)
       base.class_eval do
         class_attribute :callback_tester_attrs
@@ -24,65 +23,47 @@ class CallbackMatcher
             }
           end
         end
-        alias_method_chain :initialize, :callback_init
-      end
-    end
-
-    def initialize_with_callback_init(*args)
-      reset_callback_flags!
-      initialize_without_callback_init(*args)
-    end
-
-    def reset_callback_flags!
-      self.class.callback_tester_attrs.each do |attr|
-        send("#{attr}=", false)
       end
     end
-
   end
-
 end
 
 require 'rspec/matchers'
 
-RSpec::Matchers.define :trigger_callbacks_for do |types|
-
-  check_for_match = ->(model_instance, types) {
+RSpec::Matchers.define :trigger_callbacks_for do |expected_callback_type|
+  def check_for_match(model_instance, expected_callback_type)
     @called = []
     @not_called = []
-    Array.wrap(types).each do |ct|
-      CallbackMatcher::CALLBACK_EVENTS.each do |ce|
-        callback_name = "#{ce}_#{ct}"
-        result = model_instance.send("called_#{callback_name}".to_sym)
-        @called << callback_name if result
-        @not_called << callback_name unless result
-      end
+    CallbackMatcher::CALLBACK_EVENTS.each do |ce|
+      callback_name = "#{ce}_#{expected_callback_type}"
+      result = model_instance.send("called_#{callback_name}".to_sym)
+      @called << callback_name if result
+      @not_called << callback_name unless result
     end
-  }
+  end
 
-  match_for_should do |model_instance|
-    check_for_match.call(model_instance, types)
+  match do |model_instance|
+    check_for_match(model_instance, expected_callback_type)
     result = true
     result = false unless @called.present?
     result = false if @not_called.present?
     result
   end
 
-  match_for_should_not do |model_instance|
-    check_for_match.call(model_instance, types)
+  match_when_negated do |model_instance|
+    check_for_match(model_instance, expected_callback_type)
     result = true
     result = false unless @not_called.present?
     result = false if @called.present?
     result
   end
 
-  failure_message_for_should do |actual|
-    ["Called:\t#{@called.join("\n\t")}", "Not called:\t#{@called.join("\n\t")}"].join("\n")
+  failure_message do |actual|
+    ["Called:\t#{@called.join("\n\t")}", "Not called:\t#{@not_called.join("\n\t")}"].join("\n")
   end
 
-  failure_message_for_should_not do |actual|
-    ["Called:\t#{@called.join("\n\t")}", "Not called:\t#{@called.join("\n\t")}"].join("\n")
+  failure_message_when_negated do |actual|
+    ["Called:\t#{@called.join("\n\t")}", "Not called:\t#{@not_called.join("\n\t")}"].join("\n")
   end
-
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: delete_paranoid
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Ryan Sonnek
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-02 00:00:00.000000000 Z
+date: 2016-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,28 +17,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.2.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.2.7.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -89,7 +89,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".rvmrc"
+- ".ruby-gemset"
+- ".ruby-version"
 - ".travis.yml"
 - CONTRIBUTORS.txt
 - Gemfile
@@ -123,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: delete_paranoid
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: soft delete Rails ActiveRecord objects

data/.rvmrc

@@ -1 +0,0 @@
-rvm use "ruby-1.9.3-p484@delete_paranoid" --create