social_stream 0.2.3 → 0.3.0

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

@@ -11,9 +11,13 @@
 <br class="clearfloat" />
 <div class="space_center">
 </div>
+
+<% if current_subject.respond_to?(:recent_groups) %>
 <div id="my_groups">
   <%= render :partial => "groups" %>
 </div>
+<% end %>
+
 <%= render :partial => "activities/activities",
-           :locals => { :activities => current_user.wall.paginate,
-                        :owner => current_user } %>
+           :locals => { :activities => current_subject.home_wall.paginate,
+                        :owner => current_subject } %>

data/app/views/layouts/_footer.html.erb

@@ -2,7 +2,7 @@
 	<div id="footer">
 	  <ul>
 		<li>2010 © </li>
-		<li id="trade_mark"><%= link_to t('socialstream'), 'http://social_stream.dit.upm.es/' %></li>
+		<li id="trade_mark"><%= link_to t('socialstream'), 'http://social-stream.dit.upm.es/' %></li>
 	  </ul>
 	</div>
 </div>

data/app/views/layouts/_header.erb

@@ -12,7 +12,7 @@
               </div>			
               <%=image_tag("btn/btn_profile.png",:class=>"btn_config") %>
               <div class="txt_config">
-                <%= link_to(t('profile.one'), current_user)%>
+                <%= link_to(t('profile.one'), current_subject)%>
               </div>
                 <%=image_tag("btn/btn_browse.png",:class=>"btn_config") %>
               <div class="txt_config2">
@@ -24,6 +24,9 @@
               <div class="txt_config">
                 <%= t('account.one') %>
               </div>
+
+              <%= render :partial => 'layouts/representation' %>
+
               <%=image_tag("btn/btn_exit.png",:class=>"btn_config") %>
               <div class="txt_config2">
                 <%= link_to t('sign_out_user', :user => current_user.name), destroy_user_session_path %>

data/app/views/layouts/_representation.html.erb

@@ -0,0 +1,20 @@
+<%= link_to(image_tag(current_user.logo.url(:tie)), current_user) %>
+
+<div class="txt_config">
+  <%= link_to(current_user.name, current_user) %>
+
+  <%= t('representation.action') %>
+
+  <%= form_for(Representation.new(current_subject), :url => representation_path) do |f| %>
+    <%= f.select :subject_dom_id, current_user.represented.unshift(current_user).map{ |s| [ s.name, dom_id(s) ] } %>
+    <%= f.submit t('representation.change') %>
+  <% end %>
+</div>
+
+<%-# this should be in content_for(:javascript), but the partial is rendered after yield(:javascript) -%>
+<script type="text/javascript" charset="utf-8">
+  $("#representation_submit").hide();
+  $("#representation_subject_dom_id").change(function() {
+    $(this).closest("form").submit();
+  });
+</script>

data/app/views/{private_messages → messages}/_form.html.erb

@@ -1,10 +1,10 @@
-<%= form_for(@private_message) do |f| %>
-  <% if @private_message.errors.any? %>
+<%= form_for(@message) do |f| %>
+  <% if @message.errors.any? %>
     <div id="error_explanation">
-      <h2><%= pluralize(@private_message.errors.count, "error") %> prohibited this private_message from being saved:</h2>
+      <h2><%= pluralize(@message.errors.count, "error") %> prohibited this message from being saved:</h2>
 
       <ul>
-      <% @private_message.errors.full_messages.each do |msg| %>
+      <% @message.errors.full_messages.each do |msg| %>
         <li><%= msg %></li>
       <% end %>
       </ul>

data/app/views/{private_messages → messages}/_index.html.erb

@@ -12,7 +12,7 @@
 <div class="space_center">
 </div>
 
-<div id="new_message" ><%= link_to 'New Message', new_private_message_path %></div>
+<div id="new_message" ><%= link_to 'New Message', new_message_path %></div>
 <div class="space_center">
 </div>
 <div class="space_center">

data/app/views/{private_messages → messages}/_location.html.erb

@@ -1,3 +1,3 @@
 <div id="map_location" class="content_size">
-  <%= t('location.message', :location => "#{ image_tag('btn/btn_inbox.png' , :class => 'btn_config') } #{ t('inbox.one') }: <span class=\"name_group\">#{ sanitize current_user.name }</span>").html_safe %>
+  <%= t('location.message', :location => "#{ image_tag('btn/btn_inbox.png' , :class => 'btn_config') } #{ t('inbox.one') }: <span class=\"name_group\">#{ sanitize current_subject.name }</span>").html_safe %>
 </div>

data/app/views/messages/_message.html.erb

