social_stream 0.17.1 → 0.18.0

data/base/lib/social_stream/toolbar_config/base.rb

@@ -76,7 +76,7 @@ module SocialStream
             :url => new_message_path,
             :options => {:link =>{:remote=> false}}}
           items << { :key => :message_inbox,
-            :name => image_tag("btn/message_inbox.png")+t('message.inbox')+' (' + current_subject.mailbox.inbox(:unread => true).count.to_s + ')',
+            :name => image_tag("btn/message_inbox.png")+t('message.inbox')+' (' + current_subject.unread_messages_count.to_s + ')',
             :url => conversations_path,
             :options => {:link =>{:remote=> false}}}
           items << { :key => :message_sentbox,

data/base/lib/tasks/db/populate.rake

@@ -12,7 +12,7 @@ namespace :db do
       require 'forgery'
 
       LOGOS_PATH = File.join(Rails.root, 'lib', 'logos')
-      LOGOS_TOTAL = (ENV["LOGOS_TOTAL"] || 10).to_i if ENV["LOGOS_TOTAL"].present?
+      LOGOS_TOTAL = (ENV["LOGOS_TOTAL"] || 10).to_i
       USERS = (ENV["USERS"] || 9).to_i
       GROUPS = (ENV["GROUPS"] || 10).to_i
       CHEESECAKE = (ENV["CHEESECAKE"].present? || false)

data/base/social_stream-base.gemspec

@@ -34,11 +34,11 @@ Gem::Specification.new do |s|
   # Authorization
   s.add_runtime_dependency('cancan', '~> 1.6.4')
   # Pagination
-  s.add_runtime_dependency('kaminari', '~> 0.12.4')
+  s.add_runtime_dependency('kaminari', '~> 0.13.0')
   # OAuth client
   s.add_runtime_dependency('omniauth','~> 0.2.6')
   # Messages
-  s.add_runtime_dependency('mailboxer','~> 0.5.4')
+  s.add_runtime_dependency('mailboxer','~> 0.6.0')
   # Tagging
   s.add_runtime_dependency('acts-as-taggable-on','~> 2.0.6')
   # HTML Forms

data/base/spec/controllers/comments_controller_spec.rb

@@ -13,7 +13,7 @@ describe CommentsController do
 
     describe "comment from user" do
       before do
-        activity = Factory(:self_activity, :contact => Factory(:self_contact, :sender => @user.actor))
+        activity = Factory(:self_activity, :channel => @user.self_channel)
 
         model_attributes[:author_id] = @user.actor_id
         model_attributes[:owner_id]  = @user.actor_id
@@ -38,7 +38,7 @@ describe CommentsController do
     describe "comment to friend" do
       before do
         f = Factory(:friend, :contact => Factory(:contact, :receiver => @user.actor)).sender
-        activity = Factory(:self_activity, :contact => f.contact_to!(f))
+        activity = Factory(:self_activity, :channel => f.contact_to!(f).channel)
 
         model_attributes[:author_id] = @user.actor_id
         model_attributes[:owner_id]  = f.id
@@ -52,7 +52,7 @@ describe CommentsController do
     describe "post to acquaintance" do
       before do
         a = Factory(:acquaintance, :contact => Factory(:contact, :receiver => @user.actor)).sender
-        activity = Factory(:self_activity, :contact => a.contact_to!(a))
+        activity = Factory(:self_activity, :channel => a.self_channel)
 
         model_attributes[:author_id] = @user.actor_id
         model_attributes[:owner_id]  = a.id

data/base/spec/factories/activity.rb

@@ -23,14 +23,14 @@ end
 ## End of helpers
 
 Factory.define :activity do |a|
-  a.contact { Factory(:friend).contact }
+  a.channel { Factory(:friend).contact.channel }
   a.activity_verb { ActivityVerb["post"] }
   a.relation_ids  { |b| Array(b.sender.relation_custom('friend').id) }
   a.activity_object_ids { Array(Factory(:post_spec_helper).activity_object_spec_helper.id) }
 end
 
 Factory.define :self_activity, :parent => :activity do |a|
-  a.contact { Factory(:self_contact) }
+  a.channel { Factory(:self_contact).channel }
   a.relation_ids  { |b| Array(b.sender.relation_custom('friend').id) }
 end
 
@@ -40,7 +40,7 @@ end
 
 Factory.define :like_activity, :class => 'Activity' do |a|
   a.association :parent, :factory => :activity
-  a.contact { |b| Factory(:friend, :sender => b.parent.sender).receiver.contact_to!(b.parent.sender) }
+  a.channel { |b| Factory(:friend, :sender => b.parent.sender).receiver.contact_to!(b.parent.sender).channel }
   a.activity_verb { ActivityVerb["like"] }
   a.relation_ids  { |b| b.parent.relation_ids }
   a.after_build{ |b| b.activity_object_ids = b.parent.activity_object_ids }

data/base/spec/factories/contact.rb

@@ -1,6 +1,7 @@
 Factory.define :contact do |c|
   c.sender   { |s| Factory(:user).actor }
   c.receiver { |r| Factory(:user).actor }
+  c.user_author { |d| d.sender }
 end
 
 Factory.define :self_contact, :parent => :contact do |c|
@@ -9,6 +10,7 @@ end
 
 Factory.define :group_contact, :parent => :contact do |g|
   g.sender { |s| Factory(:group).actor }
+  g.after_build { |h| h.user_author = h.sender.user_author }
 end
 
 Factory.define :g2g_contact, :parent => :group_contact do |g|

data/base/spec/models/activity_authorization_spec.rb

@@ -281,7 +281,11 @@ describe Activity do
     describe "build to non replied contact" do
       before do
         @tie = Factory(:friend, :contact => Factory(:contact, :sender => @user.actor))
-        @activity = Activity.new :contact_id => @tie.contact.id
+        partner = @tie.receiver
+        @activity = Activity.new :author => @user.actor,
+                                 :user_author => @user.author,
+                                 :owner => partner
+
         create_ability_accessed_by @tie.sender_subject
       end
 

data/base/spec/models/like_spec.rb

@@ -20,7 +20,7 @@ describe Like do
   describe "actor" do
     shared_examples_for "creates activity" do
       it "should recognize the user who likes it" do
-        Like.build(@sender, @receiver).save
+        Like.build(@sender, @sender, @receiver).save
 
         assert @receiver.liked_by?(@sender)
       end
@@ -28,13 +28,13 @@ describe Like do
       it "should increment like count" do
         count = @receiver.like_count
 
-        Like.build(@sender, @receiver).save
+        Like.build(@sender, @sender, @receiver).save
 
         @receiver.like_count.should eq(count + 1)
       end
 
       it "should decrement like count" do
-        @like = Like.build(@sender, @receiver)
+        @like = Like.build(@sender, @sender, @receiver)
         @like.save
 
         count = @receiver.like_count

data/base/spec/models/tie_spec.rb

@@ -41,8 +41,8 @@ describe Tie do
     end
 
     it "should create activity with follow verb" do
-      @tie.contact.activities.should be_present
-      @tie.contact.activities.first.verb.should eq('follow')
+      @tie.contact.channel.activities.should be_present
+      @tie.contact.channel.activities.first.verb.should eq('follow')
     end
 
     context "reciprocal" do
@@ -51,8 +51,8 @@ describe Tie do
       end
 
       it "should create activity with make-friend verb" do
-        @reciprocal.contact.activities.should be_present
-        @reciprocal.contact.activities.first.verb.should eq('make-friend')
+        @reciprocal.contact.channel.activities.should be_present
+        @reciprocal.contact.channel.activities.first.verb.should eq('make-friend')
       end
     end
 

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

@@ -18,15 +18,23 @@
 
 .attachment_text
 {
-	line-height: 20px;
-	height: auto;
-	font-size:13px;
+        float: left;
+	font-size:11px;
+	margin-bottom: 3px;
+	text-align: left;
+	width: 310px;
+}
+
+.attachment_text .title
+{
+        font-weight: bold;
+	margin: 10px 0 3px 0;
 }
 
 .attachment_text_link
 {
 	color: #2A3890;
-	padding-left: 10px;
+	text-decoration: underline;
 }
 
 .attachment_text audio
@@ -46,7 +54,7 @@
 	/*width: 10%;*/
 	float: left;
 	/*height: 50px;*/
-  padding-right:5px;
+	padding-right:5px;
 	vertical-align: middle;
 }
 
