amico 2.3.1 → 2.3.2

data/.rspec

@@ -1,2 +1,3 @@
 --color
---format nested
+--format nested
+--order random

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 2.3.2 (2013-01-04)
+
+* Fixed an issue where the call to `reciprocated?` in the internal method `add_following_followers_reciprocated` was not passing along the scope.
+
 ## 2.3.1 (2012-09-13)
 
 * Wrapped a few operations in Redis multi/exec blocks to be consistent with the rest of the library.

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2012 David Czarnecki
+Copyright (c) 2012-2013 David Czarnecki
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -605,5 +605,5 @@ user-defined in the future to allow for some specific ordering.
 
 ## Copyright
 
-Copyright (c) 2012 David Czarnecki. See LICENSE.txt for further details.
+Copyright (c) 2012-2013 David Czarnecki. See LICENSE.txt for further details.
 

data/lib/amico/relationships.rb

@@ -1,9 +1,9 @@
 module Amico
   module Relationships
-  	# Establish a follow relationship between two IDs. After adding the follow 
-  	# relationship, it checks to see if the relationship is reciprocated and establishes that 
+  	# Establish a follow relationship between two IDs. After adding the follow
+  	# relationship, it checks to see if the relationship is reciprocated and establishes that
   	# relationship if so.
-  	# 
+  	#
   	# @param from_id [String] The ID of the individual establishing the follow relationship.
   	# @param to_id [String] The ID of the individual to be followed.
   	# @param scope [String] Scope for the call.
@@ -16,24 +16,24 @@ module Amico
   	  return if blocked?(to_id, from_id, scope)
   	  return if Amico.pending_follow && pending?(from_id, to_id, scope)
 
-  	  unless Amico.pending_follow
-  		  add_following_followers_reciprocated(from_id, to_id, scope)
-  	  else
-        Amico.redis.multi do
-    		  Amico.redis.zadd("#{Amico.namespace}:#{Amico.pending_key}:#{scope}:#{to_id}", Time.now.to_i, from_id)
-    		  Amico.redis.zadd("#{Amico.namespace}:#{Amico.pending_with_key}:#{scope}:#{from_id}", Time.now.to_i, to_id)
+  	  if Amico.pending_follow
+        Amico.redis.multi do |transaction|
+          transaction.zadd("#{Amico.namespace}:#{Amico.pending_key}:#{scope}:#{to_id}", Time.now.to_i, from_id)
+          transaction.zadd("#{Amico.namespace}:#{Amico.pending_with_key}:#{scope}:#{from_id}", Time.now.to_i, to_id)
         end
+  	  else
+        add_following_followers_reciprocated(from_id, to_id, scope)
   	  end
   	end
 
-  	# Remove a follow relationship between two IDs. After removing the follow 
-  	# relationship, if a reciprocated relationship was established, it is 
+  	# Remove a follow relationship between two IDs. After removing the follow
+  	# relationship, if a reciprocated relationship was established, it is
   	# also removed.
   	#
   	# @param from_id [String] The ID of the individual removing the follow relationship.
   	# @param to_id [String] The ID of the individual to be unfollowed.
   	# @param scope [String] Scope for the call.
-  	# 
+  	#
   	# Examples
   	#
   	#   Amico.follow(1, 11)
@@ -49,10 +49,10 @@ module Amico
     		Amico.redis.zrem("#{Amico.namespace}:#{Amico.pending_key}:#{scope}:#{to_id}", from_id)
     		Amico.redis.zrem("#{Amico.namespace}:#{Amico.pending_with_key}:#{scope}:#{from_id}", to_id)
   	  end
-  	end  
+  	end
 
-  	# Block a relationship between two IDs. This method also has the side effect 
-  	# of removing any follower or following relationship between the two IDs. 
+  	# Block a relationship between two IDs. This method also has the side effect
+  	# of removing any follower or following relationship between the two IDs.
   	#
   	# @param from_id [String] The ID of the individual blocking the relationship.
   	# @param to_id [String] The ID of the individual being blocked.
