social_stream-base 0.9.4 → 0.9.5

data/Rakefile

@@ -27,7 +27,7 @@ end
 
 Bundler::GemHelper.install_tasks
 
-# Modify this gem tags
+# Modify this gem's tags
 class Bundler::GemHelper
   def version_tag
     "base#{version}"

data/app/assets/stylesheets/0_devise_sign.css

@@ -1,8 +1,16 @@
+/* This stylesheet overwrites some of the parameters fixed by other stylesheets found in
+ * assets/stylesheets. Since they are compiled all together in alphabetic order, it should be
+ * start by zero to make sure it is the first one to be executed. 
+ */
+
 #center_body{
   border: none;
   width:100%;
 }
 
+#footer ul{
+  padding-left: 59px;
+}
 #sidebar{
   display:none;  
 }

data/app/assets/stylesheets/activities.css

@@ -13,7 +13,7 @@
 #wrapper_activities_header {	padding-top: 5px;  padding-bottom: 5px;	background-color: #deeff8;}
 #activities_title {	vertical-align: top;	margin-left: 10px;	font-weight: bold;}
 #activities_header {	width: 100%;	margin-bottom: 5px;	text-align: center;	padding-top: 5px;}
-#input_activities {	border-color: #0656a4; color: #2A3890;	padding: 5px 5px 5px 5px;
+#activities_header input[type="text"] {	border-color: #0656a4; color: #2A3890;	padding: 5px 5px 5px 5px;
   border:1px solid #BDC7D8; width:95%;}
 #activities_share_btn {	text-align: right;	padding: 5px 16px 0px 10px;	vertical-align: middle;}
 #securities{  display:inline-block;  text-align:left; float: left; padding-left:5px;}

data/app/assets/stylesheets/base.css

@@ -18,7 +18,7 @@ h2{padding-left:10px;}
 body{font-size:1.0em;  color:#2A3890;  background-color:#ffffff; overflow-y: scroll;}
 #wrapper { 	background-color: #f5f5f5;	width: 100%; margin: 0px auto;	  }
 #wrapper_body{min-height: 552px; width: 960px; margin:0px auto;	margin-left: auto;	margin-right: auto;
-margin-top: auto; margin-bottom:auto; background-image:none;}
+margin-top: auto; margin-bottom:auto; background-image:none; padding-bottom: 9px;}
 
 
  /*********** Notices SECTION *********************/
@@ -208,7 +208,7 @@ textarea.new_contact_text_area{ height: 100px; color: #2A3890;}
 }
 
 .activity_form_selector{
-	padding: 2px;
+	padding: 5px;
 	margin-bottom: 5px;
 	float: left;
 	border: 2px solid transparent;

data/app/assets/stylesheets/frontpage.css

@@ -14,13 +14,23 @@
 span.find{  padding-right:5px;}
 
 /************** sub structure Frontpage **************/
-#devise_links {padding: 5px 0 5px 0;}
-#devise_links a{font-weight: bold;line-height: 15px; }
+#devise_links {padding: 20px 0 5px 5px; margin-left: 20%;}
+#devise_links a{font-weight: bold;line-height: 15px; color: #777;}
 #login{  padding-top: 5px;}
 .instructions{text-align: left; padding-bottom: 5px;}
-#welcome{  margin: 50px auto 50px auto;  width:330px;  padding:20px;  border: 3px solid #BDC7D8;
-  text-align:center; background-color: white;-moz-border-radius: 20px; 
+#remember{padding-left:22%; text-align: left;}
+#user_password_confirmation{vertical-align: 30%;}
+#user_password_confirmation_label {padding-top: 0;}
+#welcome{  margin: 50px auto 50px auto;  width:330px;  padding:20px;  border: 4px solid #BDC7D8;
+  background-color: white;-moz-border-radius: 20px; 
   -webkit-border-radius: 20px; border-radius: 20px;}
+#welcome .form_field{ width: 75%;}
+#welcome .btn_login { text-align: right; padding-right: 10px;}
+#welcome .form_label{ width: 20%;}
+#welcome .form_row{ padding-left: 5px;}
+#welcome .form_tag{ width: 98%;}
+#welcome h2{ font-variant: small-caps; text-transform: capitalize; padding: 0; font-size: 20px; 
+            text-align: center; }
 #wrapper_left{  vertical-align:top;  width:49%;  display:inline-block;    padding-left: 20px;}
 #wrapper_right{ vertical-align:top;  width:48%;  display:inline-block;}
 

data/app/assets/stylesheets/search.css

@@ -51,6 +51,7 @@
   height: 35px;
   background: whiteSmoke;
   overflow: hidden;
+  text-align: center;
 }
 #header_search_display  li:hover {
   background: #CFDEFF;
@@ -77,6 +78,7 @@
 #header_search_display  li.subject_result {
   padding: 0px;
   height: 45px;
