social_stream 0.2.3 → 0.3.0

data/spec/controllers/groups_controller_spec.rb

@@ -5,16 +5,12 @@ describe GroupsController do
 
   describe "when Anonymous" do
     it "should render index" do
-      pending
-
       get :index
 
       assert_response :success
     end
 
     it "should render show" do
-      pending
-
       get :show, :id => Factory(:group).to_param
 
       assert_response :success
@@ -34,8 +30,8 @@ describe GroupsController do
       assert_response :success
     end
 
-    it "should render member group" do
-      @group = Factory(:member, :sender => @user.actor).receiver_subject
+    it "should render contact group" do
+      @group = Factory(:member, :receiver => @user.actor).sender_subject
       get :show, :id => @group.to_param
 
       assert_response :success

data/spec/controllers/ties_controller_spec.rb

@@ -0,0 +1,19 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe TiesController do
+  render_views
+
+  describe "when authenticated" do
+    before do
+      @user = Factory(:user)
+
+      sign_in @user
+    end
+
+    it "should render new" do
+      get :new, :tie => Factory.attributes_for(:friend, :sender => @user.actor)
+
+      assert_response :success
+    end
+  end
+end

data/spec/controllers/users_controller_spec.rb

@@ -11,8 +11,6 @@ describe UsersController do
     end
 
     it "should render show" do
-      pending
-
       get :show, :id => Factory(:user).to_param
 
       assert_response :success

data/spec/dummy/config/application.rb

@@ -21,7 +21,6 @@ module Dummy
     # Only load the plugins named here, in the order given (default is alphabetical).
     # :all can be used as a placeholder for all plugins not explicitly named.
     # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
-    config.paths.vendor.plugins "../../.."
 
     # Activate observers that should always be running.
     # config.active_record.observers = :cacher, :garbage_collector, :forum_observer

data/spec/dummy/config/initializers/social_stream.rb

@@ -1,5 +1,17 @@
 SocialStream.setup do |config|
-  config.actors = [ :user, :group ]
+  # List the models that are social entities. These will have ties between them.
+  # Remember you must add an "actor_id" foreign key column to your migration!
+  #
+  # config.actors = [:user, :group ]
 
-  config.activity_objects = [ :post, :comment ]
+  # Include devise modules in User. See devise documentation for details.
+  # Others available are:
+  # :token_authenticatable, :confirmable, :lockable, :timeoutable, :validatable
+  # config.devise_modules :database_authenticatable, :registerable,
+  #                       :recoverable, :rememberable, :trackable
+
+  # Type of activities managed by actors
+  # Remember you must add an "activity_object_id" foreign key column to your migration!
+  #
+  # config.activity_objects = [ :post, :comment, :messages ]
 end

data/spec/dummy/config/relations.yml

@@ -0,0 +1,42 @@
+# Relations for Social Stream
+#
+# Define the relations and permissions supported by your application
+#
+user:
+  friend:
+    name: friend
+    permissions:
+      - [ create,  activity, weak_set ]
+      - [ read,    activity, star_set ]
+      - [ update,  activity, weak_set ]
+      - [ destroy, activity, weak_set ]
+  acquaintance:
+    name: acquaintance
+    parent: friend
+    permissions:
+      - [ read,    activity, star_set ]
+  public:
+    name: public
+    parent: acquaintance
+    permissions:
+      - [ read,    activity, star_set ]
+
+group:
+  member:
+    name: member
+    permissions:
+      - [ represent ]
+      - [ create,  activity, weak_set ]
+      - [ read,    activity, star_set ]
+      - [ update,  activity, weak_star_set ]
+      - [ destroy, activity, weak_star_set ]
+  partner:
+    name: partner
+    parent: member
+    permissions:
+      - [ read,    activity, star_set ]
+  public:
+    name: public
+    parent: partner
+    permissions:
+      - [ read,    activity, star_set ]

data/spec/dummy/db/schema.rb

@@ -0,0 +1,9 @@
+# Use migration template
+path = %w( .. .. .. lib generators social_stream templates migration )
+path.unshift File.dirname(__FILE__)
+
+require File.join(*path)
+
+ActiveRecord::Schema.define(:version => 0) do
+  CreateSocialStream.up
+end

data/spec/dummy/db/seeds.rb

@@ -6,4 +6,3 @@
 #   cities = City.create([{ :name => 'Chicago' }, { :name => 'Copenhagen' }])
 #   Mayor.create(:name => 'Daley', :city => cities.first)
 
-SocialStream.seed!

data/spec/factories/activity.rb

@@ -1,10 +1,10 @@
 Factory.define :activity do |a|
