social_stream-base 0.9.6 → 0.9.7

data/app/assets/javascripts/layouts.js

@@ -4,7 +4,6 @@
 //
 $(function() {
     jQuery('ul.sf-menu').superfish({
-        delay: 2000, // one second delay on mouseout
         animation: {
             height: 'show'
         }, // fade-in and slide-down animation

data/app/assets/stylesheets/frontpage.css

@@ -19,8 +19,8 @@ span.find{  padding-right:5px;}
 #login{  padding-top: 5px;}
 .instructions{text-align: left; padding-bottom: 5px;}
 #remember{padding-left:22%; text-align: left;}
-#user_password_confirmation{vertical-align: 30%;}
-#user_password_confirmation_label {padding-top: 0;}
+#welcome #user_password_confirmation{vertical-align: 30%;}
+#welcome #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;}

data/app/assets/stylesheets/location.css

@@ -0,0 +1,36 @@
+#map_location .first{
+  background: transparent url("/assets/arrow-start.png") no-repeat top left;
+  display: inline-block;
+  height: 23px;
+  margin-left: 5px;
+}
+#map_location .first span{
+  margin-left:5px;
+}
+#map_location .last{
+  margin-left: 5px;
+}
+#map_location .last a{
+  font-size: inherit;
+}
+#map_location .mid{
+  background: transparent url("/assets/arrow.png") no-repeat top right;
+}
+#map_location .penultimate{
+  background: transparent url("/assets/arrow-end.png") no-repeat top right;
+}
+#map_location .mid, #map_location .penultimate{
+  color: white;  
+  padding-left:5px;
+  padding-right: 12px;
+}
+#map_location .last, #map_location .mid, #map_location .penultimate{
+  display: inline-block;
+  font-size: 13px;
+  height: 23px;
+  line-height: 23px;
+}
+#map_location .mid a, #map_location .penultimate a{
+  color: inherit;
+  font-size: inherit;
+}

data/app/helpers/location_helper.rb

@@ -16,15 +16,13 @@ module LocationHelper
   # partial => location/_location.html.erb 
   #
   # Example:  
-  # 	Render a location with a two leves depth:
+  # 	Render a location with two leves depth:
   #
   #   	<%= location(link_to(leve1.name, level1.url),link_to(leve2.name, level2.url)) %>
   #
   def location(*stack)
-    location_body = t('location.base')
-    stack.collect {|level|
-      location_body << t('location.separator') + level
-    }
+    
+    location_body = render :partial => "location/location_body", :locals=>{:stack => stack}
     
     location_div = capture do
       render :partial => "location/location", :locals=>{:location_body => location_body}

data/app/helpers/toolbar_helper.rb

@@ -1,4 +1,7 @@
 module ToolbarHelper
+  # Configuration of toolbar items
+  include SocialStream::ToolbarConfig
+
   # Define the toolbar content for your view. There are two typical cases, depending on the value of
   # options[:profile]
   # * If present, render the profile menu for the {SocialStream::Models::Subject subject}
@@ -82,21 +85,17 @@ module ToolbarHelper
 
   #Prints the home toolbar menu.
   def home_toolbar_menu
-    default_home_toolbar_menu
+    render_items home_toolbar_items
   end
 
   #Prints the home profile menu.
   def profile_toolbar_menu(subject=current_subject)
-    default_profile_toolbar_menu(subject)
+    render_items profile_toolbar_items(subject)
   end
  
-
   #Renders array of navigation items with simple_navigation
   def render_items(items)
     menu = render_navigation :items => items
     return raw menu
   end
-  
-  
-  include SocialStream::ToolbarConfig
 end

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

@@ -21,8 +21,8 @@
 <% end %>
 
 <%= location(
- 	link_to(image_tag("btn/btn_edit.png", :class => "menu_icon")+t('profile.one'), [current_subject,:profile]),	
- 	link_to(image_tag("btn/edit.png", :class => "menu_icon")+t('avatar.other'), avatars_path)
+ 	link_to(t('menu.information'), [current_subject,:profile]),	
+ 	link_to(t('avatar.other'), avatars_path)
 ) %>
 
 <%= render :partial => 'list' %>

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

@@ -1,6 +1,6 @@
 <% toolbar :profile => @contact.receiver_subject, :option => 'contacts' %>
 
