social_stream-base 0.9.5 → 0.9.6

data/app/assets/javascripts/preloader.js

@@ -0,0 +1,6 @@
+$.preloadImages = function() {
+  for (var i = 0; i<arguments.length; i++) {
+    img = new Image();
+    img.src = arguments[i];
+  }
+}

data/app/assets/javascripts/search.js.erb

@@ -1,5 +1,6 @@
 // index
 //= require ajax.paginate
+//= require jquery.validate
 
 $(document).ready(function(){  
   $("#global_search_input").Watermark("<%= I18n.t('search.write') %>");

data/app/assets/stylesheets/search.css

@@ -101,6 +101,9 @@
   width: 100%;
 }
 /********************************* Global ******************/
+#global_search_input.searching {
+  background: url('mini-loading.gif') 5px 50% no-repeat white;
+}
 .search_row {
   text-align: center;
 }
@@ -133,6 +136,10 @@
 #search_results .subject_search_results .title {
   width: 260px;
 }
+/********************************* Form and errors *********/
+#search_form .error {
+  display: none;
+}
 /********************************* Focus options ***********/
 #focus_options ul {
   list-style: none;
@@ -146,14 +153,14 @@
   background: #CFDEFF;
   color: #2A3890;
 }
-#focus_options ul li a:hover{
+#focus_options ul li a:hover {
   text-decoration: none;
 }
-#focus_options ul li span{
+#focus_options ul li span {
   padding: 5px 10px;
   background-color: #E1EEF5;
 }
-#focus_options ul li span.selected{
+#focus_options ul li span.selected {
   border: solid 1px #2A3890;
 }
 /******************** Search css END ***********************/

data/app/controllers/contacts_controller.rb

@@ -1,5 +1,7 @@
 class ContactsController < ApplicationController
   before_filter :authenticate_user!
+  before_filter :exclude_reflexive, :except => [ :index, :pending ]
+
   def index
     if params[:pending].present?
       pending
@@ -20,15 +22,14 @@ class ContactsController < ApplicationController
   end
 
   def edit
-    @contact = current_subject.sent_contacts.find params[:id]
   end
 
   def update
-    @contact = current_subject.sent_contacts.find params[:id]
-
-    # This should be in the model
-    if params[:contact][:relation_ids].present?
-      params[:contact][:relation_ids].delete("gotcha")
+    # FIXME: This should be in the model
+    if params[:contact][:relation_ids].present? &&
+       params[:contact][:relation_ids].delete("gotcha") &&
+       params[:contact][:relation_ids].blank?
+      params[:contact][:relation_ids] << @contact.sender.relation_public.id
     end
 
     if @contact.update_attributes(params[:contact])
@@ -39,8 +40,6 @@ class ContactsController < ApplicationController
   end
 
   def destroy
-    @contact = current_subject.sent_contacts.find params[:id]
-
     @contact.relation_ids = [current_subject.relation_reject.id]
 
     respond_to do |format|
@@ -49,7 +48,6 @@ class ContactsController < ApplicationController
   end
 
   def pending
-
     @contacts = current_subject.pending_contacts
 
     respond_to do |format|
@@ -58,4 +56,14 @@ class ContactsController < ApplicationController
       format.json { render :text => @contacts.map{ |c| { 'key' => c.receiver_id.to_s, 'value' => self.class.helpers.truncate_name(c.receiver.name) } }.to_json }
     end
   end
+
+  private
+
+  def exclude_reflexive
+    @contact = current_subject.sent_contacts.find params[:id]
+
+    if @contact.reflexive?
+      redirect_to home_path
+    end
+  end
 end

data/app/controllers/search_controller.rb

@@ -3,23 +3,22 @@ class SearchController < ApplicationController
 
   #before_filter :authenticate_user! #??
 
-  FOCUS_SEARCH_PER_PAGE = 10
+  FOCUS_SEARCH_PER_PAGE=16
+  MIN_QUERY=2
   def index
-    if params[:search_query].blank?
+    @search_class_sym = params[:focus].singularize.to_sym unless params[:focus].blank?
+    if params[:search_query].blank? or too_short_query
       @search_result = nil_search
-      @search_class_sym = params[:focus].singularize.to_sym unless params[:focus].blank?
     else
-      search_query = get_search_query params[:search_query]
       if params[:mode].eql? "header_search"
-        @search_result = header_search search_query
+        @search_result = header_search
         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
+          @search_result = focus_search
         else
-          @search_result = global_search search_query
+          @search_result = global_search
         end
       end
     end
@@ -27,55 +26,56 @@ class SearchController < ApplicationController
 
   private
 
-  def get_search_query bare_query
+  def too_short_query
+    bare_query = strip_tags(params[:search_query]) unless bare_query.html_safe?
+    return bare_query.strip.size < MIN_QUERY
+  end
+
+  def get_search_query
     search_query = ""
-    bare_query = strip_tags(bare_query) unless bare_query.html_safe?
+    bare_query = strip_tags(params[:search_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 
+    return search_query.strip
   end
 
-  def global_search query
-    return search query, 10
+  def global_search
+    return search 6
   end
 
-  def header_search query
-    return search query, 3
+  def header_search
+    return search 3
   end
 
-  def search query, max_results
+  def search 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])
+      result.update({subject_sym => ThinkingSphinx.search(get_search_query, :classes => [subject_sym.to_s.classify.constantize]).page(1).per(max_results)})
+      result.update({(subject_sym.to_s+"_total").to_sym => ThinkingSphinx.count(get_search_query, :classes => [subject_sym.to_s.classify.constantize])})
     end
-    result.update({:total => total})
-    result.update({:total_shown => total_shown})
     return result
   end
 
-  def focus_search string_class, query, page
-    string_class = string_class.singularize
+  def focus_search
+    string_class = params[:focus].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
+    return ThinkingSphinx.search(get_search_query, :classes => [search_class]).page(params[:page]).per(FOCUS_SEARCH_PER_PAGE)
   end
 
   def nil_search
-    result = Hash.new
-    SocialStream.subjects.each do |subject_sym|
-      result.update({subject_sym => []})
-      result.update({(subject_sym.to_s+"_total").to_sym => 0})
+    if params[:focus].present?
+      result = []
+    else
+      result = Hash.new
+      SocialStream.subjects.each do |subject_sym|
+        result.update({subject_sym => []})
+        result.update({(subject_sym.to_s+"_total").to_sym => 0})
+      end
     end
-    result.update({:total => 0})
     return result
   end
 end

data/app/helpers/contacts_helper.rb

@@ -4,9 +4,13 @@ module ContactsHelper
   end
 
   def contact_link(c)
-    link_to c.status,
-            edit_contact_path(c),
-            :title => t("contact.#{ c.action }.title", :name => c.receiver.name)
+    if c.reflexive?
+      t('subject.this_is_you')
+    else
+      link_to c.status,
+              edit_contact_path(c),
+              :title => t("contact.#{ c.action }.title", :name => c.receiver.name)
+    end
 
   end
 

data/app/helpers/search_helper.rb

@@ -7,6 +7,12 @@ module SearchHelper
   
   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 )
+    link_to text, search_path(:focus => search_class.downcase.pluralize, :search_query => query ), :remote => true
+  end
+  
+  def too_short_query?
+    return true if params[:search_query].blank?
+    bare_query = strip_tags(params[:search_query]) unless bare_query.html_safe?
+    return bare_query.strip.size < SearchController::MIN_QUERY
   end
 end

data/app/models/contact.rb

@@ -125,14 +125,17 @@ class Contact < ActiveRecord::Base
     if ties_count > 0 && relations.where(:type => ['Relation::Custom', 'Relation::Public']).any?
       'edit'
     else
-      'new'
+      replied? ? 'reply' : 'new'
     end
   end
 
   def status
-    established? ?
-      ties.includes(:relation).map(&:relation_name).join(", ") :
-      I18n.t("contact.new.link")
+    case action
+    when 'edit'
+      ties.includes(:relation).map(&:relation_name).join(", ")
+    else
+      I18n.t("contact.#{ action }.link")
+    end
   end
 
   private

data/app/models/relation/single.rb

@@ -17,6 +17,6 @@ class Relation::Single < Relation
 
   # The name of public relation
   def name
-    I18n.t("relation_#{ self.class.name }.name")
+    I18n.t("relation_#{ self.class.name.split("::").last.underscore }.name")
   end
 end

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

@@ -9,7 +9,7 @@
   <%= javascript_include_tag 'avatars.js' %>
 
   <%= stylesheet_link_tag "jquery.Jcrop", :media => "screen, projection" %>
-  <%= stylesheet_link_tag "avatars", :media => "screen, projection" %><br/>
+  <%= stylesheet_link_tag "avatars", :media => "screen, projection" %>
   <%= stylesheet_link_tag "jquery.fileupload-ui", :media => "screen, projection" %>
 <% end %>
 

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

@@ -2,14 +2,14 @@
   <%= @search_class_sym.to_s.capitalize.pluralize %>
 </div>
 <br class="clearfloat" />
-<% if @search_result[@search_class_sym].empty? %>
+<% if @search_result.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|%>
+  <% @search_result.each do |subject|%>
   <%= subject_with_details subject %>
   <% total+=1 %>
   <% if (total%(SearchController::FOCUS_SEARCH_PER_PAGE/2)==0) %>
