social_stream 0.1.7 → 0.2.0

data/lib/generators/social_stream/templates/public/stylesheets/middle.css

@@ -60,7 +60,7 @@
 }
 .tie_header {
 	vertical-align: middle;
-	background: transparent url(../images/btn/title_background.png) scroll 0px;
+	background: transparent url(../images/title_background.png) scroll 0px;
 	padding-left: 10px;
 	display: block;
 }

data/lib/generators/social_stream/templates/public/stylesheets/right.css

@@ -42,6 +42,7 @@
   padding-top: 2px;
   vertical-align:top;
 	display: inline-block;
+  font-weight:bold;
 }
 
 .contacts_footer {

data/lib/generators/social_stream/templates/seeds.yml

@@ -1,40 +1,33 @@
 # Seed configuration for Social Stream
 #
-# Define your relations and add SocialStream.seed! to db/seeds.rb
+# Define the relations and permissions supported by your application
 #
 relations:
-  # User to User
   user-friend:
     sender_type: User
     receiver_type: User
     name: friend
-    # Friendship is a reciprocal relation
     inverse: user-friend
-    # It is set for users by default
     reflexive: true
     permissions:
-      - [ create,  resources, weak_set ]
-      - [ read,    resources, group_set ]
-      - [ update,  resources, weak_set ]
-      - [ destroy, resources, weak_set ]
+      - [ create,  activity, inverse_weak_set ]
+      - [ read,    activity, inverse_group_set ]
+      - [ update,  activity, inverse_weak_set ]
+      - [ destroy, activity, inverse_weak_set ]
   user-public:
     sender_type: User
     receiver_type: User
     name: public
-    # This relation is weaker than user-friend
     parent: user-friend
-    # This relation is also reciprocal
     inverse: user-public
     permissions:
-      - [ read, resources, group_set ]
+      - [ read,    activity, inverse_group_set ]
   user-friend-request:
     sender_type: User
     receiver_type: User
     name: friend_request
-    # This relation is the request for user-friend
     granted: user-friend
 
-  # User to Group
   user-group-member:
     sender_type: User
     receiver_type: Group
@@ -44,21 +37,28 @@ relations:
     sender_type: User
     receiver_type: Group
     name: follower
-    parent: user-group-member
   user-group-public:
     sender_type: User
     receiver_type: Group
     name: public
-    parent: user-group-follower
+    parent: user-group-member
+    inverse: group-user-public
 
-  # Group to User
   group-user-member:
     sender_type: Group
     receiver_type: User
     name: member
     inverse: user-group-member
     permissions:
-      - [ create,  resources, weak_set ]
-      - [ read,    resources, group_set ]
-      - [ update,  resources, weak_group_set ]
-      - [ destroy, resources, weak_group_set ]
+      - [ create,  activity, inverse_weak_set ]
+      - [ read,    activity, inverse_group_set ]
+      - [ update,  activity, inverse_weak_group_set ]
+      - [ destroy, activity, inverse_weak_group_set ]
+  group-user-public:
+    sender_type: Group
+    receiver_type: User
+    name: public
+    parent: group-user-member
+    inverse: user-group-public
+    permissions:
+      - [ read,    activity, inverse_group_set ]

data/lib/social_stream/ability.rb

@@ -0,0 +1,26 @@
+module SocialStream
+  class Ability
+    include CanCan::Ability
+
+    def initialize(user)
+      can :create, Activity do |a|
+        # All ties authors must the user
+        a.tie.sender_subject == user &&
+          a.tie.permission?(user, 'create', 'activity')
+      end
+
+      can :read, Activity do |a|
+        a.tie.relation.name == 'public' ||
+          a.tie.permission?(user, 'read', 'activity')
+      end
+
+      can :update, Activity do |a|
+        a.tie.permission?(user, 'update', 'activity')
+      end
+
+      can :destroy, Activity do |a|
+        a.tie.permission?(user, 'destroy', 'activity')
+      end
+    end
+  end
+end

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "0.1.7".freeze
+  VERSION = "0.2.0".freeze
 end

data/lib/tasks/db/populate.rake

@@ -27,7 +27,7 @@ namespace :db do
       # = Users
 
       # Create demo user if not present
-      if User.find_by_name('demostration').blank?
+      if User.find_by_name('demo').blank?
         User.create! :name => 'demostration',
                      :email => 'demostration@test.com',
                      :password => 'demostration',
@@ -62,18 +62,37 @@ namespace :db do
 
         Forgery::Basic.number(:at_most => users.size).times do
           user = users.delete_at((rand * users.size).to_i)
-          u.ties.create :receiver => user.actor,
-                        :relation => user_relations.random
+          u.sent_ties.create :receiver => user.actor,
+                             :relation => user_relations.random
         end
+
         groups = available_groups.dup
-        group_relations = Relation.mode('User', 'Group')
+        group_relations = Relation.mode('User', 'Group').all
 
         Forgery::Basic.number(:at_most => groups.size).times do
           group = groups.delete_at((rand * groups.size).to_i)
-          u.ties.create :receiver => group.actor,
-                        :relation => group_relations.random
+          u.sent_ties.create :receiver => group.actor,
+                             :relation => group_relations.random
         end
       end
+
+      # = Posts
+
+      Tie.all.each do |t|
+        # Only Post from users
+        next if t.relation.sender_type == "Group"
+
+        updated = Time.at(rand(Time.now))
+
+        p = Post.create :text =>
+                      "This post should be for #{ I18n.t('other', :scope => t.relation.name) } of #{ t.receiver.name }.\n#{ Forgery::LoremIpsum.paragraph(:random => true) }",
+                        :created_at => Time.at(rand(updated)),
+                        :updated_at => updated,
+                        :_activity_tie_id => t.id
+
+        p.post_activity.update_attributes(:created_at => p.created_at,
+                                          :updated_at => p.updated_at)
+      end
     end
   end
 end

data/social_stream.gemspec

@@ -16,7 +16,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('paperclip', '~> 2.3.4')
   s.add_runtime_dependency('jquery-rails', '~> 0.2.5')
   s.add_runtime_dependency('cancan', '~> 1.4.0')
-  s.add_development_dependency('rails', '~> 3.0.1')
+  s.add_runtime_dependency('will_paginate', '~> 2.3.15')
+  s.add_development_dependency('rails', '~> 3.0.3')
   s.add_development_dependency('capybara', '~> 0.3.9')
   s.add_development_dependency('sqlite3-ruby')
   if RUBY_VERSION < '1.9'

data/spec/dummy/db/seeds/social_stream.yml

@@ -1,54 +1,64 @@
+# Seed configuration for Social Stream
+#
+# Define the relations and permissions supported by your application
+#
 relations:
   user-friend:
     sender_type: User
     receiver_type: User
     name: friend
     inverse: user-friend
+    reflexive: true
     permissions:
-      - [ create,  resources, weak_set ]
-      - [ read,    resources, group_set ]
-      - [ update,  resources, weak_set ]
-      - [ destroy, resources, weak_set ]
-  user-fof:
-    sender_type: User
-    receiver_type: User
-    name: friend_of_friend
-    parent: user-friend
-    inverse: user-fof
-    permissions:
-      - [ read, resources, group_set ]
+      - [ create,  activity, inverse_weak_set ]
+      - [ read,    activity, inverse_group_set ]
+      - [ update,  activity, inverse_weak_set ]
+      - [ destroy, activity, inverse_weak_set ]
   user-public:
     sender_type: User
     receiver_type: User
     name: public
-    parent: user-fof
+    parent: user-friend
     inverse: user-public
     permissions:
-      - [ read, resources, group_set ]
-
-  user-group-admin:
+      - [ read,    activity, inverse_group_set ]
+  user-friend-request:
     sender_type: User
-    receiver_type: Group
-    name: admin
-    permissions:
-      - [ create,  resources, weak_set ]
-      - [ read,    resources, group_set ]
-      - [ update,  resources, weak_group_set ]
-      - [ destroy, resources, weak_group_set ]
-  user-group-user:
+    receiver_type: User
+    name: friend_request
+    granted: user-friend
+
+  user-group-member:
     sender_type: User
     receiver_type: Group
-    name: user
-    parent: user-group-admin
-    permissions:
-      - [ create,  resources, weak_set ]
-      - [ read,    resources, group_set ]
-      - [ update,  resources, weak_group_set ]
-      - [ destroy, resources, weak_group_set ]
+    name: member
+    inverse: group-user-member
   user-group-follower:
     sender_type: User
     receiver_type: Group
     name: follower
-    parent: user-group-user
+  user-group-public:
+    sender_type: User
+    receiver_type: Group
+    name: public
+    parent: user-group-member
+    inverse: group-user-public
+
+  group-user-member:
+    sender_type: Group
+    receiver_type: User
+    name: member
+    inverse: user-group-member
+    permissions:
+      - [ create,  activity, inverse_weak_set ]
+      - [ read,    activity, inverse_group_set ]
+      - [ update,  activity, inverse_weak_group_set ]
+      - [ destroy, activity, inverse_weak_group_set ]
+  group-user-public:
+    sender_type: Group
+    receiver_type: User
+    name: public
+    parent: group-user-member
+    inverse: user-group-public
     permissions:
-      - [ read,    resources, group_set ]
+      - [ read,    activity, inverse_group_set ]

data/spec/factories/tie.rb

@@ -6,15 +6,15 @@ end
 
 # UserToUser ties
 
-Factory.define :friend_tie, :parent => :tie do |t|
+Factory.define :friend, :parent => :tie do |t|
   t.relation { |r| Relation.mode('User', 'User').find_by_name('friend') }
 end
 
-Factory.define :fof_tie, :parent => :tie do |t|
-  t.relation { |r| Relation.mode('User', 'User').find_by_name('friend_of_friend') }
+Factory.define :friend_request, :parent => :tie do |t|
+  t.relation { |r| Relation.mode('User', 'User').find_by_name('friend_request') }
 end
 
-Factory.define :public_tie, :parent => :tie do |t|
+Factory.define :public, :parent => :tie do |t|
   t.relation { |r| Relation.mode('User', 'User').find_by_name('public') }
 end
 
@@ -24,15 +24,20 @@ Factory.define :u2g_tie, :parent => :tie do |t|
   t.relation { |r| Relation.mode('User', 'Group').strongest }
 end
 
-Factory.define :admin_tie, :parent => :u2g_tie do |t|
-  t.relation { |r| Relation.mode('User', 'Group').find_by_name('admin') }
+Factory.define :member, :parent => :u2g_tie do |t|
+  t.relation { |r| Relation.mode('User', 'Group').find_by_name('member') }
 end
 
-Factory.define :user_tie, :parent => :u2g_tie do |t|
-  t.relation { |r| Relation.mode('User', 'Group').find_by_name('user') }
+Factory.define :follower, :parent => :u2g_tie do |t|
+  t.relation { |r| Relation.mode('User', 'Group').find_by_name('follower') }
 end
 
-Factory.define :follower_tie, :parent => :u2g_tie do |t|
-  t.relation { |r| Relation.mode('User', 'Group').find_by_name('follower') }
+# GroupToUser ties
+Factory.define :g2u_tie, :parent => :tie do |t|
+  t.sender { |r| Factory(:group).actor }
+  t.relation { |r| Relation.mode('Group', 'User').strongest }
 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

@@ -1,17 +1,26 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 module ActivityTestHelper
-  def create_activity_assigned_to(t)
-    @tie = t
-    @activity = Factory(:activity, :tie => t)
+  def create_activity_assigned_to(tie)
+    @tie = tie
+    @activity = Factory(:activity, :tie => tie)
   end
 
   def create_ability_accessed_by(tie_type)
     t = Factory(tie_type, :receiver => @tie.receiver)
-    u = t.sender.subject
+    u = t.sender_subject
     @ability = Ability.new(u)
   end
 
+  def create_ability_accessed_by_sender
+    u = @tie.sender_subject
+    @ability = Ability.new(u)
+  end
+
+  def create_ability_accessed_publicly
+    @ability = Ability.new(Factory(:user))
+  end
+
   shared_examples_for "Allows Creating" do
     it "should allow create" do
       @ability.should be_able_to(:create, @activity)
@@ -80,15 +89,14 @@ describe Activity do
     end
   end
 
-  describe "belonging to friend tie" do
+  describe "belonging to friend" do
     before do
-      create_activity_assigned_to(Factory(:friend_tie))
+      create_activity_assigned_to(Factory(:friend))
     end
 
-    describe "accessed by same friend" do
+    describe "accessed by sender" do
       before do
-        u = @tie.sender.subject
-        @ability = Ability.new(u)
+        create_ability_accessed_by_sender
       end
 
       it_should_behave_like "Allows Creating"
@@ -99,7 +107,7 @@ describe Activity do
     
     describe "accessed by different friend" do
       before do
-        create_ability_accessed_by :friend_tie
+        create_ability_accessed_by :friend
       end
 
       it_should_behave_like "Denies Creating"
@@ -108,9 +116,9 @@ describe Activity do
       it_should_behave_like "Denies Destroying"
     end
 
-    describe "accessed by friend of friend" do
+    describe "accessed by friend request" do
       before do
-        create_ability_accessed_by :fof_tie
+        create_ability_accessed_by :friend_request
       end
 
       it_should_behave_like "Denies Creating"
@@ -121,7 +129,7 @@ describe Activity do
 
     describe "accessed publicly" do
       before do
-        create_ability_accessed_by :public_tie
+        create_ability_accessed_publicly
       end
 
       it_should_behave_like "Denies Creating"
@@ -131,26 +139,15 @@ describe Activity do
     end
   end
   
-  describe "belonging to fof tie from a friend" do
+  describe "belonging to friend reflexive tie" do
     before do
-      create_activity_assigned_to(Factory(:friend_tie).related('friend_of_friend'))
-    end
-    
-    describe "accessed by a friend" do
-      before do
-        create_ability_accessed_by :friend_tie
-      end
-
-      it_should_behave_like "Denies Creating"
-      it_should_behave_like "Allows Reading"
-      it_should_behave_like "Denies Updating"
-      it_should_behave_like "Denies Destroying"
+      tie = Factory(:user).ties.where(:relation_id => Relation.mode('User', 'User').find_by_name('friend')).first
+      create_activity_assigned_to(tie)
     end
 
-    describe "accessed by same friend" do
+    describe "accessed by the sender" do
       before do
-        u = @tie.sender.subject
-        @ability = Ability.new(u)
+        create_ability_accessed_by_sender
       end
 
       it_should_behave_like "Allows Creating"
@@ -159,9 +156,9 @@ describe Activity do
       it_should_behave_like "Allows Destroying"
     end
     
-    describe "accessed by different friend of friend" do
+    describe "accessed by a friend" do
       before do
-        create_ability_accessed_by :fof_tie
+        create_ability_accessed_by :friend
       end
 
       it_should_behave_like "Denies Creating"
@@ -170,9 +167,9 @@ describe Activity do
       it_should_behave_like "Denies Destroying"
     end
 
-    describe "accessed publicly" do
+    describe "accessed by friend request" do
       before do
-        create_ability_accessed_by :public_tie
+        create_ability_accessed_by :friend_request
       end
 
       it_should_behave_like "Denies Creating"
@@ -180,38 +177,40 @@ describe Activity do
       it_should_behave_like "Denies Updating"
       it_should_behave_like "Denies Destroying"
     end
-  end
 
-  describe "belonging to fof tie from a friend of friend" do
-    before do
-      create_activity_assigned_to(Factory(:fof_tie))
-      u = @tie.sender.subject
-      @ability = Ability.new(u)
+    describe "accessed publicly" do
+      before do
+        create_ability_accessed_publicly
+      end
+
+      it_should_behave_like "Denies Creating"
+      it_should_behave_like "Denies Reading"
+      it_should_behave_like "Denies Updating"
+      it_should_behave_like "Denies Destroying"
     end
-    
-    it_should_behave_like "Denies Creating"
   end
 
- 
   describe "belonging to public tie" do
+
     before do
-      create_activity_assigned_to(Factory(:friend_tie).related('public'))
+      tie = Factory(:user).ties.where(:relation_id => Relation.mode('User', 'User').find_by_name('public')).first
+      create_activity_assigned_to(tie)
     end
-    
-    describe "accessed by a friend" do
+
+    describe "accessed by the sender" do
       before do
-        create_ability_accessed_by :friend_tie
+        create_ability_accessed_by_sender
       end
 
-      it_should_behave_like "Denies Creating"
+      it_should_behave_like "Allows Creating"
       it_should_behave_like "Allows Reading"
-      it_should_behave_like "Denies Updating"
-      it_should_behave_like "Denies Destroying"
+      it_should_behave_like "Allows Updating"
+      it_should_behave_like "Allows Destroying"
     end
-
-    describe "accessed by friend of friend" do
+    
+    describe "accessed by a friend" do
       before do
-        create_ability_accessed_by :fof_tie
+        create_ability_accessed_by :friend
       end
 
       it_should_behave_like "Denies Creating"
@@ -220,21 +219,20 @@ describe Activity do
       it_should_behave_like "Denies Destroying"
     end
 
-    describe "accessed by same public sender" do
+    describe "accessed by friend request" do
       before do
-        u = @tie.sender.subject
-        @ability = Ability.new(u)
+        create_ability_accessed_by :friend_request
       end
 
-      it_should_behave_like "Allows Creating"
+      it_should_behave_like "Denies Creating"
       it_should_behave_like "Allows Reading"
-      it_should_behave_like "Allows Updating"
-      it_should_behave_like "Allows Destroying"
+      it_should_behave_like "Denies Updating"
+      it_should_behave_like "Denies Destroying"
     end
 
-    describe "accessed by different public" do
+    describe "accessed publicly" do
       before do
-        create_ability_accessed_by :public_tie
+        create_ability_accessed_publicly
       end
 
       it_should_behave_like "Denies Creating"
@@ -245,24 +243,23 @@ describe Activity do
   end
 
   describe "belonging to public tie from a public" do
+
     before do
-      create_activity_assigned_to(Factory(:public_tie))
-      u = @tie.sender.subject
-      @ability = Ability.new(u)
+      create_activity_assigned_to(Factory(:public))
+      create_ability_accessed_by_sender
     end
     
     it_should_behave_like "Denies Creating"
   end
 
-  describe "belonging to admin tie" do
+  describe "belonging to member tie" do
     before do
-      create_activity_assigned_to(Factory(:admin_tie))
+      create_activity_assigned_to(Factory(:member))
     end
 
-    describe "accessed by same admin" do
+    describe "accessed by same member" do
       before do
-        u = @tie.sender.subject
-        @ability = Ability.new(u)
+        create_ability_accessed_by_sender
       end
 
       it_should_behave_like "Allows Creating"
@@ -271,9 +268,9 @@ describe Activity do
       it_should_behave_like "Allows Destroying"
     end
     
-    describe "accessed by different admin" do
+    describe "accessed by different member" do
       before do
-        create_ability_accessed_by :admin_tie
+        create_ability_accessed_by :member
       end
 
       it_should_behave_like "Denies Creating"
@@ -282,9 +279,9 @@ describe Activity do
       it_should_behave_like "Allows Destroying"
     end
 
-    describe "accessed by user" do
+    describe "accessed by follower" do
       before do
-        create_ability_accessed_by :user_tie
+        create_ability_accessed_by :follower
       end
 
       it_should_behave_like "Denies Creating"
@@ -293,9 +290,9 @@ describe Activity do
       it_should_behave_like "Denies Destroying"
     end
 
-    describe "accessed by follower" do
+    describe "accessed publicly" do
       before do
-        create_ability_accessed_by :follower_tie
+        create_ability_accessed_publicly
       end
 
       it_should_behave_like "Denies Creating"
@@ -305,26 +302,15 @@ describe Activity do
     end
   end
   
-  describe "belonging to user tie from an admin" do
-    before do
-      create_activity_assigned_to(Factory(:admin_tie).related('user'))
-    end
-    
-    describe "accessed by a admin" do
-      before do
-        create_ability_accessed_by :admin_tie
-      end
+  describe "belonging to public tie from an admin" do
 
-      it_should_behave_like "Denies Creating"
-      it_should_behave_like "Allows Reading"
-      it_should_behave_like "Allows Updating"
-      it_should_behave_like "Allows Destroying"
+    before do
+      create_activity_assigned_to(Factory(:member).related('public'))
     end
 
-    describe "accessed by same admin" do
+    describe "accessed by sender" do
       before do
-        u = @tie.sender.subject
-        @ability = Ability.new(u)
+        create_ability_accessed_by_sender
       end
 
       it_should_behave_like "Allows Creating"
@@ -333,9 +319,9 @@ describe Activity do
       it_should_behave_like "Allows Destroying"
     end
     
-    describe "accessed by different user" do
+    describe "accessed by other member" do
       before do
-        create_ability_accessed_by :user_tie
+        create_ability_accessed_by :member
       end
 
       it_should_behave_like "Denies Creating"
@@ -344,60 +330,21 @@ describe Activity do
       it_should_behave_like "Allows Destroying"
     end
 
+   
     describe "accessed by follower" do
       before do
-        create_ability_accessed_by :follower_tie
+        create_ability_accessed_by :follower
       end
 
       it_should_behave_like "Denies Creating"
-      it_should_behave_like "Denies Reading"
+      it_should_behave_like "Allows Reading"
       it_should_behave_like "Denies Updating"
       it_should_behave_like "Denies Destroying"
     end
-  end
-
-  describe "belonging to follower tie" do
-    before do
-      create_activity_assigned_to(Factory(:user_tie).related('follower'))
-    end
-    
-    describe "accessed by an admin" do
-      before do
-        create_ability_accessed_by :admin_tie
-      end
-
-      it_should_behave_like "Denies Creating"
-      it_should_behave_like "Allows Reading"
-      it_should_behave_like "Allows Updating"
-      it_should_behave_like "Allows Destroying"
-    end
 
-    describe "accessed by user" do
-      before do
-        create_ability_accessed_by :user_tie
-      end
-
-      it_should_behave_like "Denies Creating"
-      it_should_behave_like "Allows Reading"
-      it_should_behave_like "Allows Updating"
-      it_should_behave_like "Allows Destroying"
-    end
-
-    describe "accessed by same sender" do
-      before do
-        u = @tie.sender.subject
-        @ability = Ability.new(u)
-      end
-
-      it_should_behave_like "Allows Creating"
-      it_should_behave_like "Allows Reading"
-      it_should_behave_like "Allows Updating"
-      it_should_behave_like "Allows Destroying"
-    end
-
-    describe "accessed by different follower" do
+    describe "accessed publicly" do
       before do
-        create_ability_accessed_by :follower_tie
+        create_ability_accessed_publicly
       end
 
       it_should_behave_like "Denies Creating"
@@ -407,14 +354,4 @@ describe Activity do
     end
   end
 
-  describe "belonging to follower tie from a follower" do
-    before do
-      create_activity_assigned_to(Factory(:follower_tie))
-      u = @tie.sender.subject
-      @ability = Ability.new(u)
-    end
-    
-    it_should_behave_like "Denies Creating"
-  end
-
 end