@@ -83,9 +83,9 @@ module Amico
   	# @param from_id [String] The ID of the individual unblocking the relationship.
   	# @param to_id [String] The ID of the blocked individual.
   	# @param scope [String] Scope for the call.
-  	# 
+  	#
   	# Examples
-  	# 
+  	#
   	#   Amico.block(1, 11)
   	#   Amico.unblock(1, 11)
   	def unblock(from_id, to_id, scope = Amico.default_scope_key)
@@ -117,11 +117,11 @@ module Amico
   	end
 
   	# Deny a relationship that is pending between two IDs.
-  	# 
+  	#
   	# @param from_id [String] The ID of the individual denying the relationship.
   	# @param to_id [String] The ID of the individual to be denied.
   	# @param scope [String] Scope for the call.
-  	# 
+  	#
   	# Example
   	#
   	#   Amico.follow(1, 11)
@@ -140,12 +140,12 @@ module Amico
 
     # Clears all relationships (in either direction) stored for an individual.
     # Helpful to prevent orphaned associations when deleting users.
-    # 
+    #
     # @param id [String] ID of the individual to clear info for.
     # @param scope [String] Scope for the call.
-    # 
+    #
     # Examples
-    # 
+    #
     #   Amico.follow(1, 11)
     #   Amico.followers_count(11)  => 1
     #   Amico.clear(1)
@@ -167,9 +167,9 @@ module Amico
   	#
   	# @param id [String] ID of the individual to retrieve following count for.
   	# @param scope [String] Scope for the call.
-  	# 
+  	#
   	# Examples
-  	# 
+  	#
   	#   Amico.follow(1, 11)
   	#   Amico.following_count(1)
   	#
@@ -187,7 +187,7 @@ module Amico
   	#
   	#   Amico.follow(11, 1)
   	#   Amico.followers_count(1)
-  	# 
+  	#
   	# @return the count of the number of individuals that are following someone.
   	def followers_count(id, scope = Amico.default_scope_key)
   	  Amico.redis.zcard("#{Amico.namespace}:#{Amico.followers_key}:#{scope}:#{id}")
@@ -197,7 +197,7 @@ module Amico
   	#
   	# @param id [String] ID of the individual to retrieve blocked count for.
   	# @param scope [String] Scope for the call.
-  	# 
+  	#
   	# Examples
   	#
   	#   Amico.block(1, 11)
@@ -212,7 +212,7 @@ module Amico
   	#
   	# @param id [String] ID of the individual to retrieve blocked_by count for.
   	# @param scope [String] Scope for the call.
-  	# 
+  	#
   	# Examples
   	#
   	#   Amico.block(1, 11)
@@ -227,9 +227,9 @@ module Amico
   	#
   	# @param id [String] ID of the individual to retrieve reciprocated following count for.
   	# @param scope [String] Scope for the call.
-  	# 
+  	#
   	# Examples
-  	# 
+  	#
   	#   Amico.follow(1, 11)
   	#   Amico.follow(11, 1)
   	#   Amico.reciprocated_count(1)
@@ -243,7 +243,7 @@ module Amico
   	#
   	# @param id [String] ID of the individual to retrieve pending count for.
   	# @param scope [String] Scope for the call.
-  	# 
+  	#
   	# Examples
   	#
   	#   Amico.follow(11, 1)
@@ -259,7 +259,7 @@ module Amico
   	#
   	# @param id [String] ID of the individual to retrieve pending count for.
   	# @param scope [String] Scope for the call.
-  	# 
+  	#
   	# Examples
   	#
   	#   Amico.follow(1, 11)
@@ -310,7 +310,7 @@ module Amico
   	# @param scope [String] Scope for the call.
   	#
   	# Examples
-  	# 
+  	#
   	#   Amico.block(1, 11)
   	#   Amico.blocked?(1, 11)
   	#
@@ -326,7 +326,7 @@ module Amico
   	# @param scope [String] Scope for the call.
   	#
   	# Examples
-  	# 
+  	#
   	#   Amico.block(1, 11)
   	#   Amico.blocked_by?(11, 1)
   	#
@@ -408,7 +408,7 @@ module Amico
   	# @param scope [String] Scope for the call.
   	#
   	# Examples
-  	# 
+  	#
   	#   Amico.follow(11, 1)
   	#   Amico.follow(12, 1)
   	#   Amico.followers(1, :page => 1)
@@ -550,7 +550,7 @@ module Amico
   	#   Amico.block(1, 11)
   	#   Amico.block(1, 12)
   	#   Amico.blocked_page_count(1)
-  	#    
+  	#
   	# @return the number of pages of blocked relationships for an individual.
   	def blocked_page_count(id, page_size = Amico.page_size, scope = Amico.default_scope_key)
   	  total_pages("#{Amico.namespace}:#{Amico.blocked_key}:#{scope}:#{id}", page_size)
@@ -567,7 +567,7 @@ module Amico
   	#   Amico.block(11, 1)
   	#   Amico.block(12, 1)
   	#   Amico.blocked_by_page_count(1)
-  	#    
+  	#
   	# @return the number of pages of blocked_by relationships for an individual.
   	def blocked_by_page_count(id, page_size = Amico.page_size, scope = Amico.default_scope_key)
   	  total_pages("#{Amico.namespace}:#{Amico.blocked_by_key}:#{scope}:#{id}", page_size)
@@ -586,7 +586,7 @@ module Amico
   	#   Amico.follow(11, 1)
   	#   Amico.follow(12, 1)
   	#   Amico.reciprocated_page_count(1)
-  	#    
+  	#
   	# @return the number of pages of reciprocated relationships for an individual.
   	def reciprocated_page_count(id, page_size = Amico.page_size, scope = Amico.default_scope_key)
   	  total_pages("#{Amico.namespace}:#{Amico.reciprocated_key}:#{scope}:#{id}", page_size)
@@ -603,7 +603,7 @@ module Amico
   	#   Amico.follow(11, 1)
   	#   Amico.follow(12, 1)
   	#   Amico.pending_page_count(1) # 1
-  	#    
+  	#
   	# @return the number of pages of pending relationships for an individual.
   	def pending_page_count(id, page_size = Amico.page_size, scope = Amico.default_scope_key)
   	  total_pages("#{Amico.namespace}:#{Amico.pending_key}:#{scope}:#{id}", page_size)
@@ -620,7 +620,7 @@ module Amico
   	#   Amico.follow(1, 11)
   	#   Amico.follow(1, 12)
   	#   Amico.pending_with_page_count(1) # 1
-  	#    
+  	#
   	# @return the number of pages of individuals waiting to approve another individual.
   	def pending_with_page_count(id, page_size = Amico.page_size, scope = Amico.default_scope_key)
   	  total_pages("#{Amico.namespace}:#{Amico.pending_with_key}:#{scope}:#{id}", page_size)
@@ -668,7 +668,7 @@ module Amico
     VALID_RELATIONSHIPS = [:following, :followers, :reciprocated, :blocked, :blocked_by, :pending, :pending_with]
 
     # Ensure that a relationship type is valid.
-    # 
+    #
     # @param type [Symbol] One of :following, :followers, :reciprocated, :blocked, :blocked_by, :pending, :pending_with.
     # @raise [StandardError] if the type is not included in VALID_RELATIONSHIPS
     def validate_relationship_type(type)
@@ -682,11 +682,11 @@ module Amico
   	  {:page_size => Amico.page_size, :page => 1}
   	end
 
-  	# Add the following, followers and check for a reciprocated relationship. To be used from the 
+  	# Add the following, followers and check for a reciprocated relationship. To be used from the
   	# +follow+ and +accept+ methods.
   	#
   	# @param from_id [String] The ID of the individual establishing the follow relationship.