-  a.association :_tie, :factory => :tie
+  a.association :_tie, :factory => :friend
   a.activity_verb { ActivityVerb["post"] }
 end
 
 Factory.define :like_activity, :parent => :activity do |a|
   a.association :parent, :factory => :activity
   a.activity_verb { ActivityVerb["like"] }
-  a._tie { |tie| tie.association(:tie, :receiver => tie.parent.tie.receiver) }
+  a._tie { |tie| tie.association(:friend, :sender => tie.parent.tie.sender) }
 end

data/spec/factories/actor.rb

@@ -1,4 +1,5 @@
 Factory.define :actor do |s|
   s.sequence(:name) { |n| "Actor #{ n }" }
-  s.subject_type "Subject"
+  s.subject_type "User"
 end
+

data/spec/factories/group.rb

@@ -1,3 +1,4 @@
 Factory.define :group do |g|
   g.sequence(:name) { |n| "Group #{ n }" }
+  g._founder { |g| Factory(:user).permalink }
 end

data/spec/factories/post.rb

@@ -1,4 +1,4 @@
 Factory.define :post do |p|
   p.sequence(:text)  { |n| "Post #{ n }" }
-  p._activity_tie_id { |q| q.association(:tie) }
+  p._activity_tie_id { |q| q.association(:friend) }
 end

data/spec/factories/tie.rb

@@ -1,43 +1,37 @@
 Factory.define :tie do |t|
-  t.sender { |s| Factory(:user).actor }
+  t.sender   { |s| Factory(:user).actor }
   t.receiver { |r| Factory(:user).actor }
-  t.relation { |r| Relation.mode('User', 'User').strongest }
 end
 
-# UserToUser ties
+# User ties
 
 Factory.define :friend, :parent => :tie do |t|
-  t.relation { |r| Relation.mode('User', 'User').find_by_name('friend') }
+  t.after_build { |u| u.relation = u.sender.relation('friend') }
 end
 
-Factory.define :friend_request, :parent => :tie do |t|
-  t.relation { |r| Relation.mode('User', 'User').find_by_name('friend_request') }
+Factory.define :acquaintance, :parent => :tie do |t|
+  t.after_build { |u| u.relation = u.sender.relation('acquaintance') }
 end
 
 Factory.define :public, :parent => :tie do |t|
-  t.relation { |r| Relation.mode('User', 'User').find_by_name('public') }
+  t.after_build { |u| u.relation = u.sender.relation('public') }
 end
 
-# UserToGroup ties
-Factory.define :u2g_tie, :parent => :tie do |t|
-  t.receiver { |r| Factory(:group).actor }
-  t.relation { |r| Relation.mode('User', 'Group').strongest }
+# Group ties
+Factory.define :g2u_tie, :parent => :tie do |t|
+  t.sender   { |u| Factory(:group).actor }
 end
 
-Factory.define :member, :parent => :u2g_tie do |t|
-  t.relation { |r| Relation.mode('User', 'Group').find_by_name('member') }
+Factory.define :member, :parent => :g2u_tie do |t|
+  t.after_build { |u| u.relation = u.sender.relation('member') }
 end
 
-Factory.define :follower, :parent => :u2g_tie do |t|
-  t.relation { |r| Relation.mode('User', 'Group').find_by_name('follower') }
+Factory.define :g2g_tie, :parent => :tie do |t|
+  t.sender   { |u| Factory(:group).actor }
+  t.receiver { |u| Factory(:group).actor }
 end
 
-# GroupToUser ties
-Factory.define :g2u_tie, :parent => :tie do |t|
-  t.sender { |r| Factory(:group).actor }
-  t.relation { |r| Relation.mode('Group', 'User').strongest }
+Factory.define :partner, :parent => :g2g_tie do |t|
+  t.after_build { |u| u.relation = u.sender.relation('partner') }
 end
 
-Factory.define :g2u_member, :parent => :tie do |t|
-  t.relation { |r| Relation.mode('Group', 'User').find_by_name('member') }
-end

data/spec/models/activity_spec.rb

@@ -7,13 +7,13 @@ module ActivityTestHelper
   end
 
   def create_ability_accessed_by(tie_type)
-    t = Factory(tie_type, :receiver => @tie.receiver)
-    u = t.sender_subject
+    t = Factory(tie_type, :sender => @tie.sender)
+    u = t.receiver_subject
     @ability = Ability.new(u)
   end
 
-  def create_ability_accessed_by_sender
-    u = @tie.sender_subject
+  def create_ability_accessed_by_receiver
+    u = @tie.receiver_subject
     @ability = Ability.new(u)
   end
 
@@ -96,7 +96,7 @@ describe Activity do
 
     describe "accessed by sender" do
       before do
-        create_ability_accessed_by_sender
+        create_ability_accessed_by_receiver
       end
 
       it_should_behave_like "Allows Creating"
@@ -116,11 +116,12 @@ describe Activity do
       it_should_behave_like "Denies Destroying"
     end
 
-    describe "accessed by friend request" do
+    describe "accessed by acquaintance" do
       before do
-        create_ability_accessed_by :friend_request
+        create_ability_accessed_by :acquaintance
       end
 
+
       it_should_behave_like "Denies Creating"
       it_should_behave_like "Denies Reading"
       it_should_behave_like "Denies Updating"
@@ -139,15 +140,16 @@ describe Activity do
     end
   end
   
-  describe "belonging to friend reflexive tie" do
+  describe "belonging to friend self tie" do
     before do
-      tie = Factory(:user).ties.where(:relation_id => Relation.mode('User', 'User').find_by_name('friend')).first
+      user = Factory(:user)
+      tie = user.ties.where(:relation_id => user.relation('friend')).first
       create_activity_assigned_to(tie)
     end
 
     describe "accessed by the sender" do
       before do
-        create_ability_accessed_by_sender
+        create_ability_accessed_by_receiver
       end
 
       it_should_behave_like "Allows Creating"
@@ -167,9 +169,9 @@ describe Activity do
       it_should_behave_like "Denies Destroying"
     end
 
-    describe "accessed by friend request" do
+    describe "accessed by acquaintance" do
       before do
-        create_ability_accessed_by :friend_request
+        create_ability_accessed_by :acquaintance
       end
 
       it_should_behave_like "Denies Creating"
@@ -193,13 +195,14 @@ describe Activity do
   describe "belonging to public tie" do
 
     before do
-      tie = Factory(:user).ties.where(:relation_id => Relation.mode('User', 'User').find_by_name('public')).first
+      user = Factory(:user)
+      tie = user.ties.where(:relation_id => user.relation('public')).first
       create_activity_assigned_to(tie)
     end
 
     describe "accessed by the sender" do
       before do
-        create_ability_accessed_by_sender
+        create_ability_accessed_by_receiver
       end
 
       it_should_behave_like "Allows Creating"
@@ -219,9 +222,9 @@ describe Activity do
       it_should_behave_like "Denies Destroying"
     end
 
-    describe "accessed by friend request" do
+    describe "accessed by acquaintance" do
       before do
-        create_ability_accessed_by :friend_request
+        create_ability_accessed_by :acquaintance
       end
 
       it_should_behave_like "Denies Creating"
@@ -246,7 +249,7 @@ describe Activity do
 
     before do
       create_activity_assigned_to(Factory(:public))
-      create_ability_accessed_by_sender
+      create_ability_accessed_by_receiver
     end
     
     it_should_behave_like "Denies Creating"
@@ -259,7 +262,7 @@ describe Activity do
 
     describe "accessed by same member" do
       before do
-        create_ability_accessed_by_sender
+        create_ability_accessed_by_receiver
       end
 
       it_should_behave_like "Allows Creating"
@@ -279,9 +282,9 @@ describe Activity do
       it_should_behave_like "Allows Destroying"
     end
 
-    describe "accessed by follower" do
+    describe "accessed by partner" do
       before do
-        create_ability_accessed_by :follower
+        create_ability_accessed_by :partner
       end
 
       it_should_behave_like "Denies Creating"
@@ -302,7 +305,7 @@ describe Activity do
     end
   end
   
-  describe "belonging to public tie from an admin" do
+  describe "belonging to public tie from a member" do
 
     before do
       create_activity_assigned_to(Factory(:member).related('public'))
@@ -310,7 +313,7 @@ describe Activity do
 
     describe "accessed by sender" do
       before do
-        create_ability_accessed_by_sender
+        create_ability_accessed_by_receiver
       end
 
       it_should_behave_like "Allows Creating"
@@ -331,9 +334,9 @@ describe Activity do
     end
 
    
-    describe "accessed by follower" do
+    describe "accessed by partner" do
       before do
-        create_ability_accessed_by :follower
+        create_ability_accessed_by :partner
       end
 
       it_should_behave_like "Denies Creating"

data/spec/models/actor_spec.rb

@@ -13,4 +13,7 @@ describe Actor do
     a.permalink.should_not == b.permalink
   end
 
+  it "should generate relations" do
+    assert Factory(:actor).relations.present?
+  end
 end

data/spec/models/representation_spec.rb