@@ -18,4 +18,5 @@
   <% end %>
   <% end %>
 </div>
+<%= paginate @search_result %>
 <% end %> 

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

@@ -1,17 +1,18 @@
-<div id="search_form">
-  <form action="<%= search_path %>" method="get">
+<div>
+  <form action="<%= search_path %>" method="get" data-remote="true" id="search_form">
     <div class="block">
+    	<div class="error" id="too_short_error" <%= too_short_query? ? 'style=display:block;' : ''  %>><%= t('search.at_least') %></div>
       <%= 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>
+          <li><%= link_to content_tag(:span,t('search.show_all'),:class => params[:focus].blank? ? 'global selected' : 'global'), search_path(:search_query => params[:search_query]), :remote => true %></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), 
+                                                  :class => selected_class + " " + subject.to_s.pluralize.downcase), 
                                       subject.to_s.classify.constantize, 
                                       params[:search_query] %></li>
           <% end %>
@@ -19,4 +20,25 @@
       </div>      
     </div>
   </form>
-</div>
+</div>
+
+<%= javascript_tag do %>
+	$(document).ready(function() {
+	  $.preloadImages ("assets/mini-loading.gif");
+	  
+	  $('#search_form').submit(function() {
+	    query = $('#global_search_input').val();
+      if((query=="")||(query.length < 2)||(query=="<%= t('search.write') %>")){
+        $('#too_short_error').show();
+        $('#global_search_input').removeClass("searching");
+        $('#global_search_input').blur();
+        $('#global_search_input').focus();
+        return false;   
+      }else{        
+        $('#global_search_input').addClass("searching");
+        $('#global_search_input').blur();
+      }
+      return true;
+	  });
+	});
+<% end %>

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

@@ -1,7 +1,7 @@
 <%= location(link_to(t('search.global.name')))%>
 <br class="clearfloat" />
 <div class="space_center"></div>
-<h2><%= t('search.searching', :query => truncate(params[:search_query],:length => 45)) %></h2>
+<h2><%= t('search.name') %></h2>
 <div class="space_center"></div>
 <%= render :partial => 'form' %> 
 <div class="space_center"></div>

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

@@ -0,0 +1,25 @@
+//if ($('#global_search_input').val()=="<%= params[:search_query]%>"){
+  
+  $('#search_results').html("<% unless params[:focus].present? %><%= escape_javascript render :partial => 'global_search' %><% else %><%= escape_javascript render :partial => 'focus_search' %><% end %>");
+  
+  $('#focus_options ul li a span').removeClass('selected');
+  
+  <% if params[:focus].present? %>
+  $('#focus_options ul li a span.<%= params[:focus].pluralize.downcase %>').addClass('selected');
+  <% else %>
+  $('#focus_options ul li a span.global').addClass('selected');
+  <% end %>
+  
+  $('title').text('<%= t('search.name')%> <%= escape_javascript(params[:search_query].present? ? ": #{params[:search_query]}" : "")%>');
+  
+  <% if too_short_query? %>
+  $('#too_short_error').show();
+  <% else %>
+  $('#too_short_error').hide();
+  <% end %> 
+  
+  $('#global_search_input').removeClass("searching");
+  
+/*}else{
+  alert("ignored <%= params[:search_query]%>");
+}*/

data/config/locales/en.yml

@@ -94,7 +94,7 @@ en:
     current: "Current"
     edit:
       title: "Edit contact to %{name}"
-      submit: "Edit Contact"
+      submit: "Edit contact"
     graph:
       one: "Graph"
       empty: "We're sorry but you don't have any contacts yet. You can try the search box to look for somebody!"
@@ -115,6 +115,10 @@ en:
     relation:
       one: "Contact type"
       new: "New type"
+    reply:
+      link: "+ Reply contact"
+      title: "Reply contact request to %{name}"
+      submit: "Reply contact"
     suggestion:
       one: "Suggestion"
       other: "Suggestions"
@@ -368,6 +372,8 @@ en:
   sign_out: "Sign out"
   sign_up: "Sign up"
   socialstream: "SocialStream"
+  subject:
+    this_is_you: "This is you!"
   sure: "Are you sure?"
   time:
     ago: "%{time} ago"

data/lib/generators/social_stream/base/templates/sphinx.yml

@@ -1,9 +1,9 @@
 development:
   enable_star: 1
-  min_infix_len: 2
+  min_infix_len: 1
 test:
   enable_star: 1
-  min_infix_len: 2
+  min_infix_len: 1
 production:
   enable_star: 1
-  min_infix_len: 2
+  min_infix_len: 1