social_stream 0.22.1 → 0.23.1

data/base/app/views/comments/_new.html.erb

@@ -31,17 +31,3 @@
     </div>
   </div>
 <% end %>
-
-<%= javascript_tag do %>
-  $(function() {
-    $("#comment_text_<%= dom_id(activity) %>").Watermark("<%= I18n.t('comment.input') %>","#666");
- 
-    $("#comment_text_<%= dom_id(activity) %>")
-        .change(function(){autoSize("<%= dom_id(activity) %>");})
-        .keydown(function(){autoSize("<%= dom_id(activity) %>");})
-        .keyup(function(){autoSize("<%= dom_id(activity) %>");});
-    autoSize("<%= dom_id(activity) %>"); 
-
-    SocialStream.Wall.activateAntiRebounds();
-  });
-<% end %>

data/base/app/views/objects/_show.html.erb

@@ -1,3 +1,9 @@
 <% toolbar :profile => object.owner_subject %>
 
 <%= render object.post_activity %>
+
+<%= javascript_tag do %>
+  $(function() {
+    SocialStream.Objects.init();
+  });
+<% end %>

data/base/app/views/toolbar/_home.html.erb

@@ -8,7 +8,7 @@
 </div>
 
 <% if defined?(SocialStream::Presence) and SocialStream::Presence.enable %>
-  <%= render :partial => 'chat/index' , :locals => {:flow => false} %>
+  <%= render :partial => 'chat/index' , :locals => {:flow => false } %>
 <% end %>
 
 <div class="block space_center">

data/base/app/views/toolbar/_messages.html.erb

@@ -11,5 +11,5 @@
 </div>
 
 <% if defined?(SocialStream::Presence) and SocialStream::Presence.enable %>
-  <%= render :partial => 'chat/index' , :locals => {:flow => true} %>
+  <%= render :partial => 'chat/index' , :locals => {:flow => false } %>
 <% end %>

data/base/app/views/toolbar/_profile.html.erb

@@ -23,6 +23,6 @@
 </div>
 
 <% if defined?(SocialStream::Presence) and SocialStream::Presence.enable %>
-  <%= render :partial => 'chat/index' , :locals => {:flow => true} %>
+  <%= render :partial => 'chat/index' , :locals => {:flow => true , :group => @group } %>
 <% end %>
 

data/base/config/locales/es.yml

@@ -45,6 +45,13 @@ es:
     delete: "Borrar"
     last: "Últimas actividades"
     like: "Me gusta"
+    like_sentence:
+      few:
+        one: "A %{likers} le gusta esto"
+        other: "A %{likers} les gusta esto"
+      many:
+        one: "A %{likers} y %{count} persona más les gusta esto"
+        other: "A %{likers} y %{count} personas más les gusta esto"
     one: "Actividad"
     other: "Actividades"
     privacy:

data/base/db/migrate/20120302215722_activity_object_properties.rb

@@ -0,0 +1,24 @@
+class ActivityObjectProperties < ActiveRecord::Migration
+  def up
+    create_table :activity_object_properties do |t|
+      t.integer :activity_object_id
+      t.integer :property_id
+      t.string  :type
+      
+      t.timestamp
+    end
+
+    add_index "activity_object_properties", "activity_object_id"
+    add_index "activity_object_properties", "property_id"
+
+    add_foreign_key "activity_object_properties", "activity_objects", :name => "index_activity_object_properties_on_activity_object_id", :column => :activity_object_id
+    add_foreign_key "activity_object_properties", "activity_objects", :name => "index_activity_object_properties_on_property_id", :column => :property_id
+  end
+
+  def down
+    remove_foreign_key "activity_object_properties", :name => "index_activity_object_properties_on_activity_object_id"
+    remove_foreign_key "activity_object_properties", :name => "index_activity_object_properties_on_property_id"
+
+    drop_table :activity_object_properties
+  end
+end

data/base/lib/social_stream/ability/base.rb

@@ -22,11 +22,11 @@ module SocialStream
           end
 
           can :update, klass do |k| # can :update, Post do |post|
-            k.post_activity.allow?(subject, 'update')
+            [k.channel.author_id, k.channel.owner_id].include?(Actor.normalize_id(subject))
           end
 
           can :destroy, klass do |k| # can :destroy, Post do |post|
-            k.post_activity.allow?(subject, 'destroy')
+            [k.channel.author_id, k.channel.owner_id].include?(Actor.normalize_id(subject))
           end
         end
 

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.16.4".freeze
+    VERSION = "0.17.0".freeze
   end
 end

data/documents/app/assets/javascripts/social_stream-documents.js

@@ -1,3 +1,7 @@
 //= require jquery.jplayer
+//= require jquery.ae.image.resize
+//
+//= require_self
 //= require_tree .
-//= require jquery.ae.image.resize
+
+SocialStream.Documents = SocialStream.Documents || {};

data/documents/app/models/document.rb

@@ -70,9 +70,10 @@ class Document < ActiveRecord::Base
   end
   
   protected
-  
+
   def set_title
-    self.title ||= self.file_file_name
+    self.title = file_file_name if self.title.blank?
   end
-    
 end
+
+ActiveSupport.run_load_hooks(:document, Document) 

data/documents/app/models/picture.rb

@@ -4,6 +4,8 @@ class Picture < Document
                     :path => ':rails_root/documents/:class/:id_partition/:style',
                     :styles => {:thumb48sq  => ["48x48"],
                                 :thumbwall => ["130x97#"],
+                                # midwall preserves A4 proportion: 210x297
+                                :midwall => ["80x113#"],
                                 :preview => ["500>"]
                                }                              
                                
@@ -23,6 +25,8 @@ class Picture < Document
         "#{ size.to_s }/photo.png"
       when 48
         helper.picture_path self, :format => format, :style => 'thumb48sq'
+      when 80
+        helper.picture_path self, :format => format, :style => 'midwall'
       when 130
         helper.picture_path self, :format => format, :style => 'thumbwall'
       when 500

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Documents
-    VERSION = "0.11.2".freeze
+    VERSION = "0.11.3".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.16.4')
+  s.add_runtime_dependency('social_stream-base', '~> 0.17.0')
   s.add_runtime_dependency('paperclip-ffmpeg', '~> 0.7.0')
   s.add_runtime_dependency('paperclip','= 2.4.5')
   s.add_runtime_dependency('delayed_paperclip','2.4.5.1')

data/events/app/assets/javascripts/social_stream-events.js

@@ -1 +1,8 @@
+//= require social_stream-base
+//
+//= require_self
 //= require_tree .
+
+SocialStream.Events = SocialStream.Events || {};
+SocialStream.Events.current = SocialStream.Events.current || {};
+

data/events/app/assets/javascripts/social_stream.events.poster.js

@@ -0,0 +1,21 @@
+SocialStream.Events.Poster = (function(SS, $, undefined){
+	var init = function(){
+		$('.event_poster_update').hide();
+
+		$('.event_poster').hover(
+			function(){
+				$(this).find(".event_poster_update").fadeIn("slow");
+			        
+			},
+			function(){
+				$(this).find(".event_poster_update").fadeOut("slow");
+			});
+	}
+
+	SS.Timeline.addInitCallback(init);
+
+	return {
+		init: init
+	};
+
+})(SocialStream, jQuery);

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

@@ -15,6 +15,7 @@
   text-align: center;
   vertical-align: middle;
   padding: 10px;
+  width: 40px;
 }
 
 
@@ -48,6 +49,30 @@ div.event_date {
   padding-top: 10px;
 }
 
+.event_poster {
+	width: 80px;
+	height: 113px;
+	margin-right: 10px;
+	float: left;
+	position: relative;
+}
+
+.event_poster_update {
+	top: 95px;
+	left: 10px;
+	float: left;
+	position: absolute;
+	background: $secondary-color;
+	text-align: center;
+	opacity: 0.8;
+	width: 80;
+	height: 18px;
+	/* For IE 5-7 */
+	filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80);
+	/* For IE 8 */
+	-MS-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=80)";
+}
+
 #calendar {
 	margin-top: 20px;
 }

data/events/app/helpers/events_helper.rb

@@ -0,0 +1,9 @@
+module EventsHelper
+  def event_timeline_thumb(event)
+    if event.poster.new_record?
+      image_tag("poster.png")
+    else
+      thumb_for(event.poster, 80)
+    end
+  end
+end

data/events/app/models/activity_object_property/poster.rb

@@ -0,0 +1,2 @@
+class ActivityObjectProperty::Poster < ActivityObjectProperty
+end

data/events/app/models/event.rb

@@ -27,6 +27,18 @@ class Event < ActiveRecord::Base
     end
   end
 
+  def poster_object
+    object_properties.
+      where('activity_object_properties.type' => 'ActivityObjectProperty::Poster').
+      first
+  end
+
+  def poster
+    @poster ||=
+      poster_object.try(:document) ||
+      build_poster
+  end
+
   protected
 
   def build_json(start_time = start_at, end_time = end_at)
@@ -41,6 +53,12 @@ class Event < ActiveRecord::Base
 
   end
 
+  def build_poster
+    Document.new(:event_property_object_id => activity_object_id,
+                 :owner_id => owner_id)
+  end
+
+
   private
 
   def room_belongs_to_receiver

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

@@ -1,34 +1,46 @@
-<%= link_to event, :class => "event_date" do %>
-<div id="event-<%= event.id %>" class="event_date_image">
-  <div class="event_day">
-    <%= event.start_at.day %>
-  </div>
-  <div class="event_month">
-    <%= l event.start_at, :format => "%b" %>
-  </div>
-  <% unless event.all_day? %>
-    <div class="event_hour">
-      <%= l event.start_at, :format => "%H:%M" %>
+<%= div_for event do %>
+  <%= link_to event, :class => "event_date" do %>
+    <div class="event_date_image">
+      <div class="event_day">
+        <%= event.start_at.day %>
+      </div>
+      <div class="event_month">
+        <%= l event.start_at, :format => "%b" %>
+      </div>
+      <% unless event.all_day? %>
+        <div class="event_hour">
+          <%= l event.start_at, :format => "%H:%M" %>
+        </div>
+      <% end %>
     </div>
   <% end %>
-</div>
-<% end %>
 
-<%= javascript_tag do %>
-var d = new Date(<%= 1000*event.start_at.to_i %>);
-$("#event-<%= event.id %> .event_day").text($.datepicker.formatDate('d', d));
-$("#event-<%= event.id %> .event_month").text($.datepicker.formatDate('M', d));
-if($("#event-<%= event.id %> .event_hour").length) {
- var minutes = d.getMinutes();
- if (minutes<10) minutes = "0" + minutes;
- $("#event-<%= event.id %> .event_hour").text(d.getHours() + ':' + minutes);
-}
-<% end %>
+  <%= javascript_tag do %>
+  var d = new Date(<%= 1000*event.start_at.to_i %>);
+  $("#<%= dom_id event %> .event_day").text($.datepicker.formatDate('d', d));
+  $("#<%= dom_id event %> .event_month").text($.datepicker.formatDate('M', d));
+  if($("#<%= dom_id event %> .event_hour").length) {
+   var minutes = d.getMinutes();
+   if (minutes<10) minutes = "0" + minutes;
+   $("#<%= dom_id event %> .event_hour").text(d.getHours() + ':' + minutes);
+  }
+  <% end %>
 
-<div class="event_details">
-  <div class="title">
-  <%= link_to event.title, event %>
+  <div class="event_poster">
+    <%= event_timeline_thumb(event) %>
+
+    <% if can? :update, event %>
+      <div class="event_poster_update">
+        <%= link_to t('event.poster.update'), edit_event_path(event, :poster => true), :remote => true %>
+      </div>
+    <% end %>
   </div>
-</div>
+
+  <div class="event_details">
+    <div class="title">
+    <%= link_to event.title, event %>
+    </div>
+  </div>
+<% end %>
 
 <div class="clearfloat"></div>

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

@@ -0,0 +1,8 @@
+<%= form_for @event.poster do |f| %>
+  <%= f.hidden_field :event_property_object_id %>
+  <%= f.hidden_field :owner_id %>
+
+  <%= f.file_field :file %>
+
+  <%= f.submit %>
+<% end %>

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

@@ -0,0 +1,5 @@
+<% if params[:poster] %>
+  $("#<%= dom_id @event %> .event_poster").hide("slow");
+  $("#<%= dom_id @event %> .event_details").hide("slow");
+  $("#<%= dom_id @event %>").append("<%= escape_javascript render(:partial => 'events/form_poster', :locals => { :event => @event }) %>");
+<% end %>

data/events/config/locales/en.yml

@@ -24,6 +24,8 @@ en:
     new:
       title: "New event"
     one: "an event"
+    poster:
+      update: "Upload poster"
     title:
       one: "Event"
       other: "Events"

data/events/config/locales/es.yml

@@ -24,6 +24,8 @@ es:
     new:
       title: "Nuevo evento"
     one: "un evento"
+    poster:
+      update: "Subir cartel"
     title:
       one: "Evento"
       other: "Eventos"

data/events/lib/social_stream-events.rb

@@ -17,7 +17,8 @@ module SocialStream
     autoload :Ability, 'social_stream/events/ability'
 
     module Models
-      autoload  :Actor, 'social_stream/events/models/actor'
+      autoload  :Actor,    'social_stream/events/models/actor'
+      autoload  :Document, 'social_stream/events/models/document'
     end
 
     SocialStream.objects.push(:event) unless SocialStream.objects.include?(:event)

data/events/lib/social_stream/events/engine.rb

@@ -13,6 +13,12 @@ module SocialStream
         end
       end
 
+      initializer "social_stream-events.document" do
+        ActiveSupport.on_load(:document) do
+          include SocialStream::Events::Models::Document
+        end
+      end
+
       initializer "social_stream-events.views.settings" do
         SocialStream::Views::Settings.module_eval do
           include SocialStream::Views::Settings::Events

data/events/lib/social_stream/events/models/document.rb

@@ -0,0 +1,26 @@
+module SocialStream
+  module Events
+    module Models
+      module Document
+        extend ActiveSupport::Concern
+
+        included do
+          attr_accessor :event_property_object_id
+
+          before_validation(:on => :create) do
+            set_event
+          end
+        end
+
+        protected
+
+        def set_event
+          return if event_property_object_id.blank?
+
+          activity_object_holders <<
+            ActivityObjectProperty::Poster.new(:activity_object_id => event_property_object_id)
+        end
+      end
+    end
+  end
+end