has_friendship 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: beeb114cb3e5a0439b099e7bd2d957a6c9341208
-  data.tar.gz: 1ffb7ab87dda1a4413aae89e92d3891e225ead83
+  metadata.gz: 9132e28ff843795c0c0a75a2a9a87d8924ce6b04
+  data.tar.gz: 082d2aca63456254542c02704e84caf9429fdd02
 SHA512:
-  metadata.gz: f7093c9282d5f78edf7e88e511ddde981f2e18615339ca434412d722c8e73656df913fb4a46fb94bcc3903e85a0574020c793576f4f67386f521396ae75bb1c1
-  data.tar.gz: ac6407df6de729e7a0badc49423b9be8494ab076222b2f409fe04c6113061ce4b52db110abebb60c175b88e500327d7f0b978012284ac7a422f33e602ae7b88e
+  metadata.gz: 4a19f13fb2a2ad003fb169abebf782af9df68bd70d1e2cba6fb5dbdc8f5568949cce12c5d8422e6ed89ecd84f7bfe1834df8f8112ae0159da84e246cd9749f68
+  data.tar.gz: e5c234f06331dbefbb97cec124d9d493e4de5646994e150e13a6d2ae2261790a3dd193d1c3e184b97a2920396482964804f024d3d00519847736f032af34f845

data/lib/has_friendship/friendable.rb

@@ -51,7 +51,8 @@ module HasFriendship
 
       def accept_request(friend)
         on_relation_with(friend) do |one, other|
-          HasFriendship::Friendship.find_unblocked_friendship(one, other).accept!
+          friendship = HasFriendship::Friendship.find_unblocked_friendship(one, other)
+          friendship.accept! if can_accept_request?(friendship)
         end
       end
 
@@ -87,11 +88,22 @@ 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)
         HasFriendship::Friendship.find_one_side(self, friend).blocker_id == self.id
       end
+
+      def can_accept_request?(friendship)
+        return if friendship.pending? && self == friendship.friendable
+        return if friendship.requested? && self == friendship.friend
+
+        true
+      end
     end
   end
 end

data/lib/has_friendship/friendship.rb

@@ -1,9 +1,17 @@
 module HasFriendship
   class Friendship < ActiveRecord::Base
 
+    after_create do
+      friend.on_friendship_created(self)
+    end
+
     enum status: { pending: 0, requested: 1, accepted: 2, blocked: 3 } do
       event :accept do
         transition [:pending, :requested] => :accepted
+
+        after do
+          friendable.on_friendship_accepted(self)
+        end
       end
 
       event :block do
@@ -11,6 +19,9 @@ module HasFriendship
           self.blocker_id = self.friendable.id
         end
 
+        after do
+          friendable.on_friendship_blocked(self)
+        end
         transition all - [:blocked] => :blocked
       end
     end

data/lib/has_friendship/version.rb

@@ -1,3 +1,3 @@
 module HasFriendship
-  VERSION = "1.0.2"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: has_friendship
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Sung Won Cho
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-01 00:00:00.000000000 Z
+date: 2017-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -195,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Add social network friendship features to your Active Record models.