kamikakushi 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d57943be6dcfaafeaa6e40c9428d3ff0707c2da
-  data.tar.gz: ea56754ca04bfefb15b68e45e434e1ce78ec6362
+  metadata.gz: fe1f9c0b54645b29b9914c3ecb90d7344fbbf7a9
+  data.tar.gz: a1525f1eabbfa2628a22ec705140bf49203cfa57
 SHA512:
-  metadata.gz: 498d8b86b29e8280eb58aee1f759aafa8ed1b8e83d5af097a58562854ac076b864ca02937b7ff1be650b05d9ed592756c57f143173f067203a00fcaaaf023c9e
-  data.tar.gz: 29073f0dceb08ffbf73e7e3f5b1d7cd192c70b71ddc5b0510141a84d51f446a930731ce771d56500450730ac8e5b60580c296cb7134b218c2dc2fe4eb1f31791
+  metadata.gz: 6d078eeef09c06e42e45ef9047722c30c126b4c7c834c31a0b5d3ee0fda9b5337746d9beb401505b00987a17e12530395c3a738de12f36b31c89b38b3343bf9c
+  data.tar.gz: 945f0fd48cb350473bb37ae02cb26ec58605b2a6b36f6b591c8ef4baeb90fdf90770cc6ef651645218ac08a221fb1d28f958fce0f4d212eb5deea7988eae3c14

data/lib/kamikakushi.rb

@@ -1,39 +1,3 @@
-module Kamikakushi
-  extend ActiveSupport::Concern
-
-  included do
-    default_scope { without_deleted }
-    alias_method_chain :destroy, :kamikakushi
-    alias_method_chain :destroyed?, :kamikakushi
-
-    scope :with_deleted, -> {
-      unscope(where: :deleted_at)
-    }
-
-    scope :without_deleted, -> {
-      where(deleted_at: nil)
-    }
-
-    scope :only_deleted, -> {
-      with_deleted.where.not(deleted_at: nil)
-    }
-  end
-
-  def destroy_with_kamikakushi
-    run_callbacks(:destroy) do
-      update_column(:deleted_at, Time.current)
-    end
-  end
-
-  def destroyed_with_kamikakushi?
-    self.deleted_at? || destroyed_without_kamikakushi?
-  end
-
-  def restore
-    update_column(:deleted_at, self.deleted_at = nil)
-  end
-
-  def purge
-    destroy_without_kamikakushi
-  end
-end
+require 'kamikakushi/kamikakushi'
+require 'kamikakushi/kaonashi'
+require 'kamikakushi/active_record/base'

data/lib/kamikakushi/active_record/base.rb

@@ -0,0 +1,6 @@
+module ActiveRecord
+  class Base
+    include Kamikakushi::Kamikakushi
+    include Kamikakushi::Kaonashi
+  end
+end

data/lib/kamikakushi/kamikakushi.rb

@@ -0,0 +1,51 @@
+module Kamikakushi
+  module Kamikakushi
+    extend ActiveSupport::Concern
+
+    included do
+    end
+
+    module ClassMethods
+      def kamikakushi
+        class_eval do
+          include InstanceMethods
+          default_scope { without_deleted }
+          alias_method_chain :destroy, :kamikakushi
+          alias_method_chain :destroyed?, :kamikakushi
+
+          scope :with_deleted, -> {
+            unscope(where: :deleted_at)
+          }
+
+          scope :without_deleted, -> {
+            where(deleted_at: nil)
+          }
+
+          scope :only_deleted, -> {
+            with_deleted.where.not(deleted_at: nil)
+          }
+        end
+      end
+    end
+
+    module InstanceMethods
+      def destroy_with_kamikakushi
+        run_callbacks(:destroy) do
+          touch(:deleted_at)
+        end
+      end
+
+      def destroyed_with_kamikakushi?
+        self.deleted_at? || destroyed_without_kamikakushi?
+      end
+
+      def restore
+        update_column(:deleted_at, self.deleted_at = nil)
+      end
+
+      def purge
+        destroy_without_kamikakushi
+      end
+    end
+  end
+end

data/lib/kamikakushi/kaonashi.rb

@@ -0,0 +1,50 @@
+module Kamikakushi
+  module Kaonashi
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      def kaonashi(options = {})
+        define_singleton_method(:dependent_parent_name) { options[:parent] }
+        return unless dependent_parent_name
+
+        class_eval do
+          include InstanceMethods
+          default_scope { without_deleted }
+          alias_method_chain :destroyed?, :kaonashi
+
+          scope :with_deleted, -> {
+            join_with_dependent_parent(dependent_parent_name, :with_deleted)
+          }
+
+          scope :without_deleted, -> {
+            join_with_dependent_parent(dependent_parent_name, :without_deleted)
+          }
+
+          scope :only_deleted, -> {
+            join_with_dependent_parent(dependent_parent_name, :only_deleted)
+          }
+        end
+      end
+
+      private
+
+      def join_with_dependent_parent(dependent_parent_name, scope_name)
+        association =  reflect_on_all_associations.find { |a| a.name == dependent_parent_name }
+        dependent_parent_class =  association.klass
+
+        parent_arel = dependent_parent_class.arel_table
+        joins_conditions = arel_table.join(parent_arel)
+                                    .on(parent_arel[:id].eq arel_table[association.foreign_key])
+                                    .join_sources
+        joins(joins_conditions).merge(dependent_parent_class.__send__(scope_name))
+      end
+    end
+
+    module InstanceMethods
+      def destroyed_with_kaonashi?
+        association =  self.class.reflect_on_all_associations.find { |a| a.name == self.class.dependent_parent_name }
+        association.klass.with_deleted.find(__send__(association.foreign_key)).destroyed?
+      end
+    end
+  end
+end

data/lib/kamikakushi/version.rb

@@ -1,3 +1,3 @@
 module Kamikakushi
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kamikakushi
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - ppworks
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-30 00:00:00.000000000 Z
+date: 2015-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -48,6 +48,9 @@ files:
 - MIT-LICENSE
 - Rakefile
 - lib/kamikakushi.rb
+- lib/kamikakushi/active_record/base.rb
+- lib/kamikakushi/kamikakushi.rb
+- lib/kamikakushi/kaonashi.rb
 - lib/kamikakushi/version.rb
 homepage: http://ppworks.jp
 licenses: