social_stream 0.15.8 → 0.16.1

data/README.rdoc

@@ -54,7 +54,7 @@ Current Social Stream distribution includes:
   along with users, group, post and comments
 * {Social Stream Documents}[https://github.com/ging/social_stream/tree/master/documents], support for
   activities on files
-* {Social Stream Events}[https://github.com/ging/social_stream/tree/master/events], videoconference events with an agenda and several sessions
+* {Social Stream Events}[https://github.com/ging/social_stream/tree/master/events], sheduled events with calendar
 * {Social Stream Linkser}[https://github.com/ging/social_stream/tree/master/linkser], advanced management of links to other webpages
  
 = Documentation

data/base/app/models/user.rb

@@ -12,7 +12,7 @@ class User < ActiveRecord::Base
            :foreign_key => :user_author_id
 
   # Setup accessible (or protected) attributes for your model
-  attr_accessible :name, :email, :password, :password_confirmation, :remember_me, :profile_attributes
+  attr_accessible :name, :email, :password, :password_confirmation, :language, :remember_me, :profile_attributes
 
   validates_presence_of :email
 

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

@@ -85,3 +85,29 @@ $(".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/base/app/views/devise/registrations/edit.html.erb

@@ -18,4 +18,5 @@
 <%= render :partial => "settings/api_key" %>
 <% end %>
 <%= render :partial => "settings/contacts" %>
-<%= render :partial => "delete_account"%>
+<%= render :partial => "delete_account"%>
+

data/base/app/views/posts/_post_focus_search.html.erb

@@ -11,9 +11,9 @@
   </div>
   <div class="activity_objects">
     <%= link_to post do%>
-      <% text = excerpt(strip_tags(post.text),get_search_query_words.first,:radius => 180) %>
+      <% text = excerpt(strip_tags(post.text),get_search_query_words.first,:radius => 180) || "" %>
       <% if text.length < 400 %>
-        <% text = excerpt(strip_tags(post.text),get_search_query_words.first,:radius => 540 - text.length) %>
+        <% text = excerpt(strip_tags(post.text),get_search_query_words.first,:radius => 540 - text.length) || "" %>
       <% end %>
       <%= highlight(text,get_search_query_words) %>
       <% end %>

data/base/app/views/posts/_post_global_search.html.erb

@@ -6,9 +6,9 @@
   <div class="sub-block">
     <div class="brief">
     <%= link_to post do%>
-      <% text = excerpt(strip_tags(post.text),get_search_query_words.first,:radius => 25) %>
+      <% text = excerpt(strip_tags(post.text),get_search_query_words.first,:radius => 25) || "" %>
       <% if text.length < 60 %>
-        <% text = excerpt(strip_tags(post.text),get_search_query_words.first,:radius => 30 + (60 - text.length)) %>
+        <% text = excerpt(strip_tags(post.text),get_search_query_words.first,:radius => 30 + (60 - text.length)) || "" %>
       <% end %>
       <%= highlight(text,get_search_query_words) %>
       <% end %>

data/base/config/locales/en.yml

@@ -9,6 +9,8 @@ en:
     edit: "Edit account"
     email: 
       change: "Change email address"
+    lang: 
+      change: "Change language"
     one: "Account"
     password:
       change: "Change password"
@@ -429,6 +431,8 @@ en:
       briefing: "Lets you cancel your account"
     email_change:
       briefing: "Change your email"
+    lang_change:
+      briefing: "Change your language"
     error: "Some errors raised when saving your changes"
     for: "Settings for"
     main: "Settings"

data/base/db/migrate/20111221103509_add_language_field.rb

@@ -0,0 +1,13 @@
+class AddLanguageField < ActiveRecord::Migration
+  def self.up
+    change_table "users" do |t|
+      t.string "language", :default => "en"
+    end
+  end
+
+  def self.down
+    change_table :users do |t|
+      t.remove "language"
+    end
+  end
+end

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.10.11".freeze
+    VERSION = "0.11.0".freeze
   end
 end

data/documents/lib/social_stream/documents/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Documents
-    VERSION = "0.5.2".freeze
+    VERSION = "0.6.0".freeze
   end
 end

data/documents/social_stream-documents.gemspec

@@ -7,12 +7,12 @@ Gem::Specification.new do |s|
   s.authors = ["Víctor Sánchez Belmar", "GING - DIT - UPM"]
   s.summary = "File capabilities for Social Stream, the core for building social network websites"
   s.description = "Social Stream is a Ruby on Rails engine providing your application with social networking features and activity streams.\n\nThis gem allow you upload almost any kind of file as new social stream activity."
-  s.email = "v.sanchezbelmar@gmail.com"
+  s.email = "social-stream@dit.upm.es"
   s.homepage = "http://github.com/ging/social_stream-documents"
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.10.6')
+  s.add_runtime_dependency('social_stream-base', '~> 0.11.0')
   s.add_runtime_dependency('paperclip-ffmpeg', '~> 0.7.0')
   # Waiting for version > 2.4.5, which fixes:
   # https://github.com/thoughtbot/paperclip/issues/293

data/events/app/assets/javascripts/0_init.js

@@ -0,0 +1,4 @@
+var SocialStream = SocialStream || {};
+SocialStream.Events = SocialStream.Events || {};
+SocialStream.Events.current = SocialStream.Events.current || {};
+

data/events/app/assets/javascripts/events.js.coffee

@@ -0,0 +1,66 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
+#
+#= require fullcalendar
+#= require jquery.boxy
+#= require sprintf
+#= require scheduler
+
+SocialStream.Events.create = (start, end, allDay) ->
+  title = prompt('Event Title:');
+  if title
+    $.post(SocialStream.Events.current.eventsPath,
+           {
+           event: {
+             title: title,
+             start_at: start.toString(),
+             end_at: end.toString(),
+             all_day: allDay,
+             _contact_id: SocialStream.Events.current.contactId
+             }
+           },
+           undefined,
+          "script");
+
+SocialStream.Events.tools = {}
+
+SocialStream.Events.tools.currentRGB = () ->
+  [ parseInt(SocialStream.Events.current.eventColor[1..2], 16),
+  parseInt(SocialStream.Events.current.eventColor[3..4], 16),
+  parseInt(SocialStream.Events.current.eventColor[5..6], 16) ]
+
+SocialStream.Events.tools.colorRange = () ->
+  min = 0
+
+  for color in SocialStream.Events.tools.currentRGB()
+    if color < min
+      min = color
+  
+  parseInt 2 * (255 - min) / 3
+
+SocialStream.Events.tools.increaseColor = (delta) ->
+   (if (color + delta) > 255 then 255 else (color + delta)) for color in SocialStream.Events.tools.currentRGB()
+  
+
+SocialStream.Events.tools.eventColorScale = (index) ->
+  range = SocialStream.Events.tools.colorRange()
+
+  delta = range * (index + 1) / (SocialStream.Events.current.roomIndex.length + 1)
+
+  delta = parseInt(delta)
+
+  newColor = SocialStream.Events.tools.increaseColor(delta)
+
+  sprintf "#%02x%02x%02x", newColor[0], newColor[1], newColor[2]
+  
+
+SocialStream.Events.tools.eventColor = (roomId) ->
+  currentColor = SocialStream.Events.current.eventColor
+
+  if not roomId? or not SocialStream.Events.current.roomIndex? or SocialStream.Events.current.roomIndex.length == 0
+    return currentColor
+
+  currentRoomIndex = SocialStream.Events.current.roomIndex.indexOf(roomId)
+
+  SocialStream.Events.tools.eventColorScale(currentRoomIndex)

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

@@ -0,0 +1,37 @@
+// Place all the styles related to the events controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
+//
+//= require fullcalendar
+//= require boxy
+
+#calendar {
+	margin-top: 20px;
+}
+
+#sidebar_calendar_date {
+  margin-left: 5px;
+}
+
+#sidebar_calendar {
+	width: 100%;
+	text-align: center;
+	padding-top: 5px;
+}
+
+#sidebar_calendar a {
+	color: black;
+}
+
+#sidebar_calendar td {
+  height: 25px;
+  border: 1px solid #CCCCCC;
+}
+
+#new_event div.form_row {
+  padding: 3px 0;
+}
+
+#scheduler-options {
+  padding: 2px 10px;
+}

