social_stream-base 0.7.8 → 0.7.9

data/app/assets/javascripts/activities.js.erb

@@ -41,6 +41,12 @@ $(function() {
       $("#masterSubmitButton").show();
     }
   });
+  event_input = "<%= I18n.t('event.input') %>";
+  $("#event_name").click(function(){
+    if(this.value == event_input){
+      this.value = "";
+    }
+  });
 });
 
 

data/app/assets/javascripts/relation_customs.js

@@ -34,6 +34,7 @@ function checkBoxEnable(id) {
 		};
 
 		$(':checkbox[id^="relation_custom"]:checked:not(#' + id + ')').checkBox('changeCheckStatus', false);
+		$('div[contain$='+id+'] div.options').show();
 
 		$.ajax({
 			url: "../permissions",
@@ -68,6 +69,8 @@ function checkBoxDisable(id) {
 	        $("#permissions").html("");
 		$("#permissions").hide();
 
+		$('div[contain$='+id+'] div.options').hide();
+
                 break;
 
 	case "permission":

data/app/assets/stylesheets/activities.css

@@ -16,10 +16,10 @@
 #input_activities {	border-color: #0656a4; color: #2A3890;	padding: 5px 5px 5px 5px;
   border:1px solid #BDC7D8; width:95%;}
 #activities_share_btn {	text-align: right;	padding: 5px 16px 0px 10px;	vertical-align: middle;}
-#securities{  display:inline-block;  text-align:left; float: left;}
+#securities{  display:inline-block;  text-align:left; float: left; padding-left:5px;}
 
 /******************* WALL - ACTIVITY ***************/
-.activity {	text-align:left;	display: block;	vertical-align: top;	padding: 2px 0px 0px 0px;
+.activity {	text-align:left;	display: block;	vertical-align: top;	padding: 10px 0px 0px 0px;
 	display: inline-block;	color: #000;	width: 100%;  font-size: 13px;  color: #2A3890;}
 .actor_logo {	width: 38px;	padding: 8px 0px 5px 5px;	display: inline-block;	vertical-align: top;}
 .activity_content {	padding: 8px 0px 0px 0px;	display: inline-block;	color: #000;	width: 90%;}

data/app/assets/stylesheets/base.css

@@ -46,7 +46,7 @@ label.validation_error{color: #D8000C;background-color: #FFBABA;border: 1px soli
 /************Forms SECTION **************/
 input.other_blue{	background:#497FC1;	border:0px;	cursor:pointer;  font-size:1.0em;  line-height:135%;
   margin-right:4px;	color:white;	padding:1px;}
-textarea.new_contact_text_area{ width:100%; height: 100px; color: #2A3890;}
+textarea.new_contact_text_area{ height: 100px; color: #2A3890;}
 .colum_field_title{ text-align: center; }
 .needed{color:#D8000C;font-weight: normal;}
 .select_relations select{ font-size: 12px; color: white; background-color:#1F4A75;} 

data/app/assets/stylesheets/relation_customs.css

@@ -19,7 +19,8 @@ span.ui-helper-hidden {
 	display: block;
 	font-family: sans-serif;
 	padding: 2px;
-	margin-left: 20px;
+	margin-left: 10px;
+	float: left;
 }
 
 #relation_customs label.ui-checkbox, #permissions label.ui-checkbox {
@@ -46,12 +47,42 @@ span.ui-radio-state-checked-hover {
 	background-position: 0 -200px;
 }
 
+#relation_customs input {
+	float: left;
+}
+
+#relation_customs span {
+	float: left;
+}
+
 form {
 	overflow: hidden;
 	height: 1%;
 	margin: 0px 0;
 }
 
+#relation_customs .options {
+	float: right;
+	display: none;
+}
+
+#relation_customs .button {
+	margin-left: 0;
+}
+
+#cancel_new_relation_custom {
+	margin-right: 10px;
+}
+
+.relation_custom_name_form {
+	display: none;
+}
+
+.cancel_edit_relation_custom {
+	margin-right: 10px;
+	float: right;
+}
+
 .ui-helper-hidden-accessible {
 	position: absolute;
 	left: -999em;
@@ -78,10 +109,14 @@ form {
 	padding: 15px 20px 15px 20px;
 }
 
-.privacy_add_element{
+#new_relation {
 	text-align: right;
 	padding: 5px 0px 5px 0px;
-	margin: 0px 10px 15px 0px;
+	margin: 0px 10px 15px 30px;
+}
+
+#new_relation_custom_input_block {
+	display: none;
 }
 
 input.privacy_input_new{
@@ -135,34 +170,6 @@ span.privacy_span_new {
 	margin: 0px 0px 0px 0px;
 }
 
-#slider-range{
-  height:120px;
-  margin-left: auto;
-  margin-right: auto;
-  background-color: #1f4a75;
-}
-
-.slider-div{
-	float: right;
-	margin-right: 5px;
-}
-
-.slider-header, .slider-footer{
-	text-align: center;
-	border: 0; 
-	color: #1f4a75; 
-	font-weight: bold;
-	width: 100%;
-}
-
-.slider-header {
-	margin-bottom: 10px;
-}
-
-.slider-footer {
-	margin-top: 10px;
-}
-
 .privacy_block_section{
 	margin-top: 50px;
 }

data/app/mailers/notification_mailer.rb

@@ -23,7 +23,7 @@ class NotificationMailer < ActionMailer::Base
     #subject = notifications.subject_decoded
     #END OF DIFFERENCE----------------------------
     subject = strip_tags(subject) unless subject.html_safe?
-    mail(:to => receiver.send(Mailboxer.email_method), :subject => t('mailboxer.notification_mailer.subject', :subject => subject)) do |format|
+    mail(:to => receiver.send(Mailboxer.email_method,notification), :subject => t('mailboxer.notification_mailer.subject', :subject => subject)) do |format|
       format.text {render __method__}
       format.html {render __method__}
     end

data/app/models/activity.rb

@@ -160,7 +160,7 @@ class Activity < ActiveRecord::Base
   def new_like(subject)
     a = children.new :verb => "like",
                      :contact => subject.contact_to!(receiver),
-                     :relation_ids => subject.comment_relations(self).map(&:id)
+                     :relation_ids => self.relation_ids
 
     if direct_activity_object.present?
       a.activity_objects << direct_activity_object
@@ -267,16 +267,30 @@ class Activity < ActiveRecord::Base
       allow?(subject, 'destroy')
   end
 
+  # The {Relation} with which activity is shared
+  def audience_in_words(subject)
+    visible_relations =
+      relations.select{ |r| r.actor_id == Actor.normalize_id(subject) || r.is_a?(Relation::Public) }
+
+    visible_relations.present? ?
+      I18n.t('activity.audience.visible', :audience => visible_relations.map(&:name).join(", ")) :
+      I18n.t('activity.audience.hidden', :audience => relations.map(&:actor).map(&:name).join(", "))
+  end
+
   private
 
   # Before validation callback
   #
   # Fill the relations when posting to other subject's wall
   def fill_relations
-    return if contact.reflexive? || relations.present?
+    return if relation_ids.present?
 
-    self.relations =
-      contact.receiver.relation_customs.allow(contact.sender, 'create', 'activity')
+    self.relation_ids =
+      if contact.reflexive?
+        Array(receiver.relation_public.id)
+      else
+        receiver.relation_customs.allow(contact.sender, 'create', 'activity').map(&:id)
+      end
   end
 
   #Send notifications to actors based on proximity, interest and permissions

data/app/models/actor.rb

@@ -137,17 +137,33 @@ class Actor < ActiveRecord::Base
     end
   end
   
-  # Returns the email used for Mailboxer
-  def mailboxer_email    
-    return email if email.present?
+  #Returning the email address of the model if an email should be sent for this object (Message or Notification).
+  #If the actor is a Group and has no email address, an array with the email of the highest rank members will be
+  #returned isntead.
+  #
+  #If no mail has to be sent, return nil.
+  def mailboxer_email(object)
+    #If actor has disabled the emails, return nil.
+    return nil if !notify_by_email
+    #If actor has enabled the emails and has email
+    return "#{name} <#{email}>" if email.present?
+    #If actor is a Group, has enabled emails but no mail we return the highest_rank ones.
     if (group = self.subject).is_a? Group
       relation = group.relation_customs.sort.first
       receivers = group.contact_actors(:direction => :sent, :relations => relation)
       emails = Array.new
       receivers.each do |receiver|
-        emails << receiver.email
+        receiver_emails = receiver.mailboxer_email(object)
+        case receiver_emails
+        when String
+          emails << receiver_emails
+        when Array
+          receveir_emails.each do |receveir_email|
+            emails << receiver_email
+          end
+        end
       end
-      return emails
+    return emails
     end
   end
   
@@ -282,7 +298,7 @@ class Actor < ActiveRecord::Base
   #
   #
   def activity_relations(subject, options = {})
-    return relations if Actor.normalize(subject) == self
+    return relation_customs if Actor.normalize(subject) == self
 
     Array.new
   end
@@ -404,12 +420,6 @@ class Actor < ActiveRecord::Base
     a             
   end
   
-  #Returning whether an email should be sent for this object (Message or Notification).
-  #Required by Mailboxer gem.
-  def should_email?(object)
-    return notify_by_email
-  end
-
   # Use slug as parameter
   def to_param
     slug

data/app/models/relation.rb

@@ -32,6 +32,9 @@ class Relation < ActiveRecord::Base
   has_many :ties, :dependent => :destroy
   has_many :contacts, :through => :ties
 
+  has_many :audiences, :dependent => :destroy
+  has_many :activities, :through => :audiences
+
   scope :mode, lambda { |st, rt|
     where(:sender_type => st, :receiver_type => rt)
   }

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

@@ -17,7 +17,7 @@
 </div>
 
 <% if current_subject == receiver %>
-  <div id="securities"><%= select_tag :_relation_ids, options_for_select(current_subject.activity_relations(receiver).sort.map{ |r| [ r.name, r.id ] }), :id => 'security', :multiple => true, :title => t('activity.new.security.title') %></div>
+  <div id="securities"><%= select_tag :_relation_ids, options_for_select(current_subject.activity_relations(receiver).sort.map{ |r| [ r.name, r.id ] }), :id => 'security', :multiple => true, :title => t('relation_public.name') %></div>
 <% end %>
 
 <div id="activities_share_btn">

data/app/views/activities/_options.html.erb

@@ -1,5 +1,8 @@
 <div class="activity_options">
   <ul class="activity_options" >
+    <% if user_signed_in? %>
+    <li><div class="security"><%= image_tag('btn/btn_security.png', :title => activity.audience_in_words(current_subject)) %></div></li>
+    <% end %>
     <li><div class="post_time_ago"><%= t('time.ago', :time => time_ago_in_words(activity.created_at)) %></div></li>
     <% if activity.is_root? && user_signed_in? %>
     <li><div class="verb_comment"> · <%= link_to t('activity.to_comment'), "#", :class => "to_comment" %> </div></li>

data/app/views/groups/_sidebar_index.html.erb

@@ -2,13 +2,13 @@
 
 <div class="block">
   <div class="header">
-    <%= image_tag('btn/btn_tag.png', :class => "icon", :size => "15x15") %>
+    <%= image_tag('btn/btn_tag.png', :class => "header_icon") %>
     <div class="header_text">
       <%= t 'group.cloud' %>
     </div>
   </div>
   <div id="wordcloud" class="content"></div>
-</div
+</div>
 
 <%= render :partial => 'contacts/suggestions_and_pendings' %>
 

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

@@ -4,8 +4,6 @@
 
     <p class="sectionTitle"><%= raw t('permission.of_relation.choose', :name => h(@relation.name)) %></p>
 
-    <div class="privacy_add_element"></div>
-
     <table class="tableCheckBoxOptions">
       <% default_permissions.each_with_index do |p, i| %>
       <tr>
@@ -13,6 +11,7 @@
           <div contain=<%= dom_id p %> class="checkboxPermissionOptionLeft">
             <input id=<%= dom_id p %> optionOf="permissions" type="checkbox"/>
             <label for=<%= dom_id p %>><%= p.description(:brief) %></label>
+            <div class="clearfloat"></div>
           </div>
         </td>
       <% if i == 0 %>
@@ -28,7 +27,7 @@
 
     <%= raw t('privacy.intro', :relation => h(@relation.name)) %>
 
-    <%= semantic_form_for @relation, :remote => true do |f| %>
+    <%= semantic_form_for @relation, :url => polymorphic_path(@relation, :section => 'rules'), :remote => true do |f| %>
       <%= f.input :permissions, :as => :check_boxes, :collection => default_permissions.map{ |p| [p.description(:detailed, @relation), p.id] } %>
       <%= f.submit t('button.save'), :class => 'button' %>
     <% end %>

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

@@ -4,10 +4,34 @@
       <div contain="<%= dom_id(r) %>" class="checkboxOptionLeft">
         <input id=<%= dom_id(r) %> type="checkbox"/>
         <label for=<%= dom_id(r) %>><%=r.name%></label>
+        <div class="options">
+          <%= link_to image_tag("btn/edit.png", :class => "menu_icon", :title => t('relation_custom.edit')), '#', :class => "relation_custom_edit_link" %>
+          <%= link_to image_tag("btn/delete.png", :class => "menu_icon", :title => t('relation_custom.delete')), r, :class => "relation_custom_delete_link", :method => :delete, :confirm => t('relation_custom.confirm_delete') %>
+
+        </div>
+        <div class="relation_custom_name_form">
+          <%= form_for r, :remote => true do |f| %>
+            <p><%= f.text_field :name, :class => "privacy_input_new", :size => 18 %></p>
+            <%= f.submit nil, :class => "button" %>
+            <button class="button cancel_edit_relation_custom" ><%= t('button.cancel') %></button>
+          <% end %>
+        </div>
+        <div class="clearfloat"></div>
       </div>
     <%= raw cycle("</td>", "</td></tr>", :name => "end_cell") %>
   <% end %>
 
+  <%= raw cycle("<tr><td>", "<td>", :name => "begin_cell") %>
+    <div id="new_relation">
+      <div id="new_relation_custom_title_block"> 
+        <a href="#"><span id="new_relation_custom_title" class="privacy_span_new"><%= t('relation_custom.new') %></span></a>
+      </div> 
+      <div id="new_relation_custom_input_block"> 
+        <%= render :partial => 'relation/customs/form' %>
+      </div>
+    </div>
+  <%= raw cycle("</td>", "</td></tr>", :name => "end_cell") %>
+
   <%= raw("</tr>") if list.size.odd? %>
 
 </table>
@@ -15,5 +39,18 @@
 <%= javascript_tag do %>
   $(function() {
     $('input[id^="relation_custom"]').checkBox();
+
+    $('.relation_custom_edit_link').click(function() {
+      $(this).parent().hide();
+      $(this).parent().siblings('label').hide();
+      $(this).parent().siblings('.relation_custom_name_form').show();
+    });
+
+    $(".cancel_edit_relation_custom").click(function() {   
+      $(this).parent().parent().hide();
+      $(this).parent().parent().siblings('label, .options').show();
+
+      return false;
+    });
   })
 <% end %>

data/app/views/relation/customs/_update_rules.js.erb

@@ -0,0 +1,5 @@
+<% if @custom.errors.present? %>
+  $('#new_relation_custom_input_block').html("<%= escape_javascript render(:partial => 'relation/customs/form') %>");
+<% else %>
+  alert("<%= escape_javascript t('privacy.rule.saved') %>");
+<% end %>

data/app/views/relation/customs/index.html.erb

@@ -7,19 +7,9 @@
   <div id="relation_customs" class="privacy_block_section first_block_section">
     <p class="sectionTitle"><%= t 'relation_custom.choose' %></p>
 
-    <div class="privacy_add_element">
-      <div id="new_relation_custom_title_block"> 
-        <a href="#"><span id="new_relation_custom_title" class="privacy_span_new"><%= t('relation_custom.new') %></span></a>
-      </div> 
-      <div id="new_relation_custom_input_block"> 
-        <%= render :partial => 'relation/customs/form' %>
-      </div>
-    </div>
 
     <%= javascript_tag do %>
       $(function() {
-        $("#new_relation_custom_input_block").hide();
-
         $("#new_relation_custom_title").click(function() {
           $("#new_relation_custom_title_block").hide();
           $("#new_relation_custom_input_block").show();

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

@@ -1,6 +1,11 @@
-<% if @custom.errors.present? %>
-  $('#new_relation_custom_input_block').html("<%= escape_javascript render(:partial => 'relation/customs/form') %>");
+<% if params[:section] == 'rules' %>
+  <%= render :partial => 'update_rules' %>
 <% else %>
-  alert("<%= escape_javascript t('privacy.rule.saved') %>");
+  var div = $('div[contain$=<%= dom_id(@custom) %>]');
+  div.children('label').html("<%= escape_javascript @custom.name %>");
+  div.children('label').show();
+  div.children('.options').show();
+  div.children('.relation_custom_name_form').hide();
 <% end %>
 
+

data/config/locales/en.yml

@@ -9,14 +9,14 @@ en:
     one: "Account"
     privacy: "Privacy"
   activity:
+    audience:
+      visible: "Shared with %{audience}"
+      hidden: "Shared with spheres of %{audience}"
     confirm_delete: "Delete activity?"
     delete: "Delete"
     input: "What are you doing?"
     last: "Last Activities"
     like: "I like"
-    new:
-      security:
-        title: "Share with..."
     one: "Activity"
     other: "Activities"
     title: "Activities"
@@ -163,6 +163,7 @@ en:
     submit:
       relation_custom:
         create: "Save"
+        update: "Update"
   home: "Home"
   inbox:
     one: "Inbox"
@@ -297,9 +298,12 @@ en:
     one: "Product"
     other: "Products"
   relation_custom:
-    title: "Privacy & context"
     choose: "1. Choose sphere"
+    confirm_delete: "Delete this sphere?"
+    delete: "Delete"
+    edit: "Change name"
     new: "+ New sphere"
+    title: "Privacy & context"
   relation_public:
     name: "Public"
   required: "* These fields are required"

data/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.7.8".freeze
+    VERSION = "0.7.9".freeze
   end
 end

data/social_stream-base.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |s|
   # OAuth provider
   s.add_runtime_dependency('oauth-plugin','~> 0.4.0.pre1')	
   # Messages
-  s.add_runtime_dependency('mailboxer','~> 0.4.3')
+  s.add_runtime_dependency('mailboxer','~> 0.5.0')
   # Avatar manipulation
   s.add_runtime_dependency('rmagick','~> 2.13.1')
   # Tagging

data/spec/controllers/settings_controller_spec.rb

@@ -0,0 +1,41 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe SettingsController do
+  include SocialStream::TestHelpers
+  render_views
+
+  before do
+    @user = Factory(:user)
+    @actor = @user.actor
+    sign_in @user
+  end
+
+  it "should render index" do
+    get :index
+    assert_response :success
+  end
+
+  it "should render index after update_all" do
+    put :update_all
+    response.should redirect_to settings_path
+  end
+
+  describe "Notification settings" do
+    it "update notification email settings to Never" do
+      @actor.update_attributes(:notify_by_email => true)
+      @actor.notify_by_email.should==true
+      put :update_all, :settings_section => "notifications", :notify_by_email => "never"
+      @actor.reload
+      @actor.notify_by_email.should==false
+
+    end
+
+    it "update notification email settings to Always" do
+      @actor.update_attributes(:notify_by_email => false)
+      @actor.notify_by_email.should==false
+      put :update_all, :settings_section => "notifications", :notify_by_email => "always"
+      @actor.reload
+      @actor.notify_by_email.should==true
+    end
+  end
+end

data/vendor/assets/stylesheets/jqcloud.css

@@ -3,13 +3,13 @@ div#wordcloud a {  color: inherit;  text-decoration: none;}
 div#wordcloud a:hover {  color: #0df;}
 div#wordcloud a:hover {  color: #0cf;}
 div#wordcloud span {  padding: 0;}
-div#wordcloud span.w10 {font-size: 44px; color: #1F4A75;}
-div#wordcloud span.w9 { font-size: 40px; color: #0cf; }
-div#wordcloud span.w8 { font-size: 34px; color: #0cf; }
-div#wordcloud span.w7 { font-size: 30px; color: #0cf; }
-div#wordcloud span.w6 { font-size: 24px; color: #90c5f0;}
-div#wordcloud span.w5 { font-size: 20px; color: #90a0dd;}
-div#wordcloud span.w4 { font-size: 14px; color: #90c5f0;}
+div#wordcloud span.w10 {font-size: 22px; color: #1F4A75;}
+div#wordcloud span.w9 { font-size: 20px; color: #0cf; }
+div#wordcloud span.w8 { font-size: 18px; color: #0cf; }
+div#wordcloud span.w7 { font-size: 13px; color: #0cf; }
+div#wordcloud span.w6 { font-size: 12px; color: #90c5f0;}
+div#wordcloud span.w5 { font-size: 13px; color: #90a0dd;}
+div#wordcloud span.w4 { font-size: 11px; color: #90c5f0;}
 div#wordcloud span.w3 { font-size: 10px; color: #a0ddff;}
-div#wordcloud span.w2 { font-size: 4px;  color: #99ccee;}
-div#wordcloud span.w1 { font-size: 1px;  color: #aab5f0;}
+div#wordcloud span.w2 { font-size: 8px;  color: #99ccee;}
+div#wordcloud span.w1 { font-size: 6px;  color: #aab5f0;}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream-base
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 7
-  - 8
-  version: 0.7.8
+  - 9
+  version: 0.7.9
 platform: ruby
 authors: 
 - GING - DIT - UPM
@@ -205,12 +205,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 11
         segments: 
         - 0
-        - 4
-        - 3
-        version: 0.4.3
+        - 5
+        - 0
+        version: 0.5.0
   type: :runtime
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
@@ -529,6 +529,7 @@ files:
 - app/assets/images/btn/btn_write.png
 - app/assets/images/btn/close.png
 - app/assets/images/btn/date.png
+- app/assets/images/btn/delete.png
 - app/assets/images/btn/edit.png
 - app/assets/images/btn/error.png
 - app/assets/images/btn/facebook.png
@@ -835,6 +836,7 @@ files:
 - app/views/profiles/update.js.erb
 - app/views/relation/customs/_form.html.erb
 - app/views/relation/customs/_list.html.erb
+- app/views/relation/customs/_update_rules.js.erb
 - app/views/relation/customs/create.js.erb
 - app/views/relation/customs/index.html.erb
 - app/views/relation/customs/update.js.erb
@@ -903,6 +905,7 @@ files:
 - spec/controllers/profiles_controller_spec.rb
 - spec/controllers/relation_customs_controller_spec.rb
 - spec/controllers/representations_spec.rb
+- spec/controllers/settings_controller_spec.rb
 - spec/controllers/subjects_controller.rb
 - spec/controllers/users_controller_spec.rb
 - spec/dummy/.gitignore