social_stream-documents 0.3.3 → 0.4.0

data/Rakefile

@@ -1,33 +1,23 @@
 # encoding: UTF-8
-require 'rubygems'
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
+require 'bundler/gem_tasks'
 
-require 'rake'
-require 'rake/rdoctask'
+require 'rdoc/task'
 
 require 'rspec/core'
 require 'rspec/core/rake_task'
 
-require 'bundler'
-
 RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
 
 Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'Socialstream-files'
+  rdoc.title    = 'SocialStream Documents'
   rdoc.options << '--line-numbers' << '--inline-source'
   rdoc.rdoc_files.include('README.rdoc')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-Bundler::GemHelper.install_tasks
-
 # Modify this gem's tags
 class Bundler::GemHelper
   def version_tag

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

@@ -1,35 +1,3 @@
-$('.attachment_tile a, .picture_link a').live("click",function(e){
-	if(this.type ==""){
-		return true;
-	}
-	e.preventDefault();
-	
-	var download_link = this;
-
-    /*
-	if($('.player').length > 0 && $('.attachment_tile.selected').length==1){
-		removePlayers();
-		return;
-	}
-	*/
-	if(this.type == "Audio"){
-		removePlayers();
-		$(this).parent().parent().addClass("selected");
-		$('body').append("<audio class='player' autoplay='autoplay' id='audio_player' src='"+this+"' controls='controls'></audio>");
-		$('body').append("<a href='"+download_link+"'><img id='downloadButton' src='<%= asset_path "16/default.png" %>' /></a>");
-		return;
-	}
-	if(this.type == "Video"){
-		removePlayers();
-		$(this).parent().parent().addClass("selected");
-		var show = (this+"").split('/download')[0];
-		show = show.replace("documents","videos");
-		$('body').append("<video class='player' autoplay='autoplay' id='video_player' src='"+show+"?style=webm' controls='controls'></video>");		
-		$('body').append("<a href='"+download_link+"'><img id='downloadButton' src='<%= asset_path "16/default.png" %>' /></a>");
-		return;
-	}
-});
-
 function removePlayers(){
 	$('.attachment_tile').removeClass("selected");
 	$('.player').remove();
@@ -59,3 +27,24 @@ $(".video_thumbnail_play_over").livequery("click",function(){
   $(this).parent().hide();
   $("#jpId"+the_id).jPlayer("play", 0);
 });
+
+$(document).ready(function(){  
+  //if there are 6 or more commments we only show the last 5 and a link to show the rest
+  $("#document_comments .activity_comments").each(function(){
+    var comments = $(this).children(".subactivity");    
+    if (comments.size() > 5){
+      $(this).prepend("<div class='hide_show_comments'><a href='#' onclick='showAllDocumentComments(\""+ 
+                       $(this).attr('id') +"\"); return false;'><%= I18n.t('comment.view_all') %> (" + 
+                      comments.size() + ")</a></div><div class='space_comments'></div>");
+      comments.slice(0,comments.size()-5).hide();
+      //hide alto space_comments
+      $(this).children(".space_comments").slice(0,comments.size()-5).hide();
+    }
+  });    
+});
+
+showAllDocumentComments = function(id){
+  $("#"+id).children().show("slow");
+  //and hide the hide_show_comments
+  $("#"+id).children(".hide_show_comments").hide();
+};

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

@@ -1,2 +1,3 @@
 //= require jquery.jplayer
-//= require_tree .
+//= require_tree .
+//= require jquery.ae.image.resize

data/app/assets/stylesheets/{documents.css → documents.css.scss}

@@ -1,3 +1,5 @@
+@import "colors";
+
 .attachment
 {
 	padding-top: 10px;
@@ -57,19 +59,25 @@
 }
 
 .attachment_tile{
-	margin: 4px;
-	margin-bottom: 8px;
-	width: 80px;
-	height: 65px;
+	margin: 5px;
+	width: 90px;
+	height: 70px;
 	border-bottom: 2px solid transparent;
 	float: left;
 	text-align: center;
 	overflow: hidden;
+  border: 1px solid transparent;
+  padding: 5px;
+}
+
+.attachment_tile img{
+  width: 48px;
+  height: 48px;
 }
 
+
 .attachment_tile:hover{
-	background-color: #e0edf2;
-	border-bottom: 2px solid #2A3890;
+	border: 1px solid $main-color;
 }
 
 .attachment_tile.selected{
@@ -87,6 +95,24 @@
 	background-color: #e0edf2;
 }
 
+#repository_filter {
+  margin-left: 10px;
+}
+
+#repository_filter #order_by{
+  margin: 5px 5px 5px 15px;
+}
+
+#repository_filter input {
+  padding: 0 3px 0 22px;
+  background: url('btn/search_icon.png') 5px 50% no-repeat white;
+  font-size: 11px;
+  color: $main-color;
+  border: solid 1px $input-border-color;
+  height: 25px;
+  width: 200px;
+}
+
 .player{
 	position: fixed;
 	border-left: 24px solid #2A3890;

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

@@ -0,0 +1,75 @@
+@import "colors";
+
+.picture.content_size .picture_show img{
+  max-width: 500px;
+  max-height: 500px;
+  margin-left: 30px;
+  border: 2px solid black;
+  -moz-border-radius: 5px; 
+  -webkit-border-radius: 5px; 
+  border-radius: 5px;
+}
+
+.video_show div.jp-video-270p{
+  padding-left: 40px;
+}
+.audio_show div.jp-audio{
+  padding-left: 40px;
+}
+.document_show{
+  padding-left: 40px;
+}
+
+#document_info .details{
+  color: $details-color;  
+}
+#document_info #dates, #document_info #date_labels{
+  display: inline-block;
+}
+
+#document_info {
+  margin-top: 10px; 
+}
+#document_info .right, #document_info .left{
+}
+#document_info .right{
+  float: right;
+  margin-right: 30px; 
+}
+#document_info .left{
+  float: left;
+  margin-left: 30px;
+}
+#document_info #actions{
+  margin-top: 10px; 
+  margin-left: 30px; 
+}
+#document_info #actions .action{
+  margin-right: 10px; 
+}
+#document_info #actions .action img{
+  width: 16px;
+  height: 16px;
+}
+
+#document_comments {
+  margin-top: 20px;
+  padding-top: 10px;
+  border-top: thin solid $separation-color;
+}
+
+#document_comments .new_comment.new_comment_shown {
+  width: 500px;
+}
+
+#document_comments .new_comment {
+  width: 550px;
+}
+
+#document_comments .activity, #document_comments .subactivity {
+  background: transparent;
+  border: none;
+}
+#document_comments .activity_new_comment {
+  display:block;
+}