@@ -0,0 +1,17 @@
+<%= div_for (message) do %>
+  <div class="actor_logo">
+    <%= link_to image_tag(message.text,
+                          :alt => message.text),
+                 message %>
+  </div>
+  <div class="activity_content_message">
+    <div class="actor_name_message">
+      <%= link_to(message.text, message) %>
+    </div>
+    <div class="option_msg">
+      <div class="edit_message"><%= link_to ( image_tag('btn/btn_edit.png', :class=>"btn_config"), edit_message_path(message)) %></div>
+      <div class="detele_message"><%= link_to ( image_tag('btn/btn_delete.png', :class=>"btn_config"), message, :confirm => 'Are you sure?', :method => :delete) %></div>
+    </div>
+  </div>
+
+<% end %>

data/app/views/messages/_messages.html.erb

@@ -0,0 +1,2 @@
+<% content_for :head, stylesheet_link_tag("message", :media => "screen, projection") %>
+<%= render @messages %>

data/app/views/messages/edit.html.erb

@@ -0,0 +1,6 @@
+<h1>Editing message</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Show', @message %> |
+<%= link_to 'Back', messages_path %>

data/app/views/{private_messages → messages}/new.html.erb

@@ -7,8 +7,8 @@
 <% end %>
 
 
-<h1>New private_message</h1>
+<h1>New message</h1>
 
 <%= render 'form' %>
 
-<%= link_to 'Back', private_messages_path %>
+<%= link_to 'Back', messages_path %>

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

@@ -0,0 +1,21 @@
+
+<p id="notice"><%= notice %></p>
+
+<p>
+  <b>Sender:</b>
+  <%= @message.sender %>
+</p>
+
+<p>
+  <b>Receiver:</b>
+  <%= @message.receiver %>
+</p>
+
+<p>
+  <b>Text:</b>
+  <%= @message.text %>
+</p>
+
+
+<%= link_to 'Edit', edit_message_path(@message) %> |
+<%= link_to 'Back', messages_path %>

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

@@ -0,0 +1,20 @@
+<% if (cs = subject.subjects(:direction => :receivers)).present? %>
+
+  <div class="contacts_header">
+      <%=image_tag("btn/btn_friend.png", :class => "contacts_icon")%>
+      <div class="contacts_text_header">
+        <%= cs.count %> <%= t('contact', :count => cs.count) %>
+      </div>
+  </div>
+  <div class ="contacts">
+      <div class="contact">
+        <% cs.each do |contact| %>
+            <%= link_to(image_tag(contact.logo.url, :alt => contact.name , :size => "40x40"), contact) %>
+        <% end %>
+      </div>
+  </div>
+  <div class="contacts_footer">
+    <%=link_to(image_tag("btn/btn_next.png", :alt => "next"), '#') %>
+  </div>
+
+<% end %>

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

@@ -7,17 +7,17 @@
                      @tie.receiver_subject %>
       </div>
       <div class="activity_add_ties">
-        <div><%= t('message')+":" %><br />
+        <div><%= t('message.one')+":" %><br />
          <%= form_for @tie,
                       :remote => true do |f| %>
            <%= f.hidden_field :receiver_id %>
            <%= f.hidden_field :sender_id %>
-           <%= f.hidden_field :relation_name %>
-           <% if @tie.relation!.granted %>
-             <%= f.text_area :message,   :class =>"input_new_tie" %>
-           <% end %>
+           <%= f.text_area :message,   :class =>"input_new_tie" %>
+
+           <%= f.select :relation_name, @tie.sender.relations.sort.map{ |r| [ r.name, r.name ] } %>
+
            <div class="ties_btn">
-             <%= submit_tag t('send', :scope => @tie.relation_name), :class => "tie_btn" %>
+             <%= submit_tag t('contact.new.submit'), :class => "tie_btn" %>
            </div>
          <% end %>
         </div>

data/app/views/ties/_pendings.html.erb

@@ -1,14 +1,14 @@
-<% if current_user.pending_ties.any? %>
+<% if current_subject.pending_ties.any? %>
 <div class="middle_box">
   <div class="middle_box_header">
-    <%= image_tag('notifications.png', :class => "middle_box_picture_icon") %>
+    <%= image_tag('btn/btn_notifications.png', :class => "middle_box_picture_icon") %>
     <div class="middle_box_text_header"><%= t 'tie.pending.other' %></div>
     <div class="title_righ">
       <a href="#"><%= t 'tie.pending.all' %></a>
     </div>
   </div>
 
-  <%= render current_user.pending_ties %>
+  <%= render current_subject.pending_ties %>
 
 </div>
 <% end -%>