-<% location link_to(image_tag("btn/btn_friend.png", :class => "menu_icon") + 
-                    t("contact.#{ @contact.action }.title", :name => @contact.receiver.name), edit_contact_path(@contact.to_param)) %>
+<% location link_to(t("contact.#{ @contact.action }.title", :name => @contact.receiver.name),
+                     edit_contact_path(@contact.to_param)) %>
 
 <%= render :partial => 'form' %>

data/app/views/conversations/_show.html.erb

@@ -1,6 +1,6 @@
 <%= location(
-	link_to(image_tag("btn/message_" + @box + ".png", :class => "menu_icon")+t('message.' + @box), conversations_path(:box => @box),:remote => true),
-	link_to(image_tag("btn/message_conversation.png", :class => "menu_icon")+ truncate(@conversation.subject, :length => 45), conversation_path(@conversation.id,:box => @box,:page => params[:page]))
+	link_to(t('message.' + @box), conversations_path(:box => @box),:remote => true),
+	link_to(truncate(@conversation.subject, :length => 45), conversation_path(@conversation.id,:box => @box,:page => params[:page]))
 ) %>
 
 <br class="clearfloat" />

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

@@ -10,9 +10,7 @@
   $('.pagination a').attr('data-remote', 'true');
 <% end %>
 
-<%= location(
-    link_to(image_tag("btn/message_" + @box + ".png", :class => "menu_icon")+t('message.' + @box), conversations_path(:box => @box),:remote => true)
-) %>
+<%= location(link_to(t('message.' + @box), conversations_path(:box => @box),:remote => true)) %>
 
 <% toolbar :option => :messages %>
 

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

@@ -1,6 +1,6 @@
 <% toolbar :profile => current_subject %>
 
-<%= location(image_tag("btn/btn_account.png", :class => "menu_icon")+t('account.one'), 
+<%= location(t('account.one'), 
   link_to(t('account.edit'), edit_user_registration_path)
 ) %>
 

data/app/views/frontpage/_header.html.erb

@@ -1,6 +1,6 @@
 <div id="headerFront">
   <div class="banner_top">
-    <div id="logo"><%= link_to(image_tag('logo.png', :alt => t('socialstream')), '/'); %></div>
+    <div id="logo"><%= link_to(image_tag('logo.png', :alt => t('site.name')), '/'); %></div>
     <div class="div_login">
       <%= form_for User.new, :as => :user, :url => user_session_path do |f| -%>
         <span><%= f.label :email %></span>

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

@@ -2,8 +2,7 @@
   <% render :partial => 'sidebar' %>
 <% end %>
 
-<%= location(link_to(image_tag("btn/btn_home.png", :class => "btn_config")+t('home')+": "+
-                      content_tag(:span, ( sanitize current_subject.name), :class=>"name_group")))%>
+<%= location(link_to(t('home')+": "+ truncate_name(sanitize current_subject.name)))%>
                       
 <% toolbar %>
 

data/app/views/invitation_mailer/send_invitation.html.erb

@@ -7,7 +7,7 @@
     <div>
       <div>
         <div style="padding: 10px 5px 5px 5px;">
-          <span id="name" style="font-weight: bold;"><%= @sender.name %></span> has invited you to <%= link_to( t('socialstream'), new_user_registration_url)%>
+          <span id="name" style="font-weight: bold;"><%= @sender.name %></span> has invited you to <%= link_to( t('site.name'), new_user_registration_url)%>
         </div>
         <div style="position: static;padding: 5px; border: #2A3890 solid 2px; background-color: #E1EEF5; margin:10px; min-height: 125px; width: 500px;">
           <div style="float:left; margin-right:7px; border: thin solid #D4E4EA; background-color: white; max-height: 119px;">

data/app/views/invitation_mailer/send_invitation.text.erb

@@ -1,4 +1,4 @@
-<%= @sender.name %> has invited you to <%= t('socialstream')%>: <%= new_user_registration_url%>
+<%= @sender.name %> has invited you to <%= t('site.name')%>: <%= new_user_registration_url%>
 
 <% if @message.blank? %>
   <%= t('invitation.join_me')%>         
@@ -17,4 +17,4 @@
 
 <%= t('frontpage.collaborate.default')%>:
 <%= t('frontpage.collaborate.sentence1') %>
-<%= t('frontpage.collaborate.sentence2') %>
+<%= t('frontpage.collaborate.sentence2') %>

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

@@ -5,7 +5,7 @@
 <% end %>
 
 <%= location(
-  link_to(image_tag("btn/btn_invitation.png", :class => "menu_icon")+t('invitation.other'), new_invitation_path)
+  link_to(t('invitation.other'), new_invitation_path)
 ) %>
 
 <%= render :partial => 'new' %>

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

@@ -7,7 +7,7 @@
     </div>
 	  <ul>
 		<li>2011 © </li>
-		<li id="trade_mark"><%= link_to t('socialstream'), 'http://social-stream.dit.upm.es/' %></li>
+		<li id="trade_mark"><%= link_to t('site.name'), 'http://social-stream.dit.upm.es/' %></li>
 	  </ul>
 	</div>
 </div>

data/app/views/layouts/_header.erb

@@ -2,7 +2,7 @@
   <div class="banner_top banner_top_height">
     <div id="header_left">
       <div id="logo_txt">
-        <%= link_to(image_tag('header-logo.png', :alt => t('socialstream')), root_path) %>   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+        <%= link_to(image_tag('header-logo.png', :alt => t('site.name')), root_path) %>   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
       </div>
       <% if user_signed_in? %>
         <div class="menu_list menu_white" id="menu_home">

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

@@ -3,7 +3,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8">
-    <title><%= yield(:title).empty? ? t('socialstream') : yield(:title)%></title>
+    <title><%= yield(:title).empty? ? t('site.name') : yield(:title)%></title>
     <meta name="keywords" content="<%= t('profile.tags.default') %><%= yield(:keywords) %>" >
     <meta name="description" content= "<%= yield(:description).empty? ? t('frontpage.main_title') : yield(:description) %>" >
 

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

@@ -3,7 +3,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8">
-    <title><%= yield(:title).empty? ? t('socialstream') : yield(:title)%></title>
+    <title><%= yield(:title).empty? ? t('site.name') : yield(:title)%></title>
     <meta name="keywords" content="<%= yield(:keywords).empty? ? t('profile.tags.default') : yield(:keywords) %>" >
     <meta name="description" content= "<%= yield(:description).empty? ? "Home" : yield(:description) %>" >
     <%= stylesheet_link_tag "application" %>

data/app/views/location/_location_body.html.erb

@@ -0,0 +1,18 @@
+
+<% aux='<div class="last">' + stack.last + '</div>' %>
+    <% if stack.count >1 %>
+      <% aux.insert(0, '<div class="penultimate">'+ stack.last(2).first + '</div>') %>
+    <% end %>
+    
+    <% if stack.count >2 %> 
+      <% stack.first(stack.count - 2).reverse.collect {|level|
+        aux.insert(0, '<div class="mid">'+ level + '</div>')
+      } %>
+    <% end %>
+    
+    <% if stack.count ==1 %>
+      <% aux.insert(0, '<div class="first"><span class="penultimate">'+ t('location.base') + '</span></div>') %>
+    <% else %>
+      <% aux.insert(0, '<div class="first"><span class="mid">'+ t('location.base') + '</span></div>') %>
+    <% end%>    
+<%= raw aux %>

data/app/views/message_mailer/new_message_email.html.erb

@@ -27,9 +27,9 @@
       </div>
       <div style="padding: 10px 5px 5px 5px;">    
         <p>
-          <%= link_to((t('message.look')+" at "+t('socialstream')), conversation_url(@message.conversation))%> 
+          <%= link_to((t('message.look')+" at "+t('site.name')), conversation_url(@message.conversation))%> 
         </p>
       </div>
     </div>
   </body>
-</html>
+</html>

data/app/views/message_mailer/new_message_email.text.erb

@@ -5,4 +5,4 @@
 <%= @message.body.html_safe? ? @message.body : strip_tags(@message.body) %>
 -----------------------------------------------
 
-<%=t('message.look')%> at <%= t('socialstream')%>: <%=conversation_url(@message.conversation)%>.
+<%=t('message.look')%> at <%= t('site.name')%>: <%=conversation_url(@message.conversation)%>.

data/app/views/message_mailer/reply_message_email.html.erb

@@ -27,9 +27,9 @@
       </div>
       <div style="padding: 10px 5px 5px 5px;">    
         <p>
-          <%= link_to t('message.look'), conversation_url(@message.conversation)%> at <%= t('socialstream')%>
+          <%= link_to t('message.look'), conversation_url(@message.conversation)%> at <%= t('site.name')%>
         </p>
       </div>
     </div>
   </body>
-</html>
+</html>

data/app/views/message_mailer/reply_message_email.text.erb

@@ -5,4 +5,4 @@
 "<%= @message.body.html_safe? ? @message.body : strip_tags(@message.body) %>"
 -----------------------------------------------
 
-<%=t('message.look')%> at <%= t('socialstream')%>: <%=conversation_url(@message.conversation)%>.
+<%=t('message.look')%> at <%= t('site.name')%>: <%=conversation_url(@message.conversation)%>.

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

@@ -8,8 +8,8 @@
 <% toolbar :option => :messages %>
 
 <%= location(
-  link_to(image_tag("btn/new.png", :class => "menu_icon")+t('message.other'), conversations_path,:remote => true),
-  link_to(image_tag("btn/message_new.png", :class => "menu_icon")+ t('message.new'), new_message_path, :remote => true)
+  link_to(t('message.other'), conversations_path,:remote => true),
+  link_to(t('message.new'), new_message_path, :remote => true)
 ) %>
 
 <% content_for :javascript do %>

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

@@ -7,25 +7,25 @@
 <%if params[:section].present? 
   case params[:section]
   when "about_me"
-    level2 = link_to(image_tag("btn/edit.png", :class => "menu_icon")+t('profile.' + current_subject.class.to_s.downcase + '.info'),
+    level2 = link_to( t('profile.' + current_subject.class.to_s.downcase + '.info'),
       :controller => :profiles , :action => :edit, :section => "about_me")
   when "contact_info" 
-    level2 = link_to(image_tag("btn/edit.png", :class => "menu_icon")+t('profile.contact'),
+    level2 = link_to(t('profile.contact'),
       :controller => :profiles , :action => :edit, :section => "contact_info")
   when "my_experience" 
-    level2 = link_to(image_tag("btn/edit.png", :class => "menu_icon")+t('profile.' + current_subject.class.to_s.downcase + '.experience'),
+    level2 = link_to(t('profile.' + current_subject.class.to_s.downcase + '.experience'),
       :controller => :profiles , :action => :edit, :section => "my_experience")
   when "tags"
-  level2 = link_to(image_tag("btn/edit.png", :class => "menu_icon")+t('profile.' + current_subject.class.to_s.downcase + '.tags'),
+  level2 = link_to(t('profile.' + current_subject.class.to_s.downcase + '.tags'),
     :controller => :profiles , :action => :edit, :section => "tags")
 	end
 else
-  level2 = link_to(image_tag("btn/edit.png", :class => "menu_icon")+t('profile.one'),
+  level2 = link_to(t('profile.one'),
       :controller => :profiles , :action => :edit)
 end %>
 
 <%= location(
-  link_to(image_tag("btn/btn_edit.png", :class => "menu_icon")+t('menu.information'), [current_subject, :profile]),
+  link_to(t('menu.information'), [current_subject, :profile]),
   level2
 ) %>
 <div class="space_center"></div>

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

@@ -18,8 +18,7 @@
 <% toolbar :profile => @profile.subject %>
 
 
-<%= location(link_to(image_tag("btn/btn_edit.png", :class => "menu_icon")+t('menu.information'), 
-              [@profile.subject, :profile])) %>
+<%= location(link_to(t('menu.information'), [@profile.subject, :profile])) %>
 
 
 <%= render :partial => "profile" %>

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

@@ -8,7 +8,7 @@
 	<%= render :partial => "users/sidebar_index" %>
 <% end %>
 
-<%= location(image_tag("btn/btn_browse.png", :class=>"btn_config") + t('browse') +": "+
+<%= location(t('browse') +": "+
              content_tag(:b ,content_tag(:span, t('user.other'), :id=>'name_group')) + ", "+ 
              link_to(t('group.by'),groups_path))%>
 

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

@@ -16,8 +16,7 @@
   <%= render :partial => 'sidebar_index' %>
 <% end %>
 
-<%= location(link_to(image_tag("btn/btn_profile.png", :class => "btn_config")+t('profile.one')+": "+
-                      content_tag(:span, ( truncate_name sanitize @user.name), :class=>"name_group")))%>
+<%= location(link_to(t('profile.one')+": "+truncate_name(sanitize @user.name)))%>
               
 <% toolbar :profile => @user %>
 

data/config/locales/en.yml

@@ -152,7 +152,7 @@ en:
       participants: "Participants"
       groups: "Groups"
       tags: "Tags"
-    main_title: "SocialStream is a core for building social network websites."
+    main_title: "Social Stream is a core for building social network websites."
     meet:
       default: "Meet"
       sentence1: "Meet interesting people and groups"
@@ -195,9 +195,9 @@ en:
   invitation:
     e-mails: "E-mail addresses"
     error: "Your request was unprocessable"
-    invited: " has invited you to SocialStream!"
-    join: "Invite other people to join SocialStream!"
-    join_me: "Join me at SocialStream!"
+    invited: " has invited you to Social Stream!"
+    join: "Invite other people to join Social Stream!"
+    join_me: "Join me at Social Stream!"
     one: "Invitation"
     other: "Invitations"
     toolbar: "Invite"
@@ -371,7 +371,8 @@ en:
   sign_in: "Sign in"
   sign_out: "Sign out"
   sign_up: "Sign up"
-  socialstream: "SocialStream"
+  site:
+    name: "Social Stream"
   subject:
     this_is_you: "This is you!"
   sure: "Are you sure?"
@@ -383,5 +384,5 @@ en:
     other: "Users"
     all: "All users"
     all_n: "All users (%{count})"
-  welcome: "Welcome to SocialStream!"
+  welcome: "Welcome to Social Stream!"
 

data/lib/social_stream-base.rb

@@ -45,7 +45,6 @@ module SocialStream
   autoload :Populate,  'social_stream/populate'
   autoload :Relations, 'social_stream/relations'
   autoload :TestHelpers, 'social_stream/test_helpers'
-  autoload :ToolbarConfig, 'social_stream/toolbar_config'
 
   module Controllers
     autoload :Helpers, 'social_stream/controllers/helpers'
@@ -61,6 +60,10 @@ module SocialStream
     autoload :Controllers, 'social_stream/test_helpers/controllers'
   end
 
+  module ToolbarConfig
+    autoload :Base, 'social_stream/toolbar_config/base'
+  end
+
   mattr_accessor :subjects
   @@subjects = [ :user, :group ]
 

data/lib/social_stream/base.rb

@@ -24,6 +24,12 @@ module SocialStream
         end
       end
 
+      initializer "social_stream-base.toolbar_config" do
+        SocialStream::ToolbarConfig.module_eval do
+          include SocialStream::ToolbarConfig::Base
+        end
+      end
+
       initializer "social_stream-base.avatars_for_rails" do
         AvatarsForRails.setup do |config|
           config.avatarable_model = :actor

data/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.9.6".freeze
+    VERSION = "0.9.7".freeze
   end
 end

data/lib/social_stream/toolbar_config/base.rb

@@ -0,0 +1,87 @@
+module SocialStream
+  module ToolbarConfig
+    module Base
+      # Base toolbar items
+      def home_toolbar_items
+        Array.new.tap do |items|
+          # Messages
+          items << {
+            :key => :messages,
+            :name => image_tag("btn/new.png")+t('message.other')+' (' + current_subject.mailbox.inbox(:unread => true).count.to_s + ')',
+            :url => "#",
+            :options => {:link => {:id => "messages_menu"}},
+            :items => [
+              { :key => :message_new,
+                :name => image_tag("btn/message_new.png")+ t('message.new'),
+                :url => new_message_path,
+                :options => {:link =>{:remote=> false}}},
+              { :key => :message_inbox,
+                :name => image_tag("btn/message_inbox.png")+t('message.inbox')+' (' + current_subject.mailbox.inbox(:unread => true).count.to_s + ')',
+                :url => conversations_path,
+                :options => {:link =>{:remote=> false}}},
+              { :key => :message_sentbox,
+                :name => image_tag("btn/message_sentbox.png")+t('message.sentbox'),
+                :url => conversations_path(:box => :sentbox),
+                :options => {:link =>{:remote=> false}}},
+              { :key => :message_trash,
+                :name => image_tag("btn/message_trash.png")+t('message.trash'),
+                :url => conversations_path(:box => :trash)}
+            ]
+          }
+
+          #Contacts
+          items << {
+            :key => :contacts,
+            :name => image_tag("btn/btn_friend.png")+t('contact.other'),
+            :url => "#",
+            :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.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}
+            ]
+          }
+        end
+      end
+
+      # Builds the default profile toolbar items
+      def profile_toolbar_items(subject = current_subject)
+        Array.new.tap do |items|
+          #Information button
+          items << {
+            :key => :subject_info,
+            :name => image_tag("btn/btn_edit.png")+t('menu.information'),
+            :url => [subject, :profile]
+          }
+
+          if subject != current_subject
+            #Like button
+            items << {
+              :key => :like_button,
+              :name => link_like_params(subject)[0],
+              :url => link_like_params(subject)[1],
+              :options => {:link => link_like_params(subject)[2]}
+            }
+
+            if user_signed_in?
+              #Relation button
+              items << {
+                :key => :subject_relation,
+                :name => image_tag("btn/btn_friend.png") + current_subject.contact_to!(subject).status,
+                :url => edit_contact_path(current_subject.contact_to!(subject))
+              }
+
+              #Send message button
+              items << {:key => :send_message,
+                :name => image_tag("btn/btn_send.png")+t('message.send'),
+                :url => new_message_path(:receiver => subject.slug)
+              }
+            end
+          end
+        end
+      end
+    end
+  end
+end
+

data/lib/tasks/workers.rake

@@ -0,0 +1,163 @@
+# Rake task to launch multiple Resque workers in development/production with simple management included
+
+require 'resque/tasks'    # Require Resque tasks
+
+namespace :workers do
+
+  # = $ rake workers:start
+  #
+  # Launch multiple Resque workers with the Rails environment loaded,
+  # so they have access to your models, etc.
+  #
+  # Each worker is being run in their own separate process (_not_ thread).
+  #
+  # On clean shutdown (SIGINT / Ctrl-C, SIGQUIT, SIGTERM), the task will clean
+  # after itself: kill its workers and delete PID files, when appropriate. It
+  # will deal fine with already dead workers.
+  #
+  #
+  # Default options like COUNT can and should be over-ridden when invoking, of course:
+  #
+  #    $ rake workers:start COUNT=10 QUEUE=my_queue
+  #
+  #
+  # To daemonize, simply run with nohup:
+  #
+  #    $ nohup rake workers:start > log/workers.log 2>&1 &
+  #
+  #
+  # You can and should set up your monitoring tool to watch for process with PID
+  # from `cat tmp/pids/resque/master.pid`.
+  #
+  # For proper monitoring of _individual_ workers, use provided examples for God or Monit:
+  # http://github.com/defunkt/resque/blob/master/examples/.
+  #
+  #
+  # A task for killing all workers on the machine (`rake workers:killall`) is also provided,
+  # for pruning orphaned workers etc.
+  #
+  desc "Run and manage group of Resque workers with some default options"
+  task :start => :environment do
+
+    # - CONFIGURATION ----
+    ENV['QUEUE']   ||= '*'
+    ENV['COUNT']   ||= '3'
+    # --------------------
+
+    def queue
+      ENV['QUEUE']
+    end
+
+    def count
+      ENV['COUNT']
+    end
+
+    def Process.exists?(pid)
+      kill(0, pid.to_i) rescue false
+    end
+
+    def pid_directory
+      @pid_directory ||= Rails.root.join('tmp', 'pids', "resque")
+    end
+
+    def pid_directory_for_group
+      @pid_directory_for_group ||= Rails.root.join('tmp', 'pids', "resque", queue)
+    end
+
+    def group_master_pid
+      File.read pid_directory.join("#{queue}.pid").to_s rescue nil
+    end
+
+    def group?
+      !group_master_pid || group_master_pid.to_s == Process.pid.to_s
+    end
+
+    def group_running?
+      Process.exists?(group_master_pid)
+    end
+
+    def kill_worker(pid)
+      Process.kill("QUIT", pid)
+      puts "Killed worker with PID #{pid}"
+      rescue Errno::ESRCH => e
+        puts " STALE worker with PID #{pid}"
+    end
+
+    def kill_workers
+      @pids.each { |pid| kill_worker(pid) }
+    end
+
+    def kill_workers_and_remove_pids_for_group
+      Dir.glob(pid_directory_for_group.join('worker_*.pid').to_s) do |pidfile|
+        begin
+          pid = pidfile[/(\d+)\.pid/, 1].to_i
+          kill_worker(pid)
+        ensure
+          FileUtils.rm pidfile, :force => true
+        end
+      end
+      if group_master_pid
+        FileUtils.rm    pid_directory.join("#{queue}.pid").to_s
+        FileUtils.rm_rf pid_directory_for_group.to_s
+      end
+    end
+
+    def shutdown
+      puts "\n*** Exiting"
+      if group?
+        kill_workers_and_remove_pids_for_group
+      else
+        kill_workers
+      end
+      exit(0)
+    end
+
+    # Clean up after dead group from before -- and become one
+    unless group_running?
+      puts "--- Cleaning up after previous group (PID: #{group_master_pid})"
+      kill_workers_and_remove_pids_for_group 
+    end
+
+    # Handle exit
+    trap('INT')  { shutdown }
+    trap('QUIT') { shutdown }
+    trap('TERM') { shutdown }
+    trap('KILL') { shutdown }
+    trap('SIGKILL') { shutdown }
+
+    puts "=== Launching #{ENV['COUNT']} worker(s) on '#{ENV['QUEUE']}' queue(s) with PID #{Process.pid}"
+
+    # Launch workers in separate processes, saving their PIDs
+    @pids = []
+    ENV['COUNT'].to_i.times do
+      @pids << Process.fork { Rake::Task['resque:work'].invoke }
+    end
+
+    if group?
+      # Make sure we have directory for pids
+      FileUtils.mkdir_p pid_directory.to_s
+      FileUtils.mkdir_p pid_directory_for_group.to_s
+      # Create PID files for workers
+      File.open( pid_directory.join("#{queue}.pid").to_s, 'w' ) do |f| f.write Process.pid end
+      @pids.each do |pid|
+        File.open( pid_directory_for_group.join("worker_#{pid}.pid").to_s, 'w' ) { |f| f.write pid }
+      end
+      # Stay in foreground, if any of our workers dies, we'll get killed so Monit/God etc can come to the resq^Hcue
+      Process.wait
+    else
+      # Stay in foreground, if any of our workers dies, continue running
+      Process.waitall
+    end
+  end
+
+  desc "Kill ALL workers on this machine"
+  task :kilall do
+    require 'resque'
+    Resque::Worker.all.each do |worker|
+      puts "Shutting down worker #{worker}"
+      host, pid, queues = worker.id.split(':')
+      Process.kill("QUIT", pid.to_i)
+    end
+  end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream-base
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 53
   prerelease: 
   segments: 
   - 0
   - 9
-  - 6
-  version: 0.9.6
+  - 7
+  version: 0.9.7
 platform: ruby
 authors: 
 - GING - DIT - UPM
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-21 00:00:00 +02:00
+date: 2011-09-23 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -470,6 +470,9 @@ files:
 - app/assets/images/HTML5_Semantics.png
 - app/assets/images/HTML5_Styling.png
 - app/assets/images/Jcrop.gif
+- app/assets/images/arrow-end.png
+- app/assets/images/arrow-start.png
+- app/assets/images/arrow.png
 - app/assets/images/big-logo.png
 - app/assets/images/boxy/boxy-ne.png
 - app/assets/images/boxy/boxy-nw.png
@@ -651,6 +654,7 @@ files:
 - app/assets/stylesheets/images/ui-icons_888888_256x240.png
 - app/assets/stylesheets/images/ui-icons_cd0a0a_256x240.png
 - app/assets/stylesheets/invitations.css
+- app/assets/stylesheets/location.css
 - app/assets/stylesheets/menu.css
 - app/assets/stylesheets/messages.css
 - app/assets/stylesheets/profiles.css
@@ -806,6 +810,7 @@ files:
 - app/views/likes/create.js.erb
 - app/views/likes/destroy.js.erb
 - app/views/location/_location.html.erb
+- app/views/location/_location_body.html.erb
 - app/views/message_mailer/new_message_email.html.erb
 - app/views/message_mailer/new_message_email.text.erb
 - app/views/message_mailer/reply_message_email.html.erb
@@ -918,9 +923,10 @@ files:
 - lib/social_stream/populate.rb
 - lib/social_stream/test_helpers.rb
 - lib/social_stream/test_helpers/controllers.rb
-- lib/social_stream/toolbar_config.rb
+- lib/social_stream/toolbar_config/base.rb
 - lib/tasks/db/populate.rake
 - lib/tasks/resque.rake
+- lib/tasks/workers.rake
 - social_stream-base.gemspec
 - spec/controllers/comments_controller_spec.rb
 - spec/controllers/contacts_controller_spec.rb

data/lib/social_stream/toolbar_config.rb

@@ -1,99 +0,0 @@
-module SocialStream
-  module ToolbarConfig
-    #Prints the default home toolbar menu
-    def default_home_toolbar_menu
-      items = Array.new
-
-      #Messages
-      items << {:key => :messages,
-        :name => image_tag("btn/new.png")+t('message.other')+' (' + current_subject.mailbox.inbox(:unread => true).count.to_s + ')',
-        :url => "#",
-        :options => {:link => {:id => "messages_menu"}},
-        :items => [
-          {:key => :message_new, :name => image_tag("btn/message_new.png")+ t('message.new'), :url => new_message_path, :options => {:link =>{:remote=> false}}},
-          {:key => :message_inbox, :name => image_tag("btn/message_inbox.png")+t('message.inbox')+' (' + current_subject.mailbox.inbox(:unread => true).count.to_s + ')',
-            :url => conversations_path, :options => {:link =>{:remote=> false}}},
-          {:key => :message_sentbox, :name => image_tag("btn/message_sentbox.png")+t('message.sentbox'), :url => conversations_path(:box => :sentbox), :options => {:link =>{:remote=> false}}},
-          {:key => :message_trash, :name => image_tag("btn/message_trash.png")+t('message.trash'), :url => conversations_path(:box => :trash)}
-        ]}
-
-      #Documents if present
-      if SocialStream.activity_forms.include? :document
-        items << {:key => :resources,
-          :name => image_tag("btn/btn_resource.png",:class =>"menu_icon")+t('resource.mine'),
-          :url => "#",
-          :options => {:link => {:id => "resources_menu"}},
-          :items => [
-            {:key => :resources_documents,:name => image_tag("btn/btn_document.png")+t('document.title'),:url => documents_path},
-            {:key => :resources_pictures,:name => image_tag("btn/btn_gallery.png")+t('picture.title'),:url => pictures_path},
-            {:key => :resources_videos,:name => image_tag("btn/btn_video.png")+t('video.title'),:url => videos_path},
-            {:key => :resources_audios,:name => image_tag("btn/btn_audio.png")+t('audio.title'),:url => audios_path}
-          ]}
-      end
-
-      #Contacts
-      items << {:key => :contacts,
-        :name => image_tag("btn/btn_friend.png")+t('contact.other'),
-        :url => "#",
-        :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.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}
-        ]}
-
-      render_items items
-    end
-
-    #Prints the default profile toolbar menu
-    def default_profile_toolbar_menu(subject = current_subject)
-      items = Array.new
-      #Information button
-      items << {:key => :subject_info,
-        :name => image_tag("btn/btn_edit.png")+t('menu.information'),
-        :url => [subject, :profile]
-      }
-
-      if subject!=current_subject
-        #Like button
-        items << {:key => :like_button,
-          :name => link_like_params(subject)[0],
-          :url => link_like_params(subject)[1],
-          :options => {:link => link_like_params(subject)[2]}}
-
-        if user_signed_in?
-          #Relation button
-          items << {:key => :subject_relation,
-            :name => image_tag("btn/btn_friend.png") + current_subject.contact_to!(subject).status,
-            :url => edit_contact_path(current_subject.contact_to!(subject))
-          }
-          #Send message button
-          items << {:key => :send_message,
-            :name => image_tag("btn/btn_send.png")+t('message.send'),
-            :url => new_message_path(:receiver => subject.slug)
-          }
-        end
-      end
-      #Documents if present
-      if SocialStream.activity_forms.include? :document
-        if subject == current_subject
-          resources_label = t('resource.mine')
-        else
-          resources_label = t('resource.title')
-        end
-        items << {:key => :resources,
-          :name => image_tag("btn/btn_resource.png",:class =>"menu_icon")+resources_label,
-          :url => "#",
-          :options => {:link => {:id => "resources_menu"}},
-          :items => [
-            {:key => :resources_documents,:name => image_tag("btn/btn_document.png")+t('document.title'),:url => polymorphic_path([subject, Document.new])},
-            {:key => :resources_pictures,:name => image_tag("btn/btn_gallery.png")+t('picture.title'),:url => polymorphic_path([subject, Picture.new])},
-            {:key => :resources_videos,:name => image_tag("btn/btn_video.png")+t('video.title'),:url => polymorphic_path([subject, Video.new])},
-            {:key => :resources_audios,:name => image_tag("btn/btn_audio.png")+t('audio.title'),:url => polymorphic_path([subject, Audio.new])}
-          ]}
-      end
-      render_items items
-    end
-  end
-end