friendis 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2bfbf27325dc7aeb0b8d2f49f3aeecf49db19106
-  data.tar.gz: 0d8f9ee977a62be3f5134f63c7705c1d71f33104
+  metadata.gz: 356a53acac2adc1dd9b0c89cedb8b96c3da62591
+  data.tar.gz: 134819bde4df5bde734e1286e6da35b4f3616615
 SHA512:
-  metadata.gz: c9d6f3a03d2628becef77db1da3fc01e6c388dddec80e57a4e1135d002c6134541fd61d9af5658bd3b9a6ec047ca996e04e79ed32d5857762fccde4bbbcac35f
-  data.tar.gz: 16432b72c2cbeb7514f0e63633abb0d038dc09e123a37e820ba0902b4156324cfdfc60d796c41b98e2e9264f5ade3e785a25c71c9fbae56c150ab50ec20ce839
+  metadata.gz: 1039c86f859140f530a4902b3441bc49306b528f9804d7abdda5dbf2f5ad2c191706dd0433d793b4c4eaaf365461266ca90761c3d94a7d153266963bf9ac61b7
+  data.tar.gz: dd91a510ce170f278663e858d841313540464f907a8cb6de16bfc0524e97dbb2a60389df65e9be61d4582ef354f6bf058fa4d3f30c431f68e4784449c816eb1d

data/lib/friendis/friendable.rb

@@ -15,7 +15,7 @@ module Friendis
     end
 
     module ClassMethods
-      
+
       # Mark the list of fields to track in redis for fast access.
       def friend_this(options = {})
         configuration = {
@@ -37,9 +37,9 @@ module Friendis
 
     end
 
-    module InstanceMethods 
+    module InstanceMethods
+
 
-      
 
       def get_friendis_meta(uuid = nil)
         Friendis.redis.hgetall friendis_meta_key(uuid)
@@ -53,31 +53,26 @@ module Friendis
       end
 
       def approve_friend_request(friend)
-        if !(Friendis.redis.sismember(friendis_incoming_friend_requests_key, friend.id.to_s))
-          return false
-        else
-          Friendis.redis.multi do
-            Friendis.redis.srem friend.friendis_outgoing_friend_requests_key, self.id.to_s
-            Friendis.redis.srem friendis_incoming_friend_requests_key, friend.id.to_s
-            Friendis.redis.sadd friendis_my_friends_key, friend.id.to_s
-            Friendis.redis.sadd friend.friendis_my_friends_key, self.id.to_s
-          end
-          return true
+        return false unless has_friend_request_from?(friend)
+
+        Friendis.redis.multi do
+          Friendis.redis.srem friend.friendis_outgoing_friend_requests_key, self.id.to_s
+          Friendis.redis.srem friendis_incoming_friend_requests_key, friend.id.to_s
+          Friendis.redis.sadd friendis_my_friends_key, friend.id.to_s
+          Friendis.redis.sadd friend.friendis_my_friends_key, self.id.to_s
         end
+        true
       end
 
       def ignore_friend_request(friend)
-        if !(Friendis.redis.sismember(friendis_incoming_friend_requests_key, friend.id.to_s))
-          return false
-        else
-
-          # Ignoring a friend request, leaves the request in the requester queue, but removes
-          # it from the pending requests list of the recipient.
-          Friendis.redis.multi do
-            Friendis.redis.srem friendis_incoming_friend_requests_key, friend.id.to_s
-          end
-          return true
+        return false unless has_friend_request_from?(friend)
+
+        # Ignoring a friend request, leaves the request in the requester queue, but removes
+        # it from the pending requests list of the recipient.
+        Friendis.redis.multi do
+          Friendis.redis.srem friendis_incoming_friend_requests_key, friend.id.to_s
         end
+        true
       end
 
       def unfriend(friend)
@@ -91,6 +86,10 @@ module Friendis
         Friendis.redis.smembers(friendis_my_friends_key).collect {|friend_id| get_friendis_meta(friend_id)}
       end
 
+      def has_friend_request_from?(friend) 
+        Friendis.redis.sismember friendis_incoming_friend_requests_key, friend.id.to_s
+      end
+
       def is_friends_with?(friend)
         Friendis.redis.sismember friendis_my_friends_key, friend.id.to_s
       end

data/lib/friendis/version.rb

@@ -1,3 +1,3 @@
 module Friendis
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/lib/friendable_spec.rb

@@ -117,4 +117,28 @@ describe Friendis::Friendable do
 
   end
 
+  describe "#has_friend_request_from?" do
+    before(:each) do
+      @user1 = User.new(1)
+      @user2 = User.new(2)
+
+      @user1.clear_friendis_data
+      @user2.clear_friendis_data
+
+      @user1.save
+      @user2.save
+
+      @user1.send_friend_request(@user2)
+    end
+
+    it "should return true if a user has request from other" do
+      @user2.has_friend_request_from?(@user1).should be_truthy
+    end
+
+    it "should return false if a user has no request from other" do
+      @user1.has_friend_request_from?(@user2).should be_falsy
+    end
+
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: friendis
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Elad Meidar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-11 00:00:00.000000000 Z
+date: 2016-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -110,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Friendis implements friendship relationship between objects on Redis
@@ -120,3 +120,4 @@ test_files:
 - spec/lib/friendable_spec.rb
 - spec/models/user.rb
 - spec/spec_helper.rb
+has_rdoc: