social_stream 0.4.2 → 0.4.3

data/app/models/relation.rb

@@ -27,18 +27,66 @@
 # See the documentation of {Permission} for more details on permission definition.
 #
 class Relation < ActiveRecord::Base
+  # The actor this relation belongs to
+  attr_accessor :actor
+
+  # Default relations are defined in this configuration file
+  CONFIG = File.join(::Rails.root, 'config', 'relations.yml')
+
   acts_as_nested_set
 
   scope :mode, lambda { |st, rt|
     where(:sender_type => st, :receiver_type => rt)
   }
 
+  validates_presence_of :name
+
   has_many :relation_permissions, :dependent => :destroy
   has_many :permissions, :through => :relation_permissions
 
   has_many :ties, :dependent => :destroy
 
+  before_create :initialize_sender_type
+  after_create  :initialize_ties
+
   class << self
+    # Relations configuration
+    def config
+      @config ||= YAML.load_file(CONFIG)
+    end
+
+    def defaults_for(actor)
+      cfg_rels = config[actor.subject_type.underscore]
+
+      if cfg_rels.nil?
+        raise "Undefined relations for subject type #{ actor.subject_type }. Please, add an entry to #{ CONFIG }"
+      end
+
+      rels = {}
+
+      cfg_rels.each_pair do |name, cfg_rel|
+        rels[name] =
+          Relation.create! :actor         => actor,
+                           :receiver_type => cfg_rel['receiver_type'],
+                           :name =>          cfg_rel['name']
+
+        if (ps = cfg_rel['permissions']).present?
+          ps.each do |p| 
+            rels[name].permissions << 
+              Permission.find_or_create_by_action_and_object_and_function(*p)
+          end 
+        end
+      end
+
+      # Parent, relations must be set after creation
+      # FIXME: Can fix with ruby 1.9 and ordered hashes
+      cfg_rels.each_pair do |name, cfg_rel|
+        rels[name].update_attribute(:parent, rels[cfg_rel['parent']]) if cfg_rel['parent'].present?
+      end
+
+      rels.values
+    end
+
     # Get relation from object, if possible
     #
     # Options::
@@ -103,4 +151,21 @@ class Relation < ActiveRecord::Base
   def mode
     Relation.mode(sender_type, receiver_type)
   end
+
+  private
+
+  # Before create callback
+  def initialize_sender_type
+    return if actor.blank?
+
+    self.sender_type = actor.subject_type
+  end
+
+  # Create reflexive ties for this actor
+  def initialize_ties
+    return if actor.blank?
+
+    ties.create! :sender   => actor,
+                 :receiver => actor
+  end
 end

data/app/models/tie.rb

@@ -46,9 +46,12 @@
 #
 class Tie < ActiveRecord::Base
   attr_accessor :message
+  attr_accessor :relation_permissions
 
   # Facilitates relation assigment along with find_relation callback
   attr_writer :relation_name
+  # Facilitates new relation permissions assigment along with find_or build_relation callback
+  attr_reader :relation_permissions
 
   belongs_to :sender,
              :class_name => "Actor",
@@ -77,7 +80,6 @@ class Tie < ActiveRecord::Base
   scope :sent_or_received_by, lambda { |a|
     where(arel_table[:sender_id].eq(Actor.normalize_id(a)).
           or(arel_table[:receiver_id].eq(Actor.normalize_id(a))))
-
   }
 
   scope :related_by, lambda { |r|
@@ -97,10 +99,11 @@ class Tie < ActiveRecord::Base
       joins(:relation => :permissions).merge(Permission.follow)
   }
 
-  validates_presence_of :sender_id, :receiver_id, :relation_id
+  validates_presence_of :sender_id, :receiver_id, :relation
 
-  before_validation :find_relation
+  before_validation :find_or_build_relation
 
+  before_create :save_relation
   after_create :complete_weak_set
   after_create :create_activity
   after_create :send_message
@@ -236,14 +239,31 @@ class Tie < ActiveRecord::Base
   private
 
   # Before validation callback
+  # Assigns relation or builds it based on the param
+  def find_or_build_relation
+    return if find_relation || relation_name.blank?
+
+    self.relation = Relation.new :name => relation_name,
+                                 :actor => sender
+
+    relation.permission_ids = relation_permissions
+  end
+
   # Infers relation from its name and the type of the actors
   def find_relation
