rails_soft_deletable 0.1.0 → 0.2.0

data/spec/rails_soft_deletable_spec.rb

@@ -240,9 +240,16 @@ describe RailsSoftDeletable do
     it "performs destroy callbacks" do
       model.destroy
 
-      expect(model.before_destroy_called).to eq(true)
-      expect(model.around_destroy_called).to eq(true)
-      expect(model.after_destroy_called).to eq(true)
+      expect(model.before_destroy_called).to eq(1)
+      expect(model.around_destroy_called).to eq(2)
+      expect(model.after_destroy_called).to eq(3)
+    end
+
+    it "performs commit callbacks" do
+      model.destroy
+
+      expect(model.after_commit_called).to eq(4)
+      expect(model.after_commit_called).to be > model.after_destroy_called
     end
 
     context "when record has already been soft deleted" do
@@ -251,19 +258,12 @@ describe RailsSoftDeletable do
         model.reset_callback_flags!
       end
 
-      it "does not perform destroy callbacks" do
-        model.destroy
-
-        expect(model.before_destroy_called).to be_nil
-        expect(model.around_destroy_called).to be_nil
-        expect(model.after_destroy_called).to be_nil
-      end
-
-      it "hard deletes the record from the database" do
+      it "continues to call destroy callbacks" do
         model.destroy
 
-        count = model.class.connection.select_value("SELECT COUNT(*) FROM #{model.class.quoted_table_name} WHERE #{model.class.primary_key} = #{model.id}")
-        expect(count).to eq(0)
+        expect(model.before_destroy_called).to eq(1)
+        expect(model.around_destroy_called).to eq(2)
+        expect(model.after_destroy_called).to eq(3)
       end
     end
 
@@ -278,9 +278,9 @@ describe RailsSoftDeletable do
       it "performs destroy callbacks" do
         model.destroy(:hard)
 
-        expect(model.before_destroy_called).to eq(true)
-        expect(model.around_destroy_called).to eq(true)
-        expect(model.after_destroy_called).to eq(true)
+        expect(model.before_destroy_called).to eq(1)
+        expect(model.around_destroy_called).to eq(2)
+        expect(model.after_destroy_called).to eq(3)
       end
     end
   end
@@ -356,13 +356,6 @@ describe RailsSoftDeletable do
         expect(model.around_destroy_called).to be_nil
         expect(model.after_destroy_called).to be_nil
       end
-
-      it "hard deletes the record from the database" do
-        model.delete
-
-        count = model.class.connection.select_value("SELECT COUNT(*) FROM #{model.class.quoted_table_name} WHERE #{model.class.primary_key} = #{model.id}")
-        expect(count).to eq(0)
-      end
     end
 
     context "with hard delete mode" do
@@ -410,9 +403,9 @@ describe RailsSoftDeletable do
     it "performs restore callbacks" do
       model.restore!
 
-      expect(model.before_restore_called).to eq(true)
-      expect(model.around_restore_called).to eq(true)
-      expect(model.after_restore_called).to eq(true)
+      expect(model.before_restore_called).to eq(1)
+      expect(model.around_restore_called).to eq(2)
+      expect(model.after_restore_called).to eq(3)
     end
 
     it "returns true" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_soft_deletable
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Quan Nguyen
@@ -9,11 +9,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-18 00:00:00.000000000 Z
+date: 2015-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -21,9 +20,9 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: '4.1'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -31,35 +30,42 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: '4.1'
+  type: :runtime
 - !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
+  type: :development
 - !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :development
 - !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  prerelease: false
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -67,13 +73,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :development
-  prerelease: false
+- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.0
-- !ruby/object:Gem::Dependency
+        version: '1.6'
+  prerelease: false
   name: debugger
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -81,13 +87,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
-  prerelease: false
+- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.6'
-- !ruby/object:Gem::Dependency
+        version: '0'
+  prerelease: false
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -95,13 +101,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
-  prerelease: false
+- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
+  prerelease: false
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -109,12 +115,6 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Soft deletable for ActiveRecord on Rails 3+.
 email:
 - quan@listia.com
@@ -162,7 +162,6 @@ files:
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/lib/soft_deletable_model_callbacks.rb
-- spec/dummy/log/development.log
 - spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
@@ -193,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Soft deletable for ActiveRecord on Rails 3+
@@ -227,7 +226,6 @@ test_files:
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/lib/soft_deletable_model_callbacks.rb
-- spec/dummy/log/development.log
 - spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html