@@ -278,3 +286,20 @@
   width: 100%;
   text-align: center;
 }
+
+/* Uploaded images, audio and vids */
+.picture_thumbnail_show {
+  padding: 10px;
+}
+
+.picture_thumbnail_show, .picture_thumbnail_show img {
+  position: relative;
+  float: left;
+  max-height: 100px;
+  width: 130px;
+}
+
+.attachment_thumb {
+  position: relative;
+  float: left;
+} 

data/documents/app/helpers/documents_helper.rb

@@ -20,7 +20,7 @@ module DocumentsHelper
   def link_for_wall(document)
     format = Mime::Type.lookup(document.file_content_type)
 
-    polymorphic_path(document, :format => format, :style => 'thumb0')
+    polymorphic_path(document, :format => format, :style => 'thumbwall')
   end
   
   def show_view_for(document)

data/documents/app/models/picture.rb

@@ -2,8 +2,9 @@ class Picture < Document
   has_attached_file :file, 
                     :url => '/:class/:id.:extension',
                     :path => ':rails_root/documents/:class/:id_partition/:style',
-                    :styles => {:thumb  => ["48x48#"],
-                                :thumb0 => ["130x80#"]
+                    :styles => {:thumb48sq  => ["48x48"],
+                                :thumbwall => ["130x97#"],
+                                :preview => ["500>"]
                                }                              
                                
   define_index do
@@ -14,17 +15,19 @@ class Picture < Document
     
     has created_at
   end    
+
   # Thumbnail file
   def thumb(size, helper)
     case size
       when 16
         "#{ size.to_s }/photo.png"
       when 48
-        helper.picture_path self, :format => format, :style => 'thumb'   
+        helper.picture_path self, :format => format, :style => 'thumb48sq'
       when 130
-        helper.picture_path self, :format => format, :style => 'thumb0'    
+        helper.picture_path self, :format => format, :style => 'thumbwall'
+      when 500
+        helper.picture_path self, :format => format, :style => 'preview'
     end
   end
-    
-  
+      
 end

data/documents/app/models/video.rb

@@ -5,8 +5,8 @@ class Video < Document
                     :styles => {
                       :webm => {:format => 'webm'},
                       :flv  => { :format => 'flv' },
-                      :thumb  => {:geometry => "48x48" , :format => 'png', :time => 5},
-                      :thumb0 => {:geometry => "130x80", :format => 'png', :time => 5}
+                      :thumb48sq  => {:geometry => "48x48" , :format => 'png', :time => 5},
+                      :thumbwall => {:geometry => "130x97#", :format => 'png', :time => 5}
                     },
                     :processors => [:ffmpeg]
                     

data/documents/app/views/pictures/_picture.html.erb

@@ -1,29 +1,24 @@
 <%= div_for picture, :class => 'content_size' do %>
 
-  <div class="attachment_thumb picture_link">
-    <%= link_to thumb_for(picture, 16),
-                 picture_path(picture),
-                :type => picture.type, 
-            		:title => picture.title,
-            		:path => document_path(picture) %>
-  </div>
-  
-  <div class="attachment_text picture_summary_class picture_link">
-  	<%= t('picture.msg') %>
-  	<%= link_to "\""+picture.title+"\"", 
-                picture_path(picture),
-                :alt => picture.title,
-               	:type => picture.type,
-               	:path => document_path(picture),
-                :class => "attachment_text_link" %>
-  </div>
-  
   <div class="picture_link picture_thumbnail_show">
     <%= link_to thumb_for(picture, 130),
                 download_document_path(picture),
-        :type => picture.type, 
-		:title => picture.title,
-		:path => document_path(picture) %>
+        :type => picture.type,
+                :title => picture.title,
+                :path => document_path(picture) %>
+  </div>
+
+  <div class="attachment_text picture_summary_class">
+        <div class="title"> 
+  	  <%= picture.title %>
+        </div>
+	<%= picture.description %>
+        <%= link_to t('picture.msg'),
+              picture_path(picture),
+              :alt => t('picture.msg'),
+              :type => picture.type,
+              :path => document_path(picture),
+              :class => "attachment_text_link picture_link" %>
   </div>
 <% end %>
 

data/documents/app/views/pictures/_picture_show.html.erb

@@ -1,6 +1,6 @@
 <%= div_for picture, :class => 'content_size' do %>
   <div class="picture_show">
-    <%= link_to image_tag_for(picture),
+    <%= link_to thumb_for(picture, 500),
         download_document_path(picture),
         :id => dom_id(picture) + "_a",
         :type => picture.type, 
@@ -12,7 +12,6 @@
 
 <%= javascript_tag do %>
   $(document).ready(function() {
-    $("#<%= dom_id picture %> #<%= dom_id picture %>_img").aeImageResize({ height: 500, width: 500 });
     $("#<%= dom_id picture %> #<%= dom_id picture %>_a").lightBox({ 
       maxHeight: 920,
       maxWidth: 920,
@@ -23,4 +22,4 @@
       imageBlank: '../assets/lightbox-blank.gif'});    
       
   })  
-<% end %>
+<% end %>

data/documents/app/views/videos/_video_processed.html.erb

@@ -9,7 +9,7 @@
   video,
   :class => "attachment_text_link" %>
   <div id="video_thumbnail_<%= video.id%>" class="video_thumbnail_class">
-    <%= image_tag(video_path(video, :format => :png, :style => 'thumb0'), :class => "video_thumbnail_image", :alt => "")%> <div id="<%= video.id%>" class="video_thumbnail_play_over"></div>
+    <%= image_tag(video_path(video, :format => :png, :style => 'thumbwall'), :class => "video_thumbnail_image", :alt => "")%> <div id="<%= video.id%>" class="video_thumbnail_play_over"></div>
   </div>
   <div id="full_video_<%= video.id%>" class="jp-video jp-video-270p">
     <div class="jp-type-single">
@@ -47,4 +47,4 @@
       <div id="jp_playlist_<%= video.id%>" class="jp-playlist"></div>
     </div>
   </div>
-</div>
+</div>

data/documents/config/locales/en.yml

@@ -43,7 +43,7 @@ en:
     confirm_delete: "Delete picture?"
     title: "Pictures"
     mine: "My pictures"  
-    msg: "Uploaded a picture:"
+    msg: "See details..."
     name: "picture"
     not_mine: "Pictures"
     one: "a picture"

data/documents/config/locales/es.yml

@@ -43,7 +43,7 @@ es:
     confirm_delete: "¿Borrar imagen?"
     title: "Imágenes"
     mine: "Mis imágenes"
-    msg: "Subió una imagen:"
+    msg: "Ver detalles..."
     name: "imagen"
     not_mine: "Imágenes"
     one: "una imagen"

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Documents
-    VERSION = "0.7.0".freeze
+    VERSION = "0.8.0".freeze
   end
 end

data/documents/social_stream-documents.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.12.0')
+  s.add_runtime_dependency('social_stream-base', '~> 0.13.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/models/event.rb

@@ -9,23 +9,12 @@ class Event < ActiveRecord::Base
 
   validate :room_belongs_to_receiver
 
-  class << self
-    def ocurrences(start_date, end_date)
-      between(start_date, end_date).
-      map { |e|
-        e.ocurrences(start_date, end_date)
-      }.
-      flatten.
-      uniq
-    end
-  end
-
   def to_json(options = {})
     if recurrence
       st = options[:start].try(:to_date)
       en = (options[:end] || end_at.end_of_month + 7.days).to_date
 
-      ocurrences(st, en).map do |d|
+      recurrence.events(:starts => st, :until  => en).map do |d|
 
         start_diff = d - start_at.to_date
         end_diff   = d - end_at.to_date

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

@@ -3,20 +3,21 @@
 <div class="block">
   <div class="content">
 
+    <% bow = (Time.now - 1.days).beginning_of_week %>
+
     <%= render :partial => 'events/calendar_month',
                :locals  => {
                  :position => :top,
-                 :date => Date.today.beginning_of_week 
+                 :date => bow.to_date
                 } %>
 
   <table id="sidebar_calendar">
-    <% bow = Time.now.beginning_of_week %>
 
     <% 28.times do |i| %>
       <% day = bow + i.days %>
 
       <%= raw cycle(*(Array.wrap("<tr>") + 6.times.map{""}) + Array.wrap(:name => "tr_start")) %>
-      <td class="<%= event_class(day.to_date) %>">
+      <td id="sidebar_day_<%= day.day %>_<%= day.month %>_<%= day.year %>" class="sidebar_day">
         <%= link_to day.day, polymorphic_path([profile_or_current_subject, Event.new], :date => day.to_i, :view => "agendaDay") %>
       </td>
 
@@ -24,10 +25,42 @@
     <% end %>
   </table>
 
+  <%= javascript_tag do %>
+    var now = new Date();
+    $('#sidebar_day_' + now.getDate() + '_' + (now.getMonth()+1) + '_' + now.getFullYear()).addClass('today');
+    var re = new RegExp('sidebar_day_(..?)_(..?)_(..?.?.?)');
+    $('.sidebar_day').each(function(index, domEl){
+      var m = re.exec(domEl.id);
+      if(m == null) return;
+      var d = new Date(m[3], (m[2]-1), m[1], 23, 59, 59);
+      if(d < now) $(domEl).addClass('past');
+      if(m[2] != (now.getMonth()+1)) $(domEl).addClass('next_month');
+    });
+    $.ajax({
+      dataType: 'json',
+      cache: false,
+      url: "<%= escape_javascript polymorphic_path([@current_subject, Event.new]) %>",
+      data: {
+        start: <%= bow.to_i %>,
+	end: <%= (bow + 28.days).to_i %>
+      },
+      success: function(events) {
+        $.map(events, function(event) {
+	  var start = new Date(event.start); // This applies TZ
+	  var end = new Date(event.end);
+	  for(loopTime=start.getTime(); loopTime <= end.getTime(); loopTime+=86400000) {
+	    var d = new Date(loopTime);
+	    $('#sidebar_day_'+ d.getDate() + '_' + (d.getMonth()+1) + '_' + d.getFullYear()).addClass("busy");
+	  }
+	})
+      }
+    });
+  <% end %>
+
     <%= render :partial => 'events/calendar_month',
                :locals  => {
                  :position => :bottom,
-                 :date => Date.today.beginning_of_week + 28
+                 :date => (bow + 28.days).to_date
                 } %>
 
   </div>