social_stream 0.3.6 → 0.4.0

data/app/models/permission.rb

@@ -8,13 +8,14 @@
 # the permissions assigned to {Relation} of the {Tie} she has just established.
 #
 # For example, when _Alice_ establishes a _friend_ tie to _Bob_, she is granting
-# him the permissions associated with her _friend_ relation.
+# him the permissions associated with her _friend_ relation. Alice's _friend_ relation may
+# have different permissions from Bob's _friend_ relation.
 #
 # = Permissions description
 #
 # Permissions are composed by *action*, *objective* and *function*. Action and objective
 # are typical in content management systems, e.g. <tt>create activity</tt>,
-# <tt>update tie</tt>, <tt>read post</tt>
+# <tt>update tie</tt>, <tt>read post</tt>. *function* is a new parameter for social networks
 #
 # == Actions
 #
@@ -24,8 +25,8 @@
 # +read+::   view something
 # +update+::  modify something
 # +destroy+:: delete something
-# +follow+::  get activity updates from the receiver of the tie
-# +represent+:: give the receiver rights to act as if he were us.
+# +follow+::  subscribe to activity updates from the receiver of the tie
+# +represent+:: give the receiver rights to act as if he were me.
 #
 # == Objectives
 #
@@ -46,7 +47,8 @@
 #
 #         Example: if the _friend_ relation has the permission
 #         <tt>create activity tie</tt>, the _friend_ can create activities
-#         attached to this tie only.
+#         attached to this tie only. _Bob_ can create activities only at _Alice_'s
+#         _friend_ level.
 #
 # +weak_ties+:: apply the permission to all the related ties with a relation weaker
 #               or equal than this. When a subject establishes a strong ties,

data/app/models/profile.rb

@@ -1,29 +1,45 @@
 class Profile < ActiveRecord::Base
   belongs_to :actor
   
+  validates_presence_of :actor_id
+  
   validates_format_of :mobile, :phone, :fax,
                       :allow_nil  => true,
                       :with       => /(^$)|(((\((\+?)\d+\))?|(\+\d+)?)[ ]*-?(\d+[ ]*\-?[ ]*\d*)+$)/,
                       :message    => "has a invalid format"
-                      
+  
   validates_format_of :website,
                       :allow_nil  => true,
                       :with       => /(^$)|((https?|ftp):\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)(:\d*)?)(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)?(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(\#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$)/ ,
                       :message    => "has a invalid format"
-                      
+  
   validate :validate_birthday
   
-  def birthday=(value)
-    @birthday_formatted_invalid = false
-    super Date.parse(value)
-    rescue ArgumentError
-      @birthday_formatted_invalid = true
+  def birthday=(value)    
+    if value.blank?
+      @birthday_formatted_invalid = false    
+      super value
+    else
+      begin
+        super Date.parse(value)
+        @birthday_formatted_invalid = false
+      rescue 
+        @birthday_formatted_invalid = true
+      end
+    end
   end
   
+  # The subject of this profile
+  def subject
+    actor.try(:subject)
+  end
   
+  private
+
   def validate_birthday
-    errors.add(:birthday, "is invalid. Please, use \"month/day/year\" format and make sure you choose a valid date" ) if @birthday_formatted_invalid || (birthday.present? && birthday > Date.today)
+    errors.add(:birthday, "is invalid. Please, use \"month/day/year\" format and make sure you choose a valid date" ) if (@birthday_formatted_invalid) || (birthday.present? && !birthday.blank? && birthday > Date.today)
   end
+
   
   
 end

data/app/models/tie.rb

@@ -34,6 +34,8 @@
 #
 # = Scopes
 # There are several scopes defined:
+#
+# original:: ties created by actors. It excludes ties created in the weaker set.
 # sent_by(actor):: ties whose sender is actor
 # received_by(actor):: ties whose receiver is actor
 # sent_or_received_by(actor):: the union of the former
@@ -60,6 +62,8 @@ class Tie < ActiveRecord::Base
   has_many :tie_activities, :dependent => :destroy
   has_many :activities, :through => :tie_activities
 
+  scope :original, where(:original => true)
+
   scope :recent, order("#{ quoted_table_name }.created_at DESC")
 
   scope :sent_by, lambda { |a|
@@ -96,6 +100,7 @@ class Tie < ActiveRecord::Base
   before_validation :find_relation
 
   after_create :complete_weak_set
+  after_create :create_activity_after_add_contact
 
   def relation_name
     @relation_name || relation.try(:name)
@@ -233,15 +238,23 @@ class Tie < ActiveRecord::Base
   end
 
   # After create callback
-  # Creates ties with a weaker relations in the strength hierarchy of this tie
+  # Creates ties with weaker relations in the strength hierarchy of this tie
   def complete_weak_set
     return if reflexive?
 
     relation.weaker.each do |r|
       if relation_set(:relations => r).blank?
-        t = relation_set.build :relation => r
+        t = relation_set.build :relation => r,
+                               :original => false
         t.save!
       end
     end
   end
+  
+  
+  def create_activity_after_add_contact
+    
+  end
+  
+  
 end

data/app/models/user.rb

@@ -46,7 +46,7 @@ class User < ActiveRecord::Base
   end
   
   class << self
-    %w( email permalink name ).each do |a|
+    %w( email slug name ).each do |a|
       eval <<-EOS
     def find_by_#{ a }(#{ a })             # def find_by_email(email)
       find :first,                         #   find(:first,
@@ -64,7 +64,7 @@ class User < ActiveRecord::Base
         if login =~ /@/
           find_by_email(login)
         else
-          find_by_permalink(login)
+          find_by_slug(login)
         end
       else
         super

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

@@ -1,4 +1,4 @@
-<% content_for :head, stylesheet_link_tag("activities", :media => "screen, projection") %>
+<% content_for :headers, stylesheet_link_tag("activities", :media => "screen, projection") %>
 <% content_for :javascript do %>
   <%= render :partial => 'activities/jquery' %>
 <% end -%>

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

@@ -1,5 +1,6 @@
-<% if receiver.sent_ties_allowing(current_subject, 'create', 'activity').any? %>
+<% if receiver.active_ties_for(current_subject).any? %>
   <% content_for :javascript do %>
+
     securityImage = "<%= escape_javascript(image_tag('btn/btn_security.png', :id => 'security_image', :alt => 'security')) %>";
     downImage = "<%= escape_javascript(image_tag('btn/btn_down.png')) %>";
 
@@ -10,15 +11,19 @@
 
   <div id="activities_header" class="content_size">
     <%= form_for Post.new(:text => t('activity.input'),
-                          :_activity_tie_id => receiver.sent_ties_allowing(current_subject, 'create', 'activity').first.id),
+                          :_activity_tie_id => receiver.active_ties_for(current_subject).first.id),
                           :remote => true  do |f| %>
-      <%= f.hidden_field :_activity_tie_id %>
       <%= 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').sort{ |t, u| t.relation <=> u.relation }.map{ |t| [ t.relation_name, t.id ] }, {}, :id => 'security' %>
-        </div>
-        <%= image_submit_tag "btn/btn_share.png" %>
+
+        <% if receiver.active_ties_for(current_subject).count > 1 %>
+          <div id="securities">
+            <%= f.select :_activity_tie_id, receiver.active_ties_for(current_subject).sort{ |t, u| t.relation <=> u.relation }.map{ |t| [ t.relation_name, t.id ] }, {}, :id => 'security' %>
+          </div>
+        <% else %>
+          <%= f.hidden_field :_activity_tie_id %>
+        <% end %>
+        <%= f.submit t('share'), :class =>"myButtonBlue" %>
       </div>
     <% end -%>
   </div>

data/app/views/api/activity_atom_feed.atom.builder

@@ -0,0 +1,40 @@
+atom_feed({'xmlns:activity' => 'http://activitystrea.ms/spec/1.0/'}) do |feed|
+	feed.title(@user.name + ' public stream') 
+	feed.updated(@activities.first.updated_at)
+	feed.author do
+		feed.name(@user.name)
+	end
+	
+	for activity in @activities
+		feed.entry(activity) do |entry|
+		    #Atom compliant for not ActivityStream readers
+			entry.title('Activity')
+			entry.summary(activity.direct_object.text)
+			
+			#ActivityStream compliant
+			
+			entry.author do |a|
+				a.name(activity.sender_subject.name)
+				a.tag!('activity:object-type','person')
+			end
+			
+			entry.tag!('activity:verb',activity.activity_verb.name)
+			
+			entry.tag!('activity:object') do |act_ob|
+				act_ob.title('Activity')
+				act_ob.tag!('activity:object-type','status')
+				act_ob.publised(activity.created_at)
+			end
+			
+			entry.content(activity.direct_object.text,:type=>'text/html')
+			
+		end
+	end
+	
+	feed.link :rel => 'self',     :href=>request.url
+	feed.link :rel => 'next',     :href=>api_my_home_url+'?page='+(params[:page].to_i+1).to_s
+	
+	if params[:page].to_i != 1
+	feed.link :rel => 'previous', :href=>api_my_home_url+'?page='+(params[:page].to_i-1).to_s
+	end	
+end

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

@@ -10,7 +10,7 @@
    <%= f.text_field :text,   :class =>"input_new_comments" %>
    <div class="activities_comment_btn">
      <div class="activities_security"></div>
-     <%= image_submit_tag "btn/btn_share.png" %>
+     <%= f.submit t('share'), :class =>"myButtonBlue" %>
    </div>
  <% end %>
     </div>

data/app/views/devise/passwords/edit.html.erb

@@ -0,0 +1,21 @@
+<div id="login">
+  <h2><%= t('password.update') %></h2>
+  <div class="space_height">
+  </div>
+  <%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f| %>
+    <%= devise_error_messages! %>
+    <%= f.hidden_field :reset_password_token %>
+    <div class="line">
+      <div class="label"><%= f.label t('password.default') %></div>
+      <div class="field"><%= f.password_field :password, :class =>"field_x" %></div>
+    </div>
+    <div class="line">
+      <div class="label"><%= f.label t('password.confirmation') %></div>
+      <div class="field"><%= f.password_field :password_confirmation, :class =>"field_x" %></div>
+    </div>
+    <div class="space_height"></div>
+    <div class="btn_login">
+      <%= f.submit "Change my password", :class =>"myButtonLarge" %>
+    </div>
+  <% end %>
+</div>

data/app/views/devise/passwords/new.html.erb

@@ -0,0 +1,16 @@
+<div id="welcome">
+  <div id="login" class="block">
+    <h2><%= t('password.forgot') %></h2>
+    <div class="space_center"></div>
+    <div class="space_center"></div>
+    <%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %>
+      <%= devise_error_messages! %>
+      <div class="form_row"><%=t('devise.passwords.field')  %></div>
+      <div class="form_row"><%= f.text_field :email %></div>
+      <div class="space_center"></div>
+      <div class="btn_login">
+        <%= f.submit t('action.send'), :class =>"myButton" %>
+      </div>
+    <% end %>
+  </div>
+</div>

data/app/views/devise/registrations/new.html.erb

@@ -1,21 +1,37 @@
-<h2>Sign up</h2>
+<div id="welcome">
+  <div id="login" class="block">
+  <h2><%= t('sign_in').capitalize %></h2>
+  <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
+    <%= devise_error_messages! %>
+    <div class="form_row">
+      <div class="form_label"><%= f.label :name %></div>
+      <div class="form_field"><%= f.text_field :name, :class =>"field_x"  %></div>
+    </div>
+    <div class="form_row">
+      <div class="form_label"><%= f.label :email %></div>
+      <div class="form_field"><%= f.text_field :email, :class =>"field_x"  %></div>
+    </div>
+    <div class="form_row">
+      <div class="form_label"><%= f.label :password %></div>
+      <div class="form_field"><%= f.password_field :password, :class =>"field_x", :id => "password"  %></div>
+    </div>
+    <div class="form_row">
+      <div class="form_label"><%= f.label :password_confirmation %></div>
+      <div class="form_field"><%= f.password_field :password_confirmation, :class =>"field_x"  %></div>
+    </div>
+    <div class="form_row center">
+      <div id="btn_login"><%= f.submit t('action.accept').capitalize,:class=>"myButton"  %></div>
+    </div>
+  <% end %>
+  <div class="form_row center">
+    <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
+      <%= link_to t('confirmation.not_received.long'), new_confirmation_path(resource_name) %><br />
+    <% end -%>
+  </div>
+    <div class="form_row center">
+      <%= render :partial => "devise/shared/links" %>
+    </div>
+  </div>
+</div>
 
-<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
-  <%= devise_error_messages! %>
 
-  <p><%= f.label :name %><br />
-  <%= f.text_field :name %></p>
-
-  <p><%= f.label :email %><br />
-  <%= f.text_field :email %></p>
-
-  <p><%= f.label :password %><br />
-  <%= f.password_field :password %></p>
-
-  <p><%= f.label :password_confirmation %><br />
-  <%= f.password_field :password_confirmation %></p>
-
-  <p><%= f.submit "Sign up" %></p>
-<% end %>
-
-<%= render :partial => "devise/shared/links" %>

data/app/views/devise/sessions/new.html.erb

@@ -0,0 +1,30 @@
+
+
+<div id="welcome">
+  <div id="login" class="block">
+    <h2><%= t('sign_in') %></h2>
+    <div class="space_center"></div>
+    <div class="space_center"></div>
+    <%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
+      <%= devise_error_messages! %>
+      <div class="form_row">
+        <div class="form_label"><%= f.label :email %></div>
+        <div class="form_field"><%= f.email_field :email %></div>
+      </div>
+      <div class="form_row">
+        <div class="form_label"><%= f.label :password %></div>
+        <div class="form_field"><%= f.password_field :password %></div>
+      </div>
+
+      <div class="form_row">
+        <% if devise_mapping.rememberable? -%>
+          <p><%= f.check_box :remember_me %> <%= f.label :remember_me %></p>
+        <% end -%>
+      </div>
+
+      <div class="btn_login">
+        <%= f.submit t('action.send'), :class =>"myButton" %>
+      </div>
+    <% end %>
+  </div>
+</div>

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

@@ -1,23 +1,21 @@
-<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 id="headerFront">
+  <div class="banner_top">
+    <div id="logo"><%= link_to(image_tag('/images/logo.png', :alt => t('socialstream')), '/'); %></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(:sign_in), :class => 'other_blue'%>
-        <% end -%>
-        <div class="subtexto">
-            <%= link_to t('sign_up'), new_user_registration_path, :class => "register_link" %>
-            <span>|</span>
-            <%= link_to t('forgot_password?'), new_user_password_path, :class => "register_link" %>
-        </div>
+      <%= 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(:sign_in), :class => 'other_blue'%>
+      <% end -%>
+      <div class="subtexto">
+        <%= link_to t('sign_in'), new_user_registration_path, :class => "register_link" %>
+        <span>|</span>
+        <%= link_to t('forgot_password'), new_user_password_path, :class => "register_link" %>
+      </div>
     </div>
-    <br class="clearfloat" />
-</div>
+  <br class="clearfloat" />
+  </div>
 </div>
+

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

@@ -0,0 +1,13 @@
+<div class="div_busqueda menu_list">
+  <ul>
+    <li>
+      <%= link_to t('browse'), users_path %>
+    </li>
+  </ul>
+  <div id="form_busqueda">
+  <%= form_tag(users_path, :method => "get") do -%>
+      <%=text_field_tag'search' %>
+      <%=submit_tag(t('find'), :class => 'other_blue')  %>
+  <% end %>
+  </div>
+</div>

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

@@ -1,13 +1,12 @@
-<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>
-
-
-
+<div id="sponsor-wrapper">
+  <div id="sponsor">
+    <ul>
+      <li>
+        <%=link_to("DIT","http://www.dit.upm.es/")%> -
+        <%=link_to("UPM","http://www.upm.es/")%> &#38;
+        <%=link_to("CISE","http://www.cise.espol.edu.ec/")%> -
+        <%=link_to("ESPOL","http://www.espol.edu.ec/")%>
+      </li>
+    </ul>
+  </div>
+</div>