amico 2.2.0 → 2.3.0

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 2.3.0 (2012-08-29)
+
+* Added `deny(from_id, to_id, scope = Amico.default_scope_key)` to remove a relationship that is pending between two IDs.
+
+Again, thanks to [Skip Baney](https://github.com/twelvelabs) for the pull request with this functionality.
+
 ## 2.2.0 (2012-08-27)
 
 * Added `clear(id, scope = Amico.default_scope_key)` method to clear all relationships (in either direction) stored for an individual.

data/README.md

@@ -13,7 +13,7 @@ gem 'amico'
 ```
 
 Make sure your redis server is running! Redis configuration is outside the scope of this README, but
-check out the Redis documentation, http://redis.io/documentation.
+check out the [Redis documentation](http://redis.io/documentation).
 
 ## Usage
 
@@ -222,6 +222,25 @@ Amico.follower?(1, 11)
 
 Amico.reciprocated?(1, 11)
  => true
+
+Amico.follow(1, 12)
+ => true
+
+Amico.following?(1, 12)
+ => false
+
+Amico.pending?(1, 12)
+ => true
+
+Amico.deny(1, 12)
+ => true
+
+Amico.following?(1, 12)
+ => false
+
+Amico.pending?(1, 12)
+ => false
+
 ```
 
 Use amico with nicknames instead of IDs. NOTE: This could cause you much hardship later on if you allow nicknames to change.
@@ -482,6 +501,8 @@ block(from_id, to_id, scope = Amico.default_scope_key)
 unblock(from_id, to_id, scope = Amico.default_scope_key)
 # Accept a relationship that is pending between two IDs.
 accept(from_id, to_id, scope = Amico.default_scope_key)
+# Deny a relationship that is pending between two IDs.
+deny(from_id, to_id, scope = Amico.default_scope_key)
 # Clear all relationships (in either direction) for a given ID.
 clear(id, scope = Amico.default_scope_key)
 

data/lib/amico/relationships.rb

@@ -114,6 +114,25 @@ module Amico
 	  add_following_followers_reciprocated(from_id, to_id, scope)
 	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)
+	#   Amico.pending?(1, 11) # true
+	#   Amico.deny(1, 11)
+	#   Amico.pending?(1, 11) # false
+	#   Amico.following?(1, 11) #false
+	def deny(from_id, to_id, scope = Amico.default_scope_key)
+		return if from_id == to_id
+		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
+
   # Clears all relationships (in either direction) stored for an individual.
   # Helpful to prevent orphaned associations when deleting users.
   # 

data/lib/amico/version.rb

@@ -1,3 +1,3 @@
 module Amico
-  VERSION = '2.2.0'
+  VERSION = '2.3.0'
 end

data/spec/amico/relationships_spec.rb

@@ -383,6 +383,21 @@ describe Amico::Relationships do
       end
     end
 
+    describe '#deny' do
+      it 'should remove the pending relationship without following or blocking' 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
+        Amico.blocked?(1, 11).should be_false
+      end
+    end
+
     describe '#block' do
       it 'should remove the pending relationship if you block someone' do
         Amico.follow(11, 1)
@@ -635,11 +650,13 @@ describe Amico::Relationships do
       Amico.reciprocated_count(11).should be(0)
     end
     it 'should clear pending/pending_with relationships' do
+      previous_pending_value = Amico.pending_follow
       Amico.pending_follow = true
       Amico.follow(1, 11)
       Amico.pending_count(11).should be(1)
       Amico.clear(1)
       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)

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.2.0'
+    Amico::VERSION.should == '2.3.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amico
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-27 00:00:00.000000000 Z
+date: 2012-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -95,18 +95,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1949101995631561364
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1949101995631561364
 requirements: []
 rubyforge_project: amico
 rubygems_version: 1.8.24