-  	# @param to_id [String] The ID of the individual to be followed. 
+  	# @param to_id [String] The ID of the individual to be followed.
   	def add_following_followers_reciprocated(from_id, to_id, scope)
   	  Amico.redis.multi do
     		Amico.redis.zadd("#{Amico.namespace}:#{Amico.following_key}:#{scope}:#{from_id}", Time.now.to_i, to_id)
@@ -695,12 +695,12 @@ module Amico
     		Amico.redis.zrem("#{Amico.namespace}:#{Amico.pending_with_key}:#{scope}:#{from_id}", to_id)
   	  end
 
-  	  if reciprocated?(from_id, to_id)
+  	  if reciprocated?(from_id, to_id, scope)
     		Amico.redis.multi do
     		  Amico.redis.zadd("#{Amico.namespace}:#{Amico.reciprocated_key}:#{scope}:#{from_id}", Time.now.to_i, to_id)
     		  Amico.redis.zadd("#{Amico.namespace}:#{Amico.reciprocated_key}:#{scope}:#{to_id}", Time.now.to_i, from_id)
     		end
-  	  end      
+  	  end
   	end
 
   	# Removes references to an individual in sets that are named with other individual's keys.

data/lib/amico/version.rb

@@ -1,3 +1,3 @@
 module Amico
-  VERSION = '2.3.1'
+  VERSION = '2.3.2'
 end

data/spec/amico/relationships_spec.rb

@@ -138,6 +138,17 @@ describe Amico::Relationships do
       Amico.follow(1, 11)
       Amico.reciprocated?(1, 11).should be_false
     end
+
+    it 'should respect scope when checking if a relationship is reciprocated' do
+      Amico.follow(1, 11, 'another_scope')
+      Amico.follow(11, 1, 'another_scope')
+      Amico.follow(1, 11, 'another_scope')
+      Amico.reciprocated?(1, 11).should be_false
+      Amico.reciprocated?(1, 11, 'another_scope').should be_true
+      Amico.follow(1, 11)
+      Amico.follow(11, 1)
+      Amico.reciprocated?(1, 11).should be_true
+    end
   end
 
   describe '#following' do
@@ -388,9 +399,9 @@ describe Amico::Relationships do
         Amico.follow(1, 11)
         Amico.pending?(1, 11).should be_true
         Amico.pending_with?(11, 1).should be_true
-        
+
         Amico.deny(1, 11)
-        
+
         Amico.following?(1, 11).should be_false
         Amico.pending?(1, 11).should be_false
         Amico.pending_with?(11, 1).should be_false
@@ -630,16 +641,16 @@ describe Amico::Relationships do
     it 'should remove follower/following relationships' do
       Amico.follow(1, 11)
       Amico.follow(11, 1)
-      
+
       Amico.following_count(1).should be(1)
       Amico.followers_count(1).should be(1)
       Amico.reciprocated_count(1).should be(1)
       Amico.following_count(11).should be(1)
       Amico.followers_count(11).should be(1)
       Amico.reciprocated_count(11).should be(1)
-      
+
       Amico.clear(1)
-      
+
       Amico.following_count(1).should be(0)
       Amico.followers_count(1).should be(0)
       Amico.reciprocated_count(1).should be(0)
@@ -657,7 +668,7 @@ describe Amico::Relationships do
       Amico.pending_count(11).should be(0)
       Amico.pending_follow = previous_pending_value
     end
-    
+
     it 'should clear blocked/blocked_by relationships' do
       Amico.block(1, 11)
       Amico.blocked_count(1).should be(1)

data/spec/amico/version_spec.rb

@@ -2,6 +2,6 @@ require 'spec_helper'
 
 describe 'Amico::VERSION' do
   it 'should be the correct version' do
-    Amico::VERSION.should == '2.3.1'
+    Amico::VERSION.should == '2.3.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amico
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-13 00:00:00.000000000 Z
+date: 2013-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -95,12 +95,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1960830450408836272
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1960830450408836272
 requirements: []
 rubyforge_project: amico
 rubygems_version: 1.8.24