social_stream 0.9.6 → 0.9.7

data/base/app/controllers/contacts_controller.rb

@@ -3,21 +3,18 @@ class ContactsController < ApplicationController
   before_filter :exclude_reflexive, :except => [ :index, :pending ]
 
   def index
-    if params[:pending].present?
-      pending
-    return
-    end
     @contacts =
-    Contact.sent_by(current_subject).
-            joins(:receiver).merge(Actor.alphabetic).
-            merge(Actor.letter(params[:letter])).
-            merge(Actor.name_search(params[:search])).
-            active
+      Contact.sent_by(current_subject).
+              joins(:receiver).merge(Actor.alphabetic).
+              merge(Actor.letter(params[:letter])).
+              merge(Actor.name_search(params[:search])).
+              related_by_param(params[:relation]).
+              active
 
     respond_to do |format|
       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.receiver_id.to_s, 'value' => self.class.helpers.truncate_name(c.receiver.name) } }.to_json }
+      format.json { render :text => to_json(@contacts) }
     end
   end
 
@@ -51,9 +48,14 @@ class ContactsController < ApplicationController
     @contacts = current_subject.pending_contacts
 
     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.json { render :text => @contacts.map{ |c| { 'key' => c.receiver_id.to_s, 'value' => self.class.helpers.truncate_name(c.receiver.name) } }.to_json }
+      format.html {
+        @contacts = Kaminari.paginate_array(@contacts).page(params[:page]).per(10)
+        render :action => :index
+      }
+      format.js {
+        @contacts = Kaminari.paginate_array(@contacts).page(params[:page]).per(10)
+        render :action => :index
+      }
     end
   end
 
@@ -66,4 +68,23 @@ class ContactsController < ApplicationController
       redirect_to home_path
     end
   end
+
+  def to_json(contacts)
+    contacts.map{ |c|
+      if params[:form].present?
+        {
+          'key' => c.receiver_id.to_s,
+          'value' => self.class.helpers.truncate_name(c.receiver.name)
+        }
+      else
+        {
+          'name'  => c.receiver.name,
+          'url'   => polymorphic_url(c.receiver_subject),
+          'image' => {
+            'url' => root_url + c.receiver.logo.url
+          }
+        }
+      end
+    }.to_json
+  end
 end

data/base/app/models/contact.rb

@@ -57,6 +57,12 @@ class Contact < ActiveRecord::Base
                   joins("LEFT JOIN contacts AS inverse_contacts ON inverse_contacts.id = contacts.inverse_id").
                   where(arel_table[:inverse_id].eq(nil).or(arel_table.alias("inverse_contacts")[:ties_count].eq(0)))
 
+  scope :related_by_param, lambda { |p|
+    if p.present?
+      joins(:ties).merge(Tie.where(:relation_id => p))
+    end
+  }
+
 
   validates_presence_of :sender_id, :receiver_id
   validates_uniqueness_of :sender_id, :scope => :receiver_id

data/base/app/models/user.rb

@@ -3,7 +3,7 @@ require 'devise/orm/active_record'
 class User < ActiveRecord::Base
   include SocialStream::Models::Subject
 
-  has_many :authentications
+  has_many :authentications, :dependent => :destroy
   devise *SocialStream.devise_modules
 
   # Setup accessible (or protected) attributes for your model

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

@@ -9,7 +9,7 @@
   <div class="content">
     <%= 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_count), contacts_path(:pending=>true)%>
+      <%= link_to t('contact.pending.all_n', :count => current_subject.pending_contacts_count), pending_contacts_path %>
     </div>
     <div class="space_center">
     </div>

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

@@ -3,7 +3,7 @@
     $(".new_group").validate();
   });
   $("#group__participants").fcbkcomplete({
-    json_url: "<%= contacts_path(:format => :json) %>",
+                json_url: "<%= contacts_path(:form => true, :format => :json) %>",
 		cache: true,
 		filter_hide: true,
 		newel: false,

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

@@ -15,7 +15,7 @@
 <% content_for :javascript do %>
 
 	var recipients = $("#_recipients").fcbkcomplete({
-                json_url: "<%= contacts_path(:format => :json) %>",
+                json_url: "<%= contacts_path(:form => true, :format => :json) %>",
 		cache: true,
 		filter_hide: true,
 		newel: false,

data/base/app/views/messages/new.js.erb

@@ -9,7 +9,7 @@ $("#content").html("<%= escape_javascript(render :partial => 'new') %>");
 
 
 var recipients = $("#_recipients").fcbkcomplete({
-        json_url: "<%= contacts_path(:format => :json) %>",
+        json_url: "<%= contacts_path(:form => true, :format => :json) %>",
 	cache: true,
 	filter_hide: true,
 	newel: false,

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

@@ -1,4 +1,3 @@
-<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>
@@ -20,7 +19,6 @@
       </div>      
     </div>
   </form>
-</div>
 
 <%= javascript_tag do %>
 	$(document).ready(function() {

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

@@ -3,7 +3,9 @@
 <div class="space_center"></div>
 <h2><%= t('search.name') %></h2>
 <div class="space_center"></div>
+<div id="search_form_div">
 <%= render :partial => 'form' %> 
+</div>
 <div class="space_center"></div>
 <div class="space_center"></div>
 <div id="search_results" class="block">  

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

@@ -1,6 +1,5 @@
-//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 %>");
+  $('#search_form_div').html("<%= escape_javascript render :partial => 'form' %>");
   
   $('#focus_options ul li a span').removeClass('selected');
   
@@ -19,7 +18,3 @@
   <% end %> 
   
   $('#global_search_input').removeClass("searching");
-  
-/*}else{
-  alert("ignored <%= params[:search_query]%>");
-}*/

data/base/config/routes.rb

@@ -19,6 +19,9 @@ Rails.application.routes.draw do
   match 'api/user/:id' => 'api#users'
   match 'api/me' => 'api#users'
   match 'api/me/home/' => 'api#activity_atom_feed', :format => 'atom', :as => :api_my_home
+  match 'api/me/contacts' => 'contacts#index', :format => 'json'
+  match 'api/subjects/:s/contacts' => 'contacts#index', :format => 'json'
+  match 'api/user/:id/public' => 'api#activity_atom_feed', :format => 'atom'
   match 'api/user/:id/public' => 'api#activity_atom_feed', :format => 'atom'
   ##/API##
   
@@ -34,7 +37,11 @@ Rails.application.routes.draw do
     end
   end
 
-  resources :contacts
+  resources :contacts do
+    collection do
+      get 'pending'
+    end
+  end
 
   namespace "relation" do
     resources :customs

data/base/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.9.9".freeze
+    VERSION = "0.9.10".freeze
   end
 end

data/base/lib/social_stream/toolbar_config/base.rb

@@ -38,7 +38,7 @@ module SocialStream
             :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_friend.png")+t('contact.pending.other'), :url => pending_contacts_path},
               {:key => :invitations, :name => image_tag("btn/btn_invitation.png")+t('invitation.toolbar'), :url => new_invitation_path}
             ]
           }

data/base/spec/models/contact_spec.rb

@@ -34,4 +34,20 @@ describe Contact do
       @contact.sender.pending_contacts.should_not include(@contact)
     end
   end
+
+  context "a pair" do
+    before do
+      @friend = Factory(:friend)
+      @sender = @friend.sender
+      @acquaintance = Factory(:acquaintance,
+                              :contact => Factory(:contact,
+                                                  :sender => @sender))
+    end
+
+    it "should scope friend" do
+      Contact.sent_by(@sender).count.should eq(2)
+      Contact.sent_by(@sender).related_by_param(nil).count.should eq(2)
+      Contact.sent_by(@sender).related_by_param(@friend.relation_id).count.should eq(1)
+    end
+  end
 end

data/lib/social_stream/version.rb

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

data/social_stream.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.9.9')
+  s.add_runtime_dependency('social_stream-base', '~> 0.9.10')
   s.add_runtime_dependency('social_stream-documents', '~> 0.2.8')
  
   # Development Gem dependencies

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream
 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
@@ -27,12 +27,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 41
+        hash: 47
         segments: 
         - 0
         - 9
-        - 9
-        version: 0.9.9
+        - 10
+        version: 0.9.10
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency