kakurenbo-puti 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a224bebe0029c5a6c736176831dd549df38df0a
-  data.tar.gz: 6bac0bc291bd5318c582a18f435b63850bcc598d
+  metadata.gz: 5a7a55e62643987f839573cbee301f3114176a2a
+  data.tar.gz: 440591cbabb762607202703a66c82b6d8c912b02
 SHA512:
-  metadata.gz: a8d590bfc647fbe0a63d2d743e354bed23480f89c4326def4f9c5663ccd56e9e973a8043841971360426d9b996fbb0ecbd832d78578fe9b0f03f58c4a2cceb0a
-  data.tar.gz: 32cac6cab3b8035e9983c53685809ea30c5eaec0ab2a26240c913cb76d21d8f4c50304f86d44acebe86ac6b2cb6bcd9f4f7dad1c10771fd25901617287c19473
+  metadata.gz: ff003f0b53797305c1f7b78df14ca3ce00fef049ddb1fa1030b7927230ce2699546c59122f6e080291d1bd5ef7e68bdf68701c372bc11873db7d8cb385c338cb
+  data.tar.gz: 5481b3aa1fa467ffd822703f62c3d49a232949194bd69462ff14a552528c083bd775ac2ff455cb81430b5f0c19c0c93fc37f299b69e9e48e466c0d61586c2d1a

data/.gitignore

@@ -20,3 +20,6 @@ mkmf.log
 
 # IDE files.
 .idea/
+
+# bundler directory.
+vendor/bundle/

data/README.md

@@ -77,6 +77,7 @@ model.restore!
 
 ### Definition of the dependency
 Use dependent_associations option of `soft-deletable`.
