social_stream-base 0.6.5 → 0.6.6

data/app/assets/stylesheets/base.css

@@ -206,4 +206,8 @@ textarea.new_contact_text_area{ width:100%; height: 100px; color: #2A3890;}
 
 .activities_title_header.selected{
 	border: 2px solid #46B9E8;
-}
+}
+
+.more_pending{
+	text-align: center;
+}

data/app/controllers/contacts_controller.rb

@@ -3,16 +3,24 @@ class ContactsController < ApplicationController
   
   def index
     @contacts =
-      current_subject.
-        contact_subjects(:direction => :sent, :relations => params[:relation]){ |q|
-          q.alphabetic.
-            letter(params[:letter]).
-            search(params[:search])
-        }
+      Contact.sent_by(current_subject).
+              joins(:receiver).merge(Actor.alphabetic).
+              merge(Actor.letter(params[:letter])).
+              merge(Actor.search(params[:search]))
+    
+    if params[:pending].present?
+      @contacts = 
+        Contact.received_by(current_subject).
+              joins(:sender).merge(Actor.alphabetic).
+              merge(Actor.letter(params[:letter])).
+              merge(Actor.search(params[:search])).
+              pending.
+              not_reflexive
+    end
 
     respond_to do |format|
-      format.html { @contacts = Kaminari.paginate_array(@contacts).page(params[:page]).per(10) }
-      format.js { @contacts = Kaminari.paginate_array(@contacts).page(params[:page]).per(10) }
+      format.html { @contacts = @contacts.page(params[:page]).per(10) }
+      format.js { @contacts = @contacts.page(params[:page]).per(10) }
       format.json { render :text => @contacts.map{ |c| { 'key' => c.actor_id.to_s, 'value' => self.class.helpers.truncate_name(c.name) } }.to_json }
     end
   end

data/app/models/contact.rb

@@ -57,7 +57,7 @@ class Contact < ActiveRecord::Base
   validates_uniqueness_of :receiver_id, :scope => :sender_id
 
   after_create :set_inverse
-  after_create :send_message
+  after_save :send_message
 
   def sender_subject
     sender.try(:subject)
@@ -146,9 +146,9 @@ class Contact < ActiveRecord::Base
 
   # Send a message to the contact receiver
   def send_message
-    if message.present?
-      sender.send_message(receiver, message, I18n.t("activity.verb.#{ verb }.#{ receiver.subject_type }.message", :name => sender.name))
-    end
+    return if message.blank?
+
+    sender.send_message(receiver, message, I18n.t("activity.verb.#{ verb }.#{ receiver.subject_type }.message", :name => sender.name))
   end
 
   def set_inverse

data/app/models/tie.rb

@@ -88,7 +88,7 @@ class Tie < ActiveRecord::Base
   #
   # Create contact activity if this is the first tie
   def create_activity
-    return unless contact.ties_count == 1
+    return if contact.reload.ties_count != 1
 
     Activity.create! :contact => contact,
                      :relation_ids => contact.relation_ids,

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

@@ -1,7 +1,11 @@
 <% cont=0; %>
 
 <% @contacts.each do |contact| %>
-
+  <% if params[:pending].present? %>
+    <% contact = contact.sender.subject %>
+  <% else %>
+    <% contact = contact.receiver.subject %>
+  <% end %>
   <% if (cont%2) == 0 %>
     <% cont+=1; %>
      <div class="row">

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

@@ -2,10 +2,17 @@
 <div class="block">
   <div class="header">
     <%= image_tag('btn/btn_notifications.png', :class => "header_icon") %>
-    <div class="header_text"><%= t 'contact.pending.other' %></div>
+    <div class="header_text">
+      <%= t 'contact.pending.other' %>
+    </div>
   </div>
   <div class="content">
-    <%= render current_subject.pending_contacts %>
+    <%= render current_subject.pending_contacts.shuffle.first(2) %>
+    <div class="row more_pending">
+      <%= link_to t('contact.pending.all_n', :count => current_subject.pending_contacts.size), contacts_path(:pending=>true)%>
+    </div>
+    <div class="space_center">
+    </div>
   </div>
 </div>
 <% end -%>

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

@@ -6,6 +6,10 @@
   <%= javascript_include_tag 'jquery.ba-url','ajax.paginate' %>
 <% end %>
 
+<% content_for :sidebar do %>
+  <%= render :partial => 'home/sidebar' %>
+<% end %>
+
 <% toolbar :option => :contacts %>
 
 <div id="my_conferences">

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

@@ -11,10 +11,6 @@
 <div class="space_center">
 </div>
 
-<% if SocialStream.activity_forms.include? :document %>
-	<%= render :partial => '/documents/mediawall' %>
-<% end %>
-
 <% if current_subject.respond_to?(:recent_groups) %>
 <div id="my_groups">
   <%= render :partial => "groups" %>

data/config/locales/en.yml

@@ -73,6 +73,7 @@ en:
     confirm_delete: "Delete comment?"
   contact:
     all_n: "All contacts (%{count})"
+    addressbook: "Addressbook"
     edit:
       title: "Edit contact to %{name}"
       submit: "Edit Contact"
@@ -86,6 +87,7 @@ en:
     pending:
       other: "Pending requests"
       all: "All"
+      all_n: "See all pending requests (%{count})"
     relation:
       one: "Contact type"
       new: "New type"
@@ -163,6 +165,7 @@ en:
     join_me: "Join me at SocialStream!"
     one: "Invitation"
     other: "Invitations"
+    toolbar: "Invite"
     success: "Your invitations have successfully been sent"
     text: "Write your own message"
   like:

data/lib/generators/social_stream/base/install_generator.rb

@@ -44,10 +44,6 @@ class SocialStream::Base::InstallGenerator < Rails::Generators::Base #:nodoc:
     copy_file 'navigation.rb', 'config/navigation.rb'
   end
 
-  def create_mailboxer_custom_config
-    copy_file 'mailboxer_custom.rb', 'config/initializers/mailboxer.rb'
-  end
-
   def create_migration_file
     require 'rake'
     Rails.application.load_tasks

data/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.6.5".freeze
+    VERSION = "0.6.6".freeze
   end
 end

data/lib/social_stream/base.rb

@@ -35,6 +35,12 @@ module SocialStream
                                        :profile        => '119x119'}
         end
       end
+
+      initializer "social_stream-base.mailboxer", :before => :load_config_initializers do
+        Mailboxer.setup do |config|
+          config.email_method = :mailboxer_email
+        end
+      end
     end
   end
 end

data/lib/social_stream/toolbar_config.rb

@@ -1,113 +1,111 @@
 module SocialStream
   module ToolbarConfig
     #Prints the default home toolbar menu
-  def default_home_toolbar_menu
-    items = Array.new
-    #Notifications
-    items << {:key => :notifications,
-      :name => image_tag("btn/btn_notification.png")+t('notification.other')+' ('+ current_subject.mailbox.notifications.not_trashed.unread.count.to_s+')',
-      :url => notifications_path,
-      :options => {:link => {:id => "notifications_menu"}}}
+    def default_home_toolbar_menu
+      items = Array.new
+      #Notifications
+      items << {:key => :notifications,
+        :name => image_tag("btn/btn_notification.png")+t('notification.other')+' ('+ current_subject.mailbox.notifications.not_trashed.unread.count.to_s+')',
+        :url => notifications_path,
+        :options => {:link => {:id => "notifications_menu"}}}
 
-    #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},
-        {: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=> true}}},
-        {:key => :message_sentbox, :name => image_tag("btn/message_sentbox.png")+t('message.sentbox'), :url => conversations_path(:box => :sentbox), :remote=> true},
-        {:key => :message_trash, :name => image_tag("btn/message_trash.png")+t('message.trash'), :url => conversations_path(:box => :trash)}
-      ]}
+      #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},
+          {: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=> true}}},
+          {:key => :message_sentbox, :name => image_tag("btn/message_sentbox.png")+t('message.sentbox'), :url => conversations_path(:box => :sentbox), :remote=> true},
+          {: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_documents.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
 
-    #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'),
+      #Contacts
+      items << {:key => :contacts,
+        :name => image_tag("btn/btn_friend.png")+t('contact.other'),
         :url => "#",
-        :options => {:link => {:id => "resources_menu"}},
+        :options => {:link => {:id => "contacts_menu"}},
         :items => [
-          {:key => :resources_documents,:name => image_tag("btn/btn_documents.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}
+          {:key => :invitations, :name => image_tag("btn/btn_friend.png")+t('contact.addresbook'), :url => contacts_path},
+          {:key => :invitations, :name => image_tag("btn/btn_invitation.png")+t('invitation.toolbar'), :url => new_invitation_path},
+          {:key => :invitations, :name => image_tag("btn/btn_friend.png")+t('contact.pending.other'), :url => contacts_path(:pending=>true)}
         ]}
-    end
 
-    #Contacts
-    relation_items = [{:key => :invitations, :name => image_tag("btn/btn_invitation.png")+t('invitation.other'), :url => new_invitation_path}]
-    current_subject.relation_customs.sort.each do |r|
-      relation_items << {:key => r.name + "_menu",
-        :name => image_tag("btn/btn_friend.png") + r.name,
-        :url => contacts_path(:relation => r.id)}
-    end
-    items << {:key => :contacts,
-      :name => image_tag("btn/btn_friend.png")+t('contact.other'),
-      :url => "#",
-      :options => {:link => {:id => "contacts_menu"}},
-      :items => relation_items}
+      #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 })}]
+      }
 
-    #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
 
-    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]
+      }
 
-  #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 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") + contact_status(subject),
-          :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)
-        }
+        if user_signed_in?
+          #Relation button
+          items << {:key => :subject_relation,
+            :name => image_tag("btn/btn_friend.png") + contact_status(subject),
+            :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
-    #Documents if present
-    if SocialStream.activity_forms.include? :document
-      if subject == current_subject
-        resources_label = t('resource.mine')
-      else
-        resources_label = t('resource.title')        
+      #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_documents.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
-      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_documents.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}
-        ]}
+      render_items items
     end
-    render_items items
-  end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream-base
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 6
-  - 5
-  version: 0.6.5
+  - 6
+  version: 0.6.6
 platform: ruby
 authors: 
 - GING - DIT - UPM
@@ -1077,7 +1077,6 @@ files:
 - lib/acts_as_taggable_on/social_stream.rb
 - lib/generators/social_stream/base/install_generator.rb
 - lib/generators/social_stream/base/templates/initializer.rb
-- lib/generators/social_stream/base/templates/mailboxer_custom.rb
 - lib/generators/social_stream/base/templates/navigation.rb
 - lib/generators/social_stream/base/templates/relations.yml
 - lib/paperclip/social_stream.rb

data/lib/generators/social_stream/base/templates/mailboxer_custom.rb

@@ -1,13 +0,0 @@
-Mailboxer.setup do |config|
-  
-  #Configures if you applications uses or no the email sending for Notifications and Messages
-  config.uses_emails = true
-  
-  #Configures the default from for the email sent for Messages and Notifications of Mailboxer
-  config.default_from = "no-reply@mailboxer.com"
-  
-  #Configures the methods needed by mailboxer
-  config.email_method = :mailboxer_email
-  #config.name_method = :name
-  #config.should_email_method = :should_email?
-end