social_stream-base 0.9.1 → 0.9.2

data/.gitignore

@@ -12,3 +12,5 @@ lib/generators/social_stream/base/templates/public/images/tmp/
 **.*swp
 .code_swarm
 .rvmrc
+config/development.sphinx.conf
+db/sphinx/*

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

@@ -7,20 +7,66 @@ $(function() {
   $('#new_<%= SocialStream.activity_forms.first %>').show();
   $('#select_<%= SocialStream.activity_forms.first %>').addClass('selected');
   $('#security').chosen();
+  $("#input_activities").Watermark("<%= I18n.t('activity.input') %>","#666");
 });
 
 
 $(document).ready(function() {
-  $('#new_post').submit(function() {
-    $("#input_activities").blur();
-    $("#masterSubmitButton").val("<%= I18n.t('activity.sending') %>...");
-    $('#new_post').attr("disabled", true);   
-    $('#masterSubmitButton').attr("disabled", true);   
-    $('#input_activities').attr('readonly', true);     
+  activate_anti_rebounds();
+});
+
+activate_anti_rebounds = function(){
+  $('#wrapper_activities_header form').submit(function() {
+    $(this).find('input[type=text]').each(function() {
+      $(this).blur().attr('readonly', true);
+    });
+    $("#masterSubmitButton").val("<%= I18n.t('activity.sending') %>...").attr("disabled", true); 
+    
+    // Add _relation_ids[] parameter from authorization selector
+    $('.liveAdded').remove();
+    
+    var currentForm = $(this);
+  
+    $('#security option:selected').each(function() {
+                currentForm.append(
+                $('<input/>')
+                  .addClass('liveAdded')
+                  .attr('type', 'hidden')
+                  .attr('name', currentForm
+                  .attr('id').split('_')[1]+'[_relation_ids][]')
+                  .val($(this).attr('value')));
+    });
     return true;
   });
-});
+  
+  $('.new_comment').submit(function() {
+    $(this).find('input[type=text]').each(function() {
+      $(this).blur().attr('readonly', true); 
+    });
+    $(this).find(".submitActivity").each(function() {
+      $(this).val("<%= I18n.t('activity.sending') %>...").attr("disabled", true);   
+    });
+    return true;    
+  });
+}
+
+unblock_all_forms = function() {  
+  //Sharing buttons
+  $(".submitActivity").val("<%= I18n.t('share') %>").removeAttr("disabled");  
+  //Header activities form
+  $("#masterSubmitButton").val("<%= I18n.t('share') %>").removeAttr("disabled");
+  $('#wrapper_activities_header form').find('input[type=text]').each(function() {
+    $(this).removeAttr("readonly").val("").blur();
+  });  
+  //New comments
+  $('.input_new_comments').each(function() {
+    $(this).removeAttr("readonly").val("");
+  }); 
+}
 
+$('#masterSubmitButton').live('click',function(){
+  $('#wrapper_activities_header form:visible').submit();
+});
 
 
 //clicks form selector
@@ -31,21 +77,6 @@ $('.activity_form_selector').live('click',function(){
 	$('#new_'+this.id.split("_")[1]).show();
 });
 
-//submit
-$('#masterSubmitButton').live('click',function(){
-	$('.liveAdded').remove();
-        $('#security option:selected').each(function() {
-                $('#wrapper_activities_header form:visible').append(
-                $('<input/>')
-        	  .addClass('liveAdded')
-        	  .attr('type', 'hidden')
-        	  .attr('name', $('#wrapper_activities_header form:visible')
-        	  .attr('id').split('_')[1]+'[_relation_ids][]')
-        	  .val($(this).attr('value')));
-        });
-	$('#wrapper_activities_header form:visible').submit();
-});
-
 //javascript for main activities input
 $(function() {
   $("#input_activities").click(function(){
@@ -55,11 +86,7 @@ $(function() {
 
 
 //javascript for comments
-$(function() {
-  //"write new comment..." text in every text field for comments
-  $("#input_activities").Watermark("<%= I18n.t('activity.input') %>","#666");
-  $(".input_new_comments").Watermark("<%= I18n.t('comment.input') %>","#666");
-  
+$(function() {  
   //show only the text fields for new comment if there are any comment to the post
   $(".activity_new_comment").each(function(){
   	if ($.trim($(this).siblings(".activity_comments").text()) != ""){

data/app/assets/stylesheets/base.css

@@ -130,7 +130,7 @@ textarea.new_contact_text_area{ height: 100px; color: #2A3890;}
 .block .field{  display:inline;  padding: 0px;  width:50%;}
 .block .form_tag{border-color: #0656a4;	color: #2A3890;	padding: 5px 5px 5px 5px;  border:1px solid #BDC7D8; width:90%;}
 .block .form_tag_long{border-color: #0656a4;	color: #2A3890;	padding: 5px 5px 5px 5px;  border:1px solid #BDC7D8; width:91%;}
-.block .form_label{display:inline-block;  width:25%; font-weight:bold; vertical-align:top; padding-top:3px;}
+.block .form_label{display:inline-block;  width:25%; font-weight:bold; vertical-align:10%; padding-top:3px;}
 .block .form_field{  display:inline-block;  padding: 0px;  width:73%;}
 .block .form_row {display: block; padding:5px; padding-left:20px;}
 .block .form_sub_row {display: block; padding:5px; padding-left:30px;}
@@ -140,6 +140,7 @@ textarea.new_contact_text_area{ height: 100px; color: #2A3890;}
 .block .form_column_right {	display: block; padding: 5px 10px 5px 10px; float:right; width:31%; text-align: center;}
 .block .form_bottom { display: block; padding:5px; padding-left:20px; clear:both; text-align: center; }
 .block .select_relations{ padding-top:20px; text-align: center; }
+#form_participants{vertical-align:60%;}
 
 
 /********* Links SECTION **********/

