acts_as_amico 0.2.2 → 0.2.4

data/lib/acts_as_amico/amico_object.rb

@@ -10,6 +10,19 @@ module ActsAsAmico
         @amico_key ||= :id
       end
 
+      def amico_methods
+        @result || begin
+          result = []
+          methods = [:following, :followers, :blocked, :reciprocated, :pending]
+          methods.each do |m|
+            ["_count", "_page_count" ].each do |s|
+              result << "#{m.to_s}#{s}".to_sym
+            end
+          end
+          result
+        end
+      end
+
       def acts_as_amico *args
         options = args.extract_options!
         options.assert_valid_keys(:amico_key)
@@ -25,7 +38,7 @@ module ActsAsAmico
       end
 
       def method_missing(sym, *args, &block)
-        if Amico.respond_to? sym
+        if self.class.amico_methods.include? sym
           args[0] = args[0].amico_key if not args[0].nil? and args[0].respond_to?(:amico_key)
           args.unshift(amico_key)
           if sym.nil?
@@ -42,26 +55,81 @@ module ActsAsAmico
         pass_sym_to_amico(sym) || super(sym)
       end
 
+      def get_all *args
+        options = args.extract_options!
+        options.assert_valid_keys(:scope)
+        valid_params = [:following, :followers, :blocked, :reciprocated, :pending]
+        scope = options[:scope] || Amico.default_scope_key
+        meth = args[0]
+        raise "Must be one of #{valid_params.to_s}" if not valid_params.include? meth
+        count = self.send("#{meth}_count".to_sym, scope)
+        self.send("#{meth}", :page_size => count, :scope => scope)
+      end
+
+      # Lists
       def followers options = {}
-        key = options[:scope] || Amico.default_scope_key
-        Amico.followers(amico_key, options, key)
+        scope = options[:scope] || Amico.default_scope_key
+        Amico.followers amico_key, options, scope
+      end
+      def following options = {}
+        scope = options[:scope] || Amico.default_scope_key
+        Amico.following amico_key, options, scope
+      end
+      def reciprocated options = {}
+        scope = options[:scope] || Amico.default_scope_key
+        Amico.reciprocated amico_key, options, scope
+      end
+      def pending options = {}
+        scope = options[:scope] || Amico.default_scope_key
+        Amico.pending amico_key, options, scope
+      end
+      def blocked options = {}
+        scope = options[:scope] || Amico.default_scope_key
+        Amico.blocked amico_key, options, scope
       end
 
       # Named destructive methods
-      def follow! obj, *args
-        Amico.follow(amico_key, obj.amico_key, *args)
+      def follow! obj, options = {}
+        scope = options[:scope] || Amico.default_scope_key
+        Amico.follow(amico_key, obj.amico_key, scope)
+      end
+      def unfollow! obj, options = {}
+        scope = options[:scope] || Amico.default_scope_key
+        Amico.unfollow(amico_key, obj.amico_key, scope)
+      end
+      def accept! obj, options = {}
+        scope = options[:scope] || Amico.default_scope_key
+        Amico.accept(amico_key, obj.amico_key, scope)
+      end
+      def block! obj, options = {}
+        scope = options[:scope] || Amico.default_scope_key
+        Amico.block(amico_key, obj.amico_key, scope)
+      end
+      def unblock! obj, options = {}
+        scope = options[:scope] || Amico.default_scope_key
+        Amico.unblock(amico_key, obj.amico_key, scope)
+      end
+
+      # Booleans
+      def following? obj, options = {}
+        scope = options[:scope] || Amico.default_scope_key
+        Amico.following?(amico_key, obj.amico_key, scope)
       end
-      def unfollow! obj, *args
-        Amico.unfollow(amico_key, obj.amico_key, *args)
+      def follower? obj, options = {}
+        scope = options[:scope] || Amico.default_scope_key
+        Amico.follower?(amico_key, obj.amico_key, scope)
       end
-      def accept! obj, *args
-        Amico.accept(amico_key, obj.amico_key, *args)
+      def blocked? obj, options = {}
+        scope = options[:scope] || Amico.default_scope_key
+        Amico.blocked?(amico_key, obj.amico_key, scope)
       end
-      def block! obj, *args
-        Amico.block(amico_key, obj.amico_key, *args)
+      def pending? obj, options = {}
+        scope = options[:scope] || Amico.default_scope_key
+        Amico.pending?(amico_key, obj.amico_key, scope)
       end
-      def unblock! obj, *args
-        Amico.unblock(amico_key, obj.amico_key, *args)
+      def reciprocated? obj, options = {}
+        scope = options[:scope] || Amico.default_scope_key
+        Amico.reciprocated?(amico_key, obj.amico_key, scope)
       end
 
       private

data/lib/acts_as_amico/version.rb

@@ -1,3 +1,3 @@
 module ActsAsAmico
