has_friendship 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e7405f12ea84e279cc43435c42a147f26564beeed2d42491b9ed46d6b1c0251
-  data.tar.gz: 9f4519f3ef0253f739a46f2fa2efc0a806ceb320de89eb654a739eb3139c839c
+  metadata.gz: 57947ab4c8d036df58994c27b253d0f301b7530da79c95a56d957dfe50ca2c94
+  data.tar.gz: 340377d9412274cc00905e2f469b2e1fff293a89c172b165bd1a92ae64ef7407
 SHA512:
-  metadata.gz: 7d04acf4d3f0f4a9450a40b6edcefa2b89267e275a2da11ed94c5c39a0743bd98fceb4dd28afab0fa915d74a00f671a9b3570cf21b9bd45caca998bd70014a92
-  data.tar.gz: 7da05c876ed87d065940447da83e84810db4e5f7ce904ff0548575e34c483e607b3f23b0d2dbd855e576d0427735a9be804de0a4c3f043898d2ac3e2759b1a5c
+  metadata.gz: 34ca1faf29f2b1f70a88951f13b5beb9893948e140d312c798c179a7e1536518eec9a29ca7a76c17b926be9c1591e2baaf43e6750415483fe2e59906bd1c4535
+  data.tar.gz: c5a960c9adf8e360fd893971f650d653f7dda143f316771a5079d6ac9ce85d8bcb1dc2b011a9ff0cf4c5cb2481329f6d4905dc9f3f733cf15014c91fc67ae711

data/db/migrate/4_add_unique_index_to_friendships.rb

@@ -14,6 +14,8 @@ AddUniqueIndexToFriendships.class_eval do
   end
 
   def self.down
+    return unless index_exists?(:friendships, [:friendable_id, :friend_id])
+
     remove_index :friendships, [:friendable_id, :friend_id]
   end
 end

data/lib/has_friendship/friendable.rb

@@ -1,6 +1,5 @@
 module HasFriendship
   module Friendable
-
     def friendable?
       false
     end
@@ -39,6 +38,18 @@ module HasFriendship
     end
 
     module InstanceMethods
+      CALLBACK_METHOD_NAMES = %i(
+        on_friendship_created
+        on_friendship_accepted
+        on_friendship_blocked
+        on_friendship_destroyed
+      ).freeze
+
+      CALLBACK_METHOD_NAMES.each do |method_name|
+        define_method(method_name) do |*args|
+          super(*args) if defined?(super)
+        end
+      end
 
       def friend_request(friend)
         unless self == friend || HasFriendship::Friendship.exist?(self, friend)
@@ -88,10 +99,6 @@ module HasFriendship
         HasFriendship::Friendship.find_relation(self, friend, status: 2).any?
       end
 
-      def on_friendship_created(*args); end
-      def on_friendship_accepted(*args); end
-      def on_friendship_blocked(*args); end
-
       private
 
       def has_blocked(friend)

data/lib/has_friendship/friendship.rb

@@ -1,8 +1,13 @@
 module HasFriendship
   class Friendship < ActiveRecord::Base
+    validate :satisfy_custom_conditions
 
-    after_create do
-      friend.on_friendship_created(self)
+    after_create do |record|
+      friend.on_friendship_created(record)
+    end
+
+    after_destroy do |record|
+      friendable.try(:on_friendship_destroyed, record)
     end
 
     enum status: { pending: 0, requested: 1, accepted: 2, blocked: 3 } do
@@ -65,5 +70,15 @@ module HasFriendship
     def self.find_one_side(one, other)
       find_by(relation_attributes(one, other))
     end
+
+    private
+
+    def satisfy_custom_conditions
+      return unless friend.respond_to?(:friendship_errors)
+
+      friend.friendship_errors(friendable).to_a.each do |friendship_error|
+        errors.add(:base, friendship_error)
+      end
+    end
   end
 end

data/lib/has_friendship/version.rb

@@ -1,3 +1,3 @@
 module HasFriendship
-  VERSION = "1.1.5"
+  VERSION = "1.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: has_friendship
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Sung Won Cho
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-01 00:00:00.000000000 Z
+date: 2018-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails