social_stream 0.25.1 → 0.25.2

data/base/app/controllers/conversations_controller.rb

@@ -59,17 +59,22 @@ class ConversationsController < ApplicationController
 
     @conversation.move_to_trash(@actor)
 
-    if params[:location].present?
-      case params[:location]
-      when 'conversation'
-        redirect_to conversations_path(:box => :trash)
-        return
-      else
-      redirect_to conversations_path(:box => @box,:page => params[:page])
-      return
-      end
+    respond_to do |format|
+      format.html {
+        if params[:location].present? and params[:location] == 'conversation'
+          redirect_to conversations_path(:box => :trash)
+	else
+          redirect_to conversations_path(:box => @box,:page => params[:page])
+	end
+      }
+      format.js {
+        if params[:location].present? and params[:location] == 'conversation'
+          render :js => "window.location = '#{conversations_path(:box => @box,:page => params[:page])}';"
+	else
+          render 'conversations/destroy'
+	end
+      }
     end
-    redirect_to conversations_path(:box => @box,:page => params[:page])
   end
 
   private

data/base/app/controllers/followers_controller.rb

@@ -4,17 +4,12 @@ class FollowersController < ApplicationController
   respond_to :html, :js
 
   def index
-    @contacts =
-      if params[:following]
-        current_subject.sent_contacts
-      else
-        current_subject.received_contacts
-      end
+    @followings = current_subject.following_actor_objects.includes(:actor)
+    @followers = current_subject.followers
 
     respond_to do |format|
-      format.html { @contacts = @contacts.page(params[:page]).per(20) }
-      format.js { @contacts = @contacts.page(params[:page]).per(20) }
-      format.json { render :text => to_json(@contacts) }
+      format.html
+      format.json { render :text => to_json(@followers) }
     end
   end
 

data/base/app/helpers/permissions_helper.rb

@@ -14,4 +14,8 @@ module PermissionsHelper
         Permission.find_or_create_by_action_and_object *p
       }
   end
+
+  def disable_permission_edit? perm
+    (perm.action == 'represent') and (@relation.ties.size > 0) and perm.relations.include?(@relation) and (perm.relations.where(:actor_id => @relation.actor_id).find_all{|r| r.ties.size > 0}.size <= 1)
+  end
 end

data/base/app/models/activity_action.rb

@@ -11,6 +11,10 @@ class ActivityAction < ActiveRecord::Base
     where(:actor_id => Actor.normalize_id(actor))
   }
 
+  scope :not_sent_by, lambda{ |actor|
+    where(arel_table[:actor_id].not_in(Actor.normalize_id(actor)))
+  }
+
   scope :received_by, lambda{ |activity_object|
     where(:activity_object_id => ActivityObject.normalize_id(activity_object))
   }

data/base/app/models/activity_object.rb

@@ -56,6 +56,11 @@ class ActivityObject < ActiveRecord::Base
       merge(ActivityAction.sent_by(subject).where(:author => true))
   }
 
+  scope :not_authored_by, lambda { |subject|
+    joins(:received_actions).
+      merge(ActivityAction.not_sent_by(subject).where(:author => true))
+  }
+
   scope :followed, order("activity_objects.follower_count DESC")
 
   def received_role_action(role)
@@ -122,6 +127,10 @@ class ActivityObject < ActiveRecord::Base
     object_type == "Actor"
   end
 
+  def actor!
+    actor || raise("Unknown Actor for ActivityObject: #{ inspect }")
+  end
+
   # Return the {Action} model to an {Actor}
   def action_from(actor)
     received_actions.sent_by(actor).first

data/base/app/models/actor.rb

@@ -82,6 +82,10 @@ class Actor < ActiveRecord::Base
   has_many :sent_actions,
            :class_name => "ActivityAction",
            :dependent  => :destroy
+  has_many :followings,
+           :through => :sent_actions,
+           :source  => :activity_object,
+           :conditions => { 'activity_actions.follow' => true }
 
   scope :alphabetic, order('actors.name')
 
@@ -294,6 +298,21 @@ class Actor < ActiveRecord::Base
 
   alias_method :ego_contact, :self_contact
 
+  # The {ActivityObject ActivityObjects} followed by this {Actor}
+  # that are {Actor Actors}
+  def following_actor_objects
+    followings.
+      where('activity_objects.object_type' => "Actor")
+  end
+
+  # An array with the ids of {Actor Actors} followed by this {Actor}
+  def following_actor_ids
+    following_actor_objects.
+      includes(:actor).
+      map(&:actor).
+      map(&:id)
+  end
+
   # The {Channel} of this {Actor} to self (totally close!)
   def self_channel
     Channel.find_or_create_by_author_id_and_user_author_id_and_owner_id id, id, id

data/base/app/models/group.rb

@@ -1,3 +1,8 @@
+# {Group Groups} are the other kind of social entities supported in SocialStream::Base
+#
+# As with {User}, almost all the interaction with other classes in Social Stream is done
+# through {Actor}. The glue between {Group} and {Actor} is in {SocialStream::Models::Subject}
+#
 class Group < ActiveRecord::Base
   include SocialStream::Models::Subject
 

data/base/app/models/relation/single.rb

@@ -6,7 +6,8 @@
 class Relation::Single < Relation
   class << self
     def instance
-      first || create!
+      @instance ||=
+        first || create!
     end
   end
 

data/base/app/models/user.rb

@@ -6,7 +6,7 @@ require 'devise/orm/active_record'
 # for managing authentication
 #
 # Almost all the logic of the interaction between {User} and the rest of classes in Social Stream
-# is done through {SocialStream::Models::Subject} and {Actor}
+# is done through {Actor}. The glue between {User} and {Actor} is in {SocialStream::Models::Subject}
 #
 class User < ActiveRecord::Base
   include SocialStream::Models::Subject

data/base/app/views/conversations/destroy.js.erb

@@ -0,0 +1,2 @@
+$('#conversation_<%= @conversation.id %>').remove();
+

data/base/app/views/followers/index.html.erb

@@ -1,5 +1,26 @@
-<% if params[:following] %>
-  <%= render @contacts %>
-<% else %>
-  <%= render @contacts.map(&:inverse!) %>
-<% end %>
+<% sidebar %>
+<% toolbar :profile, :subject => current_subject %>
+<div class="followers tabbable">
+  <ul class="nav nav-tabs">
+    <li class="active">
+    <a data-toggle="tab" href="#following"><%=t('follow.followings')%></a>
+    </li>
+    <li class="">
+    <a data-toggle="tab" href="#follower"><%=t('follow.followers')%></a>
+    </li>
+  </ul>
+  <div class="tab-content">
+    <div id="following" class="tab-pane active offset1">
+      <%= render @followings.
+        page(params[:page]).
+        per(20).
+        map { |f| current_subject.contact_to!(f) } %>
+    </div>
+    <div id="follower" class="tab-pane offset1 ">
+      <%= render @followers.
+        page(params[:page]).
+        per(20).
+        map { |f| current_subject.contact_to!(f) } %>
+    </div>
+  </div>
+</div>

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

@@ -9,8 +9,13 @@
       <tr>
         <td>
           <div contain=<%= dom_id p %> class="checkboxPermissionOptionLeft">
-            <input id=<%= dom_id p %> class="permission" type="checkbox"/>
-            <label for=<%= dom_id p %>><%= p.description(:brief, :subject => current_subject) %></label>
+	    <% if disable_permission_edit? p %>
+              <input id=<%= dom_id p %> class="permission" type="checkbox" disabled="disabled"/>
+              <label for=<%= dom_id p %>><%= p.description(:brief, :subject => current_subject) %></label>
+	    <% else %>
+              <input id=<%= dom_id p %> class="permission" type="checkbox"/>
+              <label for=<%= dom_id p %>><%= p.description(:brief, :subject => current_subject) %></label>
+	    <% end %>
             <div class="clearfloat"></div>
           </div>
         </td>