-  VERSION = '0.2.2'
+  VERSION = '0.2.4'
 end

data/spec/active_resource_spec.rb

@@ -36,14 +36,16 @@ describe ActsAsAmico do
   end
 
   it "should follow" do
-    @usera.follow! @admin, 'admin'
-    @usera.following?(@admin, 'admin').should be_true
+    @usera.follow! @admin, :scope => 'admin'
+    @usera.following?(@admin, :scope => 'admin').should be_true
     @admin.followers(:scope => 'admin').include?(@usera.amico_key.to_s).should be_true
   end
   it "should allow following an ActiveResource object" do
-    @usera.follow! @rest_object, 'rest_object'
-    @usera.following?(@rest_object, 'rest_object').should be_true
+    @usera.follow! @rest_object, :scope => 'rest_object'
+    @usera.following?(@rest_object, :scope => 'rest_object').should be_true
 
     @rest_object.followers(:scope => 'rest_object').include?(@usera.amico_key.to_s).should be_true
   end
+
+
 end

data/spec/amico_object_spec.rb

@@ -16,36 +16,36 @@ describe ActsAsAmico do
 
   describe '#follow' do
     it 'should allow you to follow' do
-      @usera.follow(@userb)
+      @usera.follow!(@userb)
 
       Amico.redis.zcard("#{Amico.namespace}:#{Amico.following_key}:#{Amico.default_scope_key}:#{@usera.send(@usera.class.amico_key)}").should be(1)
       Amico.redis.zcard("#{Amico.namespace}:#{Amico.followers_key}:#{Amico.default_scope_key}:#{@userb.send(@userb.class.amico_key)}").should be(1)
     end
 
     it 'should not allow you to follow yourself' do
-      @usera.follow(@usera)
+      @usera.follow!(@usera)
 
       Amico.redis.zcard("#{Amico.namespace}:#{Amico.following_key}:#{Amico.default_scope_key}:#{@usera.send(@usera.class.amico_key)}").should be(0)
     end
 
     it 'should add each individual to the reciprocated set if you both follow each other' do
-      @usera.follow(@userb)
-      @userb.follow(@usera)
+      @usera.follow!(@userb)
+      @userb.follow!(@usera)
 
       Amico.redis.zcard("#{Amico.namespace}:#{Amico.reciprocated_key}:#{Amico.default_scope_key}:#{@usera.send(@usera.class.amico_key)}").should be(1)
       Amico.redis.zcard("#{Amico.namespace}:#{Amico.reciprocated_key}:#{Amico.default_scope_key}:#{@userb.send(@userb.class.amico_key)}").should be(1)
     end
     describe "with non-id key" do
       it 'should allow you to follow' do
-        @usera.follow(@admin)
+        @usera.follow!(@admin)
 
         Amico.redis.zcard("#{Amico.namespace}:#{Amico.following_key}:#{Amico.default_scope_key}:#{@usera.send(@usera.class.amico_key)}").should be(1)
         Amico.redis.zcard("#{Amico.namespace}:#{Amico.followers_key}:#{Amico.default_scope_key}:#{@admin.send(@admin.class.amico_key)}").should be(1)
       end
 
       it 'should add each individual to the reciprocated set if you both follow each other' do
-        @usera.follow(@admin)
-        @admin.follow(@usera)
+        @usera.follow!(@admin)
+        @admin.follow!(@usera)
 
         Amico.redis.zcard("#{Amico.namespace}:#{Amico.reciprocated_key}:#{Amico.default_scope_key}:#{@usera.send(@usera.class.amico_key)}").should be(1)
         Amico.redis.zcard("#{Amico.namespace}:#{Amico.reciprocated_key}:#{Amico.default_scope_key}:#{@admin.send(@admin.class.amico_key)}").should be(1)
@@ -56,12 +56,12 @@ describe ActsAsAmico do
 
   describe '#unfollow' do
     it 'should allow you to unfollow' do
-      @usera.follow(@userb)
+      @usera.follow!(@userb)
 
       Amico.redis.zcard("#{Amico.namespace}:#{Amico.following_key}:#{Amico.default_scope_key}:#{@usera.send(@usera.class.amico_key)}").should be(1)
       Amico.redis.zcard("#{Amico.namespace}:#{Amico.followers_key}:#{Amico.default_scope_key}:#{@userb.send(@userb.class.amico_key)}").should be(1)
 
-      @usera.unfollow(@userb)
+      @usera.unfollow!(@userb)
 
       Amico.redis.zcard("#{Amico.namespace}:#{Amico.following_key}:#{Amico.default_scope_key}:#{@usera.send(@usera.class.amico_key)}").should be(0)
       Amico.redis.zcard("#{Amico.namespace}:#{Amico.followers_key}:#{Amico.default_scope_key}:#{@userb.send(@userb.class.amico_key)}").should be(0)