+  text-align: left;
 }
 #header_search_display  li.title {
   overflow: hidden;
@@ -86,12 +88,12 @@
   color: whiteSmoke;
   font-weight: bold;
 }
-#header_search_display  li.loading {
+#header_search_display  li.loading, #header_search_display  li.more, #header_search_display  li.none {
   text-align: center;
 }
-#header_search_display  li.more, #header_search_display  li.none {
-  height: 15px;
-  text-align: center;
+#header_search_display  li.more {
+  padding-top: 10px;
+  height: 30px;
 }
 #header_search_display  li.title:hover, #header_search_display  li.more:hover, #header_search_display  li.none:hover {
 }
@@ -106,16 +108,52 @@
   padding: 5px;
 }
 .subject_search_results {
-  width: 270px;
-  float: left;
+  width: 280px;
   text-align: center;
-  margin: 3px;
 }
-.subject_search_results .title {
-  width: 260px;
+#search_results {
+  text-align: center;
+}
+#search_results .left {
+  float: left;
+  padding: 0;
+}
+#search_results .right {
+  float: right;
+  padding: 0;
+}
+#search_results .title {
+  width: 540px;
   margin: auto;
   background-color: #E1EEF5;
   padding: 5px;
   font-weight: bold;
+  text-align: center;
+}
+#search_results .subject_search_results .title {
+  width: 260px;
+}
+/********************************* Focus options ***********/
+#focus_options ul {
+  list-style: none;
+}
+#focus_options ul li {
+  line-height: 27px;
+  vertical-align: top;
+  display: inline;
+}
+#focus_options  li span:hover {
+  background: #CFDEFF;
+  color: #2A3890;
+}
+#focus_options ul li a:hover{
+  text-decoration: none;
+}
+#focus_options ul li span{
+  padding: 5px 10px;
+  background-color: #E1EEF5;
+}
+#focus_options ul li span.selected{
+  border: solid 1px #2A3890;
 }
 /******************** Search css END ***********************/

data/app/controllers/groups_controller.rb

@@ -48,7 +48,7 @@ class GroupsController < InheritedResources::Base
   def set_founder
     return unless user_signed_in?
 
-    params[:group]            ||= {}
-    params[:group][:_founder] ||= current_subject.slug
+    params[:group]               ||= {}
+    params[:group][:_contact_id] ||= current_subject.ego_contact.id
   end
 end

data/app/controllers/search_controller.rb

@@ -1,35 +1,81 @@
 class SearchController < ApplicationController
-  
+  include ActionView::Helpers::SanitizeHelper
+
   #before_filter :authenticate_user! #??
-  
+
+  FOCUS_SEARCH_PER_PAGE = 10
   def index
-    if params[:mode].eql? "header_search"
-      @search_result = header_search params[:search_query]
-      render :partial => "header_search", :locals => {:search_result => @search_result}
-      return
+    if params[:search_query].blank?
+      @search_result = nil_search
+      @search_class_sym = params[:focus].singularize.to_sym unless params[:focus].blank?
     else
-      @search_result = global_search params[:search_query]      
+      search_query = get_search_query params[:search_query]
+      if params[:mode].eql? "header_search"
+        @search_result = header_search search_query
+        render :partial => "header_search", :locals => {:search_result => @search_result}
+      return
+      else
+        if params[:focus].present?
+          @search_result = focus_search params[:focus], search_query, params[:page].present? ? params[:page].to_i : 1
+          @search_class_sym = params[:focus].singularize.to_sym
+        else
+          @search_result = global_search search_query
+        end
+      end
     end
   end
 
+  private
 
+  def get_search_query bare_query
+    search_query = ""
+    bare_query = strip_tags(bare_query) unless bare_query.html_safe?
+    search_query_words = bare_query.strip.split
+    search_query_words.each_index do |i|
+      search_query+= search_query_words[i] + " " if i < (search_query_words.size - 1)
+      search_query+= "*" + search_query_words[i] + "* " if i == (search_query_words.size - 1)
+    end
+    return search_query.strip 
+  end
 
-  private
   def global_search query
-    return search query, params[:page].present? ? params[:page] : 1, 10
+    return search query, 10
   end
-  
+
   def header_search query
-    return search query, params[:page].present? ? params[:page] : 1, 3
+    return search query, 3
+  end
+
+  def search query, max_results
+    result = Hash.new
+    total = 0
+    total_shown = 0
+    SocialStream.subjects.each do |subject_sym|
+      result.update({subject_sym => ThinkingSphinx.search(query, :page => 1, :per_page => max_results, :classes => [subject_sym.to_s.classify.constantize])})
+      result.update({(subject_sym.to_s+"_total").to_sym => ThinkingSphinx.count(query, :classes => [subject_sym.to_s.classify.constantize])})
+      total+=ThinkingSphinx.count(query, :classes => [subject_sym.to_s.classify.constantize])
+    end
+    result.update({:total => total})
+    result.update({:total_shown => total_shown})
+    return result
   end
-  
-  def search query, page, per_page
+
+  def focus_search string_class, query, page
+    string_class = string_class.singularize
+    search_class = string_class.classify.constantize
+    result = Hash.new
+    result.update({string_class.to_sym => ThinkingSphinx.search(query, :page => page, :per_page => FOCUS_SEARCH_PER_PAGE, :classes => [search_class])})
+    result.update({(string_class+"_total").to_sym => ThinkingSphinx.count(query, :classes => [search_class])})
+    return result
+  end
+
+  def nil_search
     result = Hash.new
     SocialStream.subjects.each do |subject_sym|
-      result.update({subject_sym => ThinkingSphinx.search("*#{query}*", :page => page, :per_page => per_page, :classes => [subject_sym.to_s.classify.constantize])})
-      result.update({(subject_sym.to_s+"_total").to_sym => ThinkingSphinx.count("*#{query}*", :classes => [subject_sym.to_s.classify.constantize])})
+      result.update({subject_sym => []})
+      result.update({(subject_sym.to_s+"_total").to_sym => 0})
     end
+    result.update({:total => 0})
     return result
-    
   end
 end

data/app/helpers/activities_helper.rb

@@ -27,10 +27,10 @@ module ActivitiesHelper
     end
   end
 
-  # Build a new activity based on the current_subject. Useful for authorization queries
-  def new_activity(receiver)
-    return Activity.new unless user_signed_in?
+  # Build a new post based on the current_subject. Useful for authorization queries
+  def new_post(receiver)
+    return Post.new unless user_signed_in?
 
-    Activity.new :contact_id => current_subject.contact_to!(receiver).id
+    Post.new :_contact_id => current_subject.contact_to!(receiver).id
   end
 end

data/app/helpers/search_helper.rb

@@ -4,4 +4,9 @@ module SearchHelper
     render :partial => subject.class.to_s.pluralize.downcase + '/' + subject.class.to_s.downcase + '_with_details',
            :locals => {subject.class.to_s.downcase.to_sym => subject}
   end
+  
+  def focus_search_link text, search_class, query
+    search_class = search_class.to_s if search_class.is_a? Class or search_class.is_a? Symbol
+    link_to text, search_path(:focus => search_class.downcase.pluralize, :search_query => query )
+  end
 end

data/app/models/activity.rb

@@ -222,24 +222,18 @@ class Activity < ActiveRecord::Base
     when 'create'
       return false if contact.sender_id != Actor.normalize_id(subject)
 
-      val = 
-        if relation_ids.present?
-          rels = Relation.normalize(relation_ids)
-
-          foreign_rels = rels.select{ |r| r.actor_id != contact.sender_id }
-
-          # Only posting to own relations
-          foreign_rels.blank? ||
-            Relation.
-              allow(subject, action, 'activity', :in => foreign_rels).all.size == foreign_rels.size
-        else
-          contact.reflexive? ||
-            receiver.
-              relation_customs.allow(sender, 'create', 'activity').
-              present?
-        end
-
-      return val
+      rels = Relation.normalize(relation_ids)
+
+      own_rels     = rels.select{ |r| r.actor_id == contact.sender_id }
+      foreign_rels = rels - own_rels
+
+      # Only posting to own relations or allowed to post to foreign relations
+      return foreign_rels.blank? && own_rels.present? ||
+             foreign_rels.present? && Relation.allow(subject, 
+                                                     action,
+                                                     'activity',
+                                                     :in => foreign_rels).
+                                               all.size == foreign_rels.size
 
     when 'read'
       return true if relations.select{ |r| r.is_a?(Relation::Public) }.any?

data/app/models/actor.rb

@@ -259,6 +259,11 @@ class Actor < ActiveRecord::Base
       sent_contacts.create!(:receiver => Actor.normalize(subject))
   end
 
+  # The {Contact} of this {Actor} to self (totally close!)
+  def ego_contact
+    contact_to!(self)
+  end
+
   def sent_active_contact_ids
     @sent_active_contact_ids ||=
       load_sent_active_contact_ids

data/app/models/group.rb

@@ -1,13 +1,11 @@
 class Group < ActiveRecord::Base
   include SocialStream::Models::Subject
 
-  attr_accessor :_founder
   attr_accessor :_participants
 
   delegate :description, :description=, :to => :profile!
 
-  after_create :create_founder
-  after_create :create_participants
+  after_create :create_ties
 
   def profile!
     actor!.profile || actor!.build_profile
@@ -23,26 +21,27 @@ class Group < ActiveRecord::Base
         merge(Contact.recent)
     end
   end
-  
-  # Creates the ties between the group and the founder
-  def create_founder
-    founder =
-      Actor.find_by_slug(_founder) || raise("Cannot create group without founder")
 
-    sent_contacts.create! :receiver => founder,
-                          :relation_ids => Array(relation_customs.sort.first.id)
+  private
+
+  # Creates ties from founder to the group, based on _relation_ids,
+  # and ties from the group to founder and participants.
+  def create_ties
+    create_ties_from_founder
+    create_ties_to_participants
+  end
+
+  # Creates the ties from the founder to the group
+  def create_ties_from_founder
+    _contact.sender.sent_contacts.create! :receiver_id  => actor_id,
+                                          :relation_ids => _relation_ids
   end
   
-  # Creates the ties between the group and the participants
-  def create_participants
-     return if @_participants.blank?
-    
-     @_participants.each do |participant|
-      
-       participant_actor = Actor.find(participant)
-
-       sent_contacts.create! :receiver => participant_actor,
-                             :relation_ids => Array(relation_customs.sort.first.id)
-     end
+  # Creates the ties from the group to the participants
+  def create_ties_to_participants
+    ([ _contact.sender_id, _contact.receiver_id ] | Array.wrap(@_participants)).uniq.each do |a|
+      sent_contacts.create! :receiver_id => a,
+                            :relation_ids => Array(relation_customs.sort.first.id)
+    end
   end
 end

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

@@ -1,4 +1,4 @@
-<% if can? :create, new_activity(receiver) %>
+<% if can? :create, new_post(receiver) %>
 <div id="activities_header" class="content_size">
   <% SocialStream.activity_forms.each do |element| %>
     <%= render :partial => element.to_s.pluralize+'/new_activity',
@@ -6,6 +6,12 @@
                              :receiver => receiver
                            } %>
   <% end %>
+
+  <%= javascript_tag do %>
+  $(function(){  
+    activate_anti_rebounds();  
+  });
+  <% end %>
 </div>
 
 <div id="activity_form_select">

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

@@ -1,11 +1,14 @@
+<% content_for :headers do%>
+  <%= stylesheet_link_tag "0_devise_sign", :media => "screen, projection" %>
+<%end%>
 <div id="welcome">
   <div id="login" class="block">
-    <h2><%= t('password.forgot') %></h2>
+    <h2><%= t('devise.passwords.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="instructions"><%= t('devise.passwords.acquire') %></div>
+      <div class="instructions"><%= t('devise.passwords.instructions') %></div>
       <div class="form_row">
         <div class="form_label"<%= f.label :email %></div>
         <div class="form_field"><%= f.text_field :email, :class => "form_tag" %></div>
@@ -17,7 +20,7 @@
 
       <div class="space_center"></div>
       <div class="btn_login">
-        <%= f.submit t('action.send'), :class =>"myButton" %>
+        <%= f.submit t('action.send'), :class =>"button" %>
       </div>
     <% end %>
   </div>

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

@@ -1,3 +1,7 @@
+<% content_for :headers do%>
+  <%= stylesheet_link_tag "0_devise_sign", :media => "screen, projection" %>
+<%end%>
+
 <div id="welcome">
   <div id="login" class="block">
   <h2><%= t('sign_up').capitalize %></h2>
@@ -18,22 +22,23 @@
       <div class="form_field"><%= f.password_field :password, :class =>"form_tag", :id => "password"  %></div>
     </div>
     <div class="form_row">
-      <div class="form_label"><%= f.label t('devise.passwords.confirm') %></div>
+      <div class="form_label" id="user_password_confirmation_label">
+        <%= f.label t('devise.passwords.confirm') %>
+      </div>
       <div class="form_field"><%= f.password_field :password_confirmation, :class =>"form_tag"  %></div>
     </div>
     <div class="form_row center">
-      <div id="btn_login"><%= f.submit t('action.accept').capitalize,:class=>"myButton"  %></div>
+      <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
+        <%= link_to t('confirmation.not_received.long'), new_confirmation_path(resource_name) %><br />
+      <% end -%>
     </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 id="devise_links">
       <%= render :partial => "devise/shared/links" %>
     </div>
-  </div>
+    <div class="form_row center">
+      <div class="btn_login"><%= f.submit t('action.accept').capitalize,:class=>"button"  %></div>
+    </div>
+  <% end %>
 </div>
 
 

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

@@ -17,13 +17,12 @@
         <div class="form_label"><%= f.label :password %></div>
         <div class="form_field"><%= f.password_field :password, :class => "form_tag" %></div>
       </div>
-
-      
+      <% if devise_mapping.rememberable? -%>
+        <div id="remember">
+          <%= f.check_box :remember_me %> <%= f.label :remember_me %></div>
+        </div> 
+      <% end -%>
       <div id="devise_links">
-        <% if devise_mapping.rememberable? -%>
-          <%= f.check_box :remember_me %> <%= f.label :remember_me %>
-        <% end -%>
-        <div class="space_center"></div>
         <%= render :partial => "devise/shared/links" %>
       </div>
 

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

@@ -13,14 +13,14 @@
 
 <%= location(
     link_to(image_tag("btn/btn_group.png", :class => "menu_icon")+t('group.other'), groups_path),
-    link_to(image_tag("btn/btn_group.png", :class => "menu_icon")+t('group.new.action'), new_group_path('group' => { '_founder' => current_subject.slug }))
+    link_to(image_tag("btn/btn_group.png", :class => "menu_icon")+t('group.new.action'), new_group_path)
   ) %>
 
 <div class="space_center"></div>
 
 <%= form_for @group do |f| %>
-	<% f.object._founder = current_subject.slug %>
-	<%= f.hidden_field :_founder %>
+	<% f.object._contact_id ||= current_subject.ego_contact.id %>
+	<%= f.hidden_field :_contact_id %>
 
 	<% if @group.errors.any? %>
 		<div id="notice">

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

@@ -0,0 +1 @@
+<%= render :partial => 'objects/new_activity', :locals => {:receiver => receiver, :object => Group.new, :remote => false} %>

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

@@ -0,0 +1,7 @@
+<%= f.text_field :name %>
+
+<%= javascript_tag do %>
+  $(function() {
+    $('#group_name').Watermark("<%= t('group.input') %>", "#666");
+  });
+<% end %>

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

@@ -15,6 +15,9 @@ $(document).ready(function() {
   });
   $('#header_search_input').click(function(e) {
     e.stopPropagation();
+    if($("#header_search_input").val()!=""){
+      $("#header_search_display").show();      
+    }
   });
   $('#header_search_display').click(function(e) {
     e.stopPropagation();

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

@@ -51,7 +51,6 @@
               <%= yield :sidebar %>
           </div>
         </aside>
-        <div class="space_center white"></div>
       </div>
       <footer><%= render :partial => "layouts/footer" %></footer>
     </div>

data/app/views/objects/_new_activity.html.erb

@@ -6,9 +6,3 @@
 
   <%= render :partial => object.class.to_s.tableize+'/new_activity_fields' , :locals => {:f => f} %>	
 <% end %>
-
-<%= javascript_tag do %>
-$(document).ready(function(){  
-  activate_anti_rebounds();  
-});
-<% end %>

data/app/views/search/_focus_search.html.erb

@@ -0,0 +1,21 @@
+<div class="title">
+  <%= @search_class_sym.to_s.capitalize.pluralize %>
+</div>
+<br class="clearfloat" />
+<% if @search_result[@search_class_sym].empty? %>
+<div class="subject_with_details">
+  <%= I18n.t('search.no_subject_found', :subject => @search_class_sym.to_s) %>
+</div>
+<% else %>
+<% total = 0 %>
+<div class="subject_search_results block left">
+  <% @search_result[@search_class_sym].each do |subject|%>
+  <%= subject_with_details subject %>
+  <% total+=1 %>
+  <% if (total%(SearchController::FOCUS_SEARCH_PER_PAGE/2)==0) %>
+</div>
+<div class="subject_search_results block left">
+  <% end %>
+  <% end %>
+</div>
+<% end %> 

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

@@ -0,0 +1,22 @@
+<div id="search_form">
+  <form action="<%= search_path %>" method="get">
+    <div class="block">
+      <%= hidden_field_tag :focus, params[:focus] %>
+      <div class="form_row search_row">
+        <%= text_field_tag :search_query, params[:search_query].present? ? params[:search_query] : nil ,:autocomplete => :off, :id => :global_search_input %>
+      </div>
+      <div  id="focus_options" class="form_row search_row">
+        <ul>
+          <li><%= link_to content_tag(:span,t('search.show_all'),:class => params[:focus].blank? ? 'selected' : ''), search_path, :search_query => params[:search_query] %></li>
+          <% SocialStream.subjects.each do |subject| %>
+            <% selected_class = (params[:focus].present? and params[:focus].pluralize.downcase.eql?(subject.to_s.pluralize.downcase)) ? 'selected' : ''%>
+            <li><%= focus_search_link content_tag(:span, subject.to_s.pluralize.capitalize, 
+                                                  :class => selected_class), 
+                                      subject.to_s.classify.constantize, 
+                                      params[:search_query] %></li>
+          <% end %>
+        </ul>
+      </div>      
+    </div>
+  </form>
+</div>

data/app/views/search/_global_search.html.erb

@@ -0,0 +1,19 @@
+<% SocialStream.subjects.each do |subject_type| %>
+<div class="subject_search_results block  <%= cycle "left", "right" %>">
+  <div class="title">
+    <%= subject_type.to_s.capitalize.pluralize %>
+  </div>
+  <% if @search_result[subject_type].empty? %>
+  <div class="subject_with_details">
+    <%= I18n.t('search.no_subject_found', :subject => subject_type.to_s) %>
+  </div>
+  <% else %>
+  <% @search_result[subject_type].each do |subject|%>
+  <%= subject_with_details subject %>
+  <% end %>
+  <div class="subject_with_details">
+    <%= focus_search_link(I18n.t('search.all_subject_results', :subject => subject_type.to_s.pluralize, :count => @search_result[(subject_type.to_s+"_total").to_sym].to_s),subject_type.to_s,params[:search_query]) %>
+  </div>
+  <% end %>
+</div>
+<% end %> 

data/app/views/search/_header_search.html.erb

@@ -1,21 +1,22 @@
+<% total = 0 %>
 <ul>
-<% SocialStream.subjects.each do |subject_type| %>
-  
-    <li class="title">
-      <%= subject_type.to_s.capitalize.pluralize %>
-    </li>
-    <% if @search_result[subject_type].empty? %>
-      <li class="none">
-        <%= I18n.t('search.no_subject_found', :subject => subject_type.to_s) %>
+<% SocialStream.subjects.each do |subject_type| %>  
+    <% unless @search_result[subject_type].empty? %>
+      <li class="title">
+        <%= subject_type.to_s.capitalize.pluralize %>
       </li>
-    <% else %>
       <% @search_result[subject_type].each do |subject|%>
+        <% total+=1 %>
         <li class="subject_result"><%= subject_with_details subject %></li>
       <% end %>
-      <li class="more">
-        <%= I18n.t('search.all_subject_results', :subject => subject_type.to_s.pluralize, :count => @search_result[(subject_type.to_s+"_total").to_sym].to_s) %>        
-      </li>
     <% end %>    
   </li>
-  <% end %>
+<% end %>
+
+  <%= link_to raw('<li class="more">' + 
+              t('search.global.query', :query => truncate(params[:search_query],:length => 20)) + 
+              '<br>' +
+              t('search.global.first_result.' + (total==1 ? 'one' : 'more'), 
+              :count => total.to_s) + '</li>'), 
+              search_path(:search_query => params[:search_query]) %>
 </ul>

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

@@ -1,35 +1,15 @@
-<%= location(link_to(t('search.name')))%>
+<%= location(link_to(t('search.global.name')))%>
 <br class="clearfloat" />
 <div class="space_center"></div>
-<h2><%= t('search.name') %></h2>
+<h2><%= t('search.searching', :query => truncate(params[:search_query],:length => 45)) %></h2>
 <div class="space_center"></div>
-<div id="search_form">
-  <form action="<%=search_path%>" method="get">
-    <div class="block">
-      <div class="form_row search_row">
-        <%= text_field_tag :search_query, params[:search_query].present? ? params[:search_query] : nil ,:autocomplete => :off, :id => :global_search_input %>
-      </div>
-    </div>
-  </form>
-</div>
-<div id="search_results" class="block">
-  <% SocialStream.subjects.each do |subject_type| %>
-  <div class="subject_search_results" class="block">
-    <div class="title">
-      <%= subject_type.to_s.capitalize.pluralize %>
-    </div>
-    <% if @search_result[subject_type].empty? %>
-      <div class="subject_with_details">
-        <%= I18n.t('search.no_subject_found', :subject => subject_type.to_s) %>
-      </div>
-    <% else %>
-      <% @search_result[subject_type].each do |subject|%>
-        <%= subject_with_details subject %>
-      <% end %>
-      <div class="subject_with_details">
-        <%= I18n.t('search.all_subject_results', :subject => subject_type.to_s.pluralize, :count => @search_result[(subject_type.to_s+"_total").to_sym].to_s) %>        
-      </div>
-    <% end %>    
-  </div>
+<%= render :partial => 'form' %> 
+<div class="space_center"></div>
+<div class="space_center"></div>
+<div id="search_results" class="block">  
+  <% unless params[:focus].present? %>
+    <%= render :partial => 'global_search' %>
+  <% else %>
+    <%= render :partial => 'focus_search' %>
   <% end %>
 </div>

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

@@ -12,4 +12,5 @@
     
 <% end %>
 
-<%= render :partial => 'index' %>
+
+ <%= render :partial => 'index' %>

data/config/locales/en.yml

@@ -127,8 +127,9 @@ en:
     confirm: Delete %{element}}?
   devise:
     passwords:
-      acquire: "Type the email address bound to your account and we will sent you a new one:"
       confirm: "Confirm password"
+      forgot: "Forgot your password?"
+      instructions: "Type the email address bound to your account and we will sent you instructions to change it:"
       update: "Change your password"
   follower:
     n:
@@ -163,6 +164,9 @@ en:
     all: "All groups"
     all_n: "All groups (%{count})"
     by: "By groups"    
+    form:
+      title: "Group"
+    input: "What is the name of the group?"
     last: "Last groups"
     my: "My groups"
     new:
@@ -233,8 +237,6 @@ en:
     read: "Mark as read"
     read_all: "Mark all as read"
     unread: "Mark as unread"
-  password:
-    forgot: "Acquire a new password"
   post:
     confirm_delete: "Delete post?"
     form:
@@ -327,10 +329,18 @@ en:
   search:
     actor:
       none: "Nothing found"
+    all_subject_results: "Search all %{subject} (%{count})"
     at_least: "Write at least two characters"
+    global: 
+      name: "Global search"
+      first_result:
+        more: "Showing the first %{count} results."
+        one: "Showing the first result."
+      query: "See more results for %{query} >"
     name: "Search"
     no_subject_found: "No %{subject} was found."
-    all_subject_results: "Search all %{subject} (%{count})"
+    searching: "Searching: %{query}"
+    show_all: "Show all results"
     write: "Write your query ..."
     wrong: "There seems to be a problem with the search engine"
   settings:

data/config/routes.rb

@@ -65,7 +65,7 @@ Rails.application.routes.draw do
     resource :like
   end
   
-  match 'search' => 'search#index', :as => :search
+  match 'search' => 'search#index', :as => :search  
   
   match 'ties' => 'ties#index', :as => :ties
   

data/lib/social_stream/ability.rb

@@ -74,7 +74,7 @@ module SocialStream
 
       can :create, Group do |g|
         subject.present? &&
-          g._founder == subject.slug
+          g._contact.sender_id == Actor.normalize_id(subject)
       end
 
       can :update, Group do |g|

data/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.9.4".freeze
+    VERSION = "0.9.5".freeze
   end
 end

data/lib/social_stream/models/object.rb

@@ -7,7 +7,8 @@ module SocialStream
       extend ActiveSupport::Concern
 
       included do
-        attr_accessor :_contact_id, :_relation_ids
+        attr_accessor :_contact_id
+        attr_writer   :_relation_ids
         attr_accessor :_activity_parent_id
 
         belongs_to :activity_object, :dependent => :destroy, :autosave => true
@@ -61,6 +62,23 @@ module SocialStream
           @_contact ||= Contact.find(_contact_id)
         end
 
+        def _relation_ids
+          @_relation_ids ||=
+            if _contact_id.nil?
+              nil
+            else
+              if _contact.reflexive?
+                Array.wrap(_contact.sender.relation_public.id)
+              else
+                 _contact.
+                   receiver.
+                   relation_customs.
+                   allow(_contact.sender, 'create', 'activity').
+                   map(&:id)
+              end
+            end
+        end
+
         def _activity_parent
           @_activity_parent ||= Activity.find(_activity_parent_id)
         end

data/lib/social_stream/toolbar_config.rb

@@ -43,14 +43,6 @@ module SocialStream
           {:key => :invitations, :name => image_tag("btn/btn_invitation.png")+t('invitation.toolbar'), :url => new_invitation_path}
         ]}
 