+This option is useable only in `belongs_to`.
 
 ```ruby
 

data/lib/kakurenbo_puti/active_record_base.rb

@@ -12,6 +12,7 @@ module KakurenboPuti
       Initializers.create_scopes self, dependent_associations
 
       include InstanceMethods
+      extend ClassMethods
     end
 
     module Initializers
@@ -40,14 +41,17 @@ module KakurenboPuti
       def self.create_scopes(target_class, dependent_associations)
         target_class.class_eval do
           scope :only_soft_destroyed, -> { where.not(id: without_soft_destroyed.select(:id)) }
+
           scope :without_soft_destroyed, (lambda do
             dependent_associations.inject(where(soft_delete_column => nil)) do |relation, name|
               association = relation.klass.reflect_on_all_associations.find{|a| a.name == name }
+              raise 'dependent association is usable only in `belongs_to`.' unless association.belongs_to?
+
+              parent_relation = association.klass.all
               if association.klass.method_defined?(:soft_delete_column)
-                relation.joins(name).merge(association.klass.without_soft_destroyed).references(name)
-              else
-                relation.joins(name).references(name)
+                parent_relation = parent_relation.without_soft_destroyed
               end
+              relation.where(association.foreign_key => parent_relation.select(:id))
             end
           end)
         end
@@ -89,5 +93,15 @@ module KakurenboPuti
         self.class.only_soft_destroyed.where(id: id).exists?
       end
     end
+
+    module ClassMethods
+      def soft_destroy_all(conditions = nil)
+        if conditions
+          where(conditions).soft_destroy_all
+        else
+          all.each {|object| object.soft_destroy }
+        end
+      end
+    end
   end
 end

data/lib/kakurenbo_puti/version.rb

@@ -1,3 +1,3 @@
 module KakurenboPuti
-  VERSION = '0.0.3'
+  VERSION = '0.1.0'
 end

data/spec/kakurenbo_puti/active_record_base_spec.rb

@@ -19,6 +19,7 @@ describe KakurenboPuti::ActiveRecordBase do
     SoftDeleteModel.tap do |klass|
       klass.class_eval do
         soft_deletable options_cache
+        has_many :soft_delete_children
 
         before_soft_destroy :cb_mock
         after_soft_destroy  :cb_mock
@@ -147,6 +148,16 @@ describe KakurenboPuti::ActiveRecordBase do
       child_class.without_soft_destroyed
     end
 
+    context 'When dependent association use in `has_many`' do
+      let :model_class_options do
+        {dependent_associations: [:soft_delete_children]}
+      end
+
+      it 'raise error' do
+        expect { subject }.to raise_error
+      end
+    end
+
     context 'When soft-deleted' do
       it 'Return a relation without soft-deleted model.' do
         expect {
@@ -327,4 +338,33 @@ describe KakurenboPuti::ActiveRecordBase do
       end
     end
   end
+
+  describe '.soft_destroy_all' do
+    subject do
+      model_class.soft_destroy_all
+    end
+    let!(:model_instance) { model_class.create! }
+
+    it 'SoftDelete model' do
+      expect {
+        subject
+      }.to change {
+        model_class.without_soft_destroyed.count
+      }.to(0)
+    end
+
+    context 'with conditions' do
+      subject do
+        model_class.soft_destroy_all(id: model_instance.id)
+      end
+
+      it 'SoftDelete model' do
+        expect {
+          subject
+        }.to change {
+          model_class.without_soft_destroyed.count
+        }.to(0)
+      end
+    end
+  end
 end

data/spec/kakurenbo_puti/situations/deep_nest_spec.rb

@@ -0,0 +1,123 @@
+require 'spec_helper'
+
+describe KakurenboPuti::ActiveRecordBase do
+  define_active_record_model :Parent do |t|
+    t.datetime :soft_destroyed_at
+  end
+
+  define_active_record_model :OneChild do |t|
+    t.integer :parent_id
+    t.datetime :soft_destroyed_at
+  end
+
+  define_active_record_model :TwoChild do |t|
+    t.integer :one_child_id
+    t.datetime :soft_destroyed_at
+  end
+
+  define_active_record_model :ThreeChild do |t|
+    t.integer :two_child_id
+    t.datetime :soft_destroyed_at
+  end
+
+  define_active_record_model :FourChild do |t|
+    t.integer :three_child_id
+    t.datetime :soft_destroyed_at
+  end
+
+  define_active_record_model :FiveChild do |t|
+    t.integer :four_child_id
+    t.datetime :soft_destroyed_at
+  end
+
+
+  let :parent_class do
+    Parent.tap do |klass|
+      klass.class_eval { soft_deletable }
+    end
+  end
+
+  let :one_child_class do
+    OneChild.tap do |klass|
+      klass.class_eval do
+        soft_deletable dependent_associations: [:parent]
+        belongs_to :parent
+      end
+    end
+  end
+
+  let :two_child_class do
+    TwoChild.tap do |klass|
+      klass.class_eval do
+        soft_deletable dependent_associations: [:one_child]
+        belongs_to :one_child
+      end
+    end
+  end
+
+  let :three_child_class do
+    ThreeChild.tap do |klass|
+      klass.class_eval do
+        soft_deletable dependent_associations: [:two_child]
+        belongs_to :two_child
+      end
+    end
+  end
+
+  let :four_child_class do
+    FourChild.tap do |klass|
+      klass.class_eval do
+        soft_deletable dependent_associations: [:three_child]
+        belongs_to :three_child
+      end
+    end
+  end
+
+  let :five_child_class do
+    FiveChild.tap do |klass|
+      klass.class_eval do
+        soft_deletable dependent_associations: [:four_child]
+        belongs_to :four_child
+      end
+    end
+  end
+
+  let :parent do
+    parent_class.create!
+  end
+
+  let :one_child do
+    one_child_class.create!(parent: parent)
+  end
+
+  let :two_child do
+    two_child_class.create!(one_child: one_child)
+  end
+
+  let :three_child do
+    three_child_class.create!(two_child: two_child)
+  end
+
+  let :four_child do
+    four_child_class.create(three_child: three_child)
+  end
+
+  let :five_child do
+    five_child_class.create(four_child: four_child)
+  end
+
+
+  context 'When delete root' do
+    subject do
+      parent.soft_destroy
+    end
+
+    it 'SoftDestroy dependent tail.' do
+      expect {
+        subject
+      }.to change {
+        five_child.soft_destroyed?
+      }.from(false).to(true)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kakurenbo-puti
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - alfa-jpn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-07 00:00:00.000000000 Z
+date: 2015-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -132,6 +132,7 @@ files:
 - lib/kakurenbo_puti/active_record_base.rb
 - lib/kakurenbo_puti/version.rb
 - spec/kakurenbo_puti/active_record_base_spec.rb
+- spec/kakurenbo_puti/situations/deep_nest_spec.rb
 - spec/spec_helper.rb
 - spec/supports/active_record_model.rb
 - spec/supports/active_record_model_spec.rb
@@ -161,6 +162,7 @@ specification_version: 4
 summary: Lightweight soft-delete gem.
 test_files:
 - spec/kakurenbo_puti/active_record_base_spec.rb
+- spec/kakurenbo_puti/situations/deep_nest_spec.rb
 - spec/spec_helper.rb
 - spec/supports/active_record_model.rb
 - spec/supports/active_record_model_spec.rb