social_stream 0.2.3 → 0.3.0

data/app/models/relation.rb

@@ -8,24 +8,6 @@
 # two actors are stronger than others.
 # When a strong tie is established, ties with weaker relations are establised as well
 #
-# == Reflexive relations
-# Some relations are set by default for actors with theirselves. This sets some ties
-# for posting in self wall at several visibility levels: only for friends, public and
-# so on
-#
-# == Inverse relations
-# A Relation can have its inverse. When a tie is established, an inverse tie will be
-# established if an inverse relation exists. An example is a relation of friendship,
-# whose inverse relation is itself. When A is friend of B, the inverse tie B is friend of A
-# is establised as well.
-#
-# == Granted relations
-# There are cases when relations need previous invitation or request to be granted.
-# This is the case of friendship requests. When A wants to become friend of B, A
-# sends a friendship_request to B. A is granting the friend relation with B, that is,
-# friendship_request grants friend relation.
-#
-
 class Relation < ActiveRecord::Base
   acts_as_nested_set
 
@@ -33,20 +15,46 @@ class Relation < ActiveRecord::Base
     where(:sender_type => st, :receiver_type => rt)
   }
 
-  belongs_to :inverse,
-             :class_name => "Relation"
-  belongs_to :granted,
-             :class_name => "Relation"
-
-  scope :reflexive, where(:reflexive => true)
-  scope :request, where('relations.granted_id IS NOT NULL')
-
   has_many :relation_permissions, :dependent => :destroy
   has_many :permissions, :through => :relation_permissions
 
   has_many :ties, :dependent => :destroy
 
   class << self
+    # Get relation from object, if possible
+    #
+    # Options::
+    # sender:: The sender of the tie
+    def normalize(r, options = {})
+      case r
+      when Relation
+        r
+      when String
+        if options[:sender]
+          options[:sender].relation(r)
+        else
+          raise "Must provide a sender when looking up relations from name: #{ options[:sender] }"
+        end
+      when Integer
+        Relation.find r
+      when Array
+        r.map{ |e| Relation.normalize(e, options) }
+      else
+        raise "Unable to normalize relation #{ r.inspect }"
+      end
+    end
+
+    def normalize_id(r, options = {})
+      case r
+      when Integer
+        r
+      when Array
+        r.map{ |e| Relation.normalize_id(e, options) }
+      else
+        normalize(r, options).id
+      end
+    end
+
     # A relation in the top of a strength hierarchy
     def strongest
       root

data/app/models/representation.rb

@@ -0,0 +1,35 @@
+# Users can represent other subjects in the application, acting as them
+# through the browser, posting new activities, establishing new ties, etc.
+class Representation
+  extend ActiveModel::Naming
+  include ActionController::RecordIdentifier
+
+  attr_reader :subject
+
+  # Sets up new representation
+  #
+  # params[:subject] must contain the dom_id of the represented subject
+  def initialize arg
+    @subject =
+      case arg
+      when Hash
+        arg[:subject_dom_id] =~ /(.*)_(\d*)$/
+
+        subject_type = $1.classify.constantize
+        subject_id   = $2.to_i
+
+        subject_type.find subject_id
+      else
+        arg
+      end
+  end
+
+  def subject_dom_id
+    dom_id(subject)
+  end
+
+  # ActiveRecord compatibility
+  def to_key #:nodoc:
+    nil
+  end
+end

data/app/models/tie.rb

@@ -4,16 +4,17 @@
 #
 # == Ties and Activities
 # Activities are attached to ties. 
-# * The sender actor is the author of the Activity. It is the user that uploads 
+# * The sender of the tie is the target of the Activity. The wall-profile of an actor is
+#   composed by the resources assigned to the ties in which the actor is the sender.
+# * The receiver actor of the tie is the author of the Activity. It is the user that uploads 
 #   a resource to the website or the social entity that originates the activity.
-# * The receiver is the target of the Activity. The wall-profile of an actor is
-#   composed by the resources assigned to the ties in which the actor is the receiver.
 # * The Relation sets up the mode in which the Activity is shared. It sets the rules,
 #    or permissions, by which actors have access to the Activity.
-# 
-# == Inverse ties
-# Relations can have its inverse. When a tie is establised, an inverse tie is establised
-# as well.
+#
+# == Authorization
+# When an actor establishes a tie with other, she is granting a set of permissions to them
+# (posting to her wall, reading her posts, etc..) The set of permissions granted are
+# associated with the relation of the tie.
 #
 # == Scopes
 # There are several scopes defined:
@@ -21,23 +22,20 @@
 # * received_by(actor), ties whose receiver is actor
 # * sent_or_received_by(actor), the union of the former
 # * related_by(relation), ties with this relation. Accepts relation, relation_name, integer, array
-# * pending, ties whose relation grant other relations, like friendship requests.
-# * inverse(tie), the inverse of tie
+# * replied, ties having at least another tie in the other way, a tie from a to b is replied if there is a tie from b to a
 #
 class Tie < ActiveRecord::Base
+  attr_accessor :message
+
   # Facilitates relation assigment along with find_relation callback
   attr_writer :relation_name
 
-  # Avoids loops at create_inverse after save callback
-  attr_accessor :_without_inverse
-  attr_protected :_without_inverse
-
   belongs_to :sender,
              :class_name => "Actor",
-             :include => SocialStream.actors
+             :include => SocialStream.subjects
   belongs_to :receiver,
              :class_name => "Actor",
-             :include => SocialStream.actors
+             :include => SocialStream.subjects
 
   belongs_to :relation
 
@@ -47,36 +45,34 @@ class Tie < ActiveRecord::Base
   scope :recent, order("#{ quoted_table_name }.created_at DESC")
 
   scope :sent_by, lambda { |a|
-    where(:sender_id => Actor_id(a))
+    where(:sender_id => Actor.normalize_id(a))
   }
 
   scope :received_by, lambda { |a|
-    where(:receiver_id => Actor_id(a))
+    where(:receiver_id => Actor.normalize_id(a))
   }
 
   scope :sent_or_received_by, lambda { |a|
-    where(arel_table[:sender_id].eq(Actor_id(a)).
-          or(arel_table[:receiver_id].eq(Actor_id(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|
-    where(:relation_id => Relation(r))
+    where(:relation_id => Relation.normalize_id(r))
   }
 
-  scope :pending, includes(:relation) & Relation.request
-
-  scope :inverse, lambda { |t|
-    sent_by(t.receiver).
-      received_by(t.sender).
-      where(:relation_id => t.relation.inverse.try(:id))
+  scope :replied, lambda {
+    select("DISTINCT ties.*").
+      from("ties, ties as ties_2").
+      where("ties.sender_id = ties_2.receiver_id AND ties.receiver_id = ties_2.sender_id")
   }
 
   validates_presence_of :sender_id, :receiver_id, :relation_id
 
   before_validation :find_relation
 
-  after_create :complete_weak_set, :create_inverse
+  after_create :complete_weak_set
 
   def relation_name
     @relation_name || relation.try(:name)
@@ -95,6 +91,11 @@ class Tie < ActiveRecord::Base
     receiver.try(:subject)
   end
 
+  # Does this tie have the same sender and receiver?
+  def reflexive?
+    sender_id == receiver_id
+  end
+
   # The set of ties between sender and receiver
   #
   # Options::
@@ -105,8 +106,8 @@ class Tie < ActiveRecord::Base
 
     if options.key?(:relations)
       set = 
-        set.related_by self.class.Relation(options[:relations],
-                                           :mode => relation.mode)
+        set.related_by Relation.normalize_id(options[:relations],
+                                             :sender => sender)
     end
 
     set
@@ -117,13 +118,9 @@ class Tie < ActiveRecord::Base
     relation_set(:relations => r).first
   end
 
-  # The inverse tie
-  def inverse
-    Tie.inverse(self).first
-  end
-
   def activity_receivers
-    Array(inverse)
+    # TODO
+    Array.new
   end
 
   # = Access Control
@@ -151,7 +148,7 @@ class Tie < ActiveRecord::Base
   # ------------------        ------------------
   #
   # Because we want to find ties, an additional join table (ties_as) is needed for applying access set conditions
-  # We get the set of ties that are allowed to certain condition
+  # We get the set of ties that are allowing certain permission
   #
 
   scope :with_permissions, lambda { |action, object|
@@ -166,10 +163,10 @@ class Tie < ActiveRecord::Base
       where(Permission.parameter_conditions(tie))
   }
 
-  scope :allowed_set, lambda { |action, object|
+  scope :allowing_set, lambda { |action, object|
     query = 
       select("DISTINCT ties.*").
-        from("ties INNER JOIN relations ON relations.id = ties.relation_id, ties as ties_as INNER JOIN relations AS relations_as ON relations_as.id = ties_as.relation_id INNER JOIN relation_permissions ON relations_as.id = relation_permissions.relation_id INNER JOIN permissions ON permissions.id = relation_permissions.permission_id, relations as relations_inverse").
+        from("ties INNER JOIN relations ON relations.id = ties.relation_id, ties as ties_as INNER JOIN relations AS relations_as ON relations_as.id = ties_as.relation_id INNER JOIN relation_permissions ON relations_as.id = relation_permissions.relation_id INNER JOIN permissions ON permissions.id = relation_permissions.permission_id").
         where("permissions.action = ?", action).
         where("permissions.object = ?", object)
 
@@ -182,21 +179,21 @@ class Tie < ActiveRecord::Base
     query.where(conds)
   }
 
-  scope :allowed, lambda { |actor, action, object|
-    allowed_set(action, object).
-      where("ties_as.receiver_id" => Actor_id(actor))
+  scope :allowing, lambda { |actor, action, object|
+    allowing_set(action, object).
+      where("ties_as.receiver_id" => Actor.normalize_id(actor))
   }
 
   def access_set(action, object)
     self.class.access_set(self, action, object)
   end
 
-  def permissions(user, action, object)
+  def allowing(user, action, object)
     access_set(action, object).received_by(user)
   end
 
-  def permission?(user, action, object)
-    permissions(user, action, object).any?
+  def allows?(user, action, object)
+    allowing(user, action, object).any?
   end
 
   private
@@ -204,73 +201,23 @@ class Tie < ActiveRecord::Base
   # Before validation callback
   # Infers relation from its name and the type of the actors
   def find_relation
-    if relation_name.present? && relation_name != relation.try(:name)
-      self.relation = Relation.mode(sender_subject.class.to_s,
-                                    receiver_subject.class.to_s).
-                                    find_by_name(relation_name)
+    if relation_name.present? &&
+      relation_name != relation.try(:name) &&
+      sender.present?
+      self.relation = sender.relation(relation_name)
     end
   end
 
   # After create callback
   # Creates ties with a 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._without_inverse = true
         t.save!
       end
     end
   end
-
-  # After create callback
-  # Creates a the inverse of this tie
-  def create_inverse
-    if !_without_inverse &&
-       relation.inverse.present? &&
-       Tie.inverse(self).blank?
-      t = Tie.inverse(self).build
-      t._without_inverse = true
-      t.save!
-    end
-  end
-
-  class << self
-    def Actor_id(a)
-      case a
-      when Integer
-        a
-      when Actor
-        a.id
-      else
-        a.actor.id
-      end
-    end
-
-    # Normalize a relation for ActiveRecord query from relation_name, id or Array
-    #
-    # Options::
-    # mode:: Relation mode
-    def Relation(r, options = {})
-      case r
-      when Relation
-        r
-      when String
-        case options[:mode]
-        when Array
-          Relation.mode(*options[:mode]).find_by_name(r)
-        when ActiveRecord::Relation
-          options[:mode].find_by_name(r)
-        else
-          raise "Must provide a mode when looking up relations from name: #{ options[:mode] }"
-        end
-      when Integer
-        r
-      when Array
-        r.map{ |e| Relation(e, options) }
-      else
-        raise "Unable to normalize relation #{ r.inspect }"
-      end
-    end
-  end
 end

data/app/models/user.rb

@@ -3,11 +3,8 @@ require 'devise/orm/active_record'
 class User < ActiveRecord::Base
   devise *SocialStream.devise_modules
 
-  has_one :profile, :dependent => :destroy
-  accepts_nested_attributes_for :profile
-  
   # Setup accessible (or protected) attributes for your model
-  attr_accessible :name, :email, :password, :password_confirmation, :remember_me, :profile_attributes, :birthday
+  attr_accessible :name, :email, :password, :password_confirmation, :remember_me, :profile_attributes
   
   validates_presence_of :email
 
@@ -20,25 +17,25 @@ class User < ActiveRecord::Base
     v.validates_length_of       :password, :within => Devise.password_length, :allow_blank => true
   end
   
-  def recent_groups
-    receiver_subjects(:group, :relations => 'follower') & Tie.recent
-  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
-  
-  after_create :create_profile
-  
 
-  def friends
-    receiver_subjects(:user, :relations => 'friend')
+  def recent_groups
+    subjects(:subject_type => :group, :direction => :receivers) do |q|
+      q & Tie.recent
+    end
   end
 
+  # Subjects this user can acts as
+  def represented
+    subjects(:direction => :senders) do |q|
+      q.joins(:sent_ties => { :relation => :permissions }) & Permission.represent
+    end
+  end
+  
   protected
   
   # From devise
@@ -101,6 +98,4 @@ class User < ActiveRecord::Base
       record
     end
   end
-  
- 
 end

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

@@ -1,5 +1,5 @@
-<%= content_for :head, stylesheet_link_tag("activities", :media => "screen, projection") %>
-<%= content_for :javascript do %>
+<% content_for :head, 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,8 @@
-<% if current_user.active_ties_to(receiver).any? %>
+<% if receiver.sent_ties_allowing(current_subject, 'create', 'activity').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')) %>";
+
     $("#security").dropdownchecklist( { closeRadioOnClick: true } );
     $("#security_image").parent().width(28);
     $("#security_image").parent().parent().width(28);
@@ -7,13 +10,13 @@
 
   <div id="activities_header" class="content_size">
     <%= form_for Post.new(:text => t('activity.input'),
-                          :_activity_tie_id => current_user.active_ties_to(receiver).first.id),
+                          :_activity_tie_id => receiver.sent_ties_allowing(current_subject, 'create', 'activity').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, current_user.active_ties_to(receiver).map{ |t| [ t(t.relation_name, :count => :other), t.id ] }, {}, :id => 'security' %>
+          <%= f.select :_activity_tie_id, receiver.sent_ties_allowing(current_subject, 'create', 'activity').map{ |t| [ t.relation_name, t.id ] }, {}, :id => 'security' %>
         </div>
         <%= image_submit_tag "btn/btn_share.png" %>
       </div>

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

@@ -1,7 +1,7 @@
 <div class="activity_options">
   <ul class="activity_options" >
     <li><div class="post_time_ago"><%= t('time.ago', :time => time_ago_in_words(activity.created_at)) %></div></li>
-    <% if activity.is_root? && current_user.active_ties_to(activity.receiver).any? %>
+    <% if activity.is_root? && activity.receiver.sent_ties_allowing(current_subject, 'create', 'activity').any? %>
     <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>

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

@@ -1,8 +1,8 @@
-<% if current_user.active_ties_to(activity.receiver).any? %>
+<% if activity.receiver.sent_ties_allowing(current_subject, 'create', 'activity').any? %>
   <div class="activity_new_comment">
  <%= form_for Comment.new(:text => t('comment.input'),
                           :_activity_tie_id =>
-                            current_user.active_ties_to(activity.receiver).first.id,
+                            activity.receiver.sent_ties_allowing(current_subject, 'create', 'activity').first.id,
                           :_activity_parent_id => activity.id),
               :remote => true do |f| %>
    <%= f.hidden_field :_activity_tie_id %>

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

@@ -1,5 +1,3 @@
-<%= content_for :search do %>
-<%end %>
 <div class="left column span-11 borde">
     <div id="left_espacio">
     </div>

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

@@ -1,4 +1,4 @@
-<% if (current_user.recent_groups.count)>10 %>
+<% if (current_subject.recent_groups.count)>10 %>
   <li>
 <% end %>
   <%= div_for group do %>
@@ -9,6 +9,6 @@
       <%=link_to(group.name, group)%>
     </div>
   <% end %>
-<% if (current_user.recent_groups.count)>10 %>
+<% if (current_subject.recent_groups.count)>10 %>
   </li>
-<% end %>
+<% end %>

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

@@ -8,15 +8,14 @@
 	<% end %>
 
 			<div class="post_browse">
-			<div class="post_picture"><%= link_to (image_tag(group.logo.url , :size => "50x50", :alt => group.name )),home_path  %></div>
+			<div class="post_picture"><%= link_to (image_tag(group.logo.url , :size => "50x50", :alt => group.name )), group  %></div>
 			<div class="post_browse_content_people content_size">
                           <div class="post_browse_title content_size" >
                             <%= link_to group.name, group %>
                           </div>
+
                           <div class="content_size">
-                            <%= tie_link(current_user.sent_ties.build(:receiver => group.actor,
-                                                                      :relation => Relation.mode(current_user.class,
-                                                                                                 group.class).find_by_name("follower"))) %>
+                            <%= ties_to(group) %>
                           </div>
 			</div>
 			</div>

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

@@ -1,7 +1,10 @@
 <div class="space_center">
 </div>
-<%= render :partial => "ties/suggestions" %>
-<div class="space_center">
-</div>
-<%= render :partial => 'ties/pendings' %>
+
+<% if user_signed_in? %>
+  <%= render :partial => "ties/suggestions" %>
+  <div class="space_center">
+  </div>
+  <%= render :partial => 'ties/pendings' %>
+<% end %>
 

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

@@ -0,0 +1,25 @@
+<%= form_for @group do |f| %>
+  <% f.object._founder = current_subject.permalink %>
+  <%= f.hidden_field :_founder %>
+
+  <% if @group.errors.any? %>
+    <div id="error_explanation">
+      <h2><%= pluralize(@group.errors.count, "error") %> prohibited this group from being saved:</h2>
+
+      <ul>
+      <% @group.errors.full_messages.each do |msg| %>
+        <li><%= msg %></li>
+      <% end %>
+      </ul>
+    </div>
+  <% end %>
+
+  <div class="field">
+    <%= f.label :name %><br />
+    <%= f.text_field :name %>
+  </div>
+
+  <div class="actions">
+    <%= f.submit %>
+  </div>
+<% end %>

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

@@ -1,6 +1,8 @@
-<%= render :partial => 'follow' %>
+<%= ties_to(@group) %>
+
 <%= render :partial => 'logo' %>
 <%= render :partial => 'tabs' %>
 <div class="space_center"> 
 </div> 
-<%= render :partial => 'followers' %>
+
+<%= render :partial => 'subjects/contacts', :locals => { :subject => @group } %>

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

@@ -0,0 +1 @@
+<%= render :partial => 'new' %>

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

@@ -17,5 +17,5 @@
 </div>
 
 <%= render :partial => "activities/activities",
-           :locals => { :activities => @group.wall_profile(current_user).paginate,
+           :locals => { :activities => @group.profile_wall(current_subject).paginate,
                         :owner => @group } %>

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

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

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

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

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

@@ -1,8 +1,8 @@
 <ul class="menu noaccordion">
   <li>
-    <%= link_to( image_tag("btn/btn_inbox.png", :class => "menu_icon")+t('inbox.one'), private_messages_path, :remote => true) %>
+    <%= link_to( image_tag("btn/btn_inbox.png", :class => "menu_icon")+t('inbox.one'), messages_path, :remote => true) %>
   </li>
   <li>
-    <%= link_to( image_tag("btn/btn_group.png", :class => "menu_icon")+t('group.new'), "#", :remote => true) %>
+    <%= link_to( image_tag("btn/btn_group.png", :class => "menu_icon")+t('group.new'), new_group_path, :remote => true) %>
   </li>
 </ul>

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

@@ -1,6 +1,6 @@
   <div id="logo">
-    <b><%= link_to(current_user.name, current_user)%></b><br/>
-    <%= link_to(image_tag(current_user.logo.url(:profile) ,  :alt => current_user.name ), current_user ) %>
+    <b><%= link_to(current_subject.name, current_subject)%></b><br/>
+    <%= link_to(image_tag(current_subject.logo.url(:profile) ,  :alt => current_subject.name ), current_subject ) %>
   </div>
   <div class="space_center">
   </div>