-      #Subjects
-      items << {:key => :groups,
-        :name => image_tag("btn/btn_group.png")+t('group.other'),
-        :url => "#",
-        :options => {:link => {:id => "groups_menu"}},
-        :items => [{:key => :new_group ,:name => image_tag("btn/btn_group.png")+t('group.new.action'),:url => new_group_path('group' => { '_founder' => current_subject.slug })}]
-      }
-
       render_items items
     end
 

data/lib/social_stream-base.rb

@@ -72,7 +72,7 @@ module SocialStream
   @@objects = [ :post, :comment ]
 
   mattr_accessor :activity_forms
-  @@activity_forms = [:post]
+  @@activity_forms = [ :post, :group ]
   
   class << self
     def setup

data/lib/tasks/db/populate.rake

@@ -11,6 +11,12 @@ namespace :db do
     task :create => :environment do
 
       LOGOS_PATH = File.join(Rails.root, 'lib', 'logos')
+      USERS = ENV["USERS"].to_i || 9
+      GROUPS = ENV["GROUPS"].to_i || 10
+      if ENV["HARDCORE"].present?
+        USERS = 999
+        GROUPS = 1000    
+      end      
 
       Mailboxer.setup do |config|
         config.uses_emails = false
@@ -40,7 +46,7 @@ namespace :db do
         end
       end
 