@@ -0,0 +1,16 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Representation do
+  describe "initialized with" do
+    describe "valid subject" do
+      before do
+        @group  = Factory(:group)
+        @dom_id = ActionController::RecordIdentifier.dom_id(@group)
+      end
+
+      it "should find subject" do
+        assert_equal @group, Representation.new(:subject_dom_id => @dom_id).subject
+      end
+    end
+  end
+end

data/spec/models/tie_spec.rb

@@ -1,30 +1,27 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Tie do
-  it "should find the relation by its name" do
+  it "should create from relation name" do
     relation = Relation.first
     sender = Factory(relation.sender_type.underscore)
-    receiver = Factory(relation.receiver_type.underscore)
+
+    receiver_type = relation.receiver_type.present? ?
+                      relation.receiver_type :
+                      relation.sender_type
+                   
+    receiver = Factory(receiver_type.underscore)
 
     tie = Factory(:tie, :sender_id => sender.actor.id,
                         :receiver_id => receiver.actor.id,
                         :relation_name => relation.name)
     tie.should be_valid
-
   end
 
-  describe "with a relation with inverse" do
-    before do
-      @relation = Relation.where("inverse_id IS NOT NULL").first
-    end
-
-    it "should have its inverse tie" do
-      @tie = Factory(:tie, :relation => @relation)
+  it "should create pending" do
+    tie = Factory(:friend)
 
-      assert Tie.find_by_sender_id_and_receiver_id_and_relation_id(@tie.receiver_id,
-                                                                   @tie.sender_id,
-                                                                   @relation.inverse).present?
-    end
+    assert tie.receiver.pending_ties.present?
+    assert tie.receiver.pending_ties.first.relation_set.blank?
   end
 
   describe "friend" do
@@ -32,65 +29,52 @@ describe Tie do
       @tie = Factory(:friend)
     end
 
-    describe ", sender" do
+    describe ", receiver" do
       before do
-        @s = @tie.sender
+        @s = @tie.receiver
       end
 
       it "creates activity" do
-        Tie.allowed(@s, 'create', 'activity').should include(@tie)
-        Tie.allowed(@s, 'create', 'activity').should include(@tie.related('public'))
-        Tie.allowed(@s, 'create', 'activity').should_not include(@tie.inverse)
-        Tie.allowed(@s, 'create', 'activity').should_not include(@tie.inverse.related('public'))
+        Tie.allowing(@s, 'create', 'activity').should include(@tie)
+        Tie.allowing(@s, 'create', 'activity').should include(@tie.related('public'))
       end
 
       it "reads activity" do
-        Tie.allowed(@s, 'read', 'activity').should include(@tie)
-        Tie.allowed(@s, 'read', 'activity').should include(@tie.related('public'))
-        Tie.allowed(@s, 'read', 'activity').should include(@tie.inverse)
-        Tie.allowed(@s, 'read', 'activity').should include(@tie.inverse.related('public'))
+        Tie.allowing(@s, 'read', 'activity').should include(@tie)
+        Tie.allowing(@s, 'read', 'activity').should include(@tie.related('public'))
       end
     end
 
     describe ", friend" do
       before do
-        @s = @tie.receiver
+        @s = Factory(:friend, :sender => @tie.sender).receiver
       end
 
       it "creates activity" do
-        Tie.allowed(@s, 'create', 'activity').should include(@tie.inverse)
-        Tie.allowed(@s, 'create', 'activity').should include(@tie.inverse.related('public'))
-        Tie.allowed(@s, 'create', 'activity').should_not include(@tie)
-        Tie.allowed(@s, 'create', 'activity').should_not include(@tie.related('public'))
+        Tie.allowing(@s, 'create', 'activity').should_not include(@tie)
+        Tie.allowing(@s, 'create', 'activity').should_not include(@tie.related('public'))
       end
 
       it "reads activity" do
-        Tie.allowed(@s, 'read', 'activity').should include(@tie)
-        Tie.allowed(@s, 'read', 'activity').should include(@tie.related('public'))
-        Tie.allowed(@s, 'read', 'activity').should include(@tie.inverse)
-        Tie.allowed(@s, 'read', 'activity').should include(@tie.inverse.related('public'))
+        Tie.allowing(@s, 'read', 'activity').should include(@tie)
+        Tie.allowing(@s, 'read', 'activity').should include(@tie.related('public'))
       end
     end
 
-    describe ", friend request" do
+    describe ", acquaintance" do
       before do
-        @s = Factory(:friend_request, :receiver => @tie.receiver).sender
+        @s = Factory(:acquaintance, :receiver => @tie.receiver).sender
       end
 
       it "creates activity" do
-        Tie.allowed(@s, 'create', 'activity').should_not include(@tie)
-        Tie.allowed(@s, 'create', 'activity').should_not include(@tie.related('public'))
-        Tie.allowed(@s, 'create', 'activity').should_not include(@tie.inverse)
-        Tie.allowed(@s, 'create', 'activity').should_not include(@tie.inverse.related('public'))
+        Tie.allowing(@s, 'create', 'activity').should_not include(@tie)
+        Tie.allowing(@s, 'create', 'activity').should_not include(@tie.related('public'))
       end
 
       it "reads activity" do
-        Tie.allowed(@s, 'read', 'activity').should_not include(@tie)
-#        Tie.allowed(@s, 'read', 'activity').should_not include(@tie.related('public'))
-        Tie.allowed(@s, 'read', 'activity').should_not include(@tie.inverse)
-#        Tie.allowed(@s, 'read', 'activity').should_not include(@tie.inverse.related('public'))
+        Tie.allowing(@s, 'read', 'activity').should_not include(@tie)
+#        Tie.allowing(@s, 'read', 'activity').should_not include(@tie.related('public'))
       end
-
     end
 
     describe ", alien" do
@@ -99,15 +83,13 @@ describe Tie do
       end
 
       it "creates activity" do
-        Tie.allowed(@s, 'create', 'activity').should_not include(@tie)
-        Tie.allowed(@s, 'create', 'activity').should_not include(@tie.related('public'))
-        Tie.allowed(@s, 'create', 'activity').should_not include(@tie.inverse)
-        Tie.allowed(@s, 'create', 'activity').should_not include(@tie.inverse.related('public'))
+        Tie.allowing(@s, 'create', 'activity').should_not include(@tie)
+        Tie.allowing(@s, 'create', 'activity').should_not include(@tie.related('public'))
       end
       
       it "reads activity" do
-        Tie.allowed(@s, 'read', 'activity').should_not include(@tie)
-        Tie.allowed(@s, 'read', 'activity').should_not include(@tie.inverse)
+        Tie.allowing(@s, 'read', 'activity').should_not include(@tie)
+        Tie.allowing(@s, 'read', 'activity').should     include(@tie.related('public'))
       end
     end
   end
@@ -117,25 +99,35 @@ describe Tie do
       @tie = Factory(:member)
     end
 
-    describe ", sender" do
+    describe ", receiver" do
       before do
-        @s = @tie.sender
+        @s = @tie.receiver
       end
 
       it "updates activity" do
-        Tie.allowed(@s, 'update', 'activity').should include(@tie)
-        Tie.allowed(@s, 'update', 'activity').should include(@tie.related('public'))
+        Tie.allowing(@s, 'update', 'activity').should include(@tie)
+        Tie.allowing(@s, 'update', 'activity').should include(@tie.related('public'))
       end
     end
 
     describe ", member" do
       before do
-        @s = Factory(:member, :receiver => @tie.receiver).sender
+        @s = Factory(:member, :sender => @tie.sender).receiver
+      end
+
+      it "creates activity" do
+        Tie.allowing(@s, 'create', 'activity').should_not include(@tie)
+        Tie.allowing(@s, 'create', 'activity').should_not include(@tie.related('public'))
+      end
+
+       it "reads activity" do
+        Tie.allowing(@s, 'read', 'activity').should include(@tie)
+        Tie.allowing(@s, 'read', 'activity').should include(@tie.related('public'))
       end
 
       it "updates activity" do
-        Tie.allowed(@s, 'update', 'activity').should include(@tie)
-        Tie.allowed(@s, 'update', 'activity').should include(@tie.related('public'))
+        Tie.allowing(@s, 'update', 'activity').should include(@tie)
+        Tie.allowing(@s, 'update', 'activity').should include(@tie.related('public'))
       end
     end
   end

data/spec/models/user_spec.rb

@@ -0,0 +1,22 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe User do
+  it "should find by permalink" do
+    user = Factory(:user)
+
+    assert user.should == User.find_by_permalink(user.permalink)
+  end
+
+  it "should represent" do
+    tie =   Factory(:member)
+    group = tie.sender_subject
+    user =  tie.receiver_subject
+
+    assert user.represented.should include(group)
+
+    tie = Factory(:partner, :receiver => user.actor)
+
+    assert ! user.represented.include?(tie.sender_subject)
+  end
+end
+

data/spec/support/db.rb

@@ -1,4 +1,4 @@
-require 'lib/generators/social_stream/templates/migration'
+require File.join(Rails.root, '../../lib/generators/social_stream/templates/migration')
 CreateSocialStream.up
 
 require File.expand_path("../../dummy/db/seeds", __FILE__)