data/app/assets/stylesheets/social_stream-documents.css

@@ -1,5 +1,6 @@
 /*
  *= require jplayer.blue.monday
- *= require_tree .
  *= require jquery.lightbox
+
+ *= require_tree .
  */

data/app/controllers/audios_controller.rb

@@ -1,16 +1,2 @@
 class AudiosController < CommonDocumentsController
-  respond_to :html,:js
-  
-  def show
-    path = @audio.file.path(params[:style])
-    if(params[:style].present?) && Document::STYLE_FORMAT[params[:style]]
-      path = path.split('.')[0]+'.'+Document::STYLE_FORMAT[params[:style]]
-    end
-    respond_to do |format|
-      format.all {send_file path, 
-                  :type => Document::STYLE_MIMETYPE[params[:style]],  # CANT USE: @video.file_content_type because it is allways video/mp4 and breaks explorer and firefox
-                  :disposition => "inline"}
-    end
-  end
-  
 end

data/app/controllers/common_documents_controller.rb

@@ -1,18 +1,21 @@
 class CommonDocumentsController < InheritedResources::Base
+  respond_to :html, :js
+
   belongs_to_subjects :optional => true
 
   before_filter :profile_subject!, :only => :index
 
   load_and_authorize_resource :except => :index
 
-  def show
-    path = resource.file.path(params[:style])
 
+  def show
     respond_to do |format|
+      format.html {render :action => :show}
       format.all {
+        path = resource.file.path(params[:style] || params[:format])
+
         send_file path, 
                   :filename => resource.file_file_name,
-                  :type => resource.file_content_type,
                   :disposition => "inline"
       }
     end

data/app/controllers/documents_controller.rb

@@ -1,5 +1,5 @@
 class DocumentsController < CommonDocumentsController
-  respond_to :html,:js,:png,:jpeg,:bmp,:gif
+  respond_to :html, :js
   
   SEND_FILE_METHOD = :default
 
@@ -12,9 +12,15 @@ class DocumentsController < CommonDocumentsController
   #TODO: we have to add the mimetype as in videos_controller
   def download
     path = @document.file.path(params[:style])
+
     head(:bad_request) and return unless File.exist?(path) 
-    send_file_options = {:filename=>@document.file_file_name, :type => @document.file_content_type} 
 
+    send_file_options = {
+      :filename => @document.file_file_name,
+      :type => @document.file_content_type
+    }
+
+    # Ask Victor about the rationale of this:
     case SEND_FILE_METHOD
       when :apache then send_file_options[:x_sendfile] = true
       when :nginx then head(:x_accel_redirect => path.gsub(Rails.root, ''))
@@ -25,7 +31,7 @@ class DocumentsController < CommonDocumentsController
 
   class << self
     def index_object_type
-      [:Audio,:Video,:Picture,:Document]
+      [ :Audio, :Video, :Picture, :Document ]
     end
   end
 end

data/app/controllers/pictures_controller.rb

@@ -1,3 +1,2 @@
 class PicturesController < CommonDocumentsController
-  respond_to :html,:js
 end  

data/app/controllers/videos_controller.rb

@@ -1,17 +1,2 @@
 class VideosController < CommonDocumentsController
-  respond_to :html,:js
-  
-
-  
-  def show
-    path = @video.file.path(params[:style])
-    if(params[:style].present?) && Document::STYLE_FORMAT[params[:style]]
-      path = path.split('.')[0]+'.'+Document::STYLE_FORMAT[params[:style]]
-    end
-    respond_to do |format|
-      format.all {send_file path, 
-                  :type => Document::STYLE_MIMETYPE[params[:style]],  # CANT USE: @video.file_content_type because it is allways video/mp4 and breaks explorer and firefox
-                  :disposition => "inline"}
-    end
-  end
 end

data/app/helpers/documents_helper.rb

@@ -11,16 +11,20 @@ module DocumentsHelper
   def thumb_file_for(document, size)
     document.thumb(size, self)
   end
-    
+  
+  def image_tag_for (document)
+    image_tag download_document_path document, 
+              :id => dom_id(document) + "_img"
+  end
+  
   def link_for_wall(document)
     format = Mime::Type.lookup(document.file_content_type)
-    url_for(document)+"."+format.to_sym.to_s+"?style=thumb0"
+
+    polymorphic_path(document, :format => format, :style => 'thumb0')
   end
   
-  def wrap_file_name(name)
-    name
-    if(name.length > 12)
-      name[0,12]+"..."
-    end
+  def show_view_for(document)
+    render :partial => document.class.to_s.pluralize.downcase + '/' + document.class.to_s.downcase + "_show",
+           :locals => {document.class.to_s.downcase.to_sym => document}
   end
 end

data/app/models/audio.rb

@@ -1,7 +1,7 @@
 class Audio < Document  
   has_attached_file :file, 
                     :url => '/:class/:id.:extension',
-                    :path => ':rails_root/documents/:class/:id_partition/:style.:extension',
+                    :path => ':rails_root/documents/:class/:id_partition/:style',
                     :styles => {:webma => {:format => 'webm'}                                
                     },:processors => [:ffmpeg]
   

data/app/models/document.rb

@@ -3,16 +3,14 @@ class Document < ActiveRecord::Base
 
   IMAGE_FORMATS = ["doc","ppt","xls","rar","zip","mpeg","plain","pdf"]
 
-  STYLE_FORMAT = {"webm" =>"webm", "flv"=>"flv", "thumb"=>"png", "thumb0"=>"png", "webma"=>"webm"}
-
-  STYLE_MIMETYPE = {"webm" =>"video/webm", "flv"=>"video/x-flv", "thumb"=>"image/png", "thumb0"=>"image/png", "mp3"=>"audio/mpeg", "webma"=>"audio/webm"}
-
   has_attached_file :file, 
                     :url => '/:class/:id.:extension',
-                    :path => ':rails_root/documents/:class/:id_partition/:style.:extension'
+                    :path => ':rails_root/documents/:class/:id_partition/:style/:filename.:extension'
   
   validates_attachment_presence :file
   
+  before_create :set_title_and_description
+  
   define_index do
     indexes title
     indexes file_file_name, :as => :file_name
@@ -67,5 +65,11 @@ class Document < ActiveRecord::Base
       "#{ size.to_s }/default.png"
     end
   end
+  
+  protected
+  
+  def set_title_and_description
+    self.title = self.file_file_name
+  end
     
 end

data/app/models/picture.rb

@@ -1,7 +1,7 @@
 class Picture < Document
   has_attached_file :file, 
                     :url => '/:class/:id.:extension',
-                    :path => ':rails_root/documents/:class/:id_partition/:style.:extension',
+                    :path => ':rails_root/documents/:class/:id_partition/:style',
                     :styles => {:thumb  => ["48x48#"],
                                 :thumb0 => ["130x80#"]
                                }                              

data/app/models/video.rb

@@ -1,12 +1,14 @@
 class Video < Document  
   has_attached_file :file, 
                     :url => '/:class/:id.:extension',
-                    :path => ':rails_root/documents/:class/:id_partition/:style.:extension',
-                    :styles => {:webm => {:format => 'webm'},
-                                :flv => { :format => 'flv' },
-                                :thumb   => {:geometry => "48x48" , :format => 'png', :time => 5},
-                                :thumb0  => {:geometry => "130x80", :format => 'png', :time => 5}
-                    },:processors => [:ffmpeg]
+                    :path => ':rails_root/documents/:class/:id_partition/:style',
+                    :styles => {
+                      :webm => {:format => 'webm'},
+                      :flv  => { :format => 'flv' },
+                      :thumb  => {:geometry => "48x48" , :format => 'png', :time => 5},
+                      :thumb0 => {:geometry => "130x80", :format => 'png', :time => 5}
+                    },
+                    :processors => [:ffmpeg]
                     
   process_in_background :file
   

data/app/views/audios/_audio.html.erb