-      puts 'User population'
+      puts 'User population (Demo and ' + USERS.to_s + ' users more)'
       users_start = Time.now
 
       # = Users
@@ -55,7 +61,7 @@ namespace :db do
 
       require 'forgery'
 
-      9.times do
+      USERS.times do
         User.create! :name => Forgery::Name.full_name,
                      :email => Forgery::Internet.email_address,
                      :password => 'demonstration',
@@ -66,13 +72,13 @@ namespace :db do
       users_end = Time.now
       puts '   -> ' + (users_end - users_start).round(4).to_s + 's'
 
-      puts 'Groups population'
+      puts 'Groups population (' + GROUPS.to_s + ' groups)'
       groups_start = Time.now
 
       # = Groups
       available_actors = Actor.all
 
-      10.times do
+      GROUPS.times do
         founder = available_actors[rand(available_actors.size)]
 
         Group.create! :name  => Forgery::Name.company_name,

data/spec/controllers/groups_controller_spec.rb

@@ -30,7 +30,7 @@ describe GroupsController do
 
     context "faking a new group" do
       before do
-        model_attributes[:_founder] = Factory(:user).slug
+        model_attributes[:_contact_id] = Factory(:user).ego_contact.id
       end
 
       it_should_behave_like "Deny Creating"
@@ -81,7 +81,7 @@ describe GroupsController do
 
     context "a new own group" do
       before do
