social_stream 0.3.1 → 0.3.2

data/.gitignore

@@ -2,3 +2,4 @@
 pkg/*gem
 **.tmp_*
 Gemfile.lock
+.idea

data/app/models/activity.rb

@@ -114,9 +114,14 @@ class Activity < ActiveRecord::Base
   # Assign to ties of followers
   def assign_to_ties
     original = tie_activities.create!(:tie => _tie)
-    _tie.activity_receivers.each do |t|
-      tie_activities.create!(:tie => t,
-                             :original => false)
+
+    # All the ties following the activities attached to this tie, allowed to read
+    # this activity
+    Tie.following([_tie.sender_id, _tie.receiver_id]).each do |t|
+      if _tie.allows?(t.sender_id, 'read', 'activity')
+        tie_activities.create!(:tie => t,
+                               :original => false)
+      end
     end
   end
 end

data/app/models/permission.rb

@@ -19,7 +19,9 @@ class Permission < ActiveRecord::Base
   has_many :relation_permissions, :dependent => :destroy
   has_many :relations, :through => :relation_permissions
 
-  scope :represent, where(:action => 'represent')
+  %w(represent follow).each do |p|
+    scope p, where(:action => p) # scope :represent, where(:action => 'represent')
+  end
 
   # The SQL and ARel conditions for permission queries
   ParameterConditions = {

data/app/models/tie.rb

@@ -68,6 +68,11 @@ class Tie < ActiveRecord::Base
       where("ties.sender_id = ties_2.receiver_id AND ties.receiver_id = ties_2.sender_id")
   }
 
+  scope :following, lambda { |a|
+    where(:receiver_id => Actor.normalize_id(a)).
+      joins(:relation => :permissions) & Permission.follow
+  }
+
   validates_presence_of :sender_id, :receiver_id, :relation_id
 
   before_validation :find_relation
@@ -118,11 +123,6 @@ class Tie < ActiveRecord::Base
     relation_set(:relations => r).first
   end
 
-  def activity_receivers
-    # TODO
-    Array.new
-  end
-
   # = Access Control
   #
   # Access control enforcement in ties come from the permissions assigned to other ties through relations.
@@ -184,15 +184,21 @@ class Tie < ActiveRecord::Base
       where("ties_as.receiver_id" => Actor.normalize_id(actor))
   }
 
+  # The set of ties that permit this tie allow to allow action on object
   def access_set(action, object)
     self.class.access_set(self, action, object)
   end
 
+  # The set of ties allowing user to perform action on object
   def allowing(user, action, object)
     access_set(action, object).received_by(user)
   end
 
+  # Does this tie allows user to perform action on object?
   def allows?(user, action, object)
+    # FIXME: Patch to support public activities
+    return true if relation.name == 'public' && action == 'read' && object == 'activity'
+
     allowing(user, action, object).any?
   end
 

data/app/views/activities/_activities.html.erb

@@ -12,8 +12,9 @@
   </div>
   
   <div id="wall">
-  <% if activities.any? %>
+    <% activities = activities.paginate(:page => params[:page]) %>
+    <%- # should be activities.paginate(:page => params[:page], :count => { :select => 'activity.id', :distinct => true }) but it is not working in Rails 3.0.3 -%>
     <%= render activities  %>
-  <% end %>
+    <%= will_paginate activities %>
   </div>
 </div>

data/app/views/activities/_new.html.erb

@@ -16,7 +16,7 @@
       <%= f.text_field :text, :id => "input_activities", :size => 85 %>
       <div id="activities_share_btn">
         <div id="securities">
-          <%= f.select :_activity_tie_id, receiver.sent_ties_allowing(current_subject, 'create', 'activity').map{ |t| [ t.relation_name, t.id ] }, {}, :id => 'security' %>
+          <%= f.select :_activity_tie_id, receiver.sent_ties_allowing(current_subject, 'create', 'activity').sort{ |t, u| t.relation <=> u.relation }.map{ |t| [ t.relation_name, t.id ] }, {}, :id => 'security' %>
         </div>
         <%= image_submit_tag "btn/btn_share.png" %>
       </div>

data/app/views/groups/_index.html.erb

@@ -1,6 +1,8 @@
+<% groups = Group.alphabetic.paginate(:page => params[:page]) %>
+
 <% cont=0; %>
 
-<% Group.alphabetic.all.each do |group| %>
+<% groups.each do |group| %>
 
 	<% if (cont%2) == 0
 			cont+=1; %>
@@ -31,3 +33,4 @@
 		</div>
 <% end %>
 
+<%= will_paginate(groups) %>

data/app/views/groups/index.html.erb

@@ -69,19 +69,6 @@
 					  	<%= render :partial => "groups/index"%>
 						<div class="space_center">
 						</div>
-						<div class="letters" class="content_size">
-								<a href="#">First</a>
-								<a href="#"><<</a>
-								<a href="#">1</a>
-								<a href="#">2</a>
-								<a href="#">3</a>
-								4 <a href="#">5</a>
-								<a href="#">6</a>
-								... <a href="#">>></a>
-								<a href="#">Last</a>
-						</div>
-						<div class="space_center">
-						</div>
 				</div>
 		
 		<div id="most_popular" class="tabconference_browse">

data/app/views/groups/show.html.erb

@@ -17,5 +17,5 @@
 </div>
 
 <%= render :partial => "activities/activities",
-           :locals => { :activities => @group.profile_wall(current_subject).paginate,
+           :locals => { :activities => @group.profile_wall(current_subject),
                         :owner => @group } %>

data/app/views/home/index.html.erb

@@ -19,5 +19,5 @@
 <% end %>
 
 <%= render :partial => "activities/activities",
-           :locals => { :activities => current_subject.home_wall.paginate,
+           :locals => { :activities => current_subject.home_wall,
                         :owner => current_subject } %>

data/app/views/layouts/_header.erb

@@ -1,37 +1,42 @@
 <div id="headerFront">
     <div class="banner_top">
         <div id="header_left">
-            <a href="index.htm"></a>
-            <div id="logo_txt">
-                <%= link_to(t('socialstream') , root_path)%>   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-            </div>
-            <% if user_signed_in? %>
-              <%=image_tag("btn/btn_home.png",:class=>"btn_config") %>
-              <div class="txt_config">
-                <%= link_to t('home'), home_path %>
-              </div>			
-              <%=image_tag("btn/btn_profile.png",:class=>"btn_config") %>
-              <div class="txt_config">
-                <%= link_to(t('profile.one'), current_subject)%>
-              </div>
-                <%=image_tag("btn/btn_browse.png",:class=>"btn_config") %>
-              <div class="txt_config2">
-                <%=link_to(t('browse'),users_path) %>  &nbsp;
-              </div>
+          <a href="index.htm"></a>
+          <div id="logo_txt">
+              <%= link_to(t('socialstream') , root_path)%>   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
           </div>
-          <div id="header_right">
-              <%=image_tag("btn/btn_config.png",:class=>"btn_config") %>
-              <div class="txt_config">
-                <%= link_to t('account.one'), '#' %>
-              </div>
+          <% if user_signed_in? %>
+            <%=image_tag("btn/btn_home.png",:class=>"btn_config") %>
+            <div class="txt_config">
+              <%= link_to t('home'), home_path %>
+            </div>
+            <%=image_tag("btn/btn_profile.png",:class=>"btn_config") %>
+            <div class="txt_config">
+              <%= link_to(t('profile.one'), current_subject)%>
+            </div>
+              <%=image_tag("btn/btn_browse.png",:class=>"btn_config") %>
+            <div class="txt_config2">
+              <%=link_to(t('browse'),users_path) %>  &nbsp;
+            </div>
+          <% end %>
+        </div>
 
-              <%= render :partial => 'layouts/representation' %>
+        <div id="header_right">
+          <% if user_signed_in? %>
 
-              <%=image_tag("btn/btn_exit.png",:class=>"btn_config") %>
-              <div class="txt_config2">
-                <%= link_to t('sign_out'), destroy_user_session_path %>
-              </div>
-            <% end %>
+          <%=image_tag("btn/btn_config.png",:class=>"btn_config") %>
+          <div class="txt_config">
+            <%= link_to t('account.one'), '#' %>
+          </div>
+
+          <div id="representation">
+            <%= render :partial => 'layouts/representation' %>
+          </div>
+          <%=image_tag("btn/btn_exit.png",:class=>"btn_config") %>
+          <div class="txt_config2">
+            <%= link_to t('sign_out'), destroy_user_session_path %>
+          </div>
+          <% end %>
         </div>
     </div>
     <br class="clearfloat" />

data/app/views/ties/create.js.erb

@@ -8,7 +8,7 @@
       if ($('#carousel_ul').length) { // element found
         $("#carousel_ul").prepend("<%= escape_javascript(render @tie.receiver_subject) %>");
       }else{ // no element found
-        $("#my_groups").html("<%= escape_javascript(render 'users/groups' )%>");
+        $("#my_groups").html("<%= escape_javascript(render(:partial => 'users/groups', :locals => { :user => current_subject } ))%>");
       }
       $("#group_count").html("<%=current_subject.recent_groups.count%>");
       link_tie.replaceWith("<%= escape_javascript(link_follow_state) %>");
@@ -20,7 +20,7 @@
       } else {
       old_tie.hide();
     }
-
-    $(".boxy-inner .close").click();
   <% end %>
+
+  $(".boxy-inner .close").click();
 <% end %>

data/app/views/users/_index.html.erb

@@ -1,6 +1,8 @@
+<% users = User.alphabetic.paginate(:page => params[:page]) %>
+
 <% cont=0; %>
 
-<% User.alphabetic.all.each do |user| %>
+<% users.each do |user| %>
 
 	<% if (cont%2) == 0
 			cont+=1; %>
@@ -28,3 +30,4 @@
 		</div>
 <% end %>
 
+<%= will_paginate(users) %>

data/app/views/users/index.html.erb

@@ -63,19 +63,6 @@
 
 						<div class="space_center">
 						</div>
-						<div class="letters" class="content_size">
-								<a href="#">First</a>
-								<a href="#"><<</a>
-								<a href="#">1</a>
-								<a href="#">2</a>
-								<a href="#">3</a>
-								4 <a href="#">5</a>
-								<a href="#">6</a>
-								... <a href="#">>></a>
-								<a href="#">Last</a>
-						</div>
-						<div class="space_center">
-						</div>
 				</div>
 
 

data/app/views/users/show.html.erb

@@ -16,5 +16,5 @@
            :locals  => { :user => @user } %>
 
 <%= render :partial => "activities/activities",
-           :locals  => { :activities => @user.profile_wall(current_subject).paginate,
+           :locals  => { :activities => @user.profile_wall(current_subject),
                          :owner => @user } %>

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

@@ -53,7 +53,12 @@
 	float: right;
 	right: 0px;
 	padding-right: 10px;
+  display: inline-block;
 }
+#representation {
+  display: inline;
+}
+
 
 .btn_config {
 	vertical-align: top;
@@ -107,5 +112,5 @@
 }
 
 #new_representation {
-	display: inline;
+	display: inline-block;
 }

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

@@ -6,6 +6,7 @@ user:
   friend:
     name: friend
     permissions:
+      - [ follow ]
       - [ create,  activity, weak_set ]
       - [ read,    activity, star_set ]
       - [ update,  activity, weak_set ]

data/lib/social_stream/ability.rb

@@ -10,9 +10,7 @@ module SocialStream
       end
 
       can :read, Activity do |a|
-        # This condition would not be neccesary if every actor had a public tie with others
-        a.tie.relation.name == 'public' ||
-          a.tie.allows?(user, 'read', 'activity')
+        a.tie.allows?(user, 'read', 'activity')
       end
 
       can :update, Activity do |a|

data/lib/social_stream/controllers/helpers.rb

@@ -11,14 +11,17 @@ module SocialStream
       module InstanceMethods
         # Current subject represented by the user. Defaults to the own user
         def current_subject
-          current_subject_from_session ||
-            current_user
+          @current_subject ||=
+            current_subject_from_session ||
+              current_user
         end
 
         # Set represented subject
         def current_subject= instance
           session[:subject_type] = instance.class.to_s
           session[:subject_id]   = instance.id
+
+          @current_subject = instance
         end
 
         private

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "0.3.1".freeze
+  VERSION = "0.3.2".freeze
 end

data/social_stream.gemspec

@@ -5,7 +5,8 @@ Gem::Specification.new do |s|
   s.version = SocialStream::VERSION.dup
   s.summary = "Social networking features and activity streams for Ruby on Rails."
   s.description = "Ruby on Rails engine supporting social networking features and activity streams."
-  s.authors = ["Grupo Internet de Nueva Generación, Universidad Politécnica de Madrid"]
+  s.authors = [ "GING - DIT - UPM",
+                "CISE - ESPOL" ]
   s.homepage = "http://social-stream.dit.upm.es/"
   s.files = `git ls-files`.split("\n")
   s.add_runtime_dependency('atd-ancestry', '1.3.0')
@@ -17,7 +18,7 @@ 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_runtime_dependency('will_paginate', '~> 2.3.15')
+  s.add_runtime_dependency('will_paginate', '~> 3.0.pre2')
   s.add_development_dependency('rails', '~> 3.0.3')
   s.add_development_dependency('capybara', '~> 0.3.9')
   s.add_development_dependency('sqlite3-ruby')

data/spec/dummy/config/relations.yml

@@ -6,6 +6,7 @@ user:
   friend:
     name: friend
     permissions:
+      - [ follow ]
       - [ create,  activity, weak_set ]
       - [ read,    activity, star_set ]
       - [ update,  activity, weak_set ]

data/spec/dummy/db/.gitignore

@@ -1 +1,2 @@
 *.sqlite3
+*.sqlite3-journal

data/spec/models/tie_activity_spec.rb

@@ -0,0 +1,52 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe TieActivity do
+  describe "for followers" do
+    before do
+      @tie = Factory(:friend)
+
+      @tie_to_sender_friend   = Factory(:friend, :receiver => @tie.sender)
+      @tie_to_receiver_friend = Factory(:friend, :receiver => @tie.receiver)
+    end
+
+    describe "of a public activity" do
+      before do
+        @a = Factory(:activity, :_tie => @tie.related(@tie.sender.relations.sort.last))
+      end
+
+      it "should be created" do
+        assert @tie_to_sender_friend.activities.include?(@a)
+        assert @tie_to_receiver_friend.activities.include?(@a)
+      end
+    end
+
+    describe "of a friend activity" do
+      before do
+        @a = Factory(:activity, :_tie => @tie)
+      end
+
+      it "should not be created" do
+        assert !@tie_to_sender_friend.activities.include?(@a)
+        assert !@tie_to_receiver_friend.activities.include?(@a)
+      end
+    end
+
+    describe "one of them being friend" do
+      before do
+        Factory(:friend, :sender => @tie.sender, :receiver => @tie_to_receiver_friend.sender)
+      end
+
+      describe "with a friend activity" do
+        before do
+          @a = Factory(:activity, :_tie => @tie)
+        end
+
+        it "should be created for the friend" do
+          assert !@tie_to_sender_friend.activities.include?(@a)
+          assert @tie_to_receiver_friend.activities.include?(@a)
+        end
+      end
+    end
+  end
+end
+

data/spec/models/tie_spec.rb

@@ -17,18 +17,22 @@ describe Tie do
     tie.should be_valid
   end
 
-  it "should create pending" do
-    tie = Factory(:friend)
-
-    assert tie.receiver.pending_ties.present?
-    assert tie.receiver.pending_ties.first.relation_set.blank?
-  end
 
   describe "friend" do
     before do
       @tie = Factory(:friend)
     end
 
+    it "should create pending" do
+
+      assert @tie.receiver.pending_ties.present?
+      assert @tie.receiver.pending_ties.first.relation_set.blank?
+    end
+
+    it "should be following" do
+      assert Tie.following(@tie.receiver_id).include?(@tie)
+    end
+
     describe ", receiver" do
       before do
         @s = @tie.receiver

metadata

@@ -1,21 +1,22 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
-- "Grupo Internet de Nueva Generaci\xC3\xB3n, Universidad Polit\xC3\xA9cnica de Madrid"
+- GING - DIT - UPM
+- CISE - ESPOL
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-01-19 00:00:00 +01:00
+date: 2011-01-25 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -170,12 +171,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 270495401
         segments: 
-        - 2
         - 3
-        - 15
-        version: 2.3.15
+        - 0
+        - pre2
+        version: 3.0.pre2
   type: :runtime
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
@@ -501,6 +502,7 @@ files:
 - lib/generators/social_stream/templates/public/images/btn/time.png
 - lib/generators/social_stream/templates/public/images/btn/uno.png
 - lib/generators/social_stream/templates/public/images/btn/viewer.png
+- lib/generators/social_stream/templates/public/images/favicon.ico
 - lib/generators/social_stream/templates/public/images/frontpage/collaborate.gif
 - lib/generators/social_stream/templates/public/images/frontpage/collaborate.png
 - lib/generators/social_stream/templates/public/images/frontpage/comments.png
@@ -656,6 +658,7 @@ files:
 - spec/models/actor_spec.rb
 - spec/models/post_spec.rb
 - spec/models/representation_spec.rb
+- spec/models/tie_activity_spec.rb
 - spec/models/tie_spec.rb
 - spec/models/user_spec.rb
 - spec/social_stream_spec.rb