rails_soft_deletable 0.0.7 → 0.0.8

data/spec/rails_soft_deletable_spec.rb

@@ -4,6 +4,187 @@ describe RailsSoftDeletable do
   let (:model) { IntegerModel.create! }
   let (:decimal_model) { DecimalModel.create! }
   let (:integer_model) { IntegerModel.create! }
+  let (:forest) { Forest.create! }
+  let (:park) { Park.create! }
+
+  context ".with_deleted" do
+    it "returns both non deleted and soft deleted object" do
+      model.destroy
+
+      expect(IntegerModel.with_deleted).to include(model, integer_model)
+    end
+  end
+
+  context ".only_deleted" do
+    it "returns only deleted object" do
+      model.destroy
+
+      expect(IntegerModel.only_deleted).to include(model)
+      expect(IntegerModel.only_deleted).not_to include(integer_model)
+    end
+  end
+
+  context "with associations" do
+    context "model with soft_deletable" do
+      context ".belongs_to" do
+        context "with deleted option" do
+          before do
+            Tree.belongs_to(:forest, with_deleted: true)
+            forest.destroy
+            @tree = Tree.create!(forest_id: forest.id)
+          end
+
+          it "returns associated objects" do
+            expect(@tree.forest).to eq(forest)
+          end
+        end
+
+        context "without deleted option" do
+          before do
+            Tree.belongs_to(:forest)
+            forest.destroy
+            @tree = Tree.create!(forest_id: forest.id)
+          end
+
+          it "does not return deleted associated objects" do
+            expect(@tree.forest).to be_nil
+          end
+        end
+      end
+
+      context ".has_many" do
+        context "with deleted option" do
+          before do
+            Forest.has_many(:trees, with_deleted: true)
+            @tree_destroyed = Tree.create!(forest_id: forest.id)
+            @tree_destroyed.destroy
+            @tree = Tree.create!(forest_id: forest.id)
+          end
+
+          it "returns all associated objects" do
+            expect(forest.trees).to include(@tree_destroyed, @tree)
+          end
+        end
+
+        context "without deleted option" do
+          before do
+            Forest.has_many(:trees)
+            Tree.create!(forest_id: forest.id).destroy
+          end
+
+          it "returns empty" do
+            expect(forest.trees).to be_empty
+          end
+        end
+      end
+
+      context ".has_one" do
+        context "with deleted option" do
+          before do
+            Forest.has_one(:tree, conditions: ["biggest = ?", true], with_deleted: true)
+            @tree = Tree.create!(forest_id: forest.id, biggest: true)
+            @tree.destroy
+          end
+
+          it "returns deleted object" do
+            expect(forest.tree).to eq(@tree)
+          end
+        end
+
+        context "without deleted option" do
+          before do
+            Forest.has_one(:tree, conditions: ["biggest = ?", true])
+            Tree.create!(forest_id: forest.id, biggest: true).destroy
+          end
+
+          it "returns nil" do
+            expect(forest.tree).to be_nil
+          end
+        end
+      end
+    end
+
+    context "model without soft_deletable" do
+      context ".belongs_to" do
+        context "with deleted option" do
+          before do
+            Park.belongs_to(:forest, with_deleted: true)
+            forest.destroy
+            park.forest = forest
+            park.save
+          end
+
+          it "returns associated objects" do
+            expect(park.reload.forest).to eq(forest)
+          end
+        end
+
+        context "without deleted option" do
+          before do
+            Park.belongs_to(:forest)
+            forest.destroy
+            park.forest = forest
+            park.save
+          end
+
+          it "does not return deleted associated objects" do
+            expect(park.reload.forest).to be_nil
+          end
+        end
+      end
+
+      context ".has_many" do
+        context "with deleted option" do
+          before do
+            Park.has_many(:trees, with_deleted: true)
+            @tree_destroyed = Tree.create!(park_id: park.id)
+            @tree_destroyed.destroy
+            @tree = Tree.create!(park_id: park.id)
+          end
+
+          it "returns all associated objects" do
+            expect(park.trees).to include(@tree_destroyed, @tree)
+          end
+        end
+
+        context "without deleted option" do
+          before do
+            Park.has_many(:trees)
+            Tree.create!(park_id: park.id).destroy
+          end
+
+          it "returns empty" do
+            expect(park.trees).to be_empty
+          end
+        end
+      end
+
+      context ".has_one" do
+        context "with deleted option" do
+          before do
+            Park.has_one(:tree, conditions: ["biggest = ?", true], with_deleted: true)
+            @tree = Tree.create!(park_id: park.id, biggest: true)
+            @tree.destroy
+          end
+
+          it "returns deleted object" do
+            expect(park.tree).to eq(@tree)
+          end
+        end
+
+        context "without deleted option" do
+          before do
+            Park.has_one(:tree, conditions: ["biggest = ?", true])
+            Tree.create!(park_id: park.id, biggest: true).destroy
+          end
+
+          it "returns nil" do
+            expect(park.tree).to be_nil
+          end
+        end
+      end
+    end
+  end
 
   context "#destroy" do
     it "marks deleted_at column" do