-        model_attributes[:_founder] = @user.slug
+        model_attributes[:_contact_id] = @user.ego_contact.id
       end
 
       it "should allow creating" do
@@ -127,7 +127,7 @@ describe GroupsController do
 
     context "a new fake group" do
       before do
-        model_attributes[:_founder] = Factory(:user).slug
+        model_attributes[:_contact_id] = Factory(:user).ego_contact.id
       end
 
       it_should_behave_like "Deny Creating"

data/spec/controllers/posts_controller_spec.rb

@@ -143,7 +143,7 @@ describe PostsController do
 
       post :create, :post => { :text => "Test",
                                :_contact_id => @tie.contact.inverse!.id,
-                               :_relation_ids => [""] }
+                             }
 
       post = assigns(:post)
 

data/spec/factories/group.rb

@@ -1,4 +1,4 @@
 Factory.define :group do |g|
   g.sequence(:name) { |n| "Group #{ n }" }
-  g._founder { |g| Factory(:user).slug }
+  g._contact_id { |g| Factory(:user).ego_contact.id }
 end

data/spec/models/activity_spec.rb

@@ -128,25 +128,4 @@ describe Activity do
       end
     end
   end
-
-  context "without relations" do
-    it "should allow create to friend" do
-      tie = Factory(:friend)
-
-      activity = Activity.new :contact_id => tie.contact.inverse!.id
-
-      assert activity.allow?(tie.receiver, 'create')
-    end
-
-    it "should fill relation" do
-      tie = Factory(:friend)
-
-      post = Post.new :text => "testing",
-                      :_contact_id => tie.contact.inverse!.id
-
-      post.save!
-
-      post.post_activity.relations.should include(tie.relation)
-    end
-  end
 end

data/spec/models/group_spec.rb

@@ -4,7 +4,7 @@ describe Group do
   it "should save description" do
     g = Group.create(:name => "Test",
                      :description => "Testing description",
-                     :_founder => Factory(:user).slug)
+                     :_contact_id => Factory(:user).ego_contact.id)
 
     g.reload.description.should be_present
   end

data/spec/models/post_spec.rb

@@ -30,4 +30,30 @@ describe Post do
       end
     end
   end
+
+  context "without relations" do
+    it "should allow create to friend" do
+      tie = Factory(:friend)
+
+      post = Post.new :text => "testing",
+                      :_contact_id => tie.contact.inverse!.id
+
+      assert post.build_post_activity.allow? tie.receiver_subject, 'create'
+
+      ability = Ability.new(tie.receiver_subject)
+
+      ability.should be_able_to(:create, post)
+    end
+
+    it "should fill relation" do
+      tie = Factory(:friend)
+
+      post = Post.new :text => "testing",
+                      :_contact_id => tie.contact.inverse!.id
+
+      post.save!
+
+      post.post_activity.relations.should include(tie.relation)
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream-base
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: 
   segments: 
   - 0
   - 9
-  - 4
-  version: 0.9.4
+  - 5
+  version: 0.9.5
 platform: ruby
 authors: 
 - GING - DIT - UPM
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-16 00:00:00 +02:00
+date: 2011-09-20 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -775,6 +775,8 @@ files:
 - app/views/groups/_group_with_details.html.erb
 - app/views/groups/_index.html.erb
 - app/views/groups/_new.html.erb
+- app/views/groups/_new_activity.html.erb
+- app/views/groups/_new_activity_fields.html.erb
 - app/views/groups/_sidebar_index.html.erb
 - app/views/groups/_sidebar_show.html.erb
 - app/views/groups/index.html.erb
@@ -853,6 +855,9 @@ files:
 - app/views/relation/customs/create.js.erb
 - app/views/relation/customs/index.html.erb
 - app/views/relation/customs/update.js.erb
+- app/views/search/_focus_search.html.erb
+- app/views/search/_form.html.erb
+- app/views/search/_global_search.html.erb
 - app/views/search/_header_search.html.erb
 - app/views/search/_index.html.erb
 - app/views/search/index.html.erb