social_stream 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0fa777d423bc8bdb5da4bdcd89bb767e882b98b3
-  data.tar.gz: ed92fae8cd6c25a55482b4723ebcbf26e8bae22f
+  metadata.gz: 978d9e87fb278626d427da3ada3ffd333defe398
+  data.tar.gz: b230736937ad6c26148ea5e92b74ef9417089c44
 SHA512:
-  metadata.gz: 6f54c0b15d0b36ac58dadf3347b568b6197900e3caa1e923653b3d36b4663828345d3c6e680de1fc604558030002697b0f3886b53d00bcc4618e365ebb0e98c3
-  data.tar.gz: 36700f4bf7ca3cc7761f2015e587a39579d060a3c9b1f169655a31860313e9160166b59dbd234523b7f342e646a23d306ed6061086c3ae851a14d95de5a4f7f4
+  metadata.gz: a88183687d93df8c329a3d7b1f760150effe0ec36efd54d77fc66f7f805eabba11934223b50e9afe64896b0c126e1ac8ae56af678b6e98b3beb4e86cebb43b8a
+  data.tar.gz: 03bf445c73f5974b0daee3ae54b11b4767f534c92d2fea64b9ca86775e63583db17cdb6f3ba57f5cd0c0cfe4e69d1fb69fb8414243d0ca4472a517d830d37c84

data/base/app/assets/javascripts/social_stream/actor.js

@@ -3,6 +3,7 @@ SocialStream.Actor = (function(SS, $, undefined) {
   var select2 = function(selector) {
     $(selector).select2({
       multiple: true,
+      minimumInputLength: 1,
       ajax: {
         url: $(selector).attr('data-path'),
         dataType: 'json',
@@ -15,7 +16,8 @@ SocialStream.Actor = (function(SS, $, undefined) {
       },
       id: function(object) { return object.id.toString(); },
       formatResult: select2FormatResult,
-      formatSelection: select2FormatSelection
+      formatSelection: select2FormatSelection,
+      initSelection: select2InitSelection
     });
   };
 
@@ -27,6 +29,10 @@ SocialStream.Actor = (function(SS, $, undefined) {
     return '<img src="' + object.image.url + '"> ' + object.name;
   };
 
+  var select2InitSelection = function(element, callback) {
+    callback([ { id: element.val(), name: element.attr('data-actor_name'), locked: true } ]);
+  };
+
   return {
     select2: select2
   };

data/base/app/assets/javascripts/social_stream/contact.js

@@ -171,6 +171,13 @@ SocialStream.Contact = (function($, SS, undefined) {
 
   // new_ callbacks
   
+  var initHideModal = function() {
+    $('#add-contact-modal').on('hide', function () {
+      $('input[name="actors"]').select2('close');
+      $('select[name="relations[]"]').select2('close');
+    });
+  };
+
   var initActorSelect2 = function() {
     SS.Actor.select2('input[name="actors"]');
   };
@@ -298,6 +305,7 @@ SocialStream.Contact = (function($, SS, undefined) {
                     hideLoading);
 
   callback.register('new_',
+                    initHideModal,
                     initActorSelect2,
                     initRelationSelect2);
 

data/base/app/assets/javascripts/social_stream/flash.js

@@ -1,4 +1,8 @@
 SocialStream.Flash = (function(Flashy, undefined) {
+  var notice = function(message) {
+    Flashy.message('notice', message);
+  };
+
   var error = function(message) {
     if (message === undefined) {
       message = I18n.t('ajax.error');
@@ -11,8 +15,14 @@ SocialStream.Flash = (function(Flashy, undefined) {
     Flashy.message('success', message);
   };
 
+  var warning = function(message) {
+    Flashy.message('warning', message);
+  };
+
   return {
+    notice: notice,
     error: error,
-    success: success
+    success: success,
+    warning: warning
   };
 })(Flashy);

data/base/app/controllers/groups_controller.rb

@@ -4,7 +4,7 @@ class GroupsController < ApplicationController
 
   before_filter :authenticate_user!, :except => [ :index, :show ]
 
-  load_and_authorize_resource
+  load_and_authorize_resource except: :index
 
   respond_to :html, :js
 

data/base/app/controllers/profiles_controller.rb

@@ -1,6 +1,8 @@
 class ProfilesController < ApplicationController
   before_filter :authenticate_user!, :except => [ :show ]
 
+  before_filter :authorize_update, except: [ :show ]
+
   respond_to :html, :js
 
   def show
@@ -14,11 +16,10 @@ class ProfilesController < ApplicationController
   end
 
   def edit
-    current_profile
   end
 
   def update
-    current_profile.update_attributes profile_params
+    subject_profile.update_attributes profile_params
 
     respond_to do |format|
       format.html{ redirect_to [profile_subject, :profile] }
@@ -53,4 +54,8 @@ class ProfilesController < ApplicationController
 
     current_subject.profile
   end
+
+  def authorize_update
+    authorize! :update, subject_profile
+  end
 end

data/base/app/controllers/search_controller.rb

@@ -45,17 +45,15 @@ class SearchController < ApplicationController
   private
 
   def search mode
-    result = SocialStream::Search.search(params[:q],
-                                         current_subject,
-                                         :mode => mode,
-                                         :key  => params[:type])
-
-    if mode.to_s.eql? "quick"
-      result = Kaminari.paginate_array(result).page(1).per(7)
-    else
-      result = Kaminari.paginate_array(result).page(params[:page]).per(RESULTS_SEARCH_PER_PAGE)
-    end
+    page =  ( mode == "quick" ? 1 : params[:page] )
+    limit = ( mode == "quick" ? 7 : RESULTS_SEARCH_PER_PAGE )
+
+    SocialStream::Search.search(params[:q],
+                                current_subject,
+                                mode:  mode,
+                                key:   params[:type],
+                                page:  page,
+                                limit: limit)
 
-    result
   end
 end

data/base/app/models/permission.rb

@@ -51,18 +51,19 @@ class Permission < ActiveRecord::Base
     # if the class is not found
     def available(subject)
       class_name = subject.class.to_s.underscore
+      # TODO add further classes
       base_class_name = subject.class.base_class.to_s.underscore
 
-      candidates = [ class_name, class_name.to_sym ]
+      candidates = [ class_name ]
 
       if class_name != base_class_name
-        candidates += [ base_class_name, base_class_name.to_sym ]
+        candidates += [ base_class_name ]
       end
 
       list = nil
 
       candidates.each do |n|
-        list = SocialStream.available_permissions[n]
+        list = SocialStream.available_permissions.with_indifferent_access[n]
 
         break if list.present?
       end

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

@@ -24,8 +24,8 @@ class Relation::Custom < Relation
   class << self
     def defaults_for(actor)
       subject_type = actor.subject.class.to_s.underscore
-      cfg_rels = SocialStream.custom_relations[subject_type] ||
-        SocialStream.custom_relations[subject_type.to_sym]
+
+      cfg_rels = SocialStream.custom_relations.with_indifferent_access[subject_type]
 
       if cfg_rels.nil?
         raise "Undefined relations for subject type #{ subject_type }. Please, add an entry to config/initializers/social_stream.rb"
@@ -36,10 +36,10 @@ class Relation::Custom < Relation
       cfg_rels.each_pair do |name, cfg_rel|
         rels[name] =
           create! :actor =>         actor,
-                  :name  =>         cfg_rel['name'],
-                  :receiver_type => cfg_rel['receiver_type']
+                  :name  =>         cfg_rel[:name],
+                  :receiver_type => cfg_rel[:receiver_type]
 
-        if (ps = cfg_rel['permissions']).present?
+        if (ps = cfg_rel[:permissions]).present?
           ps.each do |p| 
             p.push(nil) if p.size == 1
 

data/base/app/models/user.rb

@@ -50,6 +50,8 @@ class User < ActiveRecord::Base
 
   def as_json options = nil
     {
+      id: id,
+      actorId: actor_id,
       nickName: slug,
       displayName: name,
       email: email,

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

@@ -6,10 +6,10 @@
     </div>
     <div class="modal-body">
       <%= label_tag 'actors', t('actor.title.other') %>
-      <%= text_field_tag 'actors', '', 'data-path' => actors_path(stranger: true, sender_id: Actor.normalize_id(sender)), 'data-type' => Array.wrap(type).compact.join(',') %>
+      <%= text_field_tag 'actors', '', 'data-path' => actors_path(stranger: true, sender_id: Actor.normalize_id(sender)), 'data-type' => Array.wrap(type).compact.join(','), placeholder: t('contact.new.modal.placeholder.actors') %>
 
       <%= label_tag 'relations', t('activerecord.attributes.contact.relation_ids') %>
-      <%= select_tag 'relations', contact_select_options(sender.options_for_contact_select), multiple: true %>
+      <%= select_tag 'relations', contact_select_options(sender.options_for_contact_select), multiple: true, "data-placeholder" => t('contact.new.modal.placeholder.actors') %>
     </div>
     <div class="modal-footer">
       <%= submit_tag t('contact.new.modal.button') %>

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

@@ -20,10 +20,11 @@
         <div id="<%= type %>" class="tab-pane <%= 'active' if current_contact_section?(type) %>">
           <%= text_field_tag "contact-filter-#{ type }", (current_contact_section?(type) ? params[:q] : ""), class: "pull-right contact-filter", placeholder: "filter", autocomplete: "off" %>
 
-          <% if type == :group %>
+          <% if user_signed_in? && type == :group %>
             <%= link_to t('group.new.link'), new_group_path, class: 'new_group-modal-link', 'data-toggle' => 'modal' %>
 
-            <%= render partial: 'groups/new_modal' %>
+            <%= render partial: 'groups/new_modal',
+                       locals: { resource_class: Group } %>
           <% end %>
 
           <div class="contact-list">

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

@@ -1,15 +1 @@
-<%= location(t('account.one'), 
-  link_to(t('settings.main'), settings_path)
-) %>
-
-<h2>
-	<%= t('settings.for')%> <%= current_subject.name %>
-</h2>
-
-<%= render :partial => "edit_user"%>
-<%= render :partial => "settings/language" %>
-<%= render :partial => "settings/notifications" %>
-<% if current_subject.respond_to? :authentication_token%>
-  <%= render :partial => "settings/api_key" %>
-<% end %>
-<%= render :partial => "delete_account"%>
+<%= render template: 'settings/index' %>

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

@@ -18,7 +18,7 @@
   </section>
   <section class="owners">
     <%= f.label :owners %>
-    <%= f.hidden_field :owners, 'data-path' => actors_path(format: :json) %>
+    <%= f.hidden_field :owners, 'data-path' => actors_path(format: :json), "data-actor_name" => current_subject.name %>
   </section>
   <section class="tags">
     <%= f.label :tags_list %>

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

@@ -5,7 +5,7 @@
   </div>
   <div class="modal-body">
     <%= render partial: 'groups/form',
-               object: Group.new,
+               object: resource_class.new(owners: current_subject.actor_id),
                as: :group %>
   </div>
 </div>

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

@@ -8,6 +8,6 @@
   <h2><%= t('group.new.title') %></h2>
 
   <%= render partial: 'form',
-             object: @group,
+             object: resource_class.new(owners: current_subject.actor_id),
              as: :group %>
 </section>

data/base/app/views/profiles/_comunication-info_edit.html.erb

@@ -1,4 +1,4 @@
-<%= form_for(@profile, :url => [current_subject, :profile]) do |f| %>
+<%= form_for(@profile, :url => [@profile.subject, :profile]) do |f| %>
   <%= f.label :phone, t('profile.phone') %>
 
   <%= f.phone_field :phone %>

data/base/app/views/profiles/_experience_edit.html.erb

@@ -1,5 +1,5 @@
-<%= form_for(@profile, :url => [current_subject, :profile]) do |f| %>
+<%= form_for(@profile, :url => [@profile.subject, :profile]) do |f| %>
   <%= f.text_area :experience, :maxlength => 246, :rows => 5 %>
 
   <%= f.submit :class => "btn" %>
-<% end %>
+<% end %>

data/base/app/views/profiles/_personal_edit.html.erb

@@ -1,10 +1,10 @@
-<%= form_for(@profile, :url => [current_subject, :profile]) do |f| %>
+<%= form_for(@profile, :url => [@profile.subject, :profile]) do |f| %>
   <span class="required">*</span>
   <%= f.label :name %>
 
   <%= f.text_field :name, :class => "required" %>
 
-  <%= f.label :description, t("profile.#{ current_subject.class.to_s.downcase }.about") %>
+  <%= f.label :description, t("profile.#{ f.object.subject.class.to_s.downcase }.about") %>
 
   <%= f.text_area :description, :maxlength => 200, :rows => 10 %>
 
@@ -12,7 +12,7 @@
 
   <%= f.text_field :organization %>
 
-  <%= f.label :birthday, t('profile.' + current_subject.class.to_s.downcase + '.birthday') %>
+  <%= f.label :birthday, t('profile.' + f.object.subject.class.to_s.downcase + '.birthday') %>
 
   <%= date_select "profile", "birthday", :order => [:day, :month, :year], :end_year => Date.today.year, :start_year => (Date.today.year - 100), :prompt => {:day => 'Day', :month => 'Month', :year => 'Year'} %>
 

data/base/app/views/relation/customs/destroy.js.erb

@@ -5,4 +5,5 @@
     }
   });
 <% else %>
+  SocialStream.Flash.error('<%= @custom.errors.full_messages.to_sentence %>');
 <% end %>

data/base/app/views/relation/customs/update.js.erb

@@ -7,5 +7,5 @@
     section: '<%= params[:section] %>'
   });
 <% else %>
-
+  SocialStream.Flash.error('<%= @custom.errors.full_messages.to_sentence %>');
 <% end %>

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

@@ -5,5 +5,5 @@
 <section id="settings">
   <%= render partial: 'toolbar/profile', locals: { subject: current_subject } %>
 
-  <%= render :partial => 'index' %>
+  <%= render partial: 'settings/index' %>
 </section>

data/base/config/locales/en.yml

@@ -184,6 +184,9 @@ en:
       link: Add contact
       modal:
         button: Add
+        placeholder:
+          actors: Type names
+          relations: Type names
         title: Add contacts
       title: Add %{name} to your contacts
       menu: Add contact

data/base/config/locales/es.yml

@@ -586,7 +586,7 @@ es:
       query: Más resultados para %{query} >
     name: Buscar
     no_subject_found: No se encontró a %{subject}.
-    nothing: No se ha econtrado nada.
+    nothing: No se ha encontrado nada.
     searching: 'Buscando: %{query}'
     show_all: Todos
     write: Escribe tu búsqueda...

data/base/lib/social_stream/base/autoload.rb

@@ -1,17 +1,16 @@
 module SocialStream
+
   autoload :Ability, 'social_stream/ability'
   autoload :ActivityStreams, 'social_stream/activity_streams'
+
   module ActivityStreams
     autoload :Supertype, 'social_stream/activity_streams/supertype'
     autoload :Subtype,   'social_stream/activity_streams/subtype'
   end
+
   module Base
     autoload :Ability,   'social_stream/base/ability'
   end
-  autoload :D3,        'social_stream/d3'
-  autoload :Populate,  'social_stream/populate'
-  autoload :Relations, 'social_stream/relations'
-  autoload :TestHelpers, 'social_stream/test_helpers'
 
   module Controllers
     autoload :Authorship,              'social_stream/controllers/authorship'
@@ -23,6 +22,8 @@ module SocialStream
     autoload :Subjects, 'social_stream/controllers/subjects'
   end
 
+  autoload :D3,          'social_stream/d3'
+
   module Devise
     module Controllers
       autoload :UserSignIn, 'social_stream/devise/controllers/user_sign_in'
@@ -36,6 +37,8 @@ module SocialStream
     autoload :Supertype, 'social_stream/models/supertype'
   end
 
+  autoload :Population,  'social_stream/population'
+
   module Population
     autoload :ActivityObject, 'social_stream/population/activity_object'
     autoload :Actor,          'social_stream/population/actor'
@@ -43,6 +46,8 @@ module SocialStream
     autoload :Timestamps,     'social_stream/population/timestamps'
   end
 
+  autoload :Relations,   'social_stream/relations'
+
   module Routing
     module Constraints
       autoload :Custom, 'social_stream/routing/constraints/custom'
@@ -53,12 +58,14 @@ module SocialStream
 
   autoload :Search, 'social_stream/search'
 
-  module Views
-    autoload :List,     'social_stream/views/list'
-    autoload :Location, 'social_stream/views/location'
-  end
+  autoload :TestHelpers, 'social_stream/test_helpers'
 
   module TestHelpers
     autoload :Controllers, 'social_stream/test_helpers/controllers'
   end
+
+  module Views
+    autoload :List,     'social_stream/views/list'
+    autoload :Location, 'social_stream/views/location'
+  end
 end