social_stream-base 0.11.2 → 0.12.0

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Universidad Politécnica de Madrid
+Copyright (c) 2012 Universidad Politécnica de Madrid
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -10,7 +10,7 @@ network environment see https://github.com/ging/social_stream
 * Social network infraestructure
 * Activity streams infraestructure
 * Subjects: {User} and {Group}
-* Objects: {Post} and {Commment}
+* Objects: {Post} and {Comment}
 * Private messages and notifications, by {Mailboxer}[https://github.com/ging/mailboxer]
 * Avatars, by {Avatars For Rails}[https://github.com/ging/avatars_for_rails]
 

data/app/assets/stylesheets/header.css.scss

@@ -25,11 +25,13 @@
 .div_login .options{ height:20px;	font-size: 11px;}
 .div_login .a_border{	border-right:thin solid;	padding-right:7px;	text-decoration:underline; }
 #new_representation {	display: inline-block;}
-#header_notifications a{color: white; padding: 4px 10px 6px 11px;
+#header_notifications a{color: $text-over-main; padding: 4px 10px 6px 11px;
                       background: transparent url('btn/header_notifications.png') no-repeat center center;}
-#header_inbox_count a{ color: white; background-color: $header-notification-color; padding: 2px 7px 2px 7px;}
+#header_inbox_count a{ color: $text-over-main; background-color: $header-notification-color; padding: 2px 7px 2px 7px;}
 #representation {  display: inline;  padding-left:3px;  padding-right:3px;}
-.switch_pending_count { color: white; background-color: $header-notification-color; padding: 2px 7px 2px 7px !important; margin-left: 5px !important; float: right; }
+.switch_pending_count { color: $text-over-main; text-align: right;
+                        background: transparent url('btn/header_notifications.png') no-repeat center center;
+                        padding: 2px 10px 4px 11px !important; margin: 0 5px 0 5px !important; float: right; }
 .txt_config {color: $text-over-main;	vertical-align: top;	display: inline;	padding-top: 2px;	
               border-right: thin solid; padding-right: 3px;}
 .txt_config2 {color: $text-over-main;	vertical-align: top;	display: inline;	padding-top: 2px;	padding-right: 3px;}
@@ -37,7 +39,7 @@
 
 /******** MENU HEADER *******/
 #menu_home, .menu_home {vertical-align: top; }
-#menu_home a {color:white;}
+#menu_home a {color:$text-over-main;}
 #menu_home a:hover {text-decoration: none;}
 #menu_home ul {list-style: none;	margin: 0px;	float:left;}
 #menu_home ul li {line-height:20px;	vertical-align:top;}
@@ -49,9 +51,9 @@
 #header_dropdown_menu ul li a{padding: .40em 1em .70em 2.5em;}
 #header_dropdown_menu ul li a:hover{color:$main-color;}
 #header_dropdown_menu ul li ul li a{padding: .40em 1em .70em 1em;}
-#header_dropdown_menu ul li ul li ul li {width: 160px;}
-#header_dropdown_menu ul li ul li ul li a{padding: .40em 1em .70em 2.5em;}
-#header_dropdown_menu ul li ul li ul{position: absolute; left: -160px;}
+#header_dropdown_menu ul li ul li ul li {width: 170px;}
+#header_dropdown_menu ul li ul li ul li a{padding: .40em 1em .70em 2.5em; display:inline;}
+#header_dropdown_menu ul li ul li ul{position: absolute; left: -170px;}
 #header_dropdown_menu a.session_change{background: transparent url('btn/arrow_session_change.png') no-repeat 3px 6px;}
 
 #menu_home ul li.pipe,#menu_account ul li.pipe{padding:0; margin:0;font-size: 20px;font-weight: bold;}

data/app/controllers/groups_controller.rb

@@ -1,4 +1,6 @@
-class GroupsController < InheritedResources::Base
+class GroupsController < ApplicationController
+  include SocialStream::Controllers::Subjects
+
   before_filter :authenticate_user!, :except => [ :index, :show ]
 
   # Set group founder to current_subject
@@ -19,9 +21,6 @@ class GroupsController < InheritedResources::Base
 
   end
 
-  def show
-  end
-
   def create
     create! do |success, failure|
       success.html {

data/app/controllers/settings_controller.rb

@@ -22,13 +22,22 @@ class SettingsController < ApplicationController
         end
       end
 
+      #Updating language
+      if section.eql? "language"
+        #Preferred language setting
+        if params[:language].present?
+          lang = params[:language].to_s
+          current_user.language = lang[0..1]
+        end
+      end
+
       #Here sections to add
       #if section.eql? "section_name"
       #   blah blah blah
       #end
 
-      #Was everything ok?
-      success = current_subject.save
+      # Was everything ok?
+      success = current_subject.save && current_user.save
     end
 
     #Flashing and redirecting
@@ -37,7 +46,9 @@ class SettingsController < ApplicationController
     else
       flash[:error] = t('settings.error')
     end
-    render :action => :index
+    # render :action => :index
+
+    redirect_to settings_path
   end
 
 end

data/app/controllers/users_controller.rb

@@ -1,4 +1,6 @@
-class UsersController < InheritedResources::Base
+class UsersController < ApplicationController
+  include SocialStream::Controllers::Subjects
+
   load_and_authorize_resource
 
   respond_to :html, :xml, :js
@@ -13,9 +15,6 @@ class UsersController < InheritedResources::Base
 
   end
 
-  def show
-  end
-
   # Supported through devise
   def new; end; def create; end
   # Not supported yet

data/app/helpers/permissions_helper.rb

@@ -4,7 +4,8 @@ module PermissionsHelper
       [ "read",    "activity" ],
       [ "create",  "activity" ],
       [ "follow", nil ],
-      [ "represent", nil ]
+      [ "represent", nil ],
+      [ "notify", nil ]
     ]
 
   def default_permissions

data/app/models/activity_object.rb

@@ -9,27 +9,26 @@
 # Objects are added to +config/initializers/social_stream.rb+
 #
 class ActivityObject < ActiveRecord::Base
-  @subtypes_name = :object
-  include SocialStream::Models::Supertype
+  # ActivityObject is a subtype of Channel
+  # Author, owner and user_author of this ActivityObject are defined in its channel
+  subtype_of :channel,
+             :belongs => { :dependent => nil }
+  # ActivityObject is a supertype of SocialStream.objects
+  supertype_of :object
 
   acts_as_taggable
-  
-  # Author can be any type of Actor: User, Group, etc.
-  belongs_to :author,
-             :class_name => "Actor"
-  # Owner is the wall's subject this object is posted to
-  belongs_to :owner,
-             :class_name => "Actor"
-
-  # UserAuthor is the real user behind the Author
-  belongs_to :user_author,
-             :class_name => "Actor"
 
   has_many :activity_object_activities, :dependent => :destroy
   has_many :activities, :through => :activity_object_activities
 
   validates_presence_of :object_type
 
+  scope :authored_by, lambda { |subject|
+    joins(:channel).merge(Channel.authored_by(subject))
+  }
+
+  before_validation :check_existing_channel
+
   # The object of this activity object
   def object
     subtype_instance.is_a?(Actor) ?
@@ -37,21 +36,6 @@ class ActivityObject < ActiveRecord::Base
       subtype_instance
   end
 
-  # The {SocialStream::Models::Subject subject} author
-  def author_subject
-    author.subject
-  end
-
-  # The {SocialStream::Models::Subject subject} owner
-  def owner_subject
-    owner.subject
-  end
-
-  # The {SocialStream::Models::Subject subject} user actor
-  def user_author_subject
-    user_author.subject
-  end
-
   # The activity in which this activity_object was created
   def post_activity
     activities.includes(:activity_verb).where('activity_verbs.name' => 'post').first
@@ -61,4 +45,21 @@ class ActivityObject < ActiveRecord::Base
   def acts_as_actor?
     object_type == "Actor"
   end
+
+  protected
+
+  def check_existing_channel
+    return unless channel!.new_record?
+
+    existing_channel =
+      Channel.
+        where(:author_id      => author_id,
+              :owner_id       => owner_id,
+              :user_author_id => user_author_id).
+        first
+
+    return if existing_channel.blank?
+
+    self.channel = existing_channel
+  end
 end

data/app/models/actor.rb

@@ -15,11 +15,13 @@
 #
 #
 class Actor < ActiveRecord::Base
-  @subtypes_name = :subject
-  include SocialStream::Models::Supertype
+  # Actor is a supertype of all subjects defined in SocialStream.subjects
+  supertype_of :subject
+
   include SocialStream::Models::Object
   
-  validates_presence_of :name, :subject_type
+  validates_presence_of :name, :message => ''
+  validates_presence_of :subject_type
   
   acts_as_messageable
 
@@ -62,13 +64,13 @@ class Actor < ActiveRecord::Base
   has_many :relations,
            :dependent => :destroy
 
-  has_many :authored_objects,
-           :class_name => "ActivityObject",
+  has_many :authored_channels,
+           :class_name => "Channel",
            :foreign_key => :author_id,
            :dependent => :destroy
 
-  has_many :owned_objects,
-           :class_name => "ActivityObject",
+  has_many :owned_channels,
+           :class_name => "Channel",
            :foreign_key => :owner_id,
            :dependent => :destroy
 
@@ -162,19 +164,20 @@ class Actor < ActiveRecord::Base
     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|
-        next unless Actor.normalize(receiver).subject_type.eql?("User")
-
-        receiver_emails = receiver.mailboxer_email(object)
-        case receiver_emails
-        when String
-          emails << receiver_emails
-        when Array
-          receiver_emails.each do |receiver_email|
-            emails << receiver_email
+      group.relation_notifys.each do |relation|
+        receivers = group.contact_actors(:direction => :sent, :relations => relation)
+        receivers.each do |receiver|
+          next unless Actor.normalize(receiver).subject_type.eql?("User")
+
+          receiver_emails = receiver.mailboxer_email(object)
+          case receiver_emails
+          when String
+            emails << receiver_emails
+          when Array
+            receiver_emails.each do |receiver_email|
+              emails << receiver_email
+            end
           end
         end
       end
@@ -197,6 +200,11 @@ class Actor < ActiveRecord::Base
     relation_customs.find_by_name(name)
   end
 
+  # All {Relation relations} with the 'notify' permission
+  def relation_notifys
+    relations.joins(:relation_permissions => :permission).where('permissions.action' => 'notify')
+  end
+
   # The {Relation::Public} for this {Actor} 
   def relation_public
     Relation::Public.of(self)

data/app/models/channel.rb

@@ -0,0 +1,48 @@
+# A {Channel} is the union of the three {Actors} that are involved in an {Activity}:
+#
+# * The author that creates a post, comment, etc. This can be a {User}, {Group}
+#   or any kind of {SocialStream::Models::Subject subject}
+# * The user_author representing the author. When users change session and
+#   act in behalf of a {Group}, Social Stream still records which user is responsible
+#   for an {Activity}
+# * The owner in whose wall the Activity is performed.
+#
+class Channel < ActiveRecord::Base
+  # Author can be any type of Actor: User, Group, etc.
+  belongs_to :author,
+             :class_name => "Actor"
+  # Owner is the wall's subject this object is posted to
+  belongs_to :owner,
+             :class_name => "Actor"
+
+  # UserAuthor is the real user behind the Author
+  belongs_to :user_author,
+             :class_name => "Actor"
+
+  has_many :activity_objects
+
+  validates_uniqueness_of :author_id,      :scope => [ :owner_id,  :user_author_id ]
+  validates_uniqueness_of :owner_id,       :scope => [ :author_id, :user_author_id ]
+  validates_uniqueness_of :user_author_id, :scope => [ :author_id, :owner_id ]
+
+  scope :authored_by, lambda { |subject|
+    id = Actor.normalize_id subject
+
+    where(arel_table[:author_id].eq(id).or(arel_table[:user_author_id].eq(id)))
+  }
+
+  # The {SocialStream::Models::Subject subject} author
+  def author_subject
+    author.subject
+  end
+
+  # The {SocialStream::Models::Subject subject} owner
+  def owner_subject
+    owner.subject
+  end
+
+  # The {SocialStream::Models::Subject subject} user actor
+  def user_author_subject
+    user_author.subject
+  end
+end

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

@@ -7,7 +7,7 @@
     </div>
   </div>
   <div class="content">
-    <%= render current_subject.pending_contacts.shuffle.first(2) %>
+    <%= render :partial => 'contacts/contact', :collection => 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), pending_contacts_path %>
     </div>