data/events/app/controllers/events_controller.rb

@@ -0,0 +1,40 @@
+class EventsController < ApplicationController
+  include SocialStream::Controllers::Objects
+
+  belongs_to_subjects :optional => true
+
+  before_filter :profile_subject!, :only => :index
+
+  def index
+    index! do |format|
+      format.json {
+        start_time = Time.at(params[:start].to_i)
+        end_time   = Time.at(params[:end].to_i)
+        @activities =
+          collection.
+           joins(:activity_objects => :event).
+            merge(Event.between(start_time, end_time))
+
+        render :json =>
+          @activities.
+            map(&:direct_object).
+            map{ |e| e.to_json(:start => start_time, :end => end_time) }.flatten.to_json
+      }
+    end
+  end
+
+  def show
+    show! do |format|
+      format.html { redirect_to polymorphic_path([ @event.post_activity.receiver_subject, Event.new ], :at => @event.start_at.to_i) }
+    end
+  end
+
+  private
+
+  def collection
+    @activities =
+      profile_subject.wall(:profile,
+                           :for => current_subject,
+                           :object_type => :Event)
+  end
+end

data/events/app/controllers/rooms_controller.rb

@@ -0,0 +1,7 @@
+class RoomsController < InheritedResources::Base
+  actions :create, :destroy
+
+  respond_to :js
+
+  load_and_authorize_resource
+end