data/app/assets/stylesheets/frontpage.css

@@ -17,6 +17,7 @@ span.find{  padding-right:5px;}
 #devise_links {padding: 5px 0 5px 0;}
 #devise_links a{font-weight: bold;line-height: 15px; }
 #login{  padding-top: 5px;}
+.instructions{text-align: left; padding-bottom: 5px;}
 #welcome{  margin: 50px auto 50px auto;  width:330px;  padding:20px;  border: thin solid #2A3890;
   text-align:center;}
 #wrapper_left{  vertical-align:top;  width:49%;  display:inline-block;    padding-left: 20px;}

data/app/assets/stylesheets/search.css

@@ -55,6 +55,10 @@
 
 #global_search_display  li .name {
   float:left;
+  width: 125px;
+  overflow: hidden;
+  height: 25px;
+  text-align: left;
 }
 
 
@@ -64,11 +68,6 @@
 }
 
 
-#global_search_display  span{
-  float:left;
-  margin-top: 10px;  
-}
-
 #global_search_display  .warning{
   width:100%; 
 }

data/app/controllers/notifications_controller.rb

@@ -45,7 +45,8 @@ class NotificationsController < ApplicationController
 
   def destroy
     @notification.receipt_for(@actor).move_to_trash
-    redirect_to notifications_path
+    @notifications = @mailbox.notifications.not_trashed.page(params[:page]).per(10)
+    render :action => :index
   end
 
   private

data/app/controllers/search_controller.rb

@@ -4,8 +4,8 @@ class SearchController < ApplicationController
   
   def index
     if params[:mode].eql? "header_search"
-      @search_result = Actor.search "*#{params[:id]}*", :page => 1, :per_page => 10
-      render :partial => "header_search", :locals =>{:search_result => @search_result}
+      @search_result = ThinkingSphinx.search "*#{params[:id]}*", :page => 1, :per_page => 10, :classes => [User, Group]
+      render :partial => "header_search", :locals => {:search_result => @search_result}
       return
     else
       @search_result = ThinkingSphinx.search "*#{params[:id]}*"      

data/app/controllers/ties_controller.rb

@@ -4,5 +4,8 @@ class TiesController < ApplicationController
   before_filter :authenticate_user!
 
   def index
+    unless current_subject.sent_contacts.active.count > 0
+      flash[:notice] = t('contact.graph.empty')
+    end
   end
 end

data/app/models/actor.rb

@@ -20,15 +20,7 @@ class Actor < ActiveRecord::Base
   validates_presence_of :name, :subject_type
   
   acts_as_messageable
-  
-  define_index do
-    indexes name, :sortable => true
-    indexes email
-    indexes slug
-    
-    has created_at
-  end
-  
+
   acts_as_url :name, :url_attribute => :slug
   
   has_one :profile, :dependent => :destroy

data/app/models/permission.rb

@@ -45,10 +45,7 @@ class Permission < ActiveRecord::Base
 
   # An explanation of the permissions. Type can be brief or detailed.
   # If detailed, description includes more information about the relation
-  def description(type, relation = nil)
-    options = {}
-    options[:relation] = relation.name if relation.present?
-
+  def description(type, options = {})
     I18n.t "permission.description.#{ type }.#{ action }.#{ object || "nil" }",
            options
   end

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

@@ -1,7 +1,7 @@
 <% if can? :create, new_activity(receiver) %>
 <div id="activities_header" class="content_size">
   <% SocialStream.activity_forms.each do |element| %>
-    <%= render :partial => element.to_s.pluralize+'/new',
+    <%= render :partial => element.to_s.pluralize+'/new_activity',
                :locals  => {
                              :receiver => receiver
                            } %>

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

@@ -22,14 +22,8 @@
 <% end %>
 
 <%= javascript_tag do %>
-$(document).ready(function() {
-  $('#new_comment<%= dom_id(activity) %>').submit(function() {
-    $('#comment_text_<%= dom_id(activity) %>').blur();
-    $('#comment_submit_<%= dom_id(activity) %>').val("<%= I18n.t('activity.sending') %>...");
-    $('#new_comment<%= dom_id(activity) %>').attr("disabled", true);   
-    $('#comment_submit_<%= dom_id(activity) %>').attr("disabled", true);   
-    $('#comment_text_<%= dom_id(activity) %>').attr('readonly', true); 
-    return true;
+  $(document).ready(function() {
+    $("#comment_text_<%= dom_id(activity) %>").Watermark("<%= I18n.t('comment.input') %>","#666");
+    activate_anti_rebounds();  
   });
-});
 <% end %>

data/app/views/comments/create.js.erb

@@ -1,10 +1,5 @@
-$(".submitActivity").val("<%= I18n.t('share') %>");
-$('.input_new_comments').val("");   
-$('.input_new_comments').blur();   
-$(".submitActivity").removeAttr("disabled");   
-$('.input_new_comments').removeAttr('readonly'); 
-$('.new_comment').removeAttr("disabled");   
-
 //Display the new comment
 $("#comments_activity_<%= @comment.post_activity.parent.id %>").append("<%= escape_javascript(render @comment.post_activity) %>");
 $(".activities_comment_btn").hide();
+
+unblock_all_forms();

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

@@ -5,10 +5,15 @@
     <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="form_row"><%=t('devise.passwords.field')  %></div>
-      <div class="form_row"><%= f.text_field :email %></div>
+      <div class="instructions"><%= t('devise.passwords.acquire') %></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>
+      </div>
 
-      <%= render :partial => "devise/shared/links" %>
+      <div id="devise_links">
+        <%= render :partial => "devise/shared/links" %>
+      </div>
 
       <div class="space_center"></div>
       <div class="btn_login">

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

@@ -1,23 +1,25 @@
 <div id="welcome">
   <div id="login" class="block">
   <h2><%= t('sign_up').capitalize %></h2>
+  <div class="space_center"></div>
+  <div class="space_center"></div>
   <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
     <%= devise_error_messages! %>
     <div class="form_row">
       <div class="form_label"><%= f.label :name %></div>
-      <div class="form_field"><%= f.text_field :name, :class =>"field_x"  %></div>
+      <div class="form_field"><%= f.text_field :name, :class =>"form_tag"  %></div>
     </div>
     <div class="form_row">
       <div class="form_label"><%= f.label :email %></div>
-      <div class="form_field"><%= f.text_field :email, :class =>"field_x"  %></div>
+      <div class="form_field"><%= f.text_field :email, :class =>"form_tag"  %></div>
     </div>
     <div class="form_row">
       <div class="form_label"><%= f.label :password %></div>
-      <div class="form_field"><%= f.password_field :password, :class =>"field_x", :id => "password"  %></div>
+      <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 :password_confirmation %></div>
-      <div class="form_field"><%= f.password_field :password_confirmation, :class =>"field_x"  %></div>
+      <div class="form_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>
@@ -28,7 +30,7 @@
       <%= link_to t('confirmation.not_received.long'), new_confirmation_path(resource_name) %><br />
     <% end -%>
   </div>
-    <div class="form_row center">
+    <div id="devise_links">
       <%= render :partial => "devise/shared/links" %>
     </div>
   </div>

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

@@ -48,7 +48,7 @@
 			</div>
 		</div>
 		<div class="form_row">
-			<div class="form_label">
+			<div class="form_label" id="form_participants">
 			  <%= f.label t('group.new.participants') %>
 			</div>
 			<div class="form_field">

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

@@ -25,9 +25,11 @@ $(document).ready(function() {
   $("#global_search_input").keyup(function() {
     var searchstring = $(this).val();
     if((searchstring=="")){
+      if (last_search!=searchstring){last_search=searchstring;}
       $("#global_search_display").hide();
     }
     else if(searchstring.length < 2) {
+      if (last_search!=searchstring){last_search=searchstring;}
       $("#global_search_display").html("<ul><li><%= escape_javascript(content_tag(:span,I18n.t('search.at_least'), :class => :warning)) %></li></ul>").show();
     } else {
       if (last_search!=searchstring){
@@ -42,7 +44,7 @@ $(document).ready(function() {
             }          
           },
           error: function(){
-            $("#global_search_display").html("Something went wrong with search engine");
+            $("#global_search_display").html("<ul><li><%= escape_javascript(content_tag(:span,I18n.t('search.wrong'), :class => :warning)) %></li></ul>");
          }
         });
       }

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

@@ -0,0 +1,14 @@
+<% object._contact_id = current_subject.contact_to!(receiver).id %>
+<% remote = true if remote.nil? %>
+
+<%= form_for object, :remote => remote  do |f| %>
+  <%= f.hidden_field :_contact_id %>
+
+  <%= 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/permissions/_index.html.erb

@@ -28,7 +28,7 @@
     <%= raw t('privacy.intro', :relation => h(@relation.name)) %>
 
     <%= semantic_form_for @relation, :url => polymorphic_path(@relation, :section => 'rules'), :remote => true do |f| %>
-      <%= f.input :permissions, :as => :check_boxes, :collection => default_permissions.map{ |p| [p.description(:detailed, @relation), p.id] } %>
+      <%= f.input :permissions, :as => :check_boxes, :collection => default_permissions.map{ |p| [p.description(:detailed, :relation => @relation.name, :subject => current_subject.name), p.id] } %>
       <%= f.submit t('button.save'), :class => 'button' %>
     <% end %>
   </div>

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

@@ -0,0 +1 @@
+<%= render :partial => 'objects/new_activity', :locals => {:receiver => receiver, :object => Post.new(:text => t('activity.input')), :remote => true} %>

data/app/views/posts/create.js.erb

@@ -1,10 +1,5 @@
-$(".submitActivity").val("<%= I18n.t('share') %>");
-$('#input_activities').val("");   
-$('#input_activities').blur();   
-$(".submitActivity").removeAttr("disabled");   
-$('#input_activities').removeAttr('readonly'); 
-$('#new_post').removeAttr("disabled");   
-    
 //Display the new post
 $("#wall").prepend("<%= escape_javascript(render @post.post_activity) %>");
 
+unblock_all_forms();
+

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

@@ -96,7 +96,8 @@ end %>
 	      <%= f.label t('profile.' + current_subject.class.to_s.downcase + '.birthday')%>
 	    </div>
 	    <div class="form_field">
-	      <%= date_select "profile", "birthday", :order => [:day, :month, :year], :end_year=> Date.today.year, :start_year=> (Date.today.year - 100) %>
+	      <%= date_select "profile", "birthday", :order => [:day, :month, :year], :end_year=> Date.today.year, 
+	         :start_year=> (Date.today.year - 100), :prompt => { :day => 'Day', :month => 'Month', :year => 'Year' } %>
 	    </div>
 	  </div>
 
@@ -186,10 +187,7 @@ end %>
   <% end %>
   
   <div class="form_row space_center">
-    <%= f.submit t('button.update'), :class => "button" %>&nbsp;
-    <button class="button" onclick="window.location.href='<%= polymorphic_path(current_subject) %>';">
-    	<%= t('button.cancel')%>
-		</button>
+    <%= f.submit t('button.update'), :class => "button" %>
   </div>
 
 <% end %>

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

@@ -1,15 +1,16 @@
+<% if search_result.empty? %>
+<ul><li><%= content_tag(:span,I18n.t('search.actor.none'), :class => :warning) %></li></ul>
+<% else %>
 <ul>
-<% search_result.each do |actor| %>
-  <%= link_to actor.subject do %>
+<% search_result.each do |subject| %>
+  <%= link_to subject do %>
     <li>
-      <%= image_tag(actor.logo.url(:actor), :class => :logo) %> 
-      <%= content_tag(:span, actor.name, :class => :name) %>         
+      <%= image_tag(subject.actor.logo.url(:actor), :class => :logo) %> 
+      <%= content_tag(:span, truncate_name(subject.actor.name), :class => :name) %>         
     </li>
     <% end %>
 <% end %>
 </ul>
+<% end %>
 
 
-<% if search_result.empty? %>
-<ul><li><%= content_tag(:span,I18n.t('search.actor.none'), :class => :warning) %></li></ul>
-<% end %>

data/config/locales/en.yml

@@ -95,6 +95,9 @@ en:
     edit:
       title: "Edit contact to %{name}"
       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!"
     in_common:
       one: "1 contact in common"
       other: "%{count} contacts in common"
@@ -124,6 +127,8 @@ 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"
       update: "Change your password"
   follower:
     n:
@@ -229,7 +234,7 @@ en:
     read_all: "Mark all as read"
     unread: "Mark as unread"
   password:
-    forgot: "Do you forgot your password?"
+    forgot: "Acquire a new password"
   post:
     confirm_delete: "Delete post?"
     form:
@@ -287,7 +292,7 @@ en:
         read:
           activity: "Read wall"
         represent:
-          nil: "Represent"
+          nil: "Administrate"
       detailed:
         create:
           activity: "Post to \"%{relation}\" wall"
@@ -297,7 +302,7 @@ en:
           activity: "Read posts in \"%{relation}\" wall"
           tie: "See contacts in levels: %{relations} and %{public}"
         represent:
-          nil: "Represent me/us in the website"
+          nil: "Change session to act as %{subject}"
     of_relation:
       choose: "2. Permissions in <strong>%{name}</strong> sphere"
   privacy:
@@ -323,6 +328,7 @@ en:
     actor:
       none: "Nothing found"
     at_least: "Write at least two characters"
+    wrong: "There seems to be a problem with the search engine"
   settings:
     error: "Some errors raised when saving your changes"
     for: "Settings for"

data/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.9.1".freeze
+    VERSION = "0.9.2".freeze
   end
 end

data/lib/social_stream/models/subject.rb

@@ -71,7 +71,14 @@ module SocialStream
             __send__ m
           end
         }
-
+  
+        define_index do
+          indexes actor.name, :sortable => true
+          indexes actor.email
+          indexes actor.slug
+                
+          has created_at
+        end
       end
       
       module InstanceMethods

data/lib/social_stream/toolbar_config.rb

@@ -43,7 +43,7 @@ module SocialStream
         :options => {:link => {:id => "contacts_menu"}},
         :items => [
           {:key => :invitations, :name => image_tag("btn/btn_friend.png")+t('contact.current'), :url => contacts_path},
-          {:key => :contacts_graph, :name => image_tag("btn/btn_friend.png")+t('contact.graph'), :url => ties_path},
+          {:key => :contacts_graph, :name => image_tag("btn/btn_friend.png")+t('contact.graph.one'), :url => ties_path},
           {:key => :invitations, :name => image_tag("btn/btn_friend.png")+t('contact.pending.other'), :url => contacts_path(:pending=>true)},
           {:key => :invitations, :name => image_tag("btn/btn_invitation.png")+t('invitation.toolbar'), :url => new_invitation_path}
         ]}

data/spec/controllers/notifications_controller_spec.rb

@@ -40,8 +40,7 @@ describe NotificationsController do
   it "should send to trash" do
     delete :destroy, :id => @receipt.notification.to_param
     @receipt.notification.is_trashed?(@actor).should==true
-    response.should redirect_to notifications_path
-    
+    assert_response :success
   end
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream-base
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 63
   prerelease: 
   segments: 
   - 0
   - 9
-  - 1
-  version: 0.9.1
+  - 2
+  version: 0.9.2
 platform: ruby
 authors: 
 - GING - DIT - UPM
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-13 00:00:00 +02:00
+date: 2011-09-15 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -825,12 +825,12 @@ files:
 - app/views/notifications/index.html.erb
 - app/views/notifications/index.js.erb
 - app/views/objects/_destroy.js.erb
-- app/views/objects/_new.html.erb
+- app/views/objects/_new_activity.html.erb
 - app/views/objects/_show.html.erb
 - app/views/permissions/_index.html.erb
 - app/views/permissions/index.js.erb
-- app/views/posts/_fields.erb
-- app/views/posts/_new.html.erb
+- app/views/posts/_new_activity.html.erb
+- app/views/posts/_new_activity_fields.erb
 - app/views/posts/_post.html.erb
 - app/views/posts/create.js.erb
 - app/views/posts/destroy.js.erb

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

@@ -1,8 +0,0 @@
-<% object._contact_id = current_subject.contact_to!(receiver).id %>
-<% remote = true if remote.nil? %>
-
-<%= form_for object, :remote => remote  do |f| %>
-  <%= f.hidden_field :_contact_id %>
-
-  <%= render :partial => object.class.to_s.tableize+'/fields' , :locals => {:f => f} %>	
-<% end %>

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

@@ -1 +0,0 @@
-<%= render :partial => 'objects/new', :locals => {:receiver => receiver, :object => Post.new(:text => t('activity.input')), :remote => true} %>