kakurenbo 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0eed74f6f1f4ee3e648f8d23f196b017a3933a0
-  data.tar.gz: 9aba55b5f4d2191702e64feecfc348051fff0ad2
+  metadata.gz: f8fceaba359613cdffd663005dc7029090c9f381
+  data.tar.gz: 0d9f9a7cb444c4822c789701dc468df8fbee40b3
 SHA512:
-  metadata.gz: dd0dc2d6abe2a70959bb5fdabcdf3b6970d24530208538c19af5e4d38f570f360a593a506f53ea867801f3bbb57a54ac005a45cdd711e973824888c4a2974e72
-  data.tar.gz: a0305a8d5be99ea68c939dbd8a3e279548b8cd39e87ee14fe6c1c017655e4e87a734695b19b6c890cf0efc4b5866a8ff45bf252cca1afb53500c5b63c10572ec
+  metadata.gz: 3d8d53fe4d2766e9e1785cf4d3a4b45b044de1ac47c16091c5efdab73f938c6665279bca49fa93af598b92f9505f3d398777ee7e58026b610e9df05bb57de6e3
+  data.tar.gz: 3f179d2bbc02c7c94bce01147bf2d928af1e4c3cfa6fbeb9559a923dbf997a226e3e92a361b53c857c3007b6ff354d1ff27488a5d63c946e12dd17bfebbe9059

data/.travis.yml

@@ -5,6 +5,8 @@ before_install:
 rvm:
   - 1.9.3
   - 2.1.0
+  - 2.1.2
 env:
   - ACTIVE_RECORD_VERSION='~> 4.0.2'
   - ACTIVE_RECORD_VERSION='~> 4.1.0'
+  - ACTIVE_RECORD_VERSION='~> 4.1.4'

data/kakurenbo.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = <<-EOF
     provides soft delete.
-    Kakurenbo is a re-implementation of paranoia and acts_as_paranoid for Rails4 and 3.
+    Kakurenbo is a re-implementation of paranoia and acts_as_paranoid for Rails4.
     implemented a function that other gems are not enough.
   EOF
 

data/lib/kakurenbo.rb

@@ -5,6 +5,7 @@ require "active_record"
 # require kakurenbo modules.
 require "kakurenbo/version"
 require "kakurenbo/mixin_ar_base"
+require "kakurenbo/mixin_ar_associations"
 require "kakurenbo/mixin_ar_relation"
 require "kakurenbo/core"
 
@@ -16,3 +17,6 @@ ActiveRecord::Base.send :include, Kakurenbo::MixinARBase
 
 # Kakurenbo Mixin to ActiveRecord::Relation.
 ActiveRecord::Relation.send :include, Kakurenbo::MixinARRelation
+
+# Kakurenbo Mixin to ActiveRecord::Associations
+ActiveRecord::Associations::Association.send :include, Kakurenbo::MixinARAssociations::Association

data/lib/kakurenbo/core.rb

@@ -78,7 +78,7 @@ module Kakurenbo
       else
         return true if destroyed?
         with_transaction_returning_status do
-          destroy_at = current_time_from_proper_timezone
+          destroy_at = Time.now
           run_callbacks(:destroy){ update_column kakurenbo_column, destroy_at; self }
         end
       end
@@ -121,8 +121,7 @@ module Kakurenbo
 
       with_transaction_returning_status do
         run_callbacks(:restore) do
-          parent_deleted_at = send(kakurenbo_column)
-          restore_associated_records(parent_deleted_at) if options[:recursive]
+          restore_associated_records if options[:recursive]
           update_column kakurenbo_column, nil
           self
         end
@@ -140,50 +139,29 @@ module Kakurenbo
     end
 
     private
-    # get recoreds of association.
+    # All Scope of dependent association.
     #
-    # @param association [ActiveRecord::Associations] association.
-    # @return [Array or CollectionProxy] records.
-    def associated_records(association)
-      resource = send(association.name)
-      if resource.nil?
-        []
-      elsif association.collection?
-        resource.with_deleted
-      else
-        [resource]
-      end
-    end
-
-    # Calls the given block once for each dependent destroy records.
-    # @note Only call the class of paranoid.
-    #
-    # @param &block [Proc{|record|.. }] execute block.
-    def each_dependent_destroy_records(&block)
-      self.class.reflect_on_all_associations.each do |association|
-        next unless association.options[:dependent] == :destroy
-        next unless association.klass.paranoid?
-
-        associated_records(association).each &block
-      end
+    # @return [Array<ActiveRecord::Relation>] array of dependent association.
+    def dependent_association_scopes
+      self.class.reflect_on_all_associations.select { |reflection|
+        reflection.options[:dependent] == :destroy and reflection.klass.paranoid?
+      }.map { |reflection|
+        self.association(reflection.name).tap {|assoc| assoc.reset_scope }.scope
+      }
     end
 
     # Hard-Destroy associated records.
     def hard_destroy_associated_records
-      each_dependent_destroy_records do |record|
-        record.destroy(hard: true)
+      dependent_association_scopes.each do |scope|
+        scope.with_deleted.destroy_all(nil, hard: true)
       end
     end
 
     # Restore associated records.
-    # @note Not restore if deleted_at older than parent_deleted_at.
-    #
-    # @param parent_deleted_at [Time] The time when parent was deleted.
-    def restore_associated_records(parent_deleted_at)
-      each_dependent_destroy_records do |record|
-        next unless record.destroyed?
-        next unless parent_deleted_at <= record.send(kakurenbo_column)
-        record.restore!
+    # @note Record will be restored if record#deleted_at is newer than parent_deleted_at.
+    def restore_associated_records
+      dependent_association_scopes.each do |scope|
+        scope.restore_all
       end
     end
   end

data/lib/kakurenbo/mixin_ar_associations.rb

@@ -0,0 +1,23 @@
+module Kakurenbo
+  module MixinARAssociations
+    module Association
+      # Extend ClassMethods after include.
+      def self.included(base_class)
+        base_class.class_eval { alias_method_chain :scope, :deleted }
+      end
+
+      # Load deleted model, if owner is deleted.
+      def scope_with_deleted
+        if @owner.paranoid? and @owner.destroyed? and klass.paranoid?
+          col = klass.arel_table[klass.kakurenbo_column]
+          owner_deleted_at = @owner.send(@owner.class.kakurenbo_column)
+          condition = col.eq(nil).or(col.gteq(owner_deleted_at))
+
+          scope_without_deleted.with_deleted.where(condition)
+        else
+          scope_without_deleted
+        end
+      end
+    end
+  end
+end

data/lib/kakurenbo/mixin_ar_base.rb

@@ -34,9 +34,6 @@ module Kakurenbo
           alias_method :destroy,  :hard_destroy
           alias_method :destroy!, :hard_destroy!
 
-          singleton_class.send(:alias_method, :delete, :hard_delete)
-          singleton_class.send(:alias_method, :delete_all, :hard_delete_all)
-
           define_singleton_method(:paranoid?) { false }
         end
       end
@@ -55,9 +52,6 @@ module Kakurenbo
           alias_method :hard_destroy,  :destroy
           alias_method :hard_destroy!, :destroy!
 
-          singleton_class.send(:alias_method, :hard_delete, :delete)
-          singleton_class.send(:alias_method, :hard_delete_all, :delete_all)
-
           class_attribute :kakurenbo_column
           include Kakurenbo::Core
         end

data/lib/kakurenbo/mixin_ar_relation.rb

@@ -1,6 +1,6 @@
 module Kakurenbo
   module MixinARRelation
-    # Extend ClassMethods after include.
+    # Override methods.
     def self.included(base_class)
       base_class.class_eval do
         alias_method :hard_delete_all, :delete_all

data/lib/kakurenbo/version.rb

@@ -1,3 +1,3 @@
 module Kakurenbo
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/kakurenbo/cores/associations_spec.rb

