social_stream 0.4.1 → 0.4.2

data/app/models/avatar.rb

@@ -0,0 +1,90 @@
+require 'RMagick'
+
+class Avatar < ActiveRecord::Base
+ 	has_attached_file :logo,
+                      :styles => { :tie => "30x30>",
+                                   :actor => '35x35>',
+                                   :profile => '94x94' },
+                      :default_url => "/images/logos/:style/:subtype_class.png"
+	
+	before_post_process :process_precrop
+	attr_accessor :crop_x, :crop_y, :crop_w, :crop_h, :name,:updating_logo
+	validates_attachment_presence :logo, :if => :uploading_file?, :message => I18n.t('avatar.error.no_file')
+		
+	after_validation :precrop_done
+	
+	belongs_to :actor
+	
+	scope :active, where(:active => true)
+	
+  	def uploading_file?
+    	return @name.blank?
+  	end
+	
+	def precrop_done
+		return if @name.blank? || !@updating_logo.blank?
+
+    	precrop_path = File.join(Avatar.images_tmp_path,@name)
+    	
+    	make_precrop(precrop_path,@crop_x.to_i,@crop_y.to_i,@crop_w.to_i,@crop_h.to_i)
+	   	@avatar = Avatar.new :logo => File.open(precrop_path), :name => @name
+		
+				
+		self.logo = @avatar.logo
+		
+		FileUtils.remove_file(precrop_path)
+	end
+	
+	def self.images_tmp_path
+		images_path = File.join(RAILS_ROOT, "public", "images")
+		tmp_path = FileUtils.mkdir_p(File.join(images_path, "tmp"))		
+	end
+	
+	def self.copy_to_temp_file(path)
+		FileUtils.cp(path,Avatar.images_tmp_path)
+	end	
+	
+	
+	def self.get_image_dimensions(name)
+   		img_orig = Magick::Image.read(name).first
+   		dimensions = {}
+   		dimensions[:width] =  img_orig.columns
+   		dimensions[:height] = img_orig.rows
+   		dimensions
+   end
+	
+   def process_precrop
+   	
+  	if @name.blank? && (  logo.content_type.present? && !logo.content_type.start_with?("image/"))
+		logo.errors['invalidType'] = I18n.t('avatar.error.no_image_file')
+		return false
+	end
+   	  	
+	return if !@name.blank?
+      logo.errors['precrop'] = "You have to make precrop"
+      resize_image(logo.queued_for_write[:original].path,500,500)
+      Avatar.copy_to_temp_file(logo.queued_for_write[:original].path)   
+   end
+      
+   def resize_image(path,width,height)
+	  img_orig = Magick::Image.read(path).first
+   	img_orig = img_orig.resize_to_fit(width, height)
+   	img_orig.write(path)
+   end
+   
+   def make_precrop(path,x,y,width,height)
+     img_orig = Magick::Image.read(path).first
+     dimensions = Avatar.get_image_dimensions(path)
+     
+	   unless (width == 0) || (height == 0)
+		  crop_args = [x,y,width,height]
+      img_orig = img_orig.crop(*crop_args)
+	   end     
+ 
+     img_orig = img_orig.resize_to_fill(500,500)
+     
+     
+     img_orig.write(path)
+  end   
+end
+

data/app/models/group.rb

@@ -12,11 +12,11 @@ class Group < ActiveRecord::Base
   end
 
   def followers
-    subjects(:subject_type => :user, :direction => :senders)
+    contacts(:subject_type => :user, :direction => :received)
   end
   
   def recent_groups
-    subjects(:subject_type => :group, :direction => :receivers) do |q|
+    contacts(:type => :group, :direction => :sent) do |q|
       q.select("ties.created_at").
         merge(Tie.recent)
     end

data/app/models/profile.rb

@@ -1,6 +1,8 @@
 class Profile < ActiveRecord::Base
   belongs_to :actor
   
+  accepts_nested_attributes_for :actor
+  
   validates_presence_of :actor_id
   
   validates_format_of :mobile, :phone, :fax,
@@ -29,6 +31,12 @@ class Profile < ActiveRecord::Base
     end
   end
   
+  def age
+    return nil if self.birthday.blank? 
+    now = Time.now.utc.to_date
+    now.year - self.birthday.year - (self.birthday.to_date.change(:year => now.year) > now ? 1 : 0)
+  end
+  
   # The subject of this profile
   def subject
     actor.try(:subject)

data/app/models/tie.rb

@@ -81,7 +81,9 @@ class Tie < ActiveRecord::Base
   }
 
   scope :related_by, lambda { |r|
-    where(:relation_id => Relation.normalize_id(r))
+    if r.present?
+      where(:relation_id => Relation.normalize_id(r))
+    end
   }
 
   scope :replied, lambda {
@@ -100,7 +102,7 @@ class Tie < ActiveRecord::Base
   before_validation :find_relation
 
   after_create :complete_weak_set
-  after_create :create_activity_after_add_contact
+  after_create :create_activity
   after_create :send_message
 
   def relation_name
@@ -125,6 +127,11 @@ class Tie < ActiveRecord::Base
     sender_id == receiver_id
   end
 
+  # Is there any tie from receiver to sender?
+  def replied?
+    receiver.ties_to?(sender)
+  end
+ 
   # The set of ties between sender and receiver
   #
   # Options::
@@ -252,29 +259,20 @@ class Tie < ActiveRecord::Base
     end
   end
   
-  
-  def create_activity_after_add_contact
-    if self.original
-      p = Post.create :text =>
-                      (I18n.t "tie.activity.add_contact", :active=>self.sender.name , :pasive=>self.receiver.name),
-                       :_activity_tie_id => self.id
-    end   
+  def create_activity
+    return if ! original? || reflexive?
+
+    Activity.create! :_tie => self, :activity_verb => ActivityVerb[contact_verb]
   end
-  
-  
-  # Values of "receiver.subject_type": "User", "Group"
+ 
+  # Send a message to the receiver of the tie
   def send_message
-    if self.original
-      if((message!=nil)&&(message!="")&&(receiver.subject_type=="User"))
-        sender.send_message(receiver, get_private_message(message))
-      end 
+    if original? && message.present?
+      sender.send_message(receiver, message, I18n.t("activity.verb.#{ contact_verb }.message", :name => sender.name))
     end
   end
-  
-  
-  def get_private_message(message)
-    return (I18n.t "tie.private_messages.add_contact", :name=>sender.name) + ".\n" + message
+
+  def contact_verb
+    replied? ? "make-friend" : "follow"
   end
-  
-  
 end

data/app/models/user.rb

@@ -18,14 +18,8 @@ class User < ActiveRecord::Base
     v.validates_length_of       :password, :within => Devise.password_length, :allow_blank => true
   end
   
-  def age
-    return nil if profile.birthday.blank? 
-    now = Time.now.utc.to_date
-    now.year - profile.birthday.year - (profile.birthday.to_date.change(:year => now.year) > now ? 1 : 0)
-  end
-
   def recent_groups
-    subjects(:subject_type => :group, :direction => :receivers) do |q|
+    contacts(:type => :group, :direction => :sent) do |q|
       q.select("ties.created_at").
         merge(Tie.recent)
     end
@@ -33,7 +27,7 @@ class User < ActiveRecord::Base
 
   # Subjects this user can acts as
   def represented
-    subjects(:direction => :senders) do |q|
+    contacts(:direction => :received) do |q|
       q.joins(:sent_ties => { :relation => :permissions }).merge(Permission.represent)
     end
   end

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

@@ -0,0 +1,22 @@
+<% content_for :headers do %>
+  <%= stylesheet_link_tag "activities", :media => "screen, projection" %>
+  <%= stylesheet_link_tag "jquery-ui", :media => "screen, projection" %>
+<% end %>
+
+<% content_for :javascript do %>
+  <%= render :partial => 'activities/jquery' %>
+<% end -%>
+
+<div id="wrapper_activities">
+  <div id="wrapper_activities_header">
+    <div id="activities_title" class="content_size">
+      <%= image_tag("btn/btn_activities.png") %> <%=t('activity.other')%>
+    </div>
+    <%= render :partial => 'activities/new', :locals => { :receiver => owner } %>
+  </div>
+
+  <div id="wall">
+    <%= render activities  %>
+    <%= will_paginate activities %>
+  </div>
+</div>

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

@@ -5,6 +5,8 @@
     <li><div class="verb_comment"> · <%= link_to t('activity.to_comment'), "#", :class => "to_comment" %> </div></li>
     <% end %>
     <li><div class="verb_like" id="like_<%= dom_id(activity) %>"> · <%= link_like(activity)%></div></li>
-    <li><div class="verb_delete"> · <%= link_to t('activity.delete'), activity.direct_object , :confirm => t('confirm_delete', :scope => activity.direct_object.class.to_s.underscore), :method => :delete,  :remote => true %> </div></li>
+    <% if activity.direct_object.present? %>
+      <li><div class="verb_delete"> · <%= link_to t('activity.delete'), activity.direct_object , :confirm => t('confirm_delete', :scope => activity.direct_object.class.to_s.underscore), :method => :delete,  :remote => true %> </div></li>
+    <% end %>
   </ul>
 </div>

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

@@ -1,4 +1,5 @@
 <%= div_for activity do %>
+
   <div class="actor_logo">
     <%= link_to image_tag(activity.sender_subject.logo.url(:actor),
                           :alt => activity.sender_subject.name),
@@ -6,8 +7,9 @@
   </div>
 
   <div class="activity_content">
+  	
     <div class="actor_name">
-      <%= link_to(activity.sender_subject.name, activity.sender_subject) %>
+      <%= activity.title(self) %>
     </div>
 
     <div class="activity_objects">
@@ -34,4 +36,4 @@
       <div class="space_center"></div>
     <%end%>
   </div>
-<% end %>
+<% end %>

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

@@ -0,0 +1,34 @@
+<% content_for :javascript do %>
+  $("#tabs").tabs({ 
+    ajaxOptions: { 
+      dataType: "script",
+      success: function(data) { eval(data); }
+    }
+  });
+<% end %>
+
+<div id="tabs" class="block">
+  <ul class="activity_tabs">
+    <li><%= link_to "<span>#{ h owner.name }</span>".html_safe, "#wall-profile" %></li>
+
+    <% owner.relations.sort.each do |r| %>
+      <li><%= link_to "<span>#{ h r.name }</span>".html_safe,
+                      polymorphic_path([ owner, Activity.new ], :section => r.id, :wall => true),
+                      :title => "wall-#{ r.id }" %></li>
+    <% end %>
+  </ul>
+
+  <div id="wall-profile">
+    <%= render :partial => 'activities/index',
+               :locals => { :owner      => owner,
+                            :activities => owner.wall(:profile,
+                                                      :for => current_subject).
+                                                 paginate(:page => params[:page]) } %>
+  </div>
+
+  <% owner.relations.sort.each do |r| %>
+    <div id="wall-<%= r.id %>"></div>
+  <% end %>
+</div>
+
+

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

@@ -0,0 +1 @@
+$('#wall-<%= params[:section] || "profile" %>').html("<%= escape_javascript render(:partial => 'index', :locals => { :owner => parent, :activities => @activities }) %>");

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

@@ -0,0 +1,23 @@
+<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') %>
+  </div>
+  <div id= "prueba">
+  </div>
+  <% end %>
+</div></div>

data/app/views/{logos → avatars}/_precrop.html.erb

@@ -1,18 +1,18 @@
-Crop your image:
+<% my_file_name = File.basename(@avatar.logo.queued_for_write[:original].path) %>
 
 
-<% my_file_name = File.basename(@logo.logo.queued_for_write[:original].path) %>
-<%# my_file_name = params[:name] %>
-<div style="width:100px;height:100px;overflow:hidden;margin-left:5px;"> 
-		<%= image_tag "tmp/#{my_file_name}",:id=>"preview" %>
-</div>
-<div id="precropDiv">
+<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>
 
-<% precrop_dimensions = @logo.image_dimensions(my_file_name) %>
+<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>
+</div>
 
 <% content_for :javascript do %>
+	$("#sidebar").remove();
         jQuery('#cropImage').Jcrop({
             bgColor:     'clear',
             bgOpacity:   .6,
@@ -25,13 +25,22 @@ Crop your image:
 function update_crop(coords) {
   var rx = 100/coords.w;
   var ry = 100/coords.h;
+  
+  if((coords.w == 0) || (coords.h == 0)){
+  	rx = 100/$("#cropImage").width();
+  	ry = 100/$("#cropImage").height();
+  	coords.x = 0;
+  	coords.y = 0;
+  }
+  
+  
   $('#preview').css({
-    width: Math.round(rx * <%= precrop_dimensions[:width] %>) + 'px',
-    height: Math.round(ry * <%= precrop_dimensions[:height] %>) + 'px',
+    width: Math.round(rx * $("#cropImage").width()) + 'px',
+    height: Math.round(ry * $("#cropImage").height()) + 'px',
     marginLeft: '-' + Math.round(rx * coords.x) + 'px',
     marginTop: '-' + Math.round(ry * coords.y) + 'px'
   });
-  var ratio = 1;//<% precrop_dimensions[:width] %> / <%= precrop_dimensions[:height] %>
+  var ratio = 1;
   $("#crop_x").val(Math.round(coords.x * ratio));
   $("#crop_y").val(Math.round(coords.y * ratio));
   $("#crop_w").val(Math.round(coords.w * ratio));
@@ -39,13 +48,12 @@ function update_crop(coords) {
 }
 <% end %>
 
-<%= form_for :logo, @logo,:url => logos_path, :html => { :multipart => true } do |f| %>
+<%= form_for :logo, @avatar,:url => avatars_path, :html => { :multipart => true } do |f| %>
 
   <% 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 %>
-	
-  <p><%= f.submit "Crop" %></p>
+	<br>
+  <p><%= f.submit t('avatar.crop_submit') %></p>
 <% end %>
-

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

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

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

@@ -0,0 +1,42 @@
+<% toolbar :profile => current_subject %>
+
+<h1><%= t('avatar.list') %></h1>
+
+<table>
+  <tr>
+    <th></th>
+    <th></th>
+    <th></th>
+  </tr>
+
+<% 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 %>
+<% end %>
+</table>
+
+<br />
+
+<%= link_to t('avatar.new_short'), new_avatar_path %>