data/app/views/ties/_suggestions.html.erb

@@ -1,4 +1,4 @@
-<% if current_user.suggestion.present? %>
+<% if current_subject.suggestion.present? %>
   <% content_for :javascript do %>
 
     $(".suggestions .tie_close").livequery("click",function(){
@@ -19,8 +19,8 @@
   </div>
 </div>
 <div class="suggestions">
-  <% if (sgs = current_user.suggestions(2)).present? %>
+  <% if (sgs = current_subject.suggestions(2)).present? %>
     <%= render sgs %>
   <%end%> 
 </div>
-<%end%>
+<%end%>

data/app/views/ties/_tie.html.erb

@@ -11,7 +11,7 @@
       <%= tie_brief(tie.receiver_subject) %>
     </div>
     <div class="tie_link" id="tie_link<%= dom_id(tie.receiver_subject)%>">
-      <%= tie_link(tie) %>
+      <%= new_tie_link(tie) %>
     </div>
   </div>
   <div class="tie_close"><%=link_to('X','#')%></div>

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

@@ -3,14 +3,14 @@
 <% else %>
   var old_tie = $("#tie_<%= dom_id(@tie.receiver_subject) %>");
   var link_tie = $("#tie_link<%= dom_id(@tie.receiver_subject) %>");
-  <% if @tie.receiver_subject.is_a?(Group) && ! @tie.relation.granted  #group follower %>
+  <% if @tie.receiver_subject.is_a?(Group) #group tie %>
       // add to group list
       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' )%>");
       }
-      $("#group_count").html("<%=current_user.recent_groups.count%>");
+      $("#group_count").html("<%=current_subject.recent_groups.count%>");
       link_tie.replaceWith("<%= escape_javascript(link_follow_state) %>");
       link_tie.slideUp(300).delay(800).fadeIn(400);
   <% else %>
@@ -20,8 +20,7 @@
       } else {
       old_tie.hide();
     }
-    <% if @tie.relation.granted # There was boxy dialog %>
-      $(".boxy-inner .close").click();
-    <% end %>
+
+    $(".boxy-inner .close").click();
   <% end %>
 <% end %>

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

@@ -1,2 +1,2 @@
 new Boxy("<%= escape_javascript(render(:partial => "ties/new")) %>",
-         { title: "<%= escape_javascript(t('confirm_new', :name => @tie.receiver_subject.name , :scope => @tie.relation_name)) %>" });
+         { title: "<%= escape_javascript(t('contact.new.title', :name => @tie.receiver_subject.name )) %>" });

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

@@ -1,9 +1,9 @@
-<% if current_user.recent_groups.any? %>
+<% if user.recent_groups.any? %>
   <div id="groups_title" class="content_size">
-      <%=t('group.one', :count => current_user.recent_groups.count) %> (<span id="group_count"><%=current_user.recent_groups.count%></span>)
+      <%=t('group.one', :count => user.recent_groups.count) %> (<span id="group_count"><%=user.recent_groups.count%></span>)
   </div>
   <div id="groups_list" class="content_size">
-  <% if (current_user.recent_groups.count) > 10 %>
+  <% if (user.recent_groups.count) > 10 %>
     <div id='carousel_container'>
       <div id='left_scroll'><%=image_tag("btn/group_left.png")%></div>
       <div id='carousel_inner'>
@@ -11,8 +11,8 @@
     <% else %>
      <div class="space_center"></div>
     <%end%>
-          <%= render current_user.recent_groups %>
-    <% if (current_user.recent_groups.count) > 10 %>
+          <%= render user.recent_groups %>
+    <% if (user.recent_groups.count) > 10 %>
         </ul>
      </div>
      <div id='right_scroll'><%=image_tag("btn/group_right.png")%></div>

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

@@ -11,7 +11,9 @@
 			<div class="post_picture"><%= link_to (image_tag(user.logo.url , :size => "50x50", :alt => user.name )),user  %></div>
 			<div class="post_browse_content_people content_size">
 				<div class="post_browse_title content_size" ><%=link_to(user.name, user)%></div>
-				<div class="content_size">+ <a href="#">Add as contact</a></div>
+                                <div class="content_size">
+                                  <%= ties_to(user) %>
+                                </div>
 			</div>
 			</div>
 

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

@@ -1,5 +1,5 @@
 <ul class="menu noaccordion">
   <li>
-    <%= link_to( image_tag("btn/btn_inbox.png", :class => "menu_icon")+t('inbox.one'), current_user) %>
+    <%= link_to( image_tag("btn/btn_inbox.png", :class => "menu_icon")+t('inbox.one'), '#') %>
   </li>
 </ul>

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