@@ -11,6 +11,11 @@ describe Kakurenbo::Core do
   create_temp_table(:paranoid_child_models)        { |t| t.integer :parent_model_id; t.datetime :deleted_at }
   create_temp_table(:paranoid_single_child_models) { |t| t.integer :parent_model_id; t.datetime :deleted_at }
 
+  subject :subject_hard_delete do
+    create_unrelated_children
+    expect { parent.destroy!(hard: true) }.to change{ child_class.with_deleted.count }.by(children.length * -1)
+  end
+
   subject :subject_soft_delete do
     create_unrelated_children
     expect { parent.destroy! }.to change(child_class, :count).by(children.length * -1)
@@ -91,6 +96,12 @@ describe Kakurenbo::Core do
       end
     end
 
+    context 'when parent is hard-destroyed' do
+      it 'related children will be hard-destroyed.' do
+        subject_hard_delete
+      end
+    end
+
     context 'when parent is restored' do
       it 'related children will be restored.' do
         subject_restore
@@ -125,6 +136,12 @@ describe Kakurenbo::Core do
       end
     end
 
+    context 'when parent is hard-destroyed' do
+      it 'related children will be hard-destroyed.' do
+        subject_hard_delete
+      end
+    end
+
     context 'when parent is restored' do
       it 'related children will be restored.' do
         subject_restore
@@ -142,7 +159,7 @@ describe Kakurenbo::Core do
     end
   end
 
-  describe 'ParanoidSingleChildModel(has_one)' do
+  describe 'ParanoidSingleChildModel(belongs_to)' do
     let :child_class do
       ParanoidSingleChildModel
     end
@@ -159,6 +176,12 @@ describe Kakurenbo::Core do
       end
     end
 
+    context 'when parent is hard-destroyed' do
+      it 'related children will be hard-destroyed.' do
+        subject_hard_delete
+      end
+    end
+
     context 'when parent is restored' do
       it 'related children will be restored.' do
         subject_restore

data/spec/kakurenbo/mixin_ar_associations_spec.rb

