social_stream 0.3.3 → 0.3.4

data/.gitignore

@@ -3,3 +3,6 @@ pkg/*gem
 **.tmp_*
 Gemfile.lock
 .idea
+nbproject
+.loadpath
+.project

data/Rakefile

@@ -6,6 +6,8 @@ require 'rubygems'
 
 require 'rspec/core/rake_task'
 
+require 'ci/reporter/rake/rspec'
+
 require 'bundler'
 
 require File.join(File.dirname(__FILE__), 'lib', 'social_stream', 'version')

data/app/controllers/contacts_controller.rb

@@ -0,0 +1,28 @@
+class ContactsController < ApplicationController
+  
+  def index
+    
+    
+    return if current_subject.blank?
+    
+    myContacts = Array.new
+    mySubjects = current_subject.subjects(:direction => :receivers)
+    
+    return if mySubjects.blank?
+    
+    #Fill the array with actor name/actorId of all the actors which has a tie with current_subject
+    mySubjects.each do |aSubject|
+      aSubjectD = {}
+      aSubjectD['key'] = aSubject.name
+      aSubjectD['value'] = aSubject.actor_id.to_s
+      myContacts << aSubjectD
+    end
+    
+    respond_to do |format|
+      format.html #index.html.erb
+      format.json { render :text => myContacts.to_json }
+    end
+    
+  end
+
+end

data/app/controllers/groups_controller.rb

@@ -1,4 +1,15 @@
 class GroupsController < InheritedResources::Base
+  def index
+    if params[:search]
+      @groups = Group.search("%"+params[:search]+"%").paginate(:per_page => 10, :page => params[:page])
+    else
+      if params[:letter] && params[:letter]!="undefined"
+        @groups = Group.search(params[:letter]+"%").paginate(:per_page => 10, :page => params[:page])
+      else
+        @groups = Group.alphabetic.paginate(:per_page => 10, :page => params[:page])
+      end
+    end
+  end
   protected
 
   # Overwrite resource method to support permalink

data/app/controllers/users_controller.rb

@@ -1,4 +1,15 @@
 class UsersController < ApplicationController
+  def index
+    if params[:search]
+      @users = User.search("%"+params[:search]+"%").paginate(:per_page => 10, :page => params[:page])
+    else
+      if params[:letter] && params[:letter]!="undefined"
+        @users = User.search(params[:letter]+"%").paginate(:per_page => 10, :page => params[:page])
+      else
+        @users = User.alphabetic.paginate(:per_page => 10, :page => params[:page])
+      end
+    end
+  end
 
   def show
     @user = User.find_by_permalink!(params[:id])

data/app/helpers/contacts_helper.rb

@@ -0,0 +1,2 @@
+module ContactsHelper
+end

data/app/models/group.rb

@@ -1,14 +1,18 @@
 class Group < ActiveRecord::Base
   attr_accessor :_founder
+  attr_accessor :_participants
 
   def followers
     subjects(:subject_type => :user, :direction => :senders)
   end
 
   after_create :create_founder
-
+  after_create :create_participants
+  
+  
   private
 
+  #Creates the ties betwbeen the group and the founder
   def create_founder
     founder =
       Actor.find_by_permalink(_founder) || raise("Cannot create group without founder")
@@ -16,4 +20,19 @@ class Group < ActiveRecord::Base
     sent_ties.create! :receiver => founder,
                       :relation => relations.sort.first
   end
-end
+  
+  #Creates the ties betwbeen the group and the participants
+  def create_participants
+    
+     return if @_participants.blank?
+    
+     @_participants.each do |participant|
+      
+      participantActor = Actor.find_by_id(participant.to_i)
+      sent_ties.create! :receiver => participantActor,
+                        :relation => relations.sort.first
+     end
+    
+  end
+  
+end

data/app/models/profile.rb

@@ -1,3 +1,29 @@
 class Profile < ActiveRecord::Base
   belongs_to :actor
+  
+  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
+  end
+  
+  
+  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)
+  end
+  
+  
 end

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

@@ -0,0 +1,2 @@
+<h1>Contacts#index</h1>
+<p>Find me in app/views/contacts/index.html.erb</p>

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

@@ -1,8 +1,6 @@
-<% groups = Group.alphabetic.paginate(:page => params[:page]) %>
-
 <% cont=0; %>
 
-<% groups.each do |group| %>
+<% @groups.each do |group| %>
 
 	<% if (cont%2) == 0
 			cont+=1; %>
@@ -33,4 +31,4 @@
 		</div>
 <% end %>
 
-<%= will_paginate(groups) %>
+<%= will_paginate @groups %>

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

@@ -0,0 +1,74 @@
+<% content_for :head, stylesheet_link_tag("jqcloud") %>
+
+<div class="space_center">
+</div>
+<div class="middle_box">
+  <div class="middle_box_header">
+    <%= image_tag('btn/btn_tag.png', :class => "middle_box_picture_icon") %>
+    <div class="middle_box_text_header"><%= t 'group.cloud' %></div>
+    <div class="title_righ">
+    </div>
+  </div>
+
+  <div id="wordcloud"></div>
+
+</div>
+
+<% if user_signed_in? %>
+<div class="space_center"></div>
+<%= render :partial => "ties/suggestions" %>
+<div class="space_center"></div>
+<%= render :partial => 'ties/pendings' %>
+
+<%= javascript_include_tag "jqcloud-0.1.3.min.js" %>
+<% end %>
+
+    <script type="text/javascript">
+      var word_list = new Array(
+        {text: "Lorem", weight: 13, url: "https://github.com/DukeLeNoir/jQCloud"},
+        {text: "Ipsum", weight: 10.5, url: "http://jquery.com/"},
+        {text: "Dolor", weight: 9.4},
+        {text: "Sit", weight: 8},
+        {text: "Amet", weight: 6.2},
+        {text: "Consectetur", weight: 5},
+        {text: "Adipiscing", weight: 5},
+        {text: "Elit", weight: 5},
+        {text: "Nam et", weight: 5},
+        {text: "Leo", weight: 4},
+        {text: "Sapien", weight: 4, url: "http://www.lucaongaro.eu/"},
+        {text: "Pellentesque", weight: 3},
+        {text: "habitant", weight: 3},
+        {text: "morbi", weight: 3},
+        {text: "tristisque", weight: 3},
+        {text: "senectus", weight: 3},
+        {text: "et netus", weight: 3},
+        {text: "et malesuada", weight: 3},
+        {text: "fames", weight: 2},
+        {text: "ac turpis", weight: 2},
+        {text: "egestas", weight: 2},
+        {text: "Aenean", weight: 2},
+        {text: "vestibulum", weight: 2},
+        {text: "elit", weight: 2},
+        {text: "sit amet", weight: 2},
+        {text: "metus", weight: 2},
+        {text: "adipiscing", weight: 2},
+        {text: "ut ultrices", weight: 2},
+        {text: "justo", weight: 1},
+        {text: "dictum", weight: 1},
+        {text: "Ut et leo", weight: 1},
+        {text: "metus", weight: 1},
+        {text: "at molestie", weight: 1},
+        {text: "purus", weight: 1},
+        {text: "Curabitur", weight: 1},
+        {text: "diam", weight: 1},
+        {text: "dui", weight: 1},
+        {text: "ullamcorper", weight: 1},
+        {text: "id vuluptate ut", weight: 1},
+        {text: "mattis", weight: 1},
+        {text: "et nulla", weight: 1},
+        {text: "Sed", weight: 1}
+      );
+      $(document).ready(function() {
+        $("#wordcloud").jQCloud(word_list);
+      });
+    </script>

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

@@ -15,11 +15,30 @@
   <% end %>
 
   <div class="field">
-    <%= f.label :name %><br />
-    <%= f.text_field :name %>
+    <%= f.label t('group.new.name') %><br />
+    <%= f.text_field :name, :size=> 71 %>
   </div>
-
+  <div class="field">
+    <%= f.label t('group.new.description') %><br />
+    <%= f.text_area :description, :rows =>6, :cols=> 53 %>
+  </div>
+  <div class="field">
+    <%= f.label t('group.new.participants') %><br />
+    <%= f.select :_participants, "" %>
+  </div>
+  <br>
   <div class="actions">
     <%= f.submit %>
   </div>
 <% end %>
+<br><br>
+<% content_for :javascript do %>
+	$("#group__participants").fcbkcomplete({
+		json_url: "../contacts/index.json",
+		cache: true,
+		filter_case: true,
+		filter_hide: true,
+		newel: false,
+		height: 6
+	});
+<% end %>

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

@@ -0,0 +1,19 @@
+<% if user_signed_in? %>
+<div id="logo">
+    <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>
+  <div class="menu_header"><b><%=t('menu.options')%></b>
+  </div>
+  <div id="menu_lateral">
+    <%= render :partial => "home/options" %>
+  </div>
+  <div class="space_center">
+  </div>
+  <div class="space_center">
+  </div>
+  <div class="space_center">
+  </div>
+<% end %>

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

@@ -2,7 +2,7 @@
 
 <%= render :partial => 'logo' %>
 <%= render :partial => 'tabs' %>
-<div class="space_center"> 
-</div> 
+<div class="space_center">
+</div>
 
-<%= render :partial => 'subjects/contacts', :locals => { :subject => @group } %>
+<%= render :partial => 'subjects/contacts', :locals => { :subject => @group } %>

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

@@ -1,3 +1,5 @@
+<% content_for :head, stylesheet_link_tag("users") %>
+
 <% content_for :middle do %>
 	<%= render :partial => "groups/middle_index" %>
 <% end %>
@@ -8,22 +10,18 @@
 
 
 <div id="map_location" class="content_size">
-		Your are here ><img src="images/btn/btn_browse.png" class="btn_config"%> <%=t('browse')%>: <span id="name_group"><%= t('group.other')%></span>
+		Your are here ><img src="images/btn/btn_browse.png" class="btn_config"%> <%=t('browse')%>: <span id="name_group"><%= t('group.all')%></span>
 </div>
 <div id="by_options" class="content_size"><%= link_to(t('user.by'), users_path) %> </div>
 <br class="clearfloat" />
 <div class="space_center">
 </div>
 
-
-<div class="space_center">
-</div>
-
 <div id="my_conferences">
 		<div id="tabconference_browse" class="widget content_size">
 				<ul class="tabconference_browse">
 					<li>
-							<a href="#spaces"> <%= t('group.other')%> (<%=Group.count%>) </a>
+							<a href="/groups">All <%= t('group.other')%> (<%=Group.count%>) </a>
 					</li>
 						<li>
 								<a href="#most_popular"> <%= t('group.popular.most')%></a>
@@ -35,58 +33,23 @@
 				<div id="spaces" class="tabconference_browse">
 						<div class="space_center">
 						</div>
-						<div class="letters" class="content_size">
-								<a href="#">A</a>
-								<a href="#">B</a>
-								<a href="#">C</a>
-								<a href="#">D</a>
-								<a href="#">E</a>
-								<a href="#">F</a>
-								<a href="#">G</a>
-								<a href="#">H</a>
-								<a href="#">I</a>
-								<a href="#">J</a>
-								<a href="#">K</a>
-								<a href="#">L</a>
-								<a href="#">M</a>
-								<a href="#">N</a>
-								<a href="#">O</a>
-								<a href="#">P</a>
-								<a href="#">Q</a>
-								<a href="#">R</a>
-								<a href="#">S</a>
-								<a href="#">T</a>
-								<a href="#">U</a>
-								<a href="#">V</a>
-								<a href="#">W</a>
-								<a href="#">X</a>
-								<a href="#">Y</a>
-								<a href="#">Z</a>
+                                                <div><input type="text" value="Search by name" id="search_field" class="search_input" /><%= image_tag("btn/search.png",:size=>"20x20",:id=>"search_button") %></div>
+						<div class="space_center">
+						</div>
+                                                <div class="letters" class="content_size">
+                                                    <% for char in 'A'..'Z' %>
+                                                      <%= link_to char,{:letter => char,:page => 1},:class => "user_letter_link" %>
+                                                    <% end %>
 						</div>
 						<div class="space_center" class="content_size">
 
 						</div>
-					  	<%= render :partial => "groups/index"%>
+                                                <div id="list_users_ajax">
+                                                  <%= render :partial => "groups/index"%>
+                                                </div>
 						<div class="space_center">
 						</div>
 				</div>
-		
-		<div id="most_popular" class="tabconference_browse">
-				<div class="space_center">
-				</div>
-
-				<div class="space_center">
-						Most popular groups
-				</div>
-		</div>
-		<div id="most_voted" class="tabconference_browse">
-				<div class="space_center">
-				</div>
-				
-				<div class="space_center">
-						Most voted groups
-				</div>
-		</div>
 </div>
 </div>	
 
@@ -94,3 +57,4 @@
 <br class="clearfloat" />
 <div class="space_center">
 </div>
+<%= javascript_include_tag "ajax.paginate" %>

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

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

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

@@ -3,6 +3,6 @@
     <%= 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'), new_group_path, :remote => true) %>
+    <%= link_to( image_tag("btn/btn_group.png", :class => "menu_icon")+t('group.new.action'), new_group_path, :remote => true) %>
   </li>
 </ul>

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

@@ -11,20 +11,21 @@
         <%= stylesheet_link_tag "right", :media => "screen, projection" %>
         <%= stylesheet_link_tag "home", :media => "screen, projection" %>
         <%= stylesheet_link_tag "browse", :media => "screen, projection" %>
-	      <%= stylesheet_link_tag "social_stream", :media => "screen, projection" %>
+	    <%= stylesheet_link_tag "social_stream", :media => "screen, projection" %>
         <%= stylesheet_link_tag "boxy", :media => "screen, projection" %>
         <%= stylesheet_link_tag "middle", :media => "screen, projection" %>
         <%= stylesheet_link_tag "menu", :media => "screen, projection" %>  
         <%= 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" %>
-				<%= stylesheet_link_tag "jquery-ui.css", :media => "screen, projection" %>
+		<%= stylesheet_link_tag "jquery-ui.css", :media => "screen, projection" %>
+		<%= stylesheet_link_tag "fcbkComplete.css", :media => "screen, projection" %>
 
         <%= stylesheet_link_tag "edit_user", :media => "screen, projection" %> 
         <%= javascript_include_tag :defaults %>
        
-        <%= javascript_include_tag 'jquery', 'jquery-ui.min', 'jquery.livequery',
-                                   'jquery.boxy', 'menu','ui.dropdownchecklist','jquery.form', 'jquery.validate' %>
+        <%= javascript_include_tag 'jquery', 'jquery-ui.min', 'jquery.livequery','jquery.boxy', 'menu','ui.dropdownchecklist','jquery.form', 'jquery.validate','jquery.fcbkcomplete.min', 'jquery.ba-url' %>
+
 
 
         <% if protect_against_forgery? %>
@@ -55,12 +56,6 @@
                 </div>
                 <div id="middle">
                   <div id="middleContent">
-                    <div class="space_profile">
-                    </div>
-                    <div class="space_profile">
-                    </div>
-                    <div class="space_profile">
-                    </div>
                       <%=  yield :middle %>
                   </div>
                 </div>

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

@@ -1,8 +1,6 @@
-<% users = User.alphabetic.paginate(:page => params[:page]) %>
 
 <% cont=0; %>
-
-<% users.each do |user| %>
+<% @users.each do |user| %>
 
 	<% if (cont%2) == 0
 			cont+=1; %>
@@ -30,4 +28,4 @@
 		</div>
 <% end %>
 
-<%= will_paginate(users) %>
+<%= will_paginate @users %>

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

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

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

@@ -1,10 +1,7 @@
- 
-		
+			
 
 		  <div class="future_conference" id="personal_info" >
 				<div class="future_header">
-					   
-						<br/><br/>
 						<div class="title_section">
 								Personal Information
 						</div>
@@ -15,6 +12,7 @@
 						</div>
 				</div>
 				<div class="post_future_conference"  >
+					<% if @user.profile.organization? %>
 						<div class="info_post">
 								<div class="info_left">
 										Organization:
@@ -23,12 +21,14 @@
 										<%=h @user.profile.organization %>
 								</div>
 						</div>
+					<%end%>
+					<% if @user.profile.birthday? %>
 						<div class="info_post">
 								<div class="info_left">
 										BirthDay:
 								</div>
 								<div class="info_right">
-										<%=h @user.profile.birthday.to_s() %>
+									<%=h I18n.l @user.profile.birthday, :format => :long %>
 								</div>
 						</div>
 						<div class="info_post">
@@ -39,15 +39,21 @@
 										<%=h @user.age %>
 								</div>
 						</div>
+					<%end%>
+					<% if @user.profile.city? %>
 						<div class="info_post">
 								<div class="info_left">
 										Actual City:
 								</div>
 								<div class="info_right">
-										<%=h @user.profile.city %>, 
-										<%=h @user.profile.country %>
+										<%=h @user.profile.city %>
+										<% if @user.profile.country? %>
+										  , <%=@user.profile.country%>
+										<%end%>
 								</div>
 						</div>
+					<%end%>
+					<% if @user.profile.description? %>
 						<div class="info_post">
                 <div class="info_left">
                     About me:
@@ -56,6 +62,7 @@
                     <%=h @user.profile.description %>
                 </div>
             </div>
+					<%end%>
 				</div>
 		  </div>
 
@@ -70,19 +77,62 @@
 				</div>
 				<div class="post_future_conference">
 						<div class="future_content">
+							<% if @user.profile.phone? %>
+							   <div class="info_post">
+                    <div class="info_left">
+                        Phone
+                    </div>
+                    <div class="info_right">
+                        <%=h @user.profile.phone %>
+                    </div>
+                </div>
+							<%end%>
+							<% if @user.profile.mobile? %>
+								<div class="info_post">
+                    <div class="info_left">
+                        Mobile
+                    </div>
+                    <div class="info_right">
+                        <%=h @user.profile.mobile %>
+                    </div>
+                </div>
+							<%end%>
+							<% if @user.profile.fax? %>
+								<div class="info_post">
+                    <div class="info_left">
+                        Fax
+                    </div>
+                    <div class="info_right">
+                        <%=h @user.profile.fax %>
+                    </div>
+                </div>
+							<%end%>
+							<% if @user.profile.address? %>
+								<div class="info_post">
+                    <div class="info_left">
+                        Address
+                    </div>
+                    <div class="info_right">
+                        <%=h @user.profile.address %>
+                    </div>
+                </div>
+							<%end%>
+							<% if @user.profile.website? %>
 								<div class="info_post">
-										<div>
+										<div class="info_left">
 												Website
 										</div>
 										<div class="contact_link">
 												<a href="<%=h @user.profile.website %>"><%=h @user.profile.website %></a>
 										</div>
 								</div>
+							<%end%>
+							
 								<div class="info_post">
-                    <div>
+                    <div class="info_left">
                         E-mail
                     </div>
-                    <div class="contact_link">
+                    <div class="info_right">
                         <%=h @user.email %>
                     </div>
                 </div>

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

@@ -0,0 +1,19 @@
+<% if user_signed_in? %>
+<div id="logo">
+    <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>
+  <div class="menu_header"><b><%=t('menu.options')%></b>
+  </div>
+  <div id="menu_lateral">
+    <%= render :partial => "home/options" %>
+  </div>
+  <div class="space_center">
+  </div>
+  <div class="space_center">
+  </div>
+  <div class="space_center">
+  </div>
+<% end %>