data/app/views/devise/registrations/_edit_user.html.erb

@@ -85,29 +85,4 @@ $(".user_edit").validate({errorClass: "validation_error"});
     <% end%>
   </div>
 </div>
-<div class="block" id="lang_form">
-  <div class="header">
-    <div class="header_text">
-      <%= t("account.lang.change")%>
-    </div>
-    <div class="header_icon_right">
-      <%= link_to (image_tag('btn/edit.png')),  "javascript:showSettings(\"lang_form\");" %>
-    </div>
-  </div>
-  <div id="lang_form_briefing" class="settings_briefing content">
-    <div class="form_row">
-      <%= t('settings.lang_change.briefing')%>
-    </div>
-  </div>
-  <div class="content settings_content" id="lang_form_content" style="display:none;">
-    <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put, :id => 'form_lang' }) do |f| %>
-    <div class="form_row">
-      <div class="form_label"><%= f.label :language %></div>
-      <div class="form_field">
-        <%= f.select :language, I18n.available_locales.map{|l| [ l.to_s, l.to_s ] }, { }, { :class => 'form_lang', :onchange => "$(\'#form_lang\').submit();" } %>
-      </div>
-    </div>
-    <% end%>
-  </div>
-</div>
 

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

@@ -13,6 +13,7 @@
 </div>
 <%= render :partial => "edit_user"%>
 