@@ -2,8 +2,8 @@
 
   $("#jpId<%=audio.id%>").jPlayer( {
     ready: function () {
-      $(this).jPlayer("setMedia", {
-        webma: "<%= audio_path(audio) + "?style=webma" %>" // Defines the webma url
+      $(this).jPlayer("setMedia", {        
+        webma: "<%= audio_url(audio, :format => 'webma') %>" // Defines the webma url
       });
     },
     supplied: "webma",

data/app/views/audios/_audio_processed.html.erb

@@ -1,12 +1,12 @@
 <div class="attachment_thumb">
   <%= link_to thumb_for(audio, 16),
-  {:controller => "documents", :action => "download", :id => audio},
-  :class => "" %>
+              audio_path(audio),
+              :class => "" %>
 </div>
 <div class="attachment_text">
   <%= t('audio.msg') %><%= link_to "\""+audio.file_file_name+"\"",
-  {:controller => "documents", :action => "download", :id => audio},
-  :class => "attachment_text_link" %>
+                                   audio_path(audio),
+                                   :class => "attachment_text_link" %>
 </div>
 <div id="jpId<%= audio.id%>" class="jpId_size0"></div>
 <div class="jp-audio">

data/app/views/audios/_audio_show.html.erb

@@ -0,0 +1,62 @@
+<% content_for :javascript do %>
+
+  $("#jpId<%=audio.id%>").jPlayer( {
+    ready: function () {
+      $(this).jPlayer("setMedia", {        
+        webma: "<%= audio_url(audio, :format => 'webma') %>" // Defines the webma url
+      });
+    },
+    supplied: "webma",
+    preload: "none",
+  swfPath: "assets",
+  cssSelectorAncestor: "#jp_interface_<%=audio.id%>"
+  });
+
+<% end %>
+
+<%= div_for audio, :class => 'content_size' do %>
+<div class="audio_show">
+  <% if audio.file_processing %>
+  <div class="processing_text">
+    <%= t('audio.processing')%>
+  </div>
+  <% else %>
+  <div id="jpId<%= audio.id%>" class="jpId_size0"></div>
+  <div class="jp-audio">
+    <div class="jp-type-single">
+      <div id="jp_interface_<%= audio.id%>" class="jp-interface">
+        <ul class="jp-controls">
+          <li>
+            <a href="#" class="jp-play" tabindex="1">play</a>
+          </li>
+          <li>
+            <a href="#" class="jp-pause" tabindex="1">pause</a>
+          </li>
+          <li>
+            <a href="#" class="jp-stop" tabindex="1">stop</a>
+          </li>
+          <li>
+            <a href="#" class="jp-mute" tabindex="1">mute</a>
+          </li>
+          <li>
+            <a href="#" class="jp-unmute" tabindex="1">unmute</a>
+          </li>
+        </ul>
+        <div class="jp-progress">
+          <div class="jp-seek-bar">
+            <div class="jp-play-bar"></div>
+          </div>
+        </div>
+        <div class="jp-volume-bar">
+          <div class="jp-volume-bar-value"></div>
+        </div>
+        <div class="jp-current-time"></div>
+        <div class="jp-duration"></div>
+      </div>
+      <div id="jp_playlist_<%= audio.id%>" class="jp-playlist"></div>
+    </div>
+  </div>
+</div>
+<% end %>
+
+<% end %> 

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

@@ -1 +1 @@
-<%=render(:partial => 'common-documents/index') %>
+<%=render(:partial => 'common_documents/index') %>

data/app/views/audios/show.html.erb

@@ -1,2 +1,2 @@
-<%= render :partial => 'objects/show',
-           :locals  => { :object => @audio } %>
+<%= render :partial => 'common_documents/show',
+           :locals  => { :document => @audio } %>

data/app/views/common_documents/_document_info.html.erb

@@ -0,0 +1,34 @@
+<div id="document_info">
+  <div class="left">
+    <div id="date_labels">
+      <div class="details">
+        <%= t('document.info.date.created_at') %>
+      </div>
+      <div class="details">
+        <%= t('document.info.date.updated_at') %>
+      </div>
+    </div>
+    <div id="dates">
+      <div class="date">
+        <%= I18n.localize document.created_at, :format => :long %>
+      </div>
+      <div class="date">
+        <%= I18n.localize document.updated_at, :format => :long %>
+      </div>
+    </div>
+  </div>
+  <div class="right">
+    <div id="like_count">
+      <%= document.like_count %> <span class="details">likes</span>
+    </div>
+  </div>
+  <br class="clearfloat" />
+  <div id="actions">
+    <%= link_to image_tag("btn/download.png") + t('document.actions.download'), download_document_path(document), :class => :action %>
+    <%= link_to image_tag("btn/edit.png") + t('document.actions.edit'), "javascript:toggleEdit();", :class => :action %>
+    <% if document.post_activity.delete_object_by?(current_subject) %>
+      <%= link_to image_tag("btn/error.png") + t('document.actions.delete'), document.post_activity.direct_object , :confirm => t('confirm_delete',
+        :scope => document.post_activity.direct_object.class.to_s.underscore), :method => :delete %>
+    <% end %>
+  </div>
+</div>

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

@@ -0,0 +1,49 @@
+<% content_for :title do %>
+<%= profile_subject.name + ": " + t('repository.title') %>
+<% end %>
+
+<% content_for :sidebar do %>
+<%= render :partial => 'home/sidebar' %>
+<% end %>
+
+<%if profile_subject_is_current?%>
+<%= location(
+  link_to(t('repository.title'), polymorphic_path(controller.controller_name),:remote => true)
+  ) %>
+<%else%>
+<%= location(
+  link_to(profile_subject.name, polymorphic_path(profile_subject),:remote => true),
+  link_to(t('repository.title'), polymorphic_path([profile_subject, controller.controller_name]),:remote => true)
+  ) %>
+<%end%>
+
+<% toolbar :profile => profile_subject %>
+<br class="clearfloat" />
+<div class="space_center"></div>
+<div id="repository_filter">
+  <form action="<%= search_path%>" method="get" id="repository_filter">
+    <%= text_field_tag :filter_query, nil,:autocomplete => :off, :id => :repository_filter_input %>
+  </form>
+  <div id="order_by"><%= t('repository.order.by') %>: <%= t('repository.order.last_modified') %> · <%= t('repository.order.most_popular') %>  </div>
+</div>
+<div class="space_center"></div>
+
+<% @activities.each do |a| %>
+<% document = a.activity_objects.first.document %>
+<div class="attachment_tile">
+  <div class="attachment_tile_thumb">
+    <%= link_to thumb_for(document,48),
+    {:controller => "documents", :action => "show", :id => document},
+    :type => document.type,
+    :title => document.file_file_name,
+    :path => document_path(document) %>
+  </div>
+  <div class="attachment_tile_text">
+    <%= link_to truncate_name(document.file_file_name,:length => 15),
+    {:controller => "documents", :action => "show", :id => document},
+    :alt => document.file_file_name,
+    :type => document.type,
+    :path => document_path(document) %>
+  </div>
+</div>
+<% end %>