social_stream 0.0.5 → 0.1.0

data/README.rdoc

@@ -35,21 +35,31 @@ Then, execute:
   rails generate social_stream:install
 
 This will generate the following:
-* A migration providing the database schema
+* A jquery:install generation for jQuery support
+* A devise:install generation for authentication support
 * An initializer configuration file for Social Stream.
 * A database seeds file for defining Social Stream relations, along with an entry
 in db/seeds.rb to load it.
-* A devise:install generation for authentication support
+* A new application layout
+* A migration providing the database schema
+
+Do not forget to migrate and seed your database
+
+  rake db:migrate
+  rake db:seed
 
 == Actors and Activity Objects
 
-{Social Stream}[http://github.com/ging/social_stream] relies in Devise[http://github.com/plataformatec/devise].
+{Social Stream}[http://github.com/ging/social_stream] relies in Devise[http://github.com/plataformatec/devise]. You have authenticated users support in your application.
 
-You must include an <tt>actor_id</tt> column in the user's migration. Then add user to
-<tt>config/initializers/social_stream.rb</tt>
+Besides, there is another kind of actor: groups. If you want other type of actors
+(like organizations or social events) you must include an <tt>actor_id</tt> column in
+the migration. Then add it to <tt>config/initializers/social_stream.rb</tt>
 
-You must do the same with Activity Objects, like posts, comments or photos. Don't forget to add
-a <tt>activity_object_id</tt> column in the migration and add them to the initializer.
+There is also support for two types of basic activity objects: posts and comments.
+If you create other types, like photos, bookmarks or videos, you must do the same: 
+add a <tt>activity_object_id</tt> column in the migration and include it in the
+initializer.
 
 = Documentation
 

data/app/controllers/frontpage_controller.rb

@@ -0,0 +1,16 @@
+class FrontpageController < ApplicationController
+  before_filter :redirect_user_to_home, :only => :index
+
+  def index
+    respond_to do |format|
+      format.html # index.html.erb
+    end
+  end
+  
+
+  private
+
+  def redirect_user_to_home
+    redirect_to(home_path) if user_signed_in?
+  end
+end

data/app/models/actor.rb

@@ -8,7 +8,7 @@ class Actor < ActiveRecord::Base
 
   has_attached_file :logo,
                     :styles => { :small => "30x30" },
-                    :default_url => "/:attachment/:style/:subtype_class.png"
+                    :default_url => "/images/:attachment/:style/:subtype_class.png"
 
   has_many :sent_ties,
            :class_name => "Tie",
@@ -116,20 +116,26 @@ class Actor < ActiveRecord::Base
   #
   # @return [Tie]
   def suggestion(options = {})
-    type = options[:type].present? ?
-      options[:type].to_s.classify :
-      SuggestedRelations.keys[rand(SuggestedRelations.size)]
+    candidates_types = options[:type].present? ?
+      Array(options[:type].to_s.classify) :
+      SuggestedRelations.keys
 
-    type_class = type.constantize
+    candidates_classes = candidates_types.map(&:constantize)
     
     # Candidates are all the instance of "type" minus all the subjects
     # that are receiving any tie from this actor
-    candidates = type_class.all - receiver_subjects(type)
+    candidates = candidates_classes.inject([]) do |cs, klass|
+      cs += klass.all - receiver_subjects(klass)
+      cs -= Array(subject) if subject.is_a?(klass)
+      cs
+    end
 
     candidate = candidates[rand(candidates.size)]
 
-    sent_ties.build :receiver_id => candidate.actor_id,
-                    :relation => Relation.mode(subject_type, type).find_by_name(SuggestedRelations[type])
+    return nil unless candidate.present?
+
+    sent_ties.build :receiver_id => candidate,
+                    :relation => Relation.mode(subject_type, candidate.class).find_by_name(SuggestedRelations[candidate.class.to_s])
   end
 
   # All the ties this actor has with subject that support activities
@@ -148,10 +154,19 @@ class Actor < ActiveRecord::Base
         }
   end
 
-  # The set of activities in the wall of this actor
-  # TODO: authorization
+  # The set of activities in the wall of this actor, includes all the activities
+  # from the ties the actor has access to
+  #
+  # TODO: ties, authorization
   def wall
     Activity.wall ties
   end
+
+  # The set of activities in the wall profile of this actor, includes the activities
+  # from the ties of this actor
+  # TODO: authorization
+  def wall_profile
+    Activity.wall ties
+  end
 end
 

data/app/models/user.rb

@@ -20,6 +20,10 @@ class User < ActiveRecord::Base
     receiver_subjects(:group, :relations => 'follower') & Tie.recent
   end
 
+  def friends
+    receiver_subjects(:user, :relations => 'friend')
+  end
+
   protected
   
   # From devise

data/app/views/{home → activities}/_activities.html.erb

@@ -6,14 +6,14 @@
 <div id="wrapper_activities">
   <div id="wrapper_activities_header">
     <div id="activities_title" class="content_size">
-      <%= image_tag("buttons/btn_activities.png") %> <%=t('activity.other')%>
+      <%= image_tag("btn/btn_activities.png") %> <%=t('activity.other')%>
     </div>
 
-    <%= render :partial => 'activities/new', :locals => { :receiver => current_user } %>
+    <%= render :partial => 'activities/new', :locals => { :receiver => owner } %>
   </div>
   <div id="wall">
-  <% if current_user.wall.any? %>
-    <%= render current_user.wall  %>
+  <% if activities.any? %>
+    <%= render activities  %>
   <% end %>
   </div>
 </div>

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

@@ -5,8 +5,8 @@
     <%= f.hidden_field :_activity_tie_id %>
     <%= f.text_field :text, :id => "input_activities", :size => 85 %>
     <div id="activities_share_btn">
-       <%= image_submit_tag "buttons/btn_security.png" %>
-       <%= image_submit_tag "buttons/btn_share.png" %>
+       <%= image_submit_tag "btn/btn_security.png" %>
+       <%= image_submit_tag "btn/btn_share.png" %>
     </div>
   <% end -%>
 </div>

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

@@ -9,7 +9,7 @@
      <%= f.text_field :text,   :class =>"input_new_comments" %>
      <div class="activities_comment_btn">
        <div class="activities_security"></div>
-       <%= image_submit_tag "buttons/btn_share.png" %>
+       <%= image_submit_tag "btn/btn_share.png" %>
      </div>
    <% end %>
 </div>

data/app/views/frontpage/_header.html.erb

@@ -0,0 +1,23 @@
+<div id="global-wrapper">
+    <div id="global" class="banner">
+    <a id="logo" class="frontpage_logo" href="/" alt="<%=t('socialstream')%>"></a>
+    <div id="espacio_header">
+        &nbsp
+    </div>
+    <div class="div_login">
+        <%= form_for User.new, :as => :user, :url => user_session_path do |f| -%>
+          <span><%= f.label :email %></span>
+          <%= f.email_field :email, :class => "input_username" %>
+          <span><%= f.label :password %></span>
+          <%= f.password_field :password, :class => "input_username" %>
+          <%= f.submit t(:login), :class => 'other_blue' %>
+        <% end -%>
+        <div class="subtexto">
+            <%= link_to t('register.one'), new_user_registration_path, :class => "register_link" %>
+            <span>|</span>
+            <%= link_to t('user.lost_password'), new_user_password_path, :class => "register_link" %>
+        </div>
+    </div>
+    <br class="clearfloat" />
+</div>
+</div>

data/app/views/frontpage/_sponsor.html.erb

@@ -0,0 +1,13 @@
+<div id="sponsor">
+  <ul>
+	<li>
+    <%=link_to("DIT","http://www.dit.upm.es/")%> -
+    <%=link_to("UPM","http://www.upm.es/")%> &
+    <%=link_to("CISE","http://www.cise.espol.edu.ec/")%> -
+    <%=link_to("ESPOL","http://www.espol.edu.ec/")%>
+  </li>
+  </ul>
+</div>
+
+
+

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

@@ -0,0 +1,87 @@
+<%= content_for :search do %>
+<%end %>
+<div class="left column span-11 borde">
+    <div id="left_espacio">
+    </div>
+    <div id="left_contenido">
+        <div id="vcc_title">
+            <%= t('frontpage.main_title') %>
+            <span id="text_bottom_title">
+                <br/>
+                <%= t('frontpage.stats', :users => User.count, :groups => Group.count) %>
+            </span>
+        </div>
+        <br/>
+        <div id="share">
+            <span><%=image_tag("../images/frontpage/share.gif") %></span>
+            <span>
+                <ul class="purple">
+                </li>
+                <li><%=image_tag("../images/frontpage/purple_sq.png") %><%= t('frontpage.share.sentence2') %>
+                </img>
+            </li>
+            <li>
+            <%=image_tag("../images/frontpage/purple_sq.png") %><%= t('frontpage.share.sentence3') %>
+            </img>
+        </li>
+        </ul>
+    </span>
+</div>
+<div id="meet" class="no_float_left">
+    <span><%=image_tag("../images/frontpage/meet.gif") %></span>
+    <span class="no_float">
+        <ul class="green">
+        <li><%=image_tag("../images/frontpage/green_sq.png") %><%= t('frontpage.meet.sentence2') %>
+        </img>
+    </li>
+</ul>
+</span>
+</div>
+<div id="collaborate" class="no_float_left">
+    <span><%=image_tag("../images/frontpage/collaborate.gif") %></span>
+    <span>
+        <ul class="yellow">
+            <li>
+            <%=image_tag("../images/frontpage/yellow_sq.png") %><%= t('frontpage.collaborate.sentence1') %>
+            </img>
+        </li>
+    <li>
+    <%=image_tag("../images/frontpage/yellow_sq.png") %><%= t('frontpage.collaborate.sentence3') %>
+    </img>
+</li>
+</ul>
+</span>
+</div>
+<br/>
+<div id="join_form" class="no_float_left">
+    <%= link_to image_tag("/images/frontpage/join.gif", :alt=>"register"), new_user_registration_path, :class => "register_link" %>
+</div>
+</div>
+</div>
+<div class="right column span-12 borde">
+    <div id="caracteristics">
+
+        <ul>
+            <li class="participants">
+                <%= t('frontpage.elements.participants') %>
+            </li>
+            <li class="organizers">
+                <%= t('frontpage.elements.organizers') %>
+            </li>
+            <li class="spaces">
+                <%= t('frontpage.elements.groups') %>
+            </li>
+            <li class="comments">
+                <%= t('frontpage.elements.comments') %>
+            </li>
+            <li class="tags">
+                <%= t('frontpage.elements.tags') %>
+            </li>
+            <li class="networks">
+                <%= t('frontpage.elements.networks') %>
+            </li>
+        </ul>
+    </div>
+</div>
+<div id="espacio_body_bottom">
+</div>

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

@@ -0,0 +1,9 @@
+<div id="bookmark">
+  <%=image_tag("btn/btn_bookmark.png")%><%= link_to "Follow",
+                                ties_path("tie[sender_id]" => current_user.actor.id,
+                                          "tie[receiver_id]" => @group,
+                                          "tie[relation_name]" => "follower"),
+                                :method => :post,
+                                :remote => true %>
+</div>
+

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

@@ -0,0 +1,14 @@
+		<div id="follower">
+				<div id="title_follower">
+                                  <%=image_tag("btn/btn_follower.png", :alt => "Follower")%><%=@group.followers.count%> <%=t('follower', :count => @group.followers.count)%>
+				</div>
+				<div class="follower_line">
+          <% @group.followers.all.each do |follower| %>
+					    <%=link_to((image_tag(follower.logo.url, :alt => follower.name , :size => "40x40")) , follower)%>
+          <%end%>
+				</div>
+				<div class="future_footer">
+					<%=link_to((image_tag("btn/btn_next.png", :alt => "next")) , group_path)%>
+				</div>
+		</div>
+

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

@@ -0,0 +1,4 @@
+<div id="logo">
+  <%= link_to image_tag(@group.logo.url, :alt => @group.name , :size => "119x108"), @group %>
+</div>
+

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

@@ -0,0 +1,7 @@
+<div class="space_center">
+</div>
+<%= render :partial => "ties/suggestions" %>
+<div class="space_center">
+</div>
+<%= render :partial => 'ties/pendings' %>
+

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

@@ -0,0 +1,6 @@
+<%= render :partial => 'follow' %>
+<%= render :partial => 'logo' %>
+<%= render :partial => 'tabs' %>
+<div class="space_center"> 
+</div> 
+<%= render :partial => 'followers' %>

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

@@ -0,0 +1,32 @@
+		<div id="tabright" class="widget">
+				<ul class="tabinfo fondo">
+						<li>
+								<a href="#info">Information</a>
+						</li>
+						<li>
+							<a href="#info"><%=(image_tag("btn/btn_tag.png", :alt => "tags"))+t('tags')%></a>
+						</li>
+				</ul>
+				<div id="info" class="tabinfo">
+						Place:
+						<br/>
+						Avendia Complutense 30 
+						<br/>
+						Ciudad Universitaria 
+						<br/>
+						28040 Madrid 
+						<br/>
+						Phone: 
+						<br/>
+						(593-4) 2 269269 
+						<br/>
+						<a href="mailto:info@dit.upm.es">info@dit.upm.es</a>
+						<br/>
+				</div>
+				<!--/popular-->
+				<div id="tag" class="tabinfo">
+						tag1, tag2, tag3, tag4, tag5
+						tag6, tag7, tag8, tag9, tag10
+				</div>
+		</div>
+

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

@@ -1,9 +1,9 @@
 <% content_for :middle do %>
-	<%= render :partial => "groups/middle_group_home" %>
+  <%= render :partial => 'middle_show' %>
 <% end %>
 
 <% content_for :right do %>
-	<%= render :partial => "groups/right_group_home" %>
+  <%= render :partial => 'right_show' %>
 <% end %>
 
 
@@ -16,13 +16,6 @@
 <div class="space_center">
 </div>
 
-<div id="wrapper_activities">
-  	
-  <%= render :partial => "home/groups" %>
-  <%= render :partial => "home/activities" %>
-<!--
-    <div id="create_space">
-        Create your conference space <input name="new_space" id="input_new_space" value="" size="50"/><a class="" href="#"><img src="images/buttons/btn_check.png" class="btn_menu_online" alt="Check" />Check</a>
-    </div>
--->
-</div>
+<%= render :partial => "activities/activities",
+           :locals => { :activities => @group.wall_profile,
+                        :owner => @group } %>

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

@@ -0,0 +1,17 @@
+<div class="contacts_header">
+    <%=image_tag("btn/btn_friend.png", :class => "contacts_icon")%>
+    <div class="contacts_text_header">
+      <%= current_user.friends.count %> <%= t('friend', :count => current_user.friends.count) %>
+    </div>
+</div>
+<div class ="contacts">
+    <div class="contact">
+      <%current_user.friends.all.each do |friend|%>
+          <%=link_to((image_tag (friend.logo.url, :alt => friend.name , :size => "40x40")) , friend)%>
+      <%end%>
+    </div>
+</div>
+<div class="contacts_footer">
+  <%=link_to((image_tag("btn/btn_next.png", :alt => "next")) , users_path) %>
+</div>
+

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

@@ -1,14 +1,13 @@
-<% if current_user.recent_groups.any? %>
 <div id="my_groups">
     <div id="groups_title" class="content_size">
         <%=t('group.other') %>
     </div>
     <div id="groups_list" class="content_size">
-      <%= render current_user.recent_groups %>
+      <% if current_user.recent_groups.any? %>
+        <%= render current_user.recent_groups %>
+      <% else %>
+        <div class="space_center">
+        </div>
+      <% end %>
     </div>
 </div>
-<% else %>
-<div class="space_center">
-</div>
-<% end %>
-