kakurenbo 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 788780b9941834c2ade270af22ea73d5d25d2e18
-  data.tar.gz: 95a5300b26356040d8dac00be9431da7a6826480
+  metadata.gz: e3aad6eafcf62a9e7ba09812cbac52dc20363462
+  data.tar.gz: 849e24be08990b146d1a0099245adff73f996016
 SHA512:
-  metadata.gz: 2be387caf4f5b04a6431e01a6cc62de14dfc884473d255efae57c0fe515ac392f4806ee639011e18d51afef655d544c44c1d015ff1c350e3f3f13ca2f5a3f03a
-  data.tar.gz: bb6a270e83ce04f00b83056d7fdd4b8381773000eaa01d91c9674cefeb757ec4ec6ea35739b3ef744c24eb2484b91d5ca308d1ca075878d886e0a225d4e98f62
+  metadata.gz: c0f5d787f66cbd5c0a2da245b272533a76d93da7b56f4d8b4f24ce9a3401a35e842fb71e222cd07c17332d9d634c3eaa828ee5861373349de374f073c1eba72a
+  data.tar.gz: c99b96ca9429ca968895568383534d6723b0fb39908f21cc2151f7d76eeeb229ab367d5b1f807e6da7b87f34ac2e227be769d160e6424b9494cdedf7ee2f61ba

data/README.md