+<%= render :partial => "settings/language" %>
 <%= render :partial => "settings/notifications" %>
 <% if current_subject.respond_to? :authentication_token%>
 <%= render :partial => "settings/api_key" %>

data/app/views/layouts/_footer.html.erb

@@ -6,7 +6,7 @@
       <%= link_to(image_tag('HTML5_Semantics.png'),'http://jigsaw.w3.org/css-validator/check/referer') %>
     </div>
 	  <ul>
-		<li>2011 © </li>
+                <li><%= Date.today.year %> © </li>
 		<li id="trade_mark"><%= link_to t('site.name'), 'http://social-stream.dit.upm.es/' %></li>
 	  </ul>
 	</div>

data/app/views/layouts/_header_dropdown_menu_sessions.html.erb

@@ -5,8 +5,11 @@
   <ul>
     <% representations.each do |representation| %>
     <li>
-      <%  pending_total = representation.mailbox.notifications.not_trashed.unread.count %>
-      <%= link_to truncate_name(representation.name, :length => 15) + (content_tag(:span, pending_total.to_s, :class => "switch_pending_count") if pending_total > 0), { :s => representation.slug }, { :style => "background: transparent url('#{ image_path representation.logo.url(:representation)}') no-repeat left center;margin-left:2px;" } %>
+      <%= content_tag :span do %>
+        <%= link_to truncate_name(representation.name, :length => 15), { :s => representation.slug }, { :style => "background: transparent url('#{ image_path representation.logo.url(:representation)}') no-repeat left center;margin-left:2px;" } %>
+        <%  pending_total = representation.mailbox.notifications.not_trashed.unread.count %>
+        <%= link_to content_tag(:span, pending_total.to_s, :class => "switch_pending_count"), notifications_path(:s => representation.slug), { :style => 'margin: 1px; padding: 0;' }  if pending_total > 0 %>
+      <% end %>
     </li>
     <% end %>
   </ul>