data/base/app/views/profiles/update.js.erb

@@ -1,15 +1,10 @@
-
+<% if @profile.valid? %>
+  <% flash[:notice] = t('profile.update.success') %>
+  document.location.href="<%= resource_path(@profile) %>";
+<% else %>
   if ($("#profile_notice").length == 0){
     $("#profile_form").prepend('<div id="profile_notice" class="notice"></div>');  
   } 
-	
-<% if @profile.valid? %>
-
-  $("#profile_notice").html("<%= t('profile.update.success')%>");
-	$("#profile_notice").removeClass('error');
-  $("#profile_notice").addClass('success');
-	
-<% else %>
   $("#profile_notice").html("<h2><%= pluralize(@profile.errors.count, "error") %> <%= t('profile.update.error')%></h2>"
 	 +"<ul><% @profile.errors.full_messages.each do |msg| %><li><%= msg %></li><% end %></ul>");
 	$("#profile_notice").removeClass('success');

data/base/app/views/relation/customs/_list.html.erb

@@ -39,6 +39,8 @@
 <%= javascript_tag do %>
   $(function(){
     $('#relation_customs_list :radio').change(function(){
+      $("#new_relation_custom_title_block").show();
+      $("#new_relation_custom_input_block").hide();
       selectRelation(this);
     });
     
@@ -56,6 +58,8 @@
     });
 
     $("#new_relation_custom_title").click(function() {
+      $("#permissions_list").hide();
+      $("#privacy_rules").hide();
       $("#new_relation_custom_title_block").hide();
       $("#new_relation_custom_input_block").show();
     });

data/base/config/locales/en.yml

@@ -191,6 +191,10 @@ en:
       instructions: "Type the email address bound to your account and we will sent you instructions to change it:"
       update: "Change your password"
   follower:
+    follower:
+      title: "Followers"
+    following:
+      title: "Followings"
     n:
       one: "1 follower"
       other: "%{count} followers"

data/base/config/locales/es.yml

@@ -190,7 +190,11 @@ es:
       instructions: "Introduce el correo electrónico y te mandaremos instrucciones para cambiarlo"
       update: "Cambiar contraseña"
   follower:
-    n:
+    follower:
+      title: "Seguidores"
+    following:
+      title: "Siguiendo"
+  n:
       one: "1 seguidor/a"
       other: "%{count} seguidores"
   forgot_password: "¿Olvidaste tu contraseña?"

data/base/config/routes.rb

@@ -1,22 +1,11 @@
 Rails.application.routes.draw do
-  #Background tasks
-  resque_constraint = lambda do |request|
-    #request.env['warden'].authenticate? and request.env['warden'].user.admin?
-    true
-  end
-
-  constraints resque_constraint do
-    mount Resque::Server, :at => "/resque"
-  end
-  
   root :to => "frontpage#index"
   
   match 'home' => 'home#index', :as => :home
   match 'home' => 'home#index', :as => :user_root # devise after_sign_in_path_for
-  
-  # Webfinger
-  match '.well-known/host-meta',:to => 'frontpage#host_meta'
-  
+
+  match 'search' => 'search#index', :as => :search
+
   # Social Stream subjects configured in config/initializers/social_stream.rb
   SocialStream.subjects.each do |actor|
     resources actor.to_s.pluralize do
@@ -40,15 +29,9 @@ Rails.application.routes.draw do
     resources object.to_s.pluralize
   end
 
-  case SocialStream.relation_model
-  when :follow
-    resources :followers
-    resources :contacts do
-      collection do
-        get 'pending'
-      end
-    end
-  when :custom
+  resources :comments
+
+  constraints SocialStream::Routing::Constraints::Custom.new do
     resources :contacts do
       collection do
         get 'pending'
@@ -62,13 +45,20 @@ Rails.application.routes.draw do
     resources :permissions
   end
 
+  constraints SocialStream::Routing::Constraints::Follow.new do
+    match 'followings' => 'followers#index', :as => :followings, :defaults => { :direction => 'sent' }
+    match 'followers' => 'followers#index', :as => :followers, :defaults => { :direction => 'received' }
+    resources :followers
+
+    resources :contacts do
+      collection do
+        get 'pending'
+      end
+    end
+  end
+
   resources :activity_actions
 
-  match 'tags'     => 'tags#index', :as => 'tags'
-  
-  # Find subjects by slug
-  match 'subjects/lrdd/:id' => 'subjects#lrdd', :as => 'subject_lrdd'
-  
   resource :representation
   
   resources :settings do
@@ -89,19 +79,16 @@ Rails.application.routes.draw do
     end
   end
 
-  resources :comments
-
   resources :activities do
     resource :like
   end
   
-  match 'search' => 'search#index', :as => :search  
-  
   match 'cheesecake' => 'cheesecake#index', :as => :cheesecake  
   match 'update_cheesecake' => 'cheesecake#update', :as => :update_cheesecake  
   
   match 'ties' => 'ties#index', :as => :ties
   
+  match 'tags' => 'tags#index', :as => 'tags'
   
   ##API###
   match 'api/keygen' => 'api#create_key', :as => :api_keygen
@@ -113,4 +100,16 @@ Rails.application.routes.draw do
   match 'api/me/contacts' => 'contacts#index', :format => 'json', :as => :api_contacts
   match 'api/subjects/:s/contacts' => 'contacts#index', :format => 'json', :as => :api_subject_contacts
   ##/API##
+
+ 
+  #Background tasks
+  constraints SocialStream::Routing::Constraints::Resque.new do
+    mount Resque::Server, :at => "/resque"
+  end
+
+  # Webfinger
+  match '.well-known/host-meta',:to => 'frontpage#host_meta'
+
+  # Find subjects by slug
+  match 'subjects/lrdd/:id' => 'subjects#lrdd', :as => 'subject_lrdd'
 end

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

@@ -27,7 +27,11 @@ SocialStream.setup do |config|
   # :follow - user just follow other users, like Twitter
   #
   # config.relation_model = :custom
-  
+
+  # Expose resque interface to manage background tasks at /resque
+  #
+  # config.resque_access = true
+ 
   # Quick search (header) and Extended search models and its order. Remember to create
   # the indexes with thinking-sphinx if you are using customized models.
   # 

data/base/lib/social_stream-base.rb

@@ -26,6 +26,14 @@ module SocialStream
     autoload :Supertype, 'social_stream/models/supertype'
   end
 
+  module Routing
+    module Constraints
+      autoload :Custom, 'social_stream/routing/constraints/custom'
+      autoload :Follow, 'social_stream/routing/constraints/follow'
+      autoload :Resque, 'social_stream/routing/constraints/resque'
+    end
+  end
+
   module Views
     autoload :List, 'social_stream/views/list'
 
@@ -62,7 +70,10 @@ module SocialStream
 
   mattr_accessor :relation_model
   @@relation_model = :custom
-  
+
+  mattr_accessor :resque_access
+  @@resque_access = true
+ 
   mattr_accessor :quick_search_models
   @@quick_search_models = [ :user, :group, :post ]
   

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.19.1".freeze
+    VERSION = "0.19.2".freeze
   end
 end

data/base/lib/social_stream/models/object.rb

@@ -24,6 +24,11 @@ module SocialStream
           joins(:activity_object).
             merge(ActivityObject.authored_by(subject))
         }
+
+        scope :not_authored_by, lambda { |subject|
+          joins(:activity_object).
+            merge(ActivityObject.not_authored_by(subject))
+        }
       end
     end
   end