social_stream 0.25.1 → 0.25.2

data/base/lib/social_stream/models/supertype.rb

@@ -49,7 +49,7 @@ module SocialStream #:nodoc:
             a.map{ |e| normalize(e) }
           else
             begin
-              a.supertype!
+              a.__send__ "#{ name.underscore }!" # a.actor!
             rescue
               raise "Unable to normalize #{ self } #{ a.inspect }"
             end

data/base/lib/social_stream/routing/constraints/custom.rb

@@ -0,0 +1,11 @@
+module SocialStream
+  module Routing
+    module Constraints
+      class Custom
+        def matches?(request)
+          SocialStream.relation_model == :custom
+        end
+      end
+    end
+  end
+end

data/base/lib/social_stream/routing/constraints/follow.rb

@@ -0,0 +1,11 @@
+module SocialStream
+  module Routing
+    module Constraints
+      class Follow
+        def matches?(request)
+          SocialStream.relation_model == :follow
+        end
+      end
+    end
+  end
+end

data/base/lib/social_stream/routing/constraints/resque.rb

@@ -0,0 +1,11 @@
+module SocialStream
+  module Routing
+    module Constraints
+      class Resque
+        def matches?(request)
+          SocialStream.resque_access
+        end
+      end
+    end
+  end
+end

data/base/spec/controllers/followers_controller_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+describe FollowersController do
+  include SocialStream::TestHelpers::Controllers
+
+  render_views
+
+  describe "with followers" do
+    before do
+      @user = Factory(:user)
+
+      @follow = Factory(:follow, :contact => Factory(:contact, :sender => @user.actor))
+
+      sign_in @user
+    end
+
+    it "should render index" do
+      get :index
+
+      response.should be_success
+    end
+
+    describe "with post" do
+      before do
+        Factory(:self_post, :author_id => @user.actor_id)
+      end
+
+      it "should render index" do
+        get :index
+
+        response.should be_success
+      end
+    end
+  end
+end
+
+

data/base/spec/controllers/posts_controller_spec.rb

@@ -7,153 +7,149 @@ describe PostsController do
   render_views
 
   describe "authorizing" do
-    before do
-      @user = Factory(:user)
-      sign_in @user
+    before :all do
+      @ss_relation_model = SocialStream.relation_model
     end
 
-    describe "posts to user" do
-      describe "with first relation" do
-        before do
-          contact = @user.contact_to!(@user)
-          relation = @user.relation_customs.sort.first
-          model_assigned_to @user.contact_to!(@user), relation
-          @current_model = Factory(:post, :author_id => @user.actor_id,
-                                          :owner_id  => @user.actor_id,
-                                          :user_author_id => @user.actor_id,
-                                          :_relation_ids => Array(relation.id))
-        end
-
-        it_should_behave_like "Allow Creating"
-        it_should_behave_like "Allow Reading"
-        it_should_behave_like "Allow Destroying"
-
-        it "should destroy with js" do
-          count = model_count
-          delete :destroy, :id => @current_model.to_param, :format => :js
-
-          resource = assigns(model_sym)
+    after :all do
+      SocialStream.relation_model = @ss_relation_model
+    end
 
-          model_count.should eq(count - 1)
-        end
+    describe "in follow relation model" do
+      before :all do
+        SocialStream.relation_model = :follow
       end
 
-      describe "with last relation" do
-        before do
-          contact = @user.contact_to!(@user)
-          relation = @user.relation_customs.sort.last
-          model_assigned_to @user.contact_to!(@user), relation
-          @current_model = Factory(:post, :author_id => @user.actor_id,
-                                          :owner_id  => @user.actor_id,
-                                          :user_author_id => @user.actor_id,
-                                          :_relation_ids => Array(relation.id))
-        end
-
-        it_should_behave_like "Allow Creating"
-        it_should_behave_like "Allow Reading"
-        it_should_behave_like "Allow Destroying"
+      before do
+        @user = Factory(:user)
+        sign_in @user
       end
 
-      describe "with public relation" do
+      describe "post from other user" do
         before do
-          contact = @user.contact_to!(@user)
-          relation = Relation::Public.instance
-          model_assigned_to @user.contact_to!(@user), relation
-          @current_model = Factory(:post, :author_id => @user.actor_id,
-                                          :owner_id  => @user.actor_id,
-                                          :user_author_id => @user.actor_id)
+          @current_model = Factory(:post)
         end
 
-        it_should_behave_like "Allow Creating"
         it_should_behave_like "Allow Reading"
-        it_should_behave_like "Allow Destroying"
       end
     end
 
-    describe "post to friend" do
-      before do
-        friend = Factory(:friend, :contact => Factory(:contact, :receiver => @user.actor)).sender
+    describe "in custom relation mode" do
+      before :all do
+        SocialStream.relation_model = :custom
+      end
 
-        model_assigned_to @user.contact_to!(friend), friend.relation_custom('friend')
-        @current_model = Factory(:post, :author_id => @user.actor_id,
-                                        :owner_id  => friend.id,
-                                        :user_author_id => @user.actor_id)
+      before do
+        @user = Factory(:user)
+        sign_in @user
       end
 
-      it_should_behave_like "Allow Creating"
-      it_should_behave_like "Allow Reading"
-    end
+      describe "posts to user" do
+        describe "with first relation" do
+          before do
+            contact = @user.contact_to!(@user)
+            relation = @user.relation_customs.sort.first
+            model_assigned_to @user.contact_to!(@user), relation
+            @current_model = Factory(:post, :author_id => @user.actor_id,
+                                     :owner_id  => @user.actor_id,
+                                     :user_author_id => @user.actor_id,
+                                     :_relation_ids => Array(relation.id))
+          end
 
-    describe "post to acquaintance" do
-      before do
-        ac = Factory(:acquaintance, :contact => Factory(:contact, :receiver => @user.actor)).sender
+          it_should_behave_like "Allow Creating"
+          it_should_behave_like "Allow Reading"
+          it_should_behave_like "Allow Destroying"
 
-        model_assigned_to @user.contact_to!(ac), ac.relation_custom('acquaintance')
-      end
+          it "should destroy with js" do
+            count = model_count
+            delete :destroy, :id => @current_model.to_param, :format => :js
 
-      it_should_behave_like "Deny Creating"
-    end
+            resource = assigns(model_sym)
 
-    describe "post from other user" do
-      before do
-        @current_model = Factory(:post)
-      end
+            model_count.should eq(count - 1)
+          end
+        end
 
-      it_should_behave_like "Deny Reading"
-    end
+        describe "with last relation" do
+          before do
+            contact = @user.contact_to!(@user)
+            relation = @user.relation_customs.sort.last
+            model_assigned_to @user.contact_to!(@user), relation
+            @current_model = Factory(:post, :author_id => @user.actor_id,
+                                     :owner_id  => @user.actor_id,
+                                     :user_author_id => @user.actor_id,
+                                     :_relation_ids => Array(relation.id))
+          end
 
-    describe "posts represented group" do
-      before do
-        @group = Factory(:member, :contact => Factory(:group_contact, :receiver => @user.actor)).sender_subject
+          it_should_behave_like "Allow Creating"
+          it_should_behave_like "Allow Reading"
+          it_should_behave_like "Allow Destroying"
+        end
+
+        describe "with public relation" do
+          before do
+            contact = @user.contact_to!(@user)
+            relation = Relation::Public.instance
+            model_assigned_to @user.contact_to!(@user), relation
+            @current_model = Factory(:post, :author_id => @user.actor_id,
+                                     :owner_id  => @user.actor_id,
+                                     :user_author_id => @user.actor_id)
+          end
+
+          it_should_behave_like "Allow Creating"
+          it_should_behave_like "Allow Reading"
+          it_should_behave_like "Allow Destroying"
+        end
       end
 
-      describe "with member relation" do
+      describe "post to friend" do
         before do
-          contact = @user.contact_to!(@group)
-          relation = @group.relation_custom('member')
-
-          model_assigned_to contact, relation
-          @current_model = Factory(:post, :author_id => contact.sender.id,
-                                          :owner_id  => contact.receiver.id,
-                                          :user_author_id => contact.sender.id,
-                                          :_relation_ids => Array(relation.id))
+          friend = Factory(:friend, :contact => Factory(:contact, :receiver => @user.actor)).sender
+
+          model_assigned_to @user.contact_to!(friend), friend.relation_custom('friend')
+          @current_model = Factory(:post, :author_id => @user.actor_id,
+                                   :owner_id  => friend.id,
+                                   :user_author_id => @user.actor_id)
         end
 
         it_should_behave_like "Allow Creating"
         it_should_behave_like "Allow Reading"
-        it_should_behave_like "Allow Destroying"
       end
 
-      context "representing the group" do
+      describe "post to acquaintance" do
         before do
-          represent(@group)
+          ac = Factory(:acquaintance, :contact => Factory(:contact, :receiver => @user.actor)).sender
+
+          model_assigned_to @user.contact_to!(ac), ac.relation_custom('acquaintance')
         end
 
-        describe "with first relation" do
-          before do
-            contact = @group.contact_to!(@group)
-            relation = @group.relation_customs.sort.first
-            model_assigned_to contact, relation
-            @current_model = Factory(:post, :author_id => contact.sender.id,
-                                            :owner_id  => contact.receiver.id,
-                                            :user_author_id => contact.sender.id,
-                                            :_relation_ids => Array(relation.id))
-          end
+        it_should_behave_like "Deny Creating"
+      end
 
-          it_should_behave_like "Allow Creating"
-          it_should_behave_like "Allow Reading"
-          it_should_behave_like "Allow Destroying"
+      describe "post from other user" do
+        before do
+          @current_model = Factory(:post)
         end
 
-        describe "with last relation" do
+
+        it_should_behave_like "Deny Reading"
+      end
+
+      describe "posts represented group" do
+        before do
+          @group = Factory(:member, :contact => Factory(:group_contact, :receiver => @user.actor)).sender_subject
+        end
+
+        describe "with member relation" do
           before do
-            contact = @group.contact_to!(@group)
-            relation = @group.relation_customs.sort.last
+            contact = @user.contact_to!(@group)
+            relation = @group.relation_custom('member')
+
             model_assigned_to contact, relation
             @current_model = Factory(:post, :author_id => contact.sender.id,
-                                            :owner_id  => contact.receiver.id,
-                                            :user_author_id => contact.sender.id,
-                                            :_relation_ids => Array(relation.id))
+                                     :owner_id  => contact.receiver.id,
+                                     :user_author_id => contact.sender.id,
+                                     :_relation_ids => Array(relation.id))
           end
 
           it_should_behave_like "Allow Creating"
@@ -161,91 +157,128 @@ describe PostsController do
           it_should_behave_like "Allow Destroying"
         end
 
-        describe "with public relation" do
+        context "representing the group" do
           before do
-            contact = @group.contact_to!(@group)
-            relation = Relation::Public.instance
-            model_assigned_to contact, relation
-            @current_model = Factory(:post,  :author_id => contact.sender.id,
-                                             :owner_id  => contact.receiver.id,
-                                             :user_author_id => contact.sender.id,
-                                             :_relation_ids => Array(relation.id))
+            represent(@group)
           end
 
-          it_should_behave_like "Allow Creating"
-          it_should_behave_like "Allow Reading"
-          it_should_behave_like "Allow Destroying"
+          describe "with first relation" do
+            before do
+              contact = @group.contact_to!(@group)
+              relation = @group.relation_customs.sort.first
+              model_assigned_to contact, relation
+              @current_model = Factory(:post, :author_id => contact.sender.id,
+                                       :owner_id  => contact.receiver.id,
+                                       :user_author_id => contact.sender.id,
+                                       :_relation_ids => Array(relation.id))
+            end
+
+            it_should_behave_like "Allow Creating"
+            it_should_behave_like "Allow Reading"
+            it_should_behave_like "Allow Destroying"
+          end
+
+          describe "with last relation" do
+            before do
+              contact = @group.contact_to!(@group)
+              relation = @group.relation_customs.sort.last
+              model_assigned_to contact, relation
+              @current_model = Factory(:post, :author_id => contact.sender.id,
+                                       :owner_id  => contact.receiver.id,
+                                       :user_author_id => contact.sender.id,
+                                       :_relation_ids => Array(relation.id))
+            end
+
+            it_should_behave_like "Allow Creating"
+            it_should_behave_like "Allow Reading"
+            it_should_behave_like "Allow Destroying"
+          end
+
+          describe "with public relation" do
+            before do
+              contact = @group.contact_to!(@group)
+              relation = Relation::Public.instance
+              model_assigned_to contact, relation
+              @current_model = Factory(:post,  :author_id => contact.sender.id,
+                                       :owner_id  => contact.receiver.id,
+                                       :user_author_id => contact.sender.id,
+                                       :_relation_ids => Array(relation.id))
+            end
+
+            it_should_behave_like "Allow Creating"
+            it_should_behave_like "Allow Reading"
+            it_should_behave_like "Allow Destroying"
+          end
         end
       end
     end
-  end
 
-  context "creating post in group's wall" do
-    before do
-      @tie = Factory(:member)
-    end
+    context "creating post in group's wall" do
+      before do
+        @tie = Factory(:member)
+      end
 
-    it "should assign activity to member" do
-      sign_in @tie.receiver_subject
+      it "should assign activity to member" do
+        sign_in @tie.receiver_subject
 
-      post :create, :post => { :text => "Test",
-                               :owner_id  => @tie.contact.sender.id
-                             }
+        post :create, :post => { :text => "Test",
+                                 :owner_id  => @tie.contact.sender.id
+        }
 
-      post = assigns(:post)
+        post = assigns(:post)
 
-      post.should be_valid
-      post.post_activity.relations.should include(@tie.relation)
-    end
+        post.should be_valid
+        post.post_activity.relations.should include(@tie.relation)
+      end
 
-    it "should assign activity to member" do
-      sign_in @tie.receiver_subject
+      it "should assign activity to member" do
+        sign_in @tie.receiver_subject
 
-      post :create, :post => { :text => "Test",
-                               :owner_id  => @tie.contact.sender.id
-                             },
-                    :format => :js
-                             
+        post :create, :post => { :text => "Test",
+                                 :owner_id  => @tie.contact.sender.id
+        },
+          :format => :js
 
-      post = assigns(:post)
 
-      post.should be_valid
-      post.post_activity.relations.should include(@tie.relation)
+        post = assigns(:post)
 
-      response.should be_success
-    end
-  end
+        post.should be_valid
+        post.post_activity.relations.should include(@tie.relation)
 
-  context "creating public post" do
-    before do
-      @post = Factory(:public_post)
+        response.should be_success
+      end
     end
 
-    it "should render" do
-      get :show, :id => @post.to_param
+    context "creating public post" do
+      before do
+        @post = Factory(:public_post)
+      end
+
+      it "should render" do
+        get :show, :id => @post.to_param
 
-      response.should be_success
+        response.should be_success
+      end
     end
-  end
 
-  describe "to friend on representation change" do
-    before do
-      @post = Factory(:post)
+    describe "to friend on representation change" do
+      before do
+        @post = Factory(:post)
 
-      @user = @post.post_activity.sender_subject
+        @user = @post.post_activity.sender_subject
 
-      @group = Factory(:member, :contact => Factory(:g2g_contact, :receiver => @user.actor)).sender_subject
+        @group = Factory(:member, :contact => Factory(:g2g_contact, :receiver => @user.actor)).sender_subject
 
-      Factory(:friend, :contact => Factory(:g2g_contact, :sender => @user.actor))
+        Factory(:friend, :contact => Factory(:g2g_contact, :sender => @user.actor))
 
-      sign_in @user
-    end
+        sign_in @user
+      end
 
-    it "should redirect show to home" do
-      get :show, :id => @post.to_param, :s => @group.slug
+      it "should redirect show to home" do
+        get :show, :id => @post.to_param, :s => @group.slug
 
-      response.should redirect_to(:home)
+        response.should redirect_to(:home)
+      end
     end
   end
 end
-