data/events/app/models/event.rb

@@ -0,0 +1,53 @@
+class Event < ActiveRecord::Base
+  include SocialStream::Models::Object
+
+  scheduler
+
+  belongs_to :room
+
+  validates_presence_of :title
+
+  validate :room_belongs_to_receiver
+
+  def to_json(options = {})
+    if recurrence
+      st = options[:start].try(:to_date)
+      en = (options[:end] || end_at.end_of_month + 7.days).to_date
+
+      recurrence.events(:starts => st, :until  => en).map do |d|
+
+        start_diff = d - start_at.to_date
+        end_diff   = d - end_at.to_date
+
+        build_json start_at.advance(:days => start_diff),
+                   end_at.advance(:days => end_diff)
+      end
+    else
+      build_json 
+    end
+  end
+
+  protected
+
+  def build_json(start_time = start_at, end_time = end_at)
+      {
+        :id => id,
+        :title => title,
+        :start => start_time,
+        :end => end_time,
+        :allDay => all_day?,
+        :roomId => room_id
+      }
+
+  end
+
+  private
+
+  def room_belongs_to_receiver
+    return if room_id.blank?
+
+    unless _contact.receiver.room_ids.include?(room_id)
+      errors.add(:room_id, :invalid)
+    end
+  end
+end

data/events/app/models/room.rb

@@ -0,0 +1,8 @@
+class Room < ActiveRecord::Base
+  belongs_to :actor
+
+  has_many :events
+
+  validates_presence_of :actor_id, :name
+  validates_uniqueness_of :name, :scope => :actor_id
+end

data/events/app/views/events/_event.html.erb

@@ -0,0 +1 @@
+<%= raw t('event.wall_post', :title => link_to(h(event.title), event)) %>

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

@@ -0,0 +1,40 @@
+<%= form_for @event || Event.new(:owner_id => profile_subject.actor_id, :interval => 1), :remote => true do |f| %>
+  <%= f.hidden_field :owner_id  %>
+  <%= f.hidden_field :start_at %>
+  <%= f.hidden_field :end_at %>
+  <%= f.hidden_field :all_day %>
+
+  <% if f.object.errors.any? %>
+    <div id="error_explanation">
+      <h2><%= pluralize(f.object.errors.count, "error") %> evitaron que se guardara esta actividad:</h2>
+
+      <ul>
+      <% f.object.errors.full_messages.each do |msg| %>
+        <li><%= msg %></li>
+      <% end %>
+      </ul>
+    </div>
+  <% end %>
+
+  <div class="form_row">
+    <%= f.label :title %>
+    <%= f.text_field :title %>
+  </div>
+
+  <% if profile_subject.rooms.any? %>
+  <div class="form_row">
+    <%= f.label :room %>
+    <%= f.select :room_id, profile_subject.rooms.map{ |r| [r.name, r.id] }, { :include_blank => true } %>
+  </div>
+  <% end %>
+
+  <div class="form_row">
+    <%= render :partial => 'scheduler/form',
+               :locals  => { :f => f }
+     %>
+  </div>
+
+  <div class="form_row space_center">
+  <%= f.submit %>
+  </div>
+<% end %>

data/events/app/views/events/_sidebar_calendar.html.erb

@@ -0,0 +1,26 @@
+<div class="space_center"></div>
+
+<div class="block">
+  <div class="header">
+    <div class="header_text"><%= t 'event.title' %></div>
+  </div>
+
+  <div class="content">
+    <span id="sidebar_calendar_date"><%= l Date.today, :format => :long %></span>
+
+  <table id="sidebar_calendar">
+    <% bow = Time.now.beginning_of_week %>
+
+    <% 28.times do |i| %>
+      <% day = bow + i.days %>
+
+      <%= raw cycle("<tr>", *6.times.map{""}, :name => "tr_start") %>
+      <td<%= " class=\"fc-state-highlight\"".html_safe if day.today? %>>
+        <%= link_to day.day, polymorphic_path([subject, Event.new], :at => day.to_i) %>
+      </td>
+
+      <%= raw cycle(*6.times.map{""}, '</tr>', :name => "tr_end") %>
+    <% end %>
+  </table>
+  </div>
+</div>

data/events/app/views/events/create.js.erb

@@ -0,0 +1,21 @@
+<% if @event.valid? %>
+  SocialStream.Events.current.newForm.unload();
+
+  var cal = SocialStream.Events.current.calendar;
+
+  jQuery.each(<%= raw Array.wrap(@event.to_json).to_json  %>,
+              function(index, ev) {
+    ev.color = SocialStream.Events.tools.eventColor(<%= @event.room_id %>);
+  
+    cal.fullCalendar('renderEvent', ev,
+                     true // make the event "stick"
+                    );
+  });
+
+  cal.fullCalendar('unselect');
+
+<% else %>
+  SocialStream.Events.current.newForm.setContent("<%= escape_javascript render(:partial => 'new') %>");
+
+  Scheduler.form.init(SocialStream.Events.current.newForm.getContent().find('.scheduler_form'));
+<% end %>

data/events/app/views/events/destroy.js.erb

@@ -0,0 +1 @@
+<%= render(:partial => 'objects/destroy') %>

data/events/app/views/events/index.html.erb

@@ -0,0 +1,96 @@
+<% content_for :headers do %>
+  <style type="text/css">
+    #sidebar {width: 0px;}
+    #center_body {width: 780px; max-width: 780px;}
+  </style>
+<% end %>
+
+<% content_for :title do %>
+  <%= profile_subject.name + ": " + t('event.title') %>
+<% end %>
+
+<%= location(
+  link_to(profile_subject.name, polymorphic_path(profile_subject)),
+  link_to(t('event.title'), polymorphic_path([profile_subject, Event.new]))
+  ) %>
+
+<% toolbar :profile => profile_subject %>
+
+<div id="calendar"></div>
+
+<%= javascript_tag do %>
+  $(function(){
+
+    <% if profile_subject.respond_to? :rooms %>
+      SocialStream.Events.current.roomIndex = <%= raw profile_subject.rooms.map(&:id) %>;
+    <% end %>
+
+    SocialStream.Events.current.eventColor = '#58310E';
+
+    SocialStream.Events.current.calendar = $('#calendar').fullCalendar({
+      header: {
+        left: 'prev,next today',
+        center: 'title',
+        right: 'month,agendaWeek,agendaDay'
+      },
+      firstDay: 1,
+      eventColor: SocialStream.Events.current.eventColor,
+      <% if can? :create, new_post(profile_subject) %>
+      selectable: true,
+      selectHelper: true,
+      select: function(startDate, endDate, allDay, jsEvent){
+
+        SocialStream.Events.current.newForm = new Boxy(
+          "<%= escape_javascript render(:partial => 'events/new') %>",
+          {
+            title: "<%= t('event.new.title') %>",
+            closeable: true,
+            closeText: "<%= t('boxy.close_text') %>",
+            draggable: true
+          }
+        );
+
+
+        SocialStream.Events.current.newForm.moveTo(jsEvent.clientX, jsEvent.clientY);
+
+        var c = SocialStream.Events.current.newForm.getContent();
+
+        c.children('#event_start_at').val(startDate.toJSON());
+        c.children('#event_end_at').val(endDate.toJSON());
+        c.children('#event_all_day').val(allDay.toString());
+
+        // From rails-scheduler gem
+        Scheduler.form.init(c.find('.scheduler_form'), startDate);
+      },
+      <% end %>
+      // Implement event edition
+      // editable: true,
+      events: function(start, end, callback) {
+        $.ajax({
+            url: "<%= escape_javascript polymorphic_path([profile_subject, Event.new]) %>",
+            dataType: 'json',
+            data: {
+                // our hypothetical feed requires UNIX timestamps
+                start: Math.round(start.getTime() / 1000),
+                end: Math.round(end.getTime() / 1000)
+            },
+            success: function(events) {
+                callback(
+                  $.map(events, function(event) {
+                    event.color = SocialStream.Events.tools.eventColor(event.roomId);
+                    return event;
+                        }
+                  )
+                );
+            }
+        });
+      }
+    });
+
+    <% if params[:at] %>
+      // TODO: optimize this to save one index call
+      SocialStream.Events.current.calendar.fullCalendar('changeView', "agendaDay");
+      SocialStream.Events.current.calendar.fullCalendar('gotoDate', new Date(<%= params[:at] %> * 1000));
+    <% end %>
+  });
+<% end %>

data/events/app/views/rooms/_form.html.erb

@@ -0,0 +1,31 @@
+<%= form_for @room || Room.new(:actor => current_subject.actor), :remote => true do |f| %>
+  <%= f.hidden_field :actor_id %>
+
+  <% if f.object.errors.any? %>
+    <div id="error_explanation">
+      <h2><%= pluralize(f.object.errors.count, "error") %> evitaron que se guardara este espacio:</h2>
+
+      <ul>
+      <% f.object.errors.full_messages.each do |msg| %>
+        <li><%= msg %></li>
+      <% end %>
+      </ul>
+    </div>
+  <% end %>
+
+  <div class="row">
+    <div class="label">
+      <%= f.text_field :name %>
+    </div>
+
+    <div class="field">
+    <%= f.submit %>
+    </div>
+  </div>
+<% end %>
+
+<%= javascript_tag do %>
+  $(function(){
+    $('#room_name').Watermark("<%= escape_javascript t('room.watermark.name') %>");
+  });
+<% end %>

data/events/app/views/rooms/_index.html.erb

@@ -0,0 +1,10 @@
+<div id="rooms">
+  <% current_subject.rooms.each do |room| %>
+    <div class="row">
+      <div class="label"><%= room.name %></div>
+      <div class="field">
+        <%= link_to image_tag("btn/delete.png", :class => "menu_icon", :title => t('room.delete')), room, :class => "room_delete_link", :method => :delete, :confirm => t('room.confirm_delete'), :remote => true %>
+      </div>
+    </div>
+  <% end %>
+</div>

data/events/app/views/rooms/_settings.html.erb

@@ -0,0 +1,23 @@
+<div class="block" id="room_settings">
+  <div class="header">
+    <div class="header_text">
+      <%= t 'room.settings.title' %>
+    </div>
+    <div class="header_icon_right">
+      <%= link_to image_tag('btn/edit.png'),  "javascript:showSettings(\"room_settings\");" %>
+    </div>
+  </div>
+  <div id="room_settings_briefing" class="settings_briefing content">        
+    <div class="form_row">
+      <%= t 'room.settings.description' %>
+    </div>
+  </div>
+  <div class="content settings_content" id="room_settings_content" style="display:none;">
+    <div class="sub-block">
+      <%= render :partial => 'rooms/index' %>
+    </div>
+    <div class="sub-block">
+      <%= render :partial => 'rooms/form' %>
+    </div>
+  </div>
+</div>

data/events/app/views/rooms/create.js.erb

@@ -0,0 +1,7 @@
+<% if @room.valid? %>
+  $('#rooms').replaceWith("<%= escape_javascript render(:partial => 'index') %>");
+  $('#room_name').val("");
+  $('#room_name').Watermark("<%= escape_javascript t('room.watermark.name') %>");
+<% else %>
+  $('#new_room').replaceWith("<%= escape_javascript render(:partial => 'form') %>");
+<% end %>

data/events/app/views/rooms/destroy.js.erb

@@ -0,0 +1 @@
+$('#rooms').replaceWith("<%= escape_javascript render(:partial => 'index') %>");