data/app/views/settings/_language.html.erb

@@ -0,0 +1,32 @@
+<div class="block" id="language_settings">
+  <div class="header">
+    <div class="header_text">
+ <%= t("account.lang.change")%>
+    </div>
+    <div class="header_icon_right">
+ <%= link_to (image_tag('btn/edit.png')),  "javascript:showSettings(\"language_settings\");" %>
+    </div>
+  </div>
+  <div id="lang_form_briefing" class="settings_briefing content">
+    <div class="form_row">
+ <%= t('settings.lang_change.briefing')%>
+    </div>
+  </div>
+  <div class="content settings_content" id="language_settings_content" style="display:none;">
+    <%= form_tag update_all_settings_path, :method => :put, :id => 'form_lang', :remote => false do %>
+    <div class="form_row">
+ <div class="form_label"><%= label_tag :language, t('settings.lang_change.name') %></div>
+ <div class="form_field">
+ <%= select_tag(:language, options_for_select(I18n.available_locales.map{|l| [ l.to_s, l.to_s ] }, current_user.language), :class => 'form_tag', :onchange => "$(\'#form_lang\').submit();" )%>
+ </div>
+    </div>
+            <div class="actions center">
+                <%= hidden_field_tag :settings_section, :language %>
+		<noscript>
+                <%= submit_tag "Update Settings", :class => "button" %>
+		</noscript>
+            </div>
+    <% end%>
+  </div>
+</div>
+