@@ -4,9 +4,9 @@
 <%= render :partial => 'menu' %>
 <div class="space_center">
 </div>
-<% if @user.friends.count>0 %>
-  <%= render :partial => "contacts" %>
-<%end%>
+
+<%= render :partial => 'subjects/contacts', :locals => { :subject => @user } %>
+
 <div class="space_center">
 </div>
 <div class="space_center">

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

@@ -12,7 +12,9 @@
 <div class="space_center">
 </div>
 
-<%= render :partial => "users/groups" %>
+<%= render :partial => "users/groups",
+           :locals  => { :user => @user } %>
+
 <%= render :partial => "activities/activities",
-           :locals => { :activities => @user.wall_profile(current_user).paginate,
-                        :owner => @user } %>
+           :locals  => { :activities => @user.profile_wall(current_subject).paginate,
+                         :owner => @user } %>

data/config/locales/en.yml

@@ -15,28 +15,18 @@ en:
   comment:
     input: "Write a comment..."
     confirm_delete: "Delete comment?"
+  contact:
+    one: "Contact"
+    other: "Contacts"
+    new:
+      link: "+ Add contact"
+      title: "Add %{name} as contact"
+      submit: "+ Add contact"
   copyright: "2010 Copyright - All rights reserved"
   days: Days
   delete:
     confirm: Delete %{element}}?
-  follow: "Follow"
-  follower:
-    one: Follower
-    other: Followers
-    new: "+ Follow"
-    confirm_new: "Do you want to follow %{name}?"
-    submit: "+ Follow"
   forgot_password?: "Forgot you password?"
-  friend:
-    one: Friend
-    other: Friends
-    my: "My Friends"
-    add: Add as Friend
-    submit: "Accept as friend"
-  friend_request:
-    new: "+ Add as friend"
-    send: "Send Request"
-    confirm_new: "Do you want to add %{name} as friend?"
   frontpage:
     collaborate:
       sentence1: "Organize your projects and activities"
@@ -48,7 +38,7 @@ en:
       participants: "Participants"
       groups: "Groups"
       tags: "Tags"
-    main_title: "SocialStream a core for building social network applications."
+    main_title: "SocialStream is a core for building social network websites."
     meet:
       sentence1: "Meet interesting people and groups"
     share:
@@ -72,7 +62,8 @@ en:
     one: "Inbox"
   location:
     message: "You are here > %{location}"
-  message: "Message"
+  message:
+    one: "Message"
   menu:
     options: "Menu Options"
   post:
@@ -81,6 +72,9 @@ en:
     one: "Profile"
   public:
     other: "Everybody"
+  representation:
+    action: "representing"
+    change: "Change"
   sign_in: "Sign in"
   sign_up: "Sign up"
   sign_out_user: "Sign out (%{user})"

data/config/routes.rb

@@ -1,10 +1,15 @@
 Rails.application.routes.draw do
-  devise_for :users
-  resources :users
+
+  root :to => "frontpage#index"
 
   match 'home' => 'home#index', :as => :home
   match 'home' => 'home#index', :as => :user_root # devise after_sign_in_path_for
 
+  devise_for :users
+  resources :users
+
+  resource :representation
+
   resources :groups
 
   resources :ties do
@@ -12,12 +17,14 @@ Rails.application.routes.draw do
       get 'suggestion'
     end
   end
+
   resources :activities do
     resource :like
   end
+
+
   resources :posts
   resources :comments
-  resources :private_messages
+  resources :messages
 
-  root :to => "frontpage#index"
 end

data/lib/generators/social_stream/install_generator.rb

@@ -10,8 +10,8 @@ class SocialStream::InstallGenerator < Rails::Generators::Base #:nodoc:
     copy_file 'initializer.rb', 'config/initializers/social_stream.rb'
   end
 
-  def create_config_file
-    copy_file 'seeds.yml', 'db/seeds/social_stream.yml'
+  def create_config_relations_file
+    copy_file 'relations.yml', 'config/relations.yml'
   end
 
   def copy_public
@@ -28,14 +28,6 @@ class SocialStream::InstallGenerator < Rails::Generators::Base #:nodoc:
               'app/views/layouts/application.html.erb'
   end
 
-  def create_seed_code
-    seed_code = "\nSocialStream.seed!"
-
-    in_root do
-      append_file 'db/seeds.rb', seed_code
-    end
-  end
-
   # TODO: hook_for :orm
   require 'rails/generators/active_record'
 

data/lib/generators/social_stream/templates/initializer.rb

@@ -13,5 +13,5 @@ SocialStream.setup do |config|
   # 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 ]