@@ -6,9 +6,12 @@ Kakurenbo is a re-implementation of [paranoia](http://github.com/radar/paranoia)
 The usage of the Kakurenbo is very very very simple. Only add `deleted_at`(datetime) to column.
 Of course you can use `acts_as_paranoid`.In addition, Kakurenbo has many advantageous.
 
+# Warning
+### kakurenbo is deprecated if you use in a new rails project!
+### You should use [kakurenbo-puti](http://github.com/alfa-jpn/kakurenbo-puti)!
 
-# Installation
 
+# Installation
 
 ```ruby
 gem 'kakurenbo'

data/lib/kakurenbo.rb

@@ -7,6 +7,10 @@ require "kakurenbo/version"
 require "kakurenbo/mixin_ar_base"
 require "kakurenbo/mixin_ar_associations"
 require "kakurenbo/mixin_ar_relation"
+require "kakurenbo/mixin_ar_transactions"
+require "kakurenbo/mixin_ar_callbacks"
+require "kakurenbo/mixin_ar_persistence"
+require "kakurenbo/mixin_ar_locking_optimistic"
 require "kakurenbo/core"
 
 # Kakurenbo Add ActiveRecord::RecordNotRestored to ActiveRecord
@@ -20,3 +24,15 @@ ActiveRecord::Relation.send :include, Kakurenbo::MixinARRelation
 
 # Kakurenbo Mixin to ActiveRecord::Associations
 ActiveRecord::Associations::Association.send :include, Kakurenbo::MixinARAssociations::Association
+
+# Kakurenbo Mixin to ActiveRecord::Transaction
+ActiveRecord::Transactions.send :include, Kakurenbo::MixinARTransactions
+
+# Kakurenbo Mixin to ActiveRecord::Callbacks
+ActiveRecord::Callbacks.send :include, Kakurenbo::MixinARCallbacks
+
+# Kakurenbo Mixin to ActiveRecord::Persistence
+ActiveRecord::Persistence.send :include, Kakurenbo::MixinARPersistence
+
+# Kakurenbo Mixin to ActiveRecord::Locking::Optimistic
+ActiveRecord::Locking::Optimistic.send :include, Kakurenbo::MixinARLockingOptimistic

data/lib/kakurenbo/core.rb

@@ -94,8 +94,8 @@ module Kakurenbo
       destroy(options) || raise(ActiveRecord::RecordNotDestroyed)
     end
 
-    def destroy_row
-      relation_for_destroy.delete_all(nil, :hard => true)
+    def destroy_row(options = {:hard => true})
+      relation_for_destroy.delete_all(nil, options)
     end
 
     def destroyed?

data/lib/kakurenbo/mixin_ar_base.rb

@@ -25,7 +25,7 @@ module Kakurenbo
           remodel_as_soft_delete if has_kakurenbo_column?
 
           # Reset @table name, because ActiveRecord doesn't expect initialized at here.
-          remove_instance_variable(:@table_name)
+          remove_instance_variable(:@table_name) if instance_variable_defined? :@table_name
         end
       end
 

data/lib/kakurenbo/mixin_ar_callbacks.rb

@@ -0,0 +1,13 @@
+module Kakurenbo
+  module MixinARCallbacks
+    # Override methods.
+    def self.included(base_class)
+      base_class.class_eval do
+        def destroy(options = {:hard => false})
+          run_callbacks(:destroy) { super(options) }
+        end
+      end
+    end
+  end
+end
+

data/lib/kakurenbo/mixin_ar_locking_optimistic.rb

@@ -0,0 +1,19 @@
+module Kakurenbo
+  module MixinARLockingOptimistic
+    # Override methods.
+    def self.included(base_class)
+      base_class.class_eval do
+       def destroy_row(options = {:hard => false})
+          affected_rows = super(options)
+
+          if locking_enabled? && affected_rows != 1
+            raise ActiveRecord::StaleObjectError.new(self, "destroy")
+          end
+
+          affected_rows
+        end
+      end
+    end
+  end
+end
+

data/lib/kakurenbo/mixin_ar_persistence.rb

@@ -0,0 +1,22 @@
+module Kakurenbo
+  module MixinARPersistence
+    # Override methods.
+    def self.included(base_class)
+      base_class.class_eval do
+        def destroy(options = {:hard => false})
+          raise ReadOnlyRecord if readonly?
+          destroy_associations
+          #destroy_row(options) if persisted?
+          destroy_row if persisted?
+          @destroyed = true
+          freeze
+        end
+
+        private
+        def destroy_row(options = {:hard => false})
+          relation_for_destroy.delete_all(nil, options)
+        end
+      end
+    end
+  end
+end

data/lib/kakurenbo/mixin_ar_transactions.rb

@@ -0,0 +1,12 @@
+module Kakurenbo
+  module MixinARTransactions
+    # Override methods.
+    def self.included(base_class)
+      base_class.class_eval do
+        def destroy(options = {:hard => false})
+          with_transaction_returning_status { super(options) }
+        end
+      end
+    end
+  end
+end

data/lib/kakurenbo/version.rb

@@ -1,3 +1,3 @@
 module Kakurenbo
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/spec/kakurenbo/cores/associations_spec.rb

@@ -32,6 +32,10 @@ describe Kakurenbo::Core do
     expect { parent.restore! }.not_to change(child_class, :count)
   end
 
+  subject :subject_destroy_child_with_where do
+    expect { destroy_child_with_where }.to change(child_class, :count).by(2)
+  end
+
   let :create_unrelated_children do
     [
       child_class.create!,
@@ -43,6 +47,10 @@ describe Kakurenbo::Core do
     children.each {|child| child.destroy!}
   end
 
+  let :destroy_child_with_where do
+    parent.normal_child_models.where(id: children.first.id).destroy_all
+  end
+
   let :parent do
     parent_class.create!
   end
@@ -75,6 +83,12 @@ describe Kakurenbo::Core do
         subject_soft_delete
       end
     end
+
+    context 'when child is deleted by destroy_all with where,' do
+      it 'child will be delete.' do
+        subject_destroy_child_with_where
+      end
+    end
   end
 
   describe 'ParanoidChildModel(has_many)' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kakurenbo
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - alfa-jpn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-17 00:00:00.000000000 Z
+date: 2015-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -118,7 +118,11 @@ files:
 - lib/kakurenbo/core.rb
 - lib/kakurenbo/mixin_ar_associations.rb
 - lib/kakurenbo/mixin_ar_base.rb
+- lib/kakurenbo/mixin_ar_callbacks.rb
+- lib/kakurenbo/mixin_ar_locking_optimistic.rb
+- lib/kakurenbo/mixin_ar_persistence.rb
 - lib/kakurenbo/mixin_ar_relation.rb
+- lib/kakurenbo/mixin_ar_transactions.rb
 - lib/kakurenbo/version.rb
 - spec/kakurenbo/cores/associations_spec.rb
 - spec/kakurenbo/cores/callbacks_spec.rb
@@ -148,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: provides soft delete. Kakurenbo is a re-implementation of paranoia and acts_as_paranoid