data/app/views/settings/_notifications.html.erb

@@ -31,4 +31,4 @@
         </ul>
         <% end %>
     </div>
-</div>
+</div>

data/config/locales/en.yml

@@ -372,6 +372,8 @@ en:
           activity: "Read wall"
         represent:
           nil: "Administrate"
+        notify:
+          nil: "Notify via email"
       detailed:
         create:
           activity: "Post to \"%{relation}\" wall"
@@ -382,6 +384,8 @@ en:
           tie: "See contacts in levels: %{relations} and %{public}"
         represent:
           nil: "Change session to act as %{subject}"
+        notify:
+          nil: "Updates of contacts at %{relation} will be sent to your email"
     of_relation:
       choose: "2. Permissions in <strong>%{name}</strong> sphere"
   privacy:
@@ -433,6 +437,7 @@ en:
       briefing: "Change your email"
     lang_change:
       briefing: "Change your language"
+      name: "Change your language"
     error: "Some errors raised when saving your changes"
     for: "Settings for"
     main: "Settings"

data/config/locales/es.yml

@@ -371,6 +371,8 @@ es:
           activity: "Leer muro"
         represent:
           nil: "Administrar"
+        notify:
+          nil: "Notificar por email"
       detailed:
         create:
           activity: "Publicar en el muro de\"%{relation}\""
@@ -381,6 +383,8 @@ es:
           tie: "Ver contactos en los niveles: %{relations} y %{public}"
         represent:
           nil: "Cambiar sesión para actuar en nombre de %{subject}"
+        notify:
+          nil: "Las actividades de los contactos en %{relation} se te enviarán al email"
     of_relation:
       choose: "2. Permisos para <strong>%{name}</strong>"
   privacy:
@@ -430,6 +434,9 @@ es:
       briefing: "Te permite cancelar tu cuenta"
     email_change:
       briefing: "Cambia tu email"
+    lang_change:
+      briefing: "Cambia tu idioma"
+      name: "Cambia tu idioma"
     error: "Hubo errores al guardar los cambios"
     for: "Ajustes para"
     main: "Ajustes"

data/db/migrate/20120103103125_add_channels.rb