@@ -0,0 +1,122 @@
+require 'spec_helper'
+
+#
+#               NormalChildModel                 [has_many]
+# ParentModel < ParanoidChildModel               [has_many]
+#               ParanoidSingleChildModel         [has_many][belongs_to]
+#               ParentChild - ParanoidChildModel [intermediate]
+#
+describe Kakurenbo::MixinARAssociations::Association do
+  create_temp_table(:parent_models)                { |t| t.integer :child_belongs_to_id; t.datetime :deleted_at }
+  create_temp_table(:normal_child_models)          { |t| t.integer :parent_model_id }
+  create_temp_table(:paranoid_child_models)        { |t| t.integer :parent_model_id; t.datetime :deleted_at }
+  create_temp_table(:paranoid_single_child_models) { |t| t.integer :parent_model_id; t.datetime :deleted_at }
+  create_temp_table(:parents_children)             { |t| t.integer :parent_model_id; t.integer :paranoid_child_model_id; t.datetime :deleted_at }
+
+  subject do
+    parent.destroy!
+  end
+
+  let :parent do
+    parent_class.create!
+  end
+
+  let! :parents_child_class do
+    ParentsChild.tap do |parents_child_class|
+      parents_child_class.belongs_to :parent_model
+      parents_child_class.belongs_to :paranoid_child_model
+    end
+  end
+
+  let :parent_class do
+    ParentModel.tap do |parent_class|
+      parent_class.has_many :normal_child_models,   :dependent => :destroy
+      parent_class.has_many :paranoid_child_models, :dependent => :destroy
+
+      parent_class.has_one     :child_has_one, :class_name => :ParanoidSingleChildModel, :dependent => :destroy
+      parent_class.belongs_to  :child_belongs_to, :class_name => :ParanoidSingleChildModel, :dependent => :destroy
+
+      parent_class.has_many :parents_children, :dependent => :destroy
+      parent_class.has_many :children, :through => :parents_children, :source => :paranoid_child_model
+    end
+  end
+
+  describe 'NormalChildModel(has_many)' do
+    let! :children do
+      [
+        parent.normal_child_models.create!,
+        parent.normal_child_models.create!,
+        parent.normal_child_models.create!,
+      ]
+    end
+
+    context 'when destroyed parent is loaded' do
+      it 'related children will be not loaded.' do
+        expect(subject.normal_child_models.size).to eq(0)
+      end
+    end
+  end
+
+  describe 'ParanoidChildModel(has_many)' do
+    let! :children do
+      [
+        parent.paranoid_child_models.create!,
+        parent.paranoid_child_models.create!,
+        parent.paranoid_child_models.create!,
+      ]
+    end
+
+    context 'when destroyed parent is loaded' do
+      it 'related children will be loaded.' do
+        expect(subject.paranoid_child_models(true)).to contain_exactly(*children)
+      end
+    end
+  end
+
+  describe 'ParanoidSingleChildModel(has_one)' do
+    let! :children do
+      [
+        parent.create_child_has_one!
+      ]
+    end
+
+    context 'when destroyed parent is loaded' do
+      it 'related children will be loaded.' do
+        expect(subject.child_has_one(true)).to eq(*children)
+      end
+    end
+  end
+
+  describe 'ParanoidSingleChildModel(belongs_to)' do
+    let! :children do
+      [
+        parent.create_child_belongs_to!
+      ]
+    end
+
+    context 'when destroyed parent is loaded' do
+      it 'related children will be loaded.' do
+        expect(subject.child_belongs_to(true)).to eq(*children)
+      end
+    end
+  end
+
+  # Not Support ActiveRecord < 4.1
+  unless ActiveRecord::VERSION::STRING < "4.1"
+    describe 'ParanoidChild(intermediate table)' do
+      let! :children do
+        [
+          parent.children.create!,
+          parent.children.create!,
+          parent.children.create!,
+        ]
+      end
+
+      context 'when destroyed parent is loaded' do
+        it 'related children will be loaded.' do
+          expect(subject.children(true)).to contain_exactly(*children)
+        end
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -3,6 +3,7 @@ require "bundler/setup"
 require "kakurenbo"
 
 RSpec.configure do |config|
+  config.color = true
   config.mock_framework = :rspec
   config.before(:all) {
     ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kakurenbo
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - alfa-jpn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-11 00:00:00.000000000 Z
+date: 2014-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -116,6 +116,7 @@ files:
 - kakurenbo.gemspec
 - lib/kakurenbo.rb
 - lib/kakurenbo/core.rb
+- lib/kakurenbo/mixin_ar_associations.rb
 - lib/kakurenbo/mixin_ar_base.rb
 - lib/kakurenbo/mixin_ar_relation.rb
 - lib/kakurenbo/version.rb
@@ -123,6 +124,7 @@ files:
 - spec/kakurenbo/cores/callbacks_spec.rb
 - spec/kakurenbo/cores/core_spec.rb
 - spec/kakurenbo/cores/scopes_spec.rb
+- spec/kakurenbo/mixin_ar_associations_spec.rb
 - spec/kakurenbo/mixin_ar_base_spec.rb
 - spec/kakurenbo/mixin_ar_relation_spec.rb
 - spec/spec_helper.rb
@@ -150,12 +152,13 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: provides soft delete. Kakurenbo is a re-implementation of paranoia and acts_as_paranoid
-  for Rails4 and 3. implemented a function that other gems are not enough.
+  for Rails4. implemented a function that other gems are not enough.
 test_files:
 - spec/kakurenbo/cores/associations_spec.rb
 - spec/kakurenbo/cores/callbacks_spec.rb
 - spec/kakurenbo/cores/core_spec.rb
 - spec/kakurenbo/cores/scopes_spec.rb
+- spec/kakurenbo/mixin_ar_associations_spec.rb
 - spec/kakurenbo/mixin_ar_base_spec.rb
 - spec/kakurenbo/mixin_ar_relation_spec.rb
 - spec/spec_helper.rb