@@ -71,12 +71,12 @@ describe ActsAsAmico do
 
     describe "non-id key" do
       it 'should allow you to unfollow' do
-        @usera.follow(@admin)
+        @usera.follow!(@admin)
 
         Amico.redis.zcard("#{Amico.namespace}:#{Amico.following_key}:#{Amico.default_scope_key}:#{@usera.send(@usera.class.amico_key)}").should be(1)
         Amico.redis.zcard("#{Amico.namespace}:#{Amico.followers_key}:#{Amico.default_scope_key}:#{@admin.send(@admin.class.amico_key)}").should be(1)
 
-        @usera.unfollow(@admin)
+        @usera.unfollow!(@admin)
 
         Amico.redis.zcard("#{Amico.namespace}:#{Amico.following_key}:#{Amico.default_scope_key}:#{@usera.send(@usera.class.amico_key)}").should be(0)
         Amico.redis.zcard("#{Amico.namespace}:#{Amico.followers_key}:#{Amico.default_scope_key}:#{@admin.send(@admin.class.amico_key)}").should be(0)
@@ -88,8 +88,8 @@ describe ActsAsAmico do
 
   describe '#block' do
     it 'should allow you to block someone following you' do
-      @userb.follow(@usera)
-      @usera.block(@userb)
+      @userb.follow!(@usera)
+      @usera.block!(@userb)
 
       Amico.redis.zcard("#{Amico.namespace}:#{Amico.following_key}:#{Amico.default_scope_key}:#{@userb.send(@userb.class.amico_key)}").should be(0)
       Amico.redis.zcard("#{Amico.namespace}:#{Amico.blocked_key}:#{Amico.default_scope_key}:#{@usera.send(@usera.class.amico_key)}").should be(1)
@@ -98,32 +98,32 @@ describe ActsAsAmico do
     end
 
     it 'should allow you to block someone who is not following you' do
-      @usera.block(@userb)
+      @usera.block!(@userb)
 
       Amico.redis.zcard("#{Amico.namespace}:#{Amico.following_key}:#{Amico.default_scope_key}:#{@userb.send(@userb.class.amico_key)}").should be(0)
       Amico.redis.zcard("#{Amico.namespace}:#{Amico.blocked_key}:#{Amico.default_scope_key}:#{@usera.send(@usera.class.amico_key)}").should be(1)
     end
 
     it 'should not allow someone you have blocked to follow you' do
-      @usera.block(@userb)
+      @usera.block!(@userb)
 
       Amico.redis.zcard("#{Amico.namespace}:#{Amico.following_key}:#{Amico.default_scope_key}:#{@userb.send(@userb.class.amico_key)}").should be(0)
       Amico.redis.zcard("#{Amico.namespace}:#{Amico.blocked_key}:#{Amico.default_scope_key}:#{@usera.send(@usera.class.amico_key)}").should be(1)
 
-      @userb.follow(@usera)
+      @userb.follow!(@usera)
 
       Amico.redis.zcard("#{Amico.namespace}:#{Amico.following_key}:#{Amico.default_scope_key}:#{@userb.send(@userb.class.amico_key)}").should be(0)
       Amico.redis.zcard("#{Amico.namespace}:#{Amico.blocked_key}:#{Amico.default_scope_key}:#{@usera.send(@usera.class.amico_key)}").should be(1)
     end
 
     it 'should not allow you to block yourself' do
-      @usera.block(@usera)
+      @usera.block!(@usera)
       @usera.blocked?(@usera).should be_false
     end
     describe "non-id key" do
       it 'should allow you to block someone following you' do
-        @admin.follow(@usera)
-        @usera.block(@admin)
+        @admin.follow!(@usera)
+        @usera.block!(@admin)
 
         Amico.redis.zcard("#{Amico.namespace}:#{Amico.following_key}:#{Amico.default_scope_key}:#{@userb.send(@admin.class.amico_key)}").should be(0)
         Amico.redis.zcard("#{Amico.namespace}:#{Amico.blocked_key}:#{Amico.default_scope_key}:#{@usera.send(@usera.class.amico_key)}").should be(1)
@@ -132,19 +132,19 @@ describe ActsAsAmico do
       end
 
       it 'should allow you to block someone who is not following you' do
-        @usera.block(@userb)
+        @usera.block!(@userb)
 
         Amico.redis.zcard("#{Amico.namespace}:#{Amico.following_key}:#{Amico.default_scope_key}:#{@userb.send(@admin.class.amico_key)}").should be(0)
         Amico.redis.zcard("#{Amico.namespace}:#{Amico.blocked_key}:#{Amico.default_scope_key}:#{@usera.send(@usera.class.amico_key)}").should be(1)
       end
 
       it 'should not allow someone you have blocked to follow you' do
