has_friendship 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50065c83e6fa815a565ce0011363dee9f2b84112
-  data.tar.gz: c49fd71f89811cb8dbb69c37343d21ad2d0b20ce
+  metadata.gz: 30912406c5bb74e24220261df7b201a733cf17c8
+  data.tar.gz: e03fffdc28479f2e4a854d2fe325f960945b7538
 SHA512:
-  metadata.gz: 7ae61ed59f8998c28ec53a24e57736341d8eef93c2b2ecacc7da8618e8ae5d32c5b146ad9cc1039f5adacbf69d4ade054419bfef6f6d63863a5d84c6fd691261
-  data.tar.gz: 47d40f00541f16b31f0970fc459110da505cd0cb73d7e2c12fcf5648384f10dd3d399959cc3cedbbd565fa949bb92aae4fab1026414ddafc94a7fded50eb38a9
+  metadata.gz: cf4dae8e5fafc0a1fafdca3dd4ea37bfc13b0675426f33ce1e749356681c8ead432c72e6fcc32ba7feacd796e6e205e1f9591e8b95919457a7634ae920266a14
+  data.tar.gz: e34d36ee0924adbd0e9d97bee1a40e18209126935a12b1ddd03336139bbb31ad3fb9660ce0ef8b2195790c3c18dd6ba8a9f1a066e21088912f193582afba0e18

data/lib/has_friendship/friendable.rb

@@ -85,7 +85,7 @@ module HasFriendship
       end
 
       def friends_with?(friend)
-        HasFriendship::Friendship.find_relation(self, friend).any?
+        HasFriendship::Friendship.find_relation(self, friend, status: 'accepted').any?
       end
 
       private

data/lib/has_friendship/friendship.rb

@@ -1,11 +1,17 @@
 module HasFriendship
   class Friendship < ActiveRecord::Base
-    def self.relation_attributes(one, other)
-      {
+    def self.relation_attributes(one, other, status: nil)
+      attr = {
         friendable_id: one.id,
         friendable_type: one.class.base_class.name,
         friend_id: other.id
       }
+
+      if status
+        attr[:status] = status
+      end
+
+      attr
     end
 
     def self.create_relation(one, other, options)
@@ -14,8 +20,8 @@ module HasFriendship
       relation.save
     end
 
-    def self.find_relation(friendable, friend)
-      where relation_attributes(friendable, friend)
+    def self.find_relation(friendable, friend, status: nil)
+      where relation_attributes(friendable, friend, status: status)
     end
 
     def self.exist?(friendable, friend)

data/lib/has_friendship/version.rb

@@ -1,3 +1,3 @@
 module HasFriendship
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: has_friendship
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Sung Won Cho
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-20 00:00:00.000000000 Z
+date: 2016-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails