social_stream 0.2.1 → 0.2.2

data/.gitignore

@@ -1 +1,3 @@
+.bundle
 pkg/*gem
+**.tmp_*

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    social_stream (0.1.7)
+    social_stream (0.2.2)
       atd-ancestry (= 1.3.0)
       cancan (~> 1.4.0)
       devise (~> 1.1.3)

data/README.rdoc

@@ -1,6 +1,6 @@
-= Social Stream: building social network applications
-Social Stream is an engine for Ruby on Rails. It provides your application with
-a core of social networking features and activity streams.
+= Social Stream: core for building social network websites
+Social Stream is an engine for Ruby on Rails. It provides a robust and flexible core
+with social networking features and activity streams for building websites.
 
 == Social networking
 Social networks are a new paradigm on web application design. Social networking platforms stand 
@@ -68,7 +68,7 @@ initializer.
 
 = Documentation
 
-{Social Stream documentation is available at rdoc.info}[http://rdoc.info/github/ging/social_stream/frames]}
+{Social Stream documentation is available at rdoc.info}[http://rubydoc.info/gems/social_stream/frames]
 
 = Discussion
 

data/app/controllers/private_messages_controller.rb

@@ -0,0 +1,3 @@
+class PrivateMessagesController < InheritedResources::Base
+  respond_to :html, :xml, :js
+end

data/app/controllers/users_controller.rb

@@ -6,6 +6,32 @@ class UsersController < ApplicationController
     respond_to do |format|
       format.html # show.html.erb
       format.xml  { render :xml => @user }
+    end
+	end
+
+  def edit
+    @user = User.find_by_permalink!(params[:id])
+
+    respond_to do |format|
+      format.html # edit.html.erb
+      format.xml  { render :xml => @user }
     end
   end
+  
+  def update
+    
+    @user = User.find_by_permalink!(params[:id])
+
+    respond_to do |format|
+      if @user.update_attributes(params[:user])
+        #format.html { redirect_to(@user, :notice => 'User was successfully updated.') }
+        format.html { render :action => "edit", :notice => 'User was successfully updated.' }
+        format.xml  { head :ok }
+      else
+        format.html { render :action => "edit" }
+        format.xml  { render :xml => @user.errors, :status => :unprocessable_entity }
+      end
+    end
+  end
+
 end

data/app/models/permission.rb

@@ -1,7 +1,26 @@
+# SocialStream provides a sophisticated and powerful system of permissions based on the relations
+# and ties of the social network.
+#
+# Permissions are composed by action, objective and parameterized. Action and objective are classical
+# in content management systems, e.g. "create" "activity", "update" "tie", "read" "post"
+#
+# parameterized is a novel feature. It supports applying the permission to certain set of ties.
+# This set of ties changes with the formation of ties in your website.
+#
+# Permissions is assigned to relations, and through relations, to ties. 
+# When a sender establishes a tie with a receiver, she grants to the receiver 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 "friend" relation.
+#
+# One of this permissions can be "read" "activity" "inverse_group_set". This way, Bob will have access
+# to read the activities attached to ties inside the "inverse_group_set", which are the ties from all
+# the "friends" of Alice to Alice herself.
+#
 class Permission < ActiveRecord::Base
   has_many :relation_permissions, :dependent => :destroy
   has_many :relations, :through => :relation_permissions
 
+  # The SQL and ARel conditions for permission queries
   ParameterConditions = {
     :table => {
       'tie' =>

data/app/models/private_message.rb

@@ -0,0 +1,6 @@
+class PrivateMessage < ActiveRecord::Base
+  belongs_to :sender,
+             :class_name => 'Actor'
+  belongs_to :receiver,
+             :class_name => 'Actor'
+end

data/app/models/profile.rb

@@ -0,0 +1,3 @@
+class Profile < ActiveRecord::Base
+  belongs_to :user
+end

data/app/models/tie.rb

@@ -121,8 +121,34 @@ class Tie < ActiveRecord::Base
     Tie.inverse(self).first
   end
 
-  # Access Control
-  
+  # = Access Control
+  #
+  # Access control enforcement in ties come from the permissions assigned to other ties through relations.
+  # The access_set is the set of ties that grant some permission on a particular tie.
+  #
+  # Enforcing access control on activities and ties are a matter of finding its access set.
+  # There are two approaches for this, checking the permissions on particular tie or finding all the ties
+  # granted some permission.
+  #
+  # == Particular tie
+  # ------------------        ------------------
+  # | particular tie |--------|   access_set   |
+  # |       t        |        |      ties      |
+  # ------------------        ------------------
+  #
+  # Because t is given, the scopes are applied to the ties table
+  # We get the set of ties that allow permission on t
+  #
+  # == Finding ties
+  # ------------------  join  ------------------
+  # |  finding ties  |--------|   access_set   |
+  # |      ties      |        |     ties_as    |
+  # ------------------        ------------------
+  #
+  # 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
+  #
+
   scope :with_permissions, lambda { |action, object|
     joins(:relation => :permissions).
       where('permissions.action' => action).

data/app/models/user.rb

@@ -2,24 +2,38 @@ require 'devise/orm/active_record'
 
 class User < ActiveRecord::Base
   devise *SocialStream.devise_modules
-
+  has_one :profile
+  accepts_nested_attributes_for :profile
+  
   # Setup accessible (or protected) attributes for your model
-  attr_accessible :name, :email, :password, :password_confirmation, :remember_me
-
+  attr_accessible :name, :email, :password, :password_confirmation, :remember_me, :profile_attributes, :birthday
+  
   validates_presence_of :email
+
   validates_format_of :email, :with => Devise.email_regexp, :allow_blank => true
   # TODO: uniqueness of email, which is in actor
-
+  
   with_options :if => :password_required? do |v|
     v.validates_presence_of     :password
     v.validates_confirmation_of :password
     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 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
+  
+  after_create :create_profile
+  
+
   def friends
     receiver_subjects(:user, :relations => 'friend')
   end
@@ -30,7 +44,7 @@ class User < ActiveRecord::Base
   def password_required?
     !persisted? || !password.nil? || !password_confirmation.nil?
   end
-
+  
   class << self
     %w( email permalink name ).each do |a|
       eval <<-EOS
@@ -42,7 +56,7 @@ class User < ActiveRecord::Base
     end                                    # end
       EOS
     end
-
+    
     # Overwrite devise default find method to support login with email,
     # presence ID and login
     def find_for_authentication(conditions)
@@ -56,7 +70,7 @@ class User < ActiveRecord::Base
         super
       end
     end
-
+    
     def find_or_initialize_with_error_by(attribute, value, error=:invalid)
       if attribute == :email
         find_or_initialize_with_error_by_email(value, error)
@@ -64,26 +78,28 @@ class User < ActiveRecord::Base
         super
       end
     end
-
+    
     # Overwrite devise default method to support finding with actor.email
     def find_or_initialize_with_error_by_email(value, error)
       if value.present?
         record = find_by_email(value)
       end
-
+      
       unless record
         record = new
-
+        
         if value.present?
           record.email = value
         else
           error = :blank
         end
-
+        
         record.errors.add(:email, error)
       end
-
+      
       record
     end
   end
+  
+ 
 end

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

@@ -1,5 +1,8 @@
 <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'), private_messages_path, :remote => true) %>
+  </li>
+  <li>
+    <%= link_to( image_tag("btn/btn_group.png", :class => "menu_icon")+t('group.new'), "#", :remote => true) %>
   </li>
 </ul>

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

@@ -7,7 +7,7 @@
   <div class="menu_header"><b><%=t('menu.options')%></b>
   </div>
   <div id="menu_lateral">
-    <%= render :partial => "options" %>
+    <%= render :partial => "home/options" %>
   </div>
   <div class="space_center">
   </div>

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

@@ -18,11 +18,14 @@
         <%= stylesheet_link_tag "carousel", :media => "screen, projection" %>
         <%= stylesheet_link_tag "smoothness/jquery-ui-1.8.4.custom", :media => "screen, projection" %>
         <%= stylesheet_link_tag "ui.dropdownchecklist", :media => "screen, projection" %>
+				<!-- datepicker css -->
+        <link href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/base/jquery-ui.css" rel="stylesheet" type="text/css"/>
+        <%= stylesheet_link_tag "edit_user", :media => "screen, projection" %> 
 
 
         <%= javascript_include_tag :defaults %>
        
-        <%= javascript_include_tag 'jquery', 'jquery-ui-1.8.4.custom.min', 'jquery.livequery',
+        <%= javascript_include_tag 'jquery', 'jquery-ui.min', 'jquery.livequery',
                                    'jquery.boxy', 'menu','ui.dropdownchecklist' %>
 
 
@@ -47,11 +50,11 @@
                 </div>
                 <div id="middle">
                   <div id="middleContent">
-                    <div class="space_center">
+                    <div class="space_profile">
                     </div>
-                    <div class="space_center">
+                    <div class="space_profile">
                     </div>
-                    <div class="space_center">
+                    <div class="space_profile">
                     </div>
                       <%=  yield :middle %>
                   </div>

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

@@ -0,0 +1,24 @@
+<%= form_for(@private_message) do |f| %>
+  <% if @private_message.errors.any? %>
+    <div id="error_explanation">
+      <h2><%= pluralize(@private_message.errors.count, "error") %> prohibited this private_message from being saved:</h2>
+
+      <ul>
+      <% @private_message.errors.full_messages.each do |msg| %>
+        <li><%= msg %></li>
+      <% end %>
+      </ul>
+    </div>
+  <% end %>
+
+  <%= f.hidden_field :sender_id %>
+  <%= f.hidden_field :receiver_id %>
+
+  <div class="field">
+    <%= f.label :text %><br />
+    <%= f.text_area :text %>
+  </div>
+  <div class="actions">
+    <%= f.submit %>
+  </div>
+<% end %>

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

@@ -0,0 +1,24 @@
+<% content_for :middle do %>
+  <%= render :partial => 'home/middle' %>
+<% end %>
+
+<% content_for :right do %>
+  <%= render :partial => "home/right" %>
+<% end %>
+
+<%= render :partial => 'location' %>
+
+<br class="clearfloat" />
+<div class="space_center">
+</div>
+
+<div id="new_message" ><%= link_to 'New Message', new_private_message_path %></div>
+<div class="space_center">
+</div>
+<div class="space_center">
+</div>
+
+
+<div id="messages">  
+  <%= render :partial => 'messages' %>
+</div>

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

@@ -0,0 +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 %>
+</div>

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

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

data/app/views/private_messages/_private_message.html.erb

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

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

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

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

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

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

@@ -0,0 +1 @@
+$("#content").html("<%=escape_javascript(render :partial => 'index') %>");

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

@@ -0,0 +1,14 @@
+<% content_for :middle do %>
+  <%= render :partial => 'home/middle' %>
+<% end %>
+
+<% content_for :right do %>
+  <%= render :partial => "home/right" %>
+<% end %>
+
+
+<h1>New private_message</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Back', private_messages_path %>

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

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

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

@@ -1,3 +1,4 @@
+
 <div class="contacts_header">
     <%=image_tag("btn/btn_friend.png", :class => "contacts_icon")%>
     <div class="contacts_text_header">
@@ -15,3 +16,4 @@
   <%=link_to((image_tag("btn/btn_next.png", :alt => "next")) , users_path) %>
 </div>
 
+