-        @usera.block(@admin)
+        @usera.block!(@admin)
 
         Amico.redis.zcard("#{Amico.namespace}:#{Amico.following_key}:#{Amico.default_scope_key}:#{@userb.send(@admin.class.amico_key)}").should be(0)
         Amico.redis.zcard("#{Amico.namespace}:#{Amico.blocked_key}:#{Amico.default_scope_key}:#{@usera.send(@usera.class.amico_key)}").should be(1)
 
-        @admin.follow(@usera)
+        @admin.follow!(@usera)
 
         Amico.redis.zcard("#{Amico.namespace}:#{Amico.following_key}:#{Amico.default_scope_key}:#{@userb.send(@admin.class.amico_key)}").should be(0)
         Amico.redis.zcard("#{Amico.namespace}:#{Amico.blocked_key}:#{Amico.default_scope_key}:#{@usera.send(@usera.class.amico_key)}").should be(1)
@@ -155,15 +155,15 @@ describe ActsAsAmico do
 
   describe '#unblock' do
     it 'should allow you to unblock someone you have blocked' do
-      @usera.block(@userb)
+      @usera.block!(@userb)
       @usera.blocked?(@userb).should be_true
-      @usera.unblock(@userb)
+      @usera.unblock!(@userb)
       @usera.blocked?(@userb).should be_false
     end
     it 'should allow you to unblock someone you have blocked with non-id keys' do
-      @usera.block(@admin)
+      @usera.block!(@admin)
       @usera.blocked?(@admin).should be_true
-      @usera.unblock(@admin)
+      @usera.unblock!(@admin)
       @usera.blocked?(@admin).should be_false
     end
   end
@@ -209,7 +209,7 @@ describe ActsAsAmico do
     end
     describe '#block!' do
       it 'should allow you to block someone following you' do
-        @userb.follow(@usera)
+        @userb.follow!(@usera)
         @usera.block!(@userb)
 
         Amico.redis.zcard("#{Amico.namespace}:#{Amico.following_key}:#{Amico.default_scope_key}:#{@userb.send(@userb.class.amico_key)}").should be(0)
@@ -255,20 +255,20 @@ describe ActsAsAmico do
 
   describe '#following?' do
     it 'should return that you are following' do
-      @usera.follow(@userb)
+      @usera.follow!(@userb)
       @usera.following?(@userb).should be_true
       @userb.following?(@usera).should be_false
 
-      @userb.follow(@usera)
+      @userb.follow!(@usera)
       @userb.following?(@usera).should be_true
     end
     describe "non-id keys" do
       it 'should return that you are following' do
-        @usera.follow(@admin)
+        @usera.follow!(@admin)
         @usera.following?(@admin).should be_true
         @admin.following?(@usera).should be_false
 
-        @admin.follow(@usera)
+        @admin.follow!(@usera)
         @admin.following?(@usera).should be_true
       end
     end
@@ -276,20 +276,20 @@ describe ActsAsAmico do
 
   describe '#follower?' do
     it 'should return that you are being followed' do
-      @userb.follow(@usera)
+      @userb.follow!(@usera)
       @usera.follower?(@userb).should be_true
       @userb.follower?(@usera).should be_false
 
-      @usera.follow(@userb)
+      @usera.follow!(@userb)
       @userb.follower?(@usera).should be_true
     end
     describe "non-id keys" do
       it 'should return that you are being followed' do
-        @admin.follow(@usera)
+        @admin.follow!(@usera)
         @usera.follower?(@admin).should be_true
         @admin.follower?(@usera).should be_false
 
-        @usera.follow(@admin)
+        @usera.follow!(@admin)
         @admin.follower?(@usera).should be_true
       end
     end
@@ -297,13 +297,13 @@ describe ActsAsAmico do
 
   describe '#blocked?' do
     it 'should return that someone is being blocked' do
-      @usera.block(@userb)
+      @usera.block!(@userb)
       @usera.blocked?(@userb).should be_true
       @userb.following?(@usera).should be_false
     end
     describe "non-id keys" do
       it 'should return that someone is being blocked' do
-        @usera.block(@admin)
+        @usera.block!(@admin)
         @usera.blocked?(@admin).should be_true
         @admin.following?(@usera).should be_false
       end
@@ -312,24 +312,24 @@ describe ActsAsAmico do
 
   describe '#reciprocated?' do
     it 'should return true if both individuals are following each other' do
-      @usera.follow(@userb)
-      @userb.follow(@usera)
+      @usera.follow!(@userb)
+      @userb.follow!(@usera)
       @usera.reciprocated?(@userb).should be_true
     end
 
     it 'should return false if both individuals are not following each other' do
-      @usera.follow(@userb)
+      @usera.follow!(@userb)
       @usera.reciprocated?(@userb).should be_false
     end
     describe "non-id keys" do
       it 'should return true if both individuals are following each other' do
-        @usera.follow(@admin)
-        @admin.follow(@usera)
+        @usera.follow!(@admin)
+        @admin.follow!(@usera)
         @usera.reciprocated?(@admin).should be_true
       end
 
       it 'should return false if both individuals are not following each other' do
-        @usera.follow(@admin)
+        @usera.follow!(@admin)
         @usera.reciprocated?(@admin).should be_false
       end
     end
@@ -338,24 +338,17 @@ describe ActsAsAmico do
   describe '#following' do
     it 'should return the correct list' do
       userc = Factory :user
-      @usera.follow(@userb)
-      @usera.follow(userc)
+      @usera.follow!(@userb)
+      @usera.follow!(userc)
       @usera.following.should eql(["#{userc.id}", "#{@userb.send(@userb.class.amico_key)}"])
       @usera.following(:page => 5).should eql(["#{userc.id}", "#{@userb.send(@userb.class.amico_key)}"])
     end
 
-    it 'should page correctly' do
-      user = add_reciprocal_followers
-
-      user.following(:page => 1, :page_size => 5).size.should be(5)
-      user.following(:page => 1, :page_size => 10).size.should be(10)
-      user.following(:page => 1, :page_size => 25).size.should be(25)
-    end
     describe "non-id keys" do
       it 'should return the correct list' do
         userc = Factory :user
-        @usera.follow(@admin)
-        @usera.follow(userc)
+        @usera.follow!(@admin)
+        @usera.follow!(userc)
         @usera.following.should =~ ["#{userc.id}", "#{@admin.send(@admin.class.amico_key)}"]
         @usera.following(:page => 5).should =~ ["#{userc.id}", "#{@admin.send(@admin.class.amico_key)}"]
       end
@@ -365,24 +358,17 @@ describe ActsAsAmico do
   describe '#followers' do
     it 'should return the correct list' do
       userc = Factory :user
-      @usera.follow(@userb)
-      userc.follow(@userb)
+      @usera.follow!(@userb)
+      userc.follow!(@userb)
       @userb.followers.should eql(["#{userc.id}", "#{@usera.send(@usera.class.amico_key)}"])
       @userb.followers(:page => 5).should eql(["#{userc.id}", "#{@usera.send(@usera.class.amico_key)}"])
     end
 
-    it 'should page correctly' do
-      user = add_reciprocal_followers
-
-      user.followers(:page => 1, :page_size => 5).size.should be(5)
-      user.followers(:page => 1, :page_size => 10).size.should be(10)
-      user.followers(:page => 1, :page_size => 25).size.should be(25)
-    end
     describe "non-id keys" do
       it 'should return the correct list' do
         userc = Factory :user
-        @usera.follow(@admin)
-        userc.follow(@admin)
+        @usera.follow!(@admin)
+        userc.follow!(@admin)
         @admin.followers.should eql(["#{userc.id}", "#{@usera.send(@usera.class.amico_key)}"])
         @admin.followers(:page => 5).should eql(["#{userc.id}", "#{@usera.send(@usera.class.amico_key)}"])
       end
@@ -392,24 +378,17 @@ describe ActsAsAmico do
   describe '#blocked' do
     it 'should return the correct list' do
       userc = Factory :user
-      @usera.block(@userb)
-      @usera.block(userc)
+      @usera.block!(@userb)
+      @usera.block!(userc)
       @usera.blocked.should eql(["#{userc.id}", "#{@userb.send(@userb.class.amico_key)}"])
       @usera.blocked(:page => 5).should eql(["#{userc.id}", "#{@userb.send(@userb.class.amico_key)}"])
     end
 
-    it 'should page correctly' do
-      user = add_reciprocal_followers(26, true)
-
-      user.blocked(:page => 1, :page_size => 5).size.should be(5)
-      user.blocked(:page => 1, :page_size => 10).size.should be(10)
-      user.blocked(:page => 1, :page_size => 25).size.should be(25)
-    end
     describe "non-id keys" do
       it 'should return the correct list' do
         userc = Factory :user
-        @usera.block(@admin)
-        @usera.block(userc)
+        @usera.block!(@admin)
+        @usera.block!(userc)
         @usera.blocked.should =~ ["#{userc.id}", "#{@admin.send(@admin.class.amico_key)}"]
         @usera.blocked(:page => 5).should =~ ["#{userc.id}", "#{@admin.send(@admin.class.amico_key)}"]
       end
@@ -418,23 +397,16 @@ describe ActsAsAmico do
 
   describe '#reciprocated' do
     it 'should return the correct list' do
-      @usera.follow(@userb)
-      @userb.follow(@usera)
+      @usera.follow!(@userb)
+      @userb.follow!(@usera)
       @usera.reciprocated.should eql(["#{@userb.send(@userb.class.amico_key)}"])
       @userb.reciprocated.should eql(["#{@usera.send(@usera.class.amico_key)}"])
     end
 
-    it 'should page correctly' do
-      user = add_reciprocal_followers
-
-      user.reciprocated(:page => 1, :page_size => 5).size.should be(5)
-      user.reciprocated(:page => 1, :page_size => 10).size.should be(10)
-      user.reciprocated(:page => 1, :page_size => 25).size.should be(25)
-    end
     describe "non-id keys" do
       it 'should return the correct list' do
-        @usera.follow(@admin)
-        @admin.follow(@usera)
+        @usera.follow!(@admin)
+        @admin.follow!(@usera)
         @usera.reciprocated.should eql(["#{@admin.send(@admin.class.amico_key)}"])
         @admin.reciprocated.should eql(["#{@usera.send(@usera.class.amico_key)}"])
       end
@@ -443,33 +415,33 @@ describe ActsAsAmico do
 
   describe '#following_count' do
     it 'should return the correct count' do
-      @usera.follow(@userb)
+      @usera.follow!(@userb)
       @usera.following_count.should be(1)
     end
     it 'should return the correct count for non-id keys' do
-      @usera.follow(@admin)
+      @usera.follow!(@admin)
       @usera.following_count.should be(1)
     end
   end
 
   describe '#followers_count' do
     it 'should return the correct count' do
-      @usera.follow(@userb)
+      @usera.follow!(@userb)
       @userb.followers_count.should be(1)
     end
     it 'should return the correct count for non-id keys' do
-      @usera.follow(@admin)
+      @usera.follow!(@admin)
       @admin.followers_count.should be(1)
     end
   end
 
   describe '#blocked_count' do
     it 'should return the correct count' do
-      @usera.block(@userb)
+      @usera.block!(@userb)
       @usera.blocked_count.should be(1)
     end
     it 'should return the correct count for non-id keys' do
-      @usera.block(@admin)
+      @usera.block!(@admin)
       @usera.blocked_count.should be(1)
     end
   end
@@ -478,21 +450,21 @@ describe ActsAsAmico do
     it 'should return the correct count' do
       userc = Factory :user
       userd = Factory :user
-      @usera.follow(@userb)
-      @userb.follow(@usera)
-      @usera.follow(userc)
-      userc.follow(@usera)
-      @usera.follow(userd)
+      @usera.follow!(@userb)
+      @userb.follow!(@usera)
+      @usera.follow!(userc)
+      userc.follow!(@usera)
+      @usera.follow!(userd)
       @usera.reciprocated_count.should be(2)
     end
     it 'should return the correct count for non-id keys' do
       userc = Factory :user
       userd = Factory :user
-      @usera.follow(@admin)
-      @admin.follow(@usera)
-      @usera.follow(userc)
-      userc.follow(@usera)
-      @usera.follow(userd)
+      @usera.follow!(@admin)
+      @admin.follow!(@usera)
+      @usera.follow!(userc)
+      userc.follow!(@usera)
+      @usera.follow!(userd)
       @usera.reciprocated_count.should be(2)
     end
   end
@@ -508,7 +480,7 @@ describe ActsAsAmico do
 
     describe '#follow' do
       it 'should allow you to follow but the relationship is initially pending' do
-        @usera.follow(@userb)
+        @usera.follow!(@userb)
 
         Amico.redis.zcard("#{Amico.namespace}:#{Amico.following_key}:#{Amico.default_scope_key}:#{@usera.send(@usera.class.amico_key)}").should be(0)
         Amico.redis.zcard("#{Amico.namespace}:#{Amico.followers_key}:#{Amico.default_scope_key}:#{@userb.send(@userb.class.amico_key)}").should be(0)
@@ -516,13 +488,13 @@ describe ActsAsAmico do
       end
 
       it 'should remove the pending relationship if you have a pending follow, but you unfollow' do
-        @usera.follow(@userb)
+        @usera.follow!(@userb)
 
         Amico.redis.zcard("#{Amico.namespace}:#{Amico.following_key}:#{Amico.default_scope_key}:#{@usera.send(@usera.class.amico_key)}").should be(0)
         Amico.redis.zcard("#{Amico.namespace}:#{Amico.followers_key}:#{Amico.default_scope_key}:#{@userb.send(@userb.class.amico_key)}").should be(0)
         Amico.redis.zcard("#{Amico.namespace}:#{Amico.pending_key}:#{Amico.default_scope_key}:#{@userb.send(@userb.class.amico_key)}").should be(1)
 
-        @usera.unfollow(@userb)
+        @usera.unfollow!(@userb)
 
         Amico.redis.zcard("#{Amico.namespace}:#{Amico.following_key}:#{Amico.default_scope_key}:#{@usera.send(@usera.class.amico_key)}").should be(0)
         Amico.redis.zcard("#{Amico.namespace}:#{Amico.followers_key}:#{Amico.default_scope_key}:#{@userb.send(@userb.class.amico_key)}").should be(0)
@@ -531,10 +503,10 @@ describe ActsAsAmico do
 
       describe 'removing the pending relationship and add to following and followers if #accept is called' do
         it "should work with non-bang-named methods" do
-          @usera.follow(@userb)
+          @usera.follow!(@userb)
           @usera.pending?(@userb).should be_true
 
-          @usera.accept(@userb)
+          @usera.accept!(@userb)
 
           @usera.pending?(@userb).should be_false
           @usera.following?(@userb).should be_true
@@ -558,12 +530,12 @@ describe ActsAsAmico do
 
       describe 'removing the pending relationship and add to following and followers if #accept is called and add to reciprocated relationship' do
         it "should work with non-bang-named methods" do
-          @usera.follow(@userb)
-          @userb.follow(@usera)
+          @usera.follow!(@userb)
+          @userb.follow!(@usera)
           @usera.pending?(@userb).should be_true
           @userb.pending?(@usera).should be_true
 
-          @usera.accept(@userb)
+          @usera.accept!(@userb)
 
           @usera.pending?(@userb).should be_false
           @userb.pending?(@usera).should be_true
@@ -572,7 +544,7 @@ describe ActsAsAmico do
           @userb.follower?(@usera).should be_true
           @usera.follower?(@userb).should be_false
 
-          @userb.accept(@usera)
+          @userb.accept!(@usera)
 
           @usera.pending?(@userb).should be_false
           @userb.pending?(@usera).should be_false
@@ -612,9 +584,9 @@ describe ActsAsAmico do
 
     describe '#block' do
       it 'should remove the pending relationship if you block someone' do
-        @userb.follow(@usera)
+        @userb.follow!(@usera)
         @userb.pending?(@usera).should be_true
-        @usera.block(@userb)
+        @usera.block!(@userb)
         @userb.pending?(@usera).should be_false
         @usera.blocked?(@userb).should be_true
       end
@@ -622,77 +594,44 @@ describe ActsAsAmico do
 
     describe '#pending' do
       it 'should return the correct list' do
-        @usera.follow(@userb)
-        @userb.follow(@usera)
+        @usera.follow!(@userb)
+        @userb.follow!(@usera)
         @usera.pending.should eql(["#{@userb.send(@userb.class.amico_key)}"])
         @userb.pending.should eql(["#{@usera.send(@usera.class.amico_key)}"])
       end
 
-      it 'should page correctly' do
-        user = add_reciprocal_followers
-
-        user.pending(:page => 1, :page_size => 5).size.should be(5)
-        user.pending(:page => 1, :page_size => 10).size.should be(10)
-        user.pending(:page => 1, :page_size => 25).size.should be(25)
-      end
     end
 
     describe '#pending_count' do
       it 'should return the correct count' do
         userc = Factory :user
         userd = Factory :user
-        @usera.follow(@userb)
-        @userb.follow(@usera)
-        @usera.follow(userc)
-        userc.follow(@usera)
-        @usera.follow(userd)
+        @usera.follow!(@userb)
+        @userb.follow!(@usera)
+        @usera.follow!(userc)
+        userc.follow!(@usera)
+        @usera.follow!(userd)
         @usera.pending_count.should be(2)
       end
     end
 
-    describe '#pending_page_count' do
-      it 'should return the correct count' do
-        user = add_reciprocal_followers
-
-        user.pending_page_count.should be(2)
-        user.pending_page_count( 10).should be(3)
-        user.pending_page_count( 5).should be(6)
-        user.pending_page_count(2).should be(13)
-      end
-    end
   end
 
   describe 'scope' do
     it 'should allow you to scope a call to follow a different thing' do
       Amico.default_scope_key = 'user'
-      @usera.follow(@userb, 'user')
-      @usera.following?(@userb).should be_true
-      @usera.following?(@userb, 'user').should be_true
+      @usera.follow!(@userb, :scope => 'user')
+      @usera.following?(@userb, :scope => 'user').should be_true
+      @usera.following?(@userb, :scope => 'user').should be_true
       @usera.following.should eql(["#{@userb.send(@userb.class.amico_key)}"])
-      @usera.following( {:page_size => Amico.page_size, :page => 1}, 'user').should eql(["#{@userb.send(@userb.class.amico_key)}"])
-      @usera.following?(@userb, 'project').should be_false
-      @usera.follow(@userb, 'project')
-      @usera.following?(@userb, 'project').should be_true
-      @usera.following( {:page_size => Amico.page_size, :page => 1}, 'project').should eql(["#{@userb.send(@userb.class.amico_key)}"])
+      @usera.following(:page_size => Amico.page_size, :page => 1, :scope => 'user').should eql(["#{@userb.send(@userb.class.amico_key)}"])
+      @usera.following?(@userb, :scope => 'project').should be_false
+      @usera.follow!(@userb, :scope => 'project')
+      @usera.following?(@userb, :scope => 'project').should be_true
+      @usera.following( :page_size => Amico.page_size, :page => 1, :scope => 'project').should eql(["#{@userb.send(@userb.class.amico_key)}"])
     end
   end
 
   private
 