+  # config.activity_objects = [ :post, :comment, :messages ]
 end

data/lib/generators/social_stream/templates/migration.rb

@@ -67,10 +67,19 @@ class CreateSocialStream < ActiveRecord::Migration
 
     add_index "groups", "actor_id"
 
+    create_table "messages", :force => true do |t|
+      t.integer  "activity_object_id"
+      t.datetime "created_at"
+      t.datetime "updated_at"
+      t.text     "text"
+    end
+
+    add_index "messages", "activity_object_id"
+
     create_table "permissions", :force => true do |t|
       t.string   "action"
       t.string   "object"
-      t.string   "parameter"
+      t.string   "function"
       t.datetime "created_at"
       t.datetime "updated_at"
     end
@@ -84,19 +93,8 @@ class CreateSocialStream < ActiveRecord::Migration
 
     add_index "posts", "activity_object_id"
 
-    create_table "private_messages", :force => true do |t|
-      t.integer  "sender_id"
-      t.integer  "receiver_id"
-      t.datetime "created_at"
-      t.datetime "updated_at"
-      t.text     "text"
-    end
-
-    add_index "private_messages", "sender_id"
-    add_index "private_messages", "receiver_id"
-
     create_table "profiles", :force => true do |t|
-      t.integer  "user_id"
+      t.integer  "actor_id"
       t.date     "birthday"
       t.datetime "created_at"
       t.datetime "updated_at"
@@ -117,7 +115,7 @@ class CreateSocialStream < ActiveRecord::Migration
       t.string   "im",           :limit => 45
     end
 
-    add_index "profiles", "user_id"
+    add_index "profiles", "actor_id"
 
     create_table "relation_permissions", :force => true do |t|
       t.integer  "relation_id"
@@ -139,9 +137,6 @@ class CreateSocialStream < ActiveRecord::Migration
       t.integer  "parent_id"
       t.integer  "lft"
       t.integer  "rgt"
-      t.integer  "inverse_id"
-      t.integer  "granted_id"
-      t.boolean  "reflexive", :default => false
     end
 
     add_index "relations", "parent_id"
@@ -164,7 +159,6 @@ class CreateSocialStream < ActiveRecord::Migration
       t.integer "tie_id"
       t.integer "activity_id"
       t.boolean "read"
-      t.boolean "deleted"
       t.boolean "original", :default => true
     end
 
@@ -177,7 +171,6 @@ class CreateSocialStream < ActiveRecord::Migration
       t.integer  "relation_id"
       t.datetime "created_at"
       t.datetime "updated_at"
-      t.text     "message"
     end
 
     add_index "ties", "receiver_id"
@@ -198,8 +191,6 @@ class CreateSocialStream < ActiveRecord::Migration
 
       t.timestamps
       t.integer  "actor_id"
-      # FIXME: move to profile
-      t.date "birthday"
     end
 
     add_index "users", "actor_id"
@@ -218,9 +209,11 @@ class CreateSocialStream < ActiveRecord::Migration
 
     add_foreign_key "groups", "actors", :name => "groups_on_actor_id"
 
+    add_foreign_key "messages", "activity_objects", :name => "messages_on_activity_object_id"
+
     add_foreign_key "posts", "activity_objects", :name => "posts_on_activity_object_id"
 
-    add_foreign_key "profiles", "users", :name => "profiles_on_user_id"
+    add_foreign_key "profiles", "actors", :name => "profiles_on_actor_id"
 
     add_foreign_key "relation_permissions", "relations", :name => "relation_permissions_on_relation_id"
     add_foreign_key "relation_permissions", "permissions", :name => "relation_permissions_on_permission_id"
@@ -250,9 +243,11 @@ class CreateSocialStream < ActiveRecord::Migration
 
     remove_foreign_key "groups", :name => "groups_on_actor_id"
 
+    remove_foreign_key "messages", :name => "messages_on_activity_object_id"
+
     remove_foreign_key "posts", :name => "posts_on_activity_object_id"
 
-    remove_foreign_key "profiles", :name => "profiles_on_user_id"
+    remove_foreign_key "profiles", :name => "profiles_on_actor_id"
 
     remove_foreign_key "relation_permissions", :name => "relation_permissions_on_relation_id"
     remove_foreign_key "relation_permissions", :name => "relation_permissions_on_permission_id"
@@ -276,9 +271,9 @@ class CreateSocialStream < ActiveRecord::Migration
     drop_table :actors
     drop_table :comments
     drop_table :groups
+    drop_table :messages
     drop_table :permissions
     drop_table :posts
-    drop_table :private_messages
     drop_table :profiles
     drop_table :relation_permissions
     drop_table :relations