social_stream 2.0.4 → 2.1.0

data/base/app/controllers/contacts_controller.rb

@@ -1,32 +1,19 @@
 class ContactsController < ApplicationController
   before_filter :authenticate_user!, except: [ :index ]
-  before_filter :exclude_reflexive, :except => [ :index, :suggestion, :pending ]
+  load_and_authorize_resource except: [ :index, :suggestion, :pending ]
+  before_filter :exclude_reflexive,  except: [ :index, :suggestion, :pending ]
 
-  def index
-    subject = profile_or_current_subject!
+  helper_method :current_subject_contacts_to
 
+  def index
+    params[:subject] = subject = profile_or_current_subject!
     params[:d]    ||= 'sent'
     params[:type] ||= subject.class.contact_index_models.first.to_s
 
-    @contacts = Contact
-
-    @contacts =
-    if params[:d] == 'received'
-      @contacts.received_by(subject).joins(:sender)
-    else
-      @contacts.sent_by(subject).joins(:receiver)
-    end
-
-    @contacts =
-      @contacts.
-        positive.
-        merge(Actor.subject_type(params[:type])).
-        merge(Actor.name_search(params[:q])).
-        related_by_param(params[:relation]).
-        page(params[:page])
+    @contacts = Contact.index(params)
 
     respond_to do |format|
-      format.html { render @contacts if request.xhr? }
+      format.html { render current_subject_contacts_to(@contacts) if request.xhr? }
       format.json { render json: @contacts.map(&:receiver), helper: self }
     end
   end
@@ -87,11 +74,19 @@ class ContactsController < ApplicationController
     end
   end
 
+  protected
+
+  def current_subject_contacts_to(contacts)
+    contacts.map{ |c|
+      current_actor.blank? || c.sender == current_actor ?
+        c :
+        current_actor.contact_to!(c.receiver)
+    }
+  end
+
   private
 
   def exclude_reflexive
-    @contact = current_subject.sent_contacts.find params[:id]
-
     if @contact.reflexive?
       redirect_to home_path
     end

data/base/app/controllers/permissions_controller.rb

@@ -15,6 +15,8 @@ class PermissionsController < ApplicationController
   private
 
   def relation!
-    @relation = current_subject.relations.find(params[:relation_id])
+    @relation = Relation.find(params[:relation_id])
+
+    authorize! :read, @relation
   end
 end

data/base/app/helpers/contacts_helper.rb

@@ -10,38 +10,33 @@ module ContactsHelper
   # Add contact button
   def contact_button(contact_or_actor)
     if user_signed_in?
-      current_actor_contact_button contact_or_actor
+      signed_in_contact_button contact_or_actor
     else
       anonymous_contact_button
     end
   end
 
-  def current_actor_contact_button contact_or_actor
+  def signed_in_contact_button contact_or_actor
     c =
       if contact_or_actor.is_a?(Contact)
-        if contact_or_actor.sender == current_actor
-          contact_or_actor
-        else
-          current_actor.contact_to!(contact_or_actor.receiver)
-        end
+        contact_or_actor
       else
         current_actor.contact_to!(contact_or_actor)
       end
 
     if c.reflexive?
       t('subject.this_is_you')
+    elsif can? :update, c
+      render partial: "contacts/button",
+             locals: { contact: c }
     else
-      render :partial => "contacts/link_#{ SocialStream.relation_model }", :locals => { :contact => c }
+      ""
     end
   end
 
   def anonymous_contact_button
-    if SocialStream.relation_model == :follow
-      form_tag new_user_session_path do |f|
-        submit_tag t('contact.follow')
-      end
-    else
-      link_to t("contact.new.link"), new_user_session_path
+    form_tag new_user_session_path do |f|
+      submit_tag t('contact.new.button.zero')
     end
   end
 

data/base/app/models/actor.rb

@@ -51,10 +51,22 @@ class Actor < ActiveRecord::Base
            :through => :received_contacts,
            :source  => :ties
 
+  has_many :sent_relations,
+           :through => :sent_ties,
+           :source  => :relation
+
   has_many :received_relations,
            :through => :received_ties,
            :source  => :relation
-  
+
+  has_many :sent_permissions,
+           :through => :sent_relations,
+           :source  => :permissions
+
+  has_many :received_permissions,
+           :through => :received_relations,
+           :source  => :permissions
+ 
   has_many :senders,
            :through => :received_contacts,
            :uniq => true
@@ -200,6 +212,20 @@ class Actor < ActiveRecord::Base
     relations.joins(:relation_permissions => :permission).where('permissions.action' => 'notify')
   end
 
+  # The relations that will appear in privacy forms
+  #
+  # They usually include {Relation::Custom} but may also include other system-defined
+  # relations that are not editable but appear in add contact buttons
+  def relations_list
+    Relation.extra_list(subject) + relation_customs
+  end
+
+  # The relations offered in the "Add contact" button when subjects
+  # add new contacts
+  def relations_for_button
+    relations_list
+  end
+
   # All the {Actor Actors} this one has ties with:
   # 
   #   actor.contact_actors #=> array of actors that sent and receive ties from actor
@@ -334,7 +360,7 @@ class Actor < ActiveRecord::Base
   end
 
   # Does this {Actor} allow subject to perform action on object?
-  def allow?(subject, action, object)
+  def allow?(subject, action, object = nil)
     ties_to(subject).with_permissions(action, object).any?
   end
 

data/base/app/models/contact.rb

@@ -48,6 +48,14 @@ class Contact < ActiveRecord::Base
           or(arel_table[:receiver_id].eq(Actor.normalize_id(a))))
   }
 
+  scope :in_direction_with, lambda { |subject, d = 'sent'|
+    if d == 'sent'
+      sent_by(subject).joins(:receiver)
+    else
+      received_by(subject).joins(:sender)
+    end
+  }
+
   scope :recent, order("contacts.created_at DESC")
 
   scope :active, where(arel_table[:ties_count].gt(0))
@@ -72,6 +80,15 @@ class Contact < ActiveRecord::Base
     end
   }
 
+  scope :index, lambda { |params|
+    in_direction_with(params[:subject], params[:d]).
+      positive.
+      merge(Actor.subject_type(params[:type])).
+      merge(Actor.name_search(params[:q])).
+      related_by_param(params[:relation]).
+      page(params[:page])
+  }
+
   validates_presence_of :sender_id, :receiver_id
   validates_uniqueness_of :sender_id, :scope => :receiver_id
   validates_uniqueness_of :receiver_id, :scope => :sender_id
@@ -165,7 +182,7 @@ class Contact < ActiveRecord::Base
 
   # Return an array of options suitable for the contact add button
   def options_for_select
-    sender.relation_customs.map{ |r| [ r.name, r.id ] }
+    sender.relations_for_button.map{ |r| [ r.name, r.id ] }
   end
 
   private

data/base/app/models/permission.rb

@@ -43,9 +43,29 @@ class Permission < ActiveRecord::Base
     scope p, where(:action => p) # scope :represent, where(:action => 'represent')
   end
 
+  class << self
+    # Finds or creates in the database the instances of the permissions described in
+    # {ary} by arrays of [ action, object ]
+    def instances ary
+      ary.map{ |p| find_or_create_by_action_and_object *p }
+    end
+  end
+
+  # The permission title
+  def title(options = {})
+    i18n_description :brief, options
+  end
+
+  # The permission description
+  def description(options = {})
+    i18n_description :detailed, options
+  end
+
+  private
+
   # An explanation of the permissions. Type can be brief or detailed.
   # If detailed, description includes more information about the relation
-  def description(type, options = {})
+  def i18n_description(type, options = {})
     unless options[:subject].present?
       raise "Now we need subject for permission description"
     end

data/base/app/models/relation.rb

@@ -44,8 +44,6 @@ class Relation < ActiveRecord::Base
   Positive = %w{ custom public follow }
   Negative = %w{ reject }
 
-  belongs_to :actor
-
   has_many :relation_permissions, :dependent => :destroy
   has_many :permissions, :through => :relation_permissions
 
@@ -57,10 +55,6 @@ class Relation < ActiveRecord::Base
 
   has_many :activity_object_audiences, :dependent => :destroy
 
-  scope :actor, lambda { |a|
-    where(:actor_id => Actor.normalize_id(a))
-  }
-
   scope :mode, lambda { |st, rt|
     where(:sender_type => st, :receiver_type => rt)
   }
@@ -74,8 +68,6 @@ class Relation < ActiveRecord::Base
       merge(Permission.where(:action => action).where(:object => object))
   }
 
-  before_create :initialize_sender_type
-
   class << self
     # Get relation from object, if possible
     #
@@ -173,6 +165,15 @@ class Relation < ActiveRecord::Base
     def create_activity?
       true
     end
+
+    # Default extra relations that are displayed in {Actor}'s relation list,
+    # typically in /relation/customs
+    def extra_list subject
+      l = SocialStream.list_relations[subject.class.to_s.underscore]
+      return [] if l.blank?
+
+      l.map{ |r| "Relation::#{ r.to_s.classify }".constantize.instance }
+    end
   end
 
   # Relation class scoped in the same mode that this relation
@@ -190,12 +191,10 @@ class Relation < ActiveRecord::Base
     permissions.follow.any?
   end
 
-  private
-
-  # Before create callback
-  def initialize_sender_type
-    return if actor.blank?
-
-    self.sender_type = actor.subject_type
+  # The permissions that can be assigned to this relation.
+  #
+  # They are principally used in the privacy form in /relation/customs form
+  def available_permissions
+    []
   end
 end

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

@@ -5,14 +5,6 @@
 # Default relations are defined at config/relations.yml
 #
 class Relation::Custom < Relation
-  # Default relations shipped with Social Stream
-  DEFAULT = {
-    'site' => {}
-  }
-
-  # Default relations are re-defined in this configuration file
-  CONFIG_FILE = File.join(::Rails.root, 'config', 'relations.yml')
-
   # This is weird. We must call #inspect before has_ancestry for Relation::Custom
   # to recognize STI
   inspect
@@ -23,17 +15,20 @@ class Relation::Custom < Relation
   validates_presence_of :name, :actor_id
   validates_uniqueness_of :name, :scope => :actor_id
 
-  class << self
-    # Relations configuration
-    def config
-      @config ||= build_config
-    end
+  scope :actor, lambda { |a|
+    where(:actor_id => Actor.normalize_id(a))
+  }
+
+  before_create :initialize_sender_type
 
+  class << self
     def defaults_for(actor)
-      cfg_rels = config[actor.subject_type.underscore]
+      subject_type = actor.subject.class.to_s.underscore
+      cfg_rels = SocialStream.custom_relations[subject_type] ||
+        SocialStream.custom_relations[subject_type.to_sym]
 
       if cfg_rels.nil?
-        raise "Undefined relations for subject type #{ actor.subject_type }. Please, add an entry to #{ CONFIG_FILE }"
+        raise "Undefined relations for subject type #{ subject_type }. Please, add an entry to config/initializers/social_stream.rb"
       end
 
       rels = {}
@@ -67,14 +62,11 @@ class Relation::Custom < Relation
     def strongest
       roots
     end
+  end
 
-    private
-    
-    # Gets the default relations defined in DEFAULT and updates the values
-    # from the CONFIG_FILE configuration file
-    def build_config
-      DEFAULT.merge YAML.load_file(CONFIG_FILE)
-    end
+  # The subject who defined of this relation
+  def subject
+    actor.subject
   end
 
   # Compare two relations
@@ -109,6 +101,17 @@ class Relation::Custom < Relation
   def stronger_or_equal
     path
   end
-end
 
-ActiveSupport.run_load_hooks(:relation_custom, Relation::Custom)
+  def available_permissions
+    Permission.instances SocialStream.available_permissions[subject.class.to_s.underscore]
+  end
+
+  private
+
+  # Before create callback
+  def initialize_sender_type
+    return if actor.blank?
+
+    self.sender_type = actor.subject_type
+  end
+end

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

@@ -6,7 +6,7 @@
       <%= f.text_area :text, rows: 1, placeholder: t('post.input') %>
 
       <section class="wall_input-actions">
-        <%= f.submit t('activity.share'), class: "btn" %>
+      <%= f.submit t('activity.share'), class: "btn", 'data-loading-text' => t('activity.share_loading') %>
 
         <% SocialStream.activity_forms.each do |element| %>
           <%= render partial: "#{ element.to_s.pluralize }/new_activity",

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

@@ -1,4 +1,4 @@
-<% destroy_params ||=  {} %>
+<% destroy_params ||= {} %>
 
 <section class="contact" id="<%= dom_id contact %>">
   <div class="avatar">

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

@@ -29,7 +29,7 @@
           <div class="contact-list">
             <% if current_contact_section?(type) %>
               <% if @contacts.any? %>
-                <%= render @contacts %>
+                <%= render current_subject_contacts_to(@contacts) %>
               <% else %>
                 <%= raw t("contact.empty", explore: explore_path) %>
               <% end %>

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

@@ -1,15 +1,13 @@
 <section id="forgot-pass">
-  <section class="forgot-img">
-    
-  </section>
   <section class="forgot">
     <header>
-    <h2>
-      <%= t('devise.passwords.forgot') %>
-    </h2>
+      <h2>
+        <%= t('devise.passwords.forgot') %>
+      </h2>
+
+      <%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %>
+        <%= devise_error_messages! %>
 
-    <%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %>
-      <%= devise_error_messages! %>
       <h4>
         <%= t('devise.passwords.instructions') %>
       </h4>

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

@@ -13,21 +13,19 @@
     <div class="reg-labels">
       <%= f.label :name %>
       
-      <%= f.text_field :name, :class =>"form_tag"  %>
+      <%= f.text_field :name, :class =>"form_tag", :placeholder => "Homo Sapiens apiens"  %>
       
       <%= f.label :email %>
       
-      <%= f.text_field :email, :class =>"form_tag"  %>
+      <%= f.text_field :email, :class =>"form_tag", :placeholder => "user@email.soc"  %>
       
       <%= f.label :password %>
       
-      <%= f.password_field :password, :class =>"form_tag", :id => "password"  %>
+      <%= f.password_field :password, :class =>"form_tag", :id => "password", :placeholder => "********"  %>
 
-      <div id="user_password_confirmation_label">
-        <%= f.label :password_confirmation %>
-      </div>
+      <%= f.label :password_confirmation %>
       
-      <%= f.password_field :password_confirmation, :class =>"form_tag"  %>
+      <%= f.password_field :password_confirmation, :class =>"form_tag", :placeholder => "********"  %>
 
       <%= f.submit t('action.accept').capitalize,:class=>"btn pull-right"%>
     </div>