@@ -20,14 +201,14 @@ describe RailsSoftDeletable do
     end
 
     it "soft deletes the record" do
-      Timecop.freeze(Time.now) do
+      Timecop.freeze(Time.now.round) do
         decimal_model.destroy
         integer_model.destroy
 
         expect(decimal_model.deleted_at).to eq(("%0.6f" % Time.now.to_f).to_f)
         expect(integer_model.deleted_at).to eq(Time.now.to_i)
 
-        expect(decimal_model.soft_delete_time).to eq(Time.now)
+        expect(decimal_model.soft_delete_time).to eq(Time.now.in_time_zone)
         expect(integer_model.soft_delete_time.to_i).to eq(Time.now.to_i)
       end
     end
@@ -119,14 +300,14 @@ describe RailsSoftDeletable do
     end
 
     it "soft deletes the record" do
-      Timecop.freeze(Time.now) do
+      Timecop.freeze(Time.now.round) do
         decimal_model.delete
         integer_model.delete
 
         expect(decimal_model.deleted_at).to eq(("%0.6f" % Time.now.to_f).to_f)
         expect(integer_model.deleted_at.to_i).to eq(Time.now.to_i)
 
-        expect(decimal_model.soft_delete_time).to eq(Time.now)
+        expect(decimal_model.soft_delete_time).to eq(Time.now.in_time_zone)
         expect(integer_model.soft_delete_time.to_i).to eq(Time.now.to_i)
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_soft_deletable
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Quan Nguyen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-06 00:00:00.000000000 Z
+date: 2013-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   type: :runtime
@@ -126,6 +126,7 @@ files:
 - lib/rails_soft_deletable/callbacks.rb
 - lib/rails_soft_deletable/query.rb
 - lib/rails_soft_deletable/rails/active_record.rb
+- lib/rails_soft_deletable/rails/associations.rb
 - lib/rails_soft_deletable/rails/railtie.rb
 - lib/rails_soft_deletable/version.rb
 - lib/rails_soft_deletable.rb
@@ -134,7 +135,10 @@ files:
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/models/decimal_model.rb
+- spec/dummy/app/models/forest.rb
 - spec/dummy/app/models/integer_model.rb
+- spec/dummy/app/models/park.rb
+- spec/dummy/app/models/tree.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
@@ -151,7 +155,9 @@ files:
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
 - spec/dummy/db/schema.rb
+- spec/dummy/db/test.sqlite3
 - spec/dummy/lib/soft_deletable_model_callbacks.rb
+- spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -160,7 +166,6 @@ files:
 - spec/dummy/README.rdoc
 - spec/dummy/script/rails
 - spec/rails_soft_deletable_spec.rb
-- spec/schema.rb
 - spec/spec_helper.rb
 - spec/support/environment.rb
 - spec/support/timecop.rb
@@ -197,7 +202,10 @@ test_files:
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/models/decimal_model.rb
+- spec/dummy/app/models/forest.rb
 - spec/dummy/app/models/integer_model.rb
+- spec/dummy/app/models/park.rb
+- spec/dummy/app/models/tree.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
@@ -214,7 +222,9 @@ test_files:
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
 - spec/dummy/db/schema.rb
+- spec/dummy/db/test.sqlite3
 - spec/dummy/lib/soft_deletable_model_callbacks.rb
+- spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -223,7 +233,6 @@ test_files:
 - spec/dummy/README.rdoc
 - spec/dummy/script/rails
 - spec/rails_soft_deletable_spec.rb
-- spec/schema.rb
 - spec/spec_helper.rb
 - spec/support/environment.rb
 - spec/support/timecop.rb

data/spec/schema.rb

@@ -1,11 +0,0 @@
-# encoding: UTF-8
-
-ActiveRecord::Schema.define(version: Time.now.strftime("%Y%m%d%H%M%S")) do
-  create_table "decimal_models", force: true do |t|
-    t.decimal "deleted_at", default: 0
-  end
-
-  create_table "integer_models", force: true do |t|
-    t.integer "deleted_at", default: 0
-  end
-end