-  def add_reciprocal_followers(count = 26, block_relationship = false)
-    outer_user = nil
-    1.upto(count) do
-      outer_user = Factory :user
-      1.upto(count) do
-        inner_user = Factory :user
-        outer_user.follow! inner_user
-        inner_user.follow! outer_user
-        if block_relationship
-          outer_user.block! inner_user
-          inner_user.block! outer_user
-        end
-      end
-    end
-    outer_user
-  end
 end

data/spec/reciprocal_followers.rb

@@ -0,0 +1,72 @@
+require 'spec_helper'
+
+describe ActsAsAmico do
+
+  describe "non-pending" do
+    before :each do
+      @user = add_reciprocal_followers
+    end
+
+    it 'should page #following correctly' do
+      @user.following(:page => 1, :page_size => 5).size.should be(5)
+    end
+
+    it 'should page #following correctly' do
+      @user.followers(:page => 1, :page_size => 5).size.should be(5)
+    end
+    it 'should page #reciprocated correctly' do
+      @user.reciprocated(:page => 1, :page_size => 5).size.should be(5)
+    end
+    it "should return all following" do
+      @user.get_all(:following).size.should be(6)
+    end
+  end
+
+  describe "pending operations" do
+    before :each do
+      Amico.pending_follow = true
+      @user = add_reciprocal_followers
+    end
+    after :all do
+      Amico.pending_follow = false
+    end
+
+    it 'should page correctly' do
+      @user.pending(:page => 1, :page_size => 5).size.should be(5)
+    end
+    it 'should return the correct count' do
+      @user.pending_page_count.should be(1)
+      @user.pending_page_count(2).should be(3)
+    end
+  end
+
+  describe "pending operations" do
+    before :each do
+      @user = add_reciprocal_followers 6, true
+      Amico.pending_follow = true
+    end
+    after :all do
+      Amico.pending_follow = false
+    end
+    it 'should page #blocked correctly' do
+      @user.blocked(:page => 1, :page_size => 5).size.should be(5)
+    end
+  end
+
+  private
+
+  def add_reciprocal_followers(count = 6, block_relationship = false)
+    user = Factory :user
+    1.upto(count) do
+      inner_user = Factory :user
+      user.follow! inner_user
+      inner_user.follow! user
+      if block_relationship
+        user.block! inner_user
+        inner_user.block! user
+      end
+    end
+    user
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_amico
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-08 00:00:00.000000000 Z
+date: 2012-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70349693755600 !ruby/object:Gem::Requirement
+  requirement: &70186816397260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70349693755600
+  version_requirements: *70186816397260
 - !ruby/object:Gem::Dependency
   name: amico
-  requirement: &70349693752680 !ruby/object:Gem::Requirement
+  requirement: &70186816395200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70349693752680
+  version_requirements: *70186816395200
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70349693763920 !ruby/object:Gem::Requirement
+  requirement: &70186816394620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70349693763920
+  version_requirements: *70186816394620
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70349693762520 !ruby/object:Gem::Requirement
+  requirement: &70186816393840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70349693762520
+  version_requirements: *70186816393840
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70349693761600 !ruby/object:Gem::Requirement
+  requirement: &70186816391700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70349693761600
+  version_requirements: *70186816391700
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
-  requirement: &70349693759660 !ruby/object:Gem::Requirement
+  requirement: &70186816390440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70349693759660
+  version_requirements: *70186816390440
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70349693757560 !ruby/object:Gem::Requirement
+  requirement: &70186816406200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70349693757560
+  version_requirements: *70186816406200
 - !ruby/object:Gem::Dependency
   name: uuidtools
-  requirement: &70349693772320 !ruby/object:Gem::Requirement
+  requirement: &70186816405520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70349693772320
+  version_requirements: *70186816405520
 description: Rails injectable Relationships (e.g. friendships) backed by Redis
 email:
 - mail@johnmetta.com
@@ -166,6 +166,7 @@ files:
 - spec/dummy/script/rails
 - spec/factories/people.rb
 - spec/factories/stuff.rb
+- spec/reciprocal_followers.rb
 - spec/spec_helper.rb
 homepage: https://github.com/mettadore/acts_as_amico
 licenses: []
@@ -238,4 +239,5 @@ test_files:
 - spec/dummy/script/rails
 - spec/factories/people.rb
 - spec/factories/stuff.rb
+- spec/reciprocal_followers.rb
 - spec/spec_helper.rb