-    if relation_name.present? &&
-      relation_name != relation.try(:name) &&
-      sender.present?
+    return if relation_name.blank?
+
+    if relation_name == relation.try(:name)
+      relation
+    elsif sender.present?
       self.relation = sender.relation(relation_name)
     end
+ end
+ 
+  def save_relation
+    relation.save! if relation.new_record?
   end
+ 
 
   # After create callback
   # Creates ties with weaker relations in the strength hierarchy of this tie
@@ -268,7 +288,7 @@ class Tie < ActiveRecord::Base
   # Send a message to the receiver of the tie
   def send_message
     if original? && message.present?
-      sender.send_message(receiver, message, I18n.t("activity.verb.#{ contact_verb }.message", :name => sender.name))
+      sender.send_message(receiver, message, I18n.t("activity.verb.#{ contact_verb }.#{ receiver.subject_type }.message", :name => sender.name))
     end
   end
 

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

@@ -4,7 +4,6 @@
                           :alt => activity.sender_subject.name),
                  activity.sender_subject %>
   </div>
-
   <div class="activity_content">
     <div class="actor_name-activity_objects">
       <%= link_to(activity.sender_subject.name, activity.sender_subject) %>
@@ -12,11 +11,8 @@
         <%= render activity.activity_objects %>
       </span>
     </div>
-
     <%= render :partial => 'activities/options',
                :locals => { :activity => activity } %>
-
   </div>
 <% end %>
-<div class="space_comments">
-</div>
+<div class="space_comments"></div>

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

@@ -25,15 +25,13 @@
     <%= render :partial => 'comments/new',
                :locals => { :activity => activity } %>
 
-  </div>			
-  <div class="space_comments"></div>
-
+  </div>
 
   <div class="space_activities">
     <% if activity.activity_objects.count > 1 %>
       <div class="space_sub"></div>
     <%else %>
-      <div class="space_center"></div>
+      <div class="#"></div>
     <%end%>
   </div>
 <% end %>

data/app/views/avatars/_form.html.erb

@@ -1,21 +1,10 @@
 <div class= "block">
   <div class = "content">
-  <%= form_for :logo, @avatar,:url => avatars_path, :html => { :multipart => true, :id=>'new_logo_form' }, :remote => false do |f| %>
-  <% if @avatar.errors.any? %>
-  <div id="error_explanation">
-    <h2><%= pluralize(@avatar.errors.count, "error") %> prohibited this logo from being saved:</h2>
-    <ul>
-      <% @avatar.errors.each do |msg| %><!--.full_messages -->
-      <li>
-        <%= msg[1] %>
-      </li>
-      <% end %>
-    </ul>
-  </div>
-  <% end %>
-  <%= f.file_field :logo %>
-  <div class="actions">
-    <%= f.submit t('avatar.upload') %>
+  <%= form_for Avatar.new,:html => { :multipart => true} do |f| %>
+  <div class="form_row">
+  	<%= f.file_field :logo %>
+
+	  <%= f.submit t('avatar.upload'), :class => "button" %>
   </div>
   <div id= "prueba">
   </div>

data/app/views/avatars/_precrop.html.erb

@@ -1,19 +1,25 @@
 <% my_file_name = File.basename(@avatar.logo.queued_for_write[:original].path) %>
 
-
-<div id="precropDiv" class = "block title content" style="width:500px;display:inline-block;padding: 5px 4px 5px 4px;">
-	<%= image_tag "tmp/#{my_file_name}",:id=>"cropImage" %>
-</div>
-
-<div  class = "block logo" style = "vertical-align:top;display:inline-block;padding: 5px 4px 5px 4px;" ><%= t('avatar.preview') %></br>
-  <div style="width:100px;height:100px;overflow:hidden;margin-left:5px;" >
-		<%= image_tag "tmp/#{my_file_name}",:id=>"preview" %>
+<div class = "block">
+  <div id="precropPrev" >
+    <div class="form_row">
+      <%= t('avatar.preview') %>
+    </div>
+    <div id="precropPrevImg" class="logo">
+      <%= image_tag "tmp/#{my_file_name}",:id=>"preview" %>
+    </div>  
+  </div>
+  
+  <div class="form_row">
+    <%= t('avatar.original') %>
+  </div>
+  
+  <div id="precropDiv" class = "block title content">
+  	<%= image_tag "tmp/#{my_file_name}",:id=>"cropImage" %>
   </div>
 </div>
-
 <% content_for :javascript do %>
-	$("#sidebar").remove();
-        jQuery('#cropImage').Jcrop({
+jQuery('#cropImage').Jcrop({
             bgColor:     'clear',
             bgOpacity:   .6,
             setSelect:   [ 0, 0, 200, 200 ],
@@ -31,8 +37,7 @@ function update_crop(coords) {
   	ry = 100/$("#cropImage").height();
   	coords.x = 0;
   	coords.y = 0;
-  }
-  
+  }  
   
   $('#preview').css({
     width: Math.round(rx * $("#cropImage").width()) + 'px',
@@ -48,12 +53,14 @@ function update_crop(coords) {
 }
 <% end %>
 
-<%= form_for :logo, @avatar,:url => avatars_path, :html => { :multipart => true } do |f| %>
-
+<%= form_for @avatar, :html => { :multipart => true } do |f| %>
+<div class= "block">
   <% for attribute in [:crop_x, :crop_y, :crop_w, :crop_h] %>
     <%= f.hidden_field attribute, :id => attribute %>
   <% end %>
 	<%= f.hidden_field :name, :value => my_file_name %>
-	<br>
-  <p><%= f.submit t('avatar.crop_submit') %></p>
+	  <div class="form_row center">
+  <%= f.submit t('avatar.crop_submit'), :class => "button" %>
+  </div>
+  </div>
 <% end %>

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

@@ -1,42 +1,53 @@
 <% toolbar :profile => current_subject %>
 
-<h1><%= t('avatar.list') %></h1>
-
-<table>
-  <tr>
-    <th></th>
-    <th></th>
-    <th></th>
-  </tr>
+<% content_for :headers do %>
+<%= stylesheet_link_tag "avatars.css", :media => "screen, projection" %>
+<%= javascript_include_tag 'avatars.js' %>
+<% end %>
 
-<% current_subject.avatars.each do |avatar| %>
-<% unless avatar.id.blank? && (current_subject.avatars.size == 1) %>
-  <% unless avatar.id.blank? %>
-  <tr>  
-  	<td style="margin-left: 5px;">
-  	<% if avatar.active%>
-  	  <%= image_tag avatar.logo.url(:profile), :style => "border: 7px solid #e0eef5" %></image_tag>
-  	   <td><%= link_to image_tag("btn/close.png", :class => "menu_icon"), avatar, :confirm => t('avatar.destroy_sure'), :method => :delete %></td>
-  	  <td></td>
-    <% else %>
-      <%= image_tag avatar.logo.url(:profile), :style => "margin: 7px" %></image_tag>
-       <td><%= link_to image_tag("btn/close.png"), avatar, :confirm => t('avatar.destroy_sure'), :method => :delete %></td>
-      <td><%= link_to t('avatar.set_default'), avatar, :confirm => t('avatar.set_default_sure'), :method => :put %></td>
-    <% end %>
-    </td>
-   </tr>
-  <%end%>
-  <%else%>
-    <tr>
-      <td>
-        <%= t('avatar.no_avatars') %>
-      </td>
-    </tr>
-  
-  <% end %>
+<% content_for :sidebar do %>
+  <%= render :partial => 'home/sidebar' %>
 <% end %>
-</table>
 
-<br />
+<%= location(
+	link_to(image_tag("btn/btn_edit.png", :class => "menu_icon")+t('profile.one'), [current_subject,:profile]),	
+	link_to(image_tag("btn/edit.png", :class => "menu_icon")+t('avatar.other'), avatars_path)
+) %>
 
-<%= link_to t('avatar.new_short'), new_avatar_path %>
+<br class="clearfloat" />
+<div class="space_center"></div>
+<div class="space_center"></div>
+<% unless(@avatars.empty? || (@avatars.first.present? && @avatars.first.id.blank?)) %>
+  <h2>Use your saved avatars ...</h2>
+  <div class="space_center"></div>
+  <div class="space_center"></div>
+  <div class="avatars">
+  <% @avatars.each do |avatar| %>
+    <% unless avatar.id.blank? %>
+  	<%= div_for(avatar) do %>
+  	     <div class="boxgrid captionfull">
+           <%= image_tag(avatar.logo.url(:profile), :class => avatar.active ? 'default' : 'non_default', :size => '94x94') %>
+           <% if avatar.active %>    
+             <div class="cover boxcaption">    
+               <%= link_to "Delete avatar", avatar, :confirm => t('avatar.destroy_sure'), :method => :delete %>
+             </div>  
+           <% else %>
+             <div class="cover boxcaption">    
+               <%= link_to "Set as default", avatar, :confirm => t('avatar.set_default_sure'), :method => :put %>
+               <%= link_to "Delete avatar", avatar, :confirm => t('avatar.destroy_sure'), :method => :delete %>
+             </div>
+           <% end %>
+         </div>  	  	 
+    	<% end %>
+      <% end %>
+  <% end %>
+  </div>
+  <br />
+  <br class="clearfloat" />
+  <div class="space_center"></div>
+  <div class="space_center"></div>
+  <h2>... our upload a new one</h2>
+<% else %>
+  <h2><%= t('avatar.new') %></h2>
+<% end %>
+<%= render :partial => 'form' %>

data/app/views/avatars/new.html.erb

@@ -1,15 +1,31 @@
 <% content_for :headers do %>
 	<%= javascript_include_tag 'jquery.Jcrop.min' %>
 	<%= stylesheet_link_tag "jquery.Jcrop", :media => "screen, projection" %>
-    <%= stylesheet_link_tag "logos", :media => "screen, projection" %>
+  <%= stylesheet_link_tag "avatars", :media => "screen, projection" %>
 <%end%>
+
 <% toolbar :profile => current_subject %>
+
+<% content_for :sidebar do %>
+  <%= render :partial => 'home/sidebar' %>
+<% end %>
+
+<%= location(
+	link_to(image_tag("btn/btn_edit.png", :class => "menu_icon")+t('profile.one'), [current_subject,:profile]),	
+	link_to(image_tag("btn/edit.png", :class => "menu_icon")+t('avatar.other'), avatars_path)
+) %>
+
+<br class="clearfloat" />
+<div class="space_center"></div>
+<div class="space_center"></div>
 <div id="content_logo">
 <% if !@avatar.logo.errors['precrop'].blank? %>
-	<h1><%= t('avatar.crop_image') %></h1>
+	<h2><%= t('avatar.crop_image') %></h2>
+	<br class="clearfloat" />
+  <div class="space_center"></div>
 	<%= render :partial => 'precrop' %>
 <% else %>
-	<h1><%= t('avatar.new') %></h1>
+	<h2><%= t('avatar.new') %></h2>
 	<%= render :partial => 'form' %>
 <% end %>
 </div>

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

@@ -2,7 +2,7 @@
   <%= javascript_include_tag 'jquery.ba-url','ajax.paginate' %>
 <% end %>
 
-<% toolbar %>
+<% toolbar :option => :contacts %>
 
 <div id="my_conferences">
   <div id="contacts" class="block">

data/app/views/contacts/index.js.erb

@@ -1 +1,3 @@
 $('#list_contacts_ajax').html("<%= escape_javascript(render :partial => "contacts/index") %>");
+
+<% toolbar :option => :contacts %>

data/app/views/conversations/_conversation_full.html.erb

@@ -10,6 +10,7 @@
 <div class="clearfloat">
 </div>
 <div class="participants">
+	<h3><%= t("message.participants") %>:</h3>
 	<% conversation.recipients.each do |recp| %>
 	<%= link_to image_tag(recp.logo.url(:tie), :title=>recp.name, :alt => recp.name), recp.subject %>
 	<% end %>
@@ -38,7 +39,7 @@
 	<% end %>
 		<div class="block">
 		<div class="form_row">
-			Write your answer:
+			<%= t("message.answer") %>
 		</div>
 		<div class="form_row">
 			<%= text_area_tag :body, nil,:rows =>6, :cols=> 53, :class => "required form_tag" %>