@@ -0,0 +1,88 @@
+class AddChannels < ActiveRecord::Migration
+  def up
+    create_table :channels do |t|
+      t.integer :author_id
+      t.integer :owner_id
+      t.integer :user_author_id
+
+      t.timestamps
+    end
+
+    add_index "channels", "author_id"
+    add_index "channels", "owner_id"
+    add_index "channels", "user_author_id"
+
+    add_foreign_key "channels", "actors", :name => "index_channels_on_author_id", :column => :author_id
+    add_foreign_key "channels", "actors", :name => "index_channels_on_owner_id", :column => :owner_id
+    add_foreign_key "channels", "actors", :name => "index_channels_on_user_author_id", :column => :user_author_id
+
+    change_table :activity_objects do |t|
+      t.integer :channel_id
+    end
+
+    add_index "activity_objects", "channel_id"
+
+    add_foreign_key "activity_objects", "channels", :name => "index_activity_objects_on_channel_id"
+
+    ActivityObject.record_timestamps = false
+
+    ActivityObject.reset_column_information
+
+    ActivityObject.all.each do |a|
+      %w( author user_author owner ).each do |m|
+        a.channel!.__send__ "#{ m }_id=",  a.read_attribute("#{ m }_id") # a.channel!.author_id = a.read_attribute("author_id")
+      end
+
+      a.save!
+    end
+
+    remove_foreign_key "activity_objects", :name => "index_activity_objects_on_author_id"
+    remove_foreign_key "activity_objects", :name => "index_activity_objects_on_owner_id"
+    remove_foreign_key "activity_objects", :name => "index_activity_objects_on_user_author_id"
+
+    remove_column :activity_objects, :author_id
+    remove_column :activity_objects, :owner_id
+    remove_column :activity_objects, :user_author_id
+
+    ActivityObject.reset_column_information
+  end
+
+  def down
+    change_table :activity_objects do |t|
+      t.integer :author_id
+      t.integer :owner_id
+      t.integer :user_author_id
+    end
+
+    add_index "activity_objects", "author_id"
+    add_index "activity_objects", "owner_id"
+    add_index "activity_objects", "user_author_id"
+
+    add_foreign_key "activity_objects", "actors", :name => "index_activity_objects_on_author_id", :column => :author_id
+    add_foreign_key "activity_objects", "actors", :name => "index_activity_objects_on_owner_id", :column => :owner_id
+    add_foreign_key "activity_objects", "actors", :name => "index_activity_objects_on_user_author_id", :column => :user_author_id
+
+    ActivityObject.reset_column_information
+    ActivityObject.record_timestamps = false
+
+    ActivityObject.all.each do |a|
+      next if a.channel.blank?
+
+      a.author_id      = a.channel.author_id
+      a.owner_id       = a.channel.owner_id
+      a.user_author_id = a.channel.user_author_id
+
+      a.save!
+    end
+
+    remove_foreign_key "activity_objects", :name => "index_activity_objects_on_channel_id"
+
+    remove_column :activity_objects, :channel_id
+
+    remove_foreign_key "channels", :name => "index_channels_on_author_id"
+    remove_foreign_key "channels", :name => "index_channels_on_owner_id"
+    remove_foreign_key "channels", :name => "index_channels_on_user_author_id"
+
+    drop_table :channels
+  end
+end

data/db/migrate/20120109081509_update_notify_permissions.rb

@@ -0,0 +1,15 @@
+# Before the 'notify' permission was added, only users with the first relation in each group where notified by email
+# This migration preserves the old behavior by granting the 'notify' permission to the first relation in each group
+class UpdateNotifyPermissions < ActiveRecord::Migration
+  def up
+    perm_notify = Permission.find_or_create_by_action('notify')
+    Group.all.each do |g|
+      r = g.relation_customs.first
+      next if r.blank?
+      r.permissions << perm_notify
+    end
+  end
+
+  def down
+  end
+end

data/lib/social_stream/base/engine.rb

@@ -14,14 +14,22 @@ module SocialStream
         end
       end
 
-     initializer "social_stream-base.mime_types" do
+      initializer "social_stream-base.mime_types" do
         Mime::Type.register 'application/xrd+xml', :xrd
       end
 
-      initializer "social_stream-base.controller_helpers" do
+      initializer "social_stream-base.model.supertype" do
+        ActiveSupport.on_load(:active_record) do
+          include SocialStream::Models::Subtype::ActiveRecord
+          include SocialStream::Models::Supertype::ActiveRecord
+        end
+      end
+
+      initializer "social_stream-base.controller.helpers" do
         ActiveSupport.on_load(:action_controller) do
           include SocialStream::Controllers::Helpers
           include SocialStream::Controllers::CancanDeviseIntegration
+          include SocialStream::Controllers::I18nIntegration
         end
       end
 

data/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.11.2".freeze
+    VERSION = "0.12.0".freeze
   end
 end