social_stream-documents 0.1.5 → 0.1.6

data/app/assets/javascripts/documents.js

@@ -1,4 +1,7 @@
 $('.attachment_tile a').live("click",function(e){
+	if(this.type ==""){
+		return true;
+	}
 	e.preventDefault();
 	
 	var download_link = this;
@@ -28,7 +31,7 @@ $('.attachment_tile a').live("click",function(e){
 		$(this).parent().parent().addClass("selected");
 		$('body').append("<img class='player' id='picture_player' src='"+download_link+"' />");		
 		$('body').append("<a href='"+download_link+"'><img id='downloadButton' src='assets/formats/default.png' /></a>");
-	}
+	}		
 });
 
 function removePlayers(){

data/app/assets/stylesheets/documents.css

@@ -6,7 +6,7 @@
 .attachment_text
 {
 	position: relative;
-	width: 70%;
+	width: 90%;
 	vertical-align: middle;
 	line-height: 20px;
 	height: auto;
@@ -128,7 +128,6 @@
 	color: #2A3890;
 }
 
-.picture_summary_class{
-	margin-top: 14px;
+.size_19px {
+	width: 19px;
 }
-

data/app/controllers/audios_controller.rb

@@ -16,4 +16,10 @@ class AudiosController < InheritedResources::Base
                                         :object_type => :Audio).page(params[:page]).per(params[:per])
   end
   
+  
+  def destroy
+    @post_activity = resource.post_activity
+
+    destroy!
+  end
 end

data/app/controllers/documents_controller.rb

@@ -28,7 +28,10 @@ class DocumentsController < InheritedResources::Base
   end
   
   def index
-    @document_activities = current_subject.wall(:profile,
+    @subject = User.find_by_slug(params[:user_id]) || Group.find_by_slug(params[:group_id])
+    
+    #TODO, clarify if use :home or :profile
+    @document_activities = (@subject ? @subject : current_subject).wall(:home,
                                         :for => current_subject,
                                         :object_type => [:Audio,:Video,:Picture,:Document]).page(params[:page]).per(params[:per])
   end
@@ -38,5 +41,11 @@ class DocumentsController < InheritedResources::Base
       format.all {redirect_to request.referer || home_path}
     end
   end
+  
+  def destroy
+    @post_activity = resource.post_activity
+
+    destroy!
+  end
 
 end

data/app/controllers/pictures_controller.rb

@@ -15,4 +15,10 @@ class PicturesController < InheritedResources::Base
                                         :for => current_subject,
                                         :object_type => :Picture).page(params[:page]).per(params[:per])
   end
+  
+  def destroy
+    @post_activity = resource.post_activity
+
+    destroy!
+  end
 end  

data/app/controllers/videos_controller.rb

@@ -19,4 +19,9 @@ class VideosController < InheritedResources::Base
                                         :object_type => :Video).page(params[:page]).per(params[:per])
   end
     
+  def destroy
+    @post_activity = resource.post_activity
+
+    destroy!
+  end
 end

data/app/helpers/documents_helper.rb

@@ -6,6 +6,10 @@ module DocumentsHelper
     image_tag document.thumb(self)
   end
   
+  def big_thumb_for(document)
+    image_tag document.big_thumb(self)
+  end
+  
   def link_for_wall(document)
     format = Mime::Type.lookup(document.file_content_type)
     url_for(document)+"."+format.to_sym.to_s+"?style=thumb0"

data/app/models/document.rb

@@ -5,7 +5,7 @@ class Document < ActiveRecord::Base
 
   has_attached_file :file, 
                     :url => '/:class/:id.:extension',
-                    :path => ':rails_root/documents/:class/:id_partition/:style.:extension'
+                    :path => ':rails_root/documents/:class/:id_partition/:basename.:extension'
   
   validates_attachment_presence :file
   
@@ -53,4 +53,13 @@ class Document < ActiveRecord::Base
     end
   end
   
+  # Thumbnail file
+  def big_thumb helper
+    if format && IMAGE_FORMATS.include?(format.to_s)
+      "formats_big/#{ format }.png"
+    else
+      "formats_big/default.png"
+    end
+  end
+  
 end

data/app/models/picture.rb

@@ -1,11 +1,17 @@
 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_:basename.:extension',
                     :styles => {:thumb  => ["48x48#"],
                                 :thumb0 => ["130x80#"]
                                }                                  
   def thumb helper
+    "formats/photo.png"
+  end
+  
+  def big_thumb helper
     helper.picture_path self, :format => format, :style => 'thumb'
   end
+  
+  
 end

data/app/models/video.rb

@@ -3,7 +3,7 @@ class Video < 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_:basename.:extension',
                     :styles => {:webm => {:format => 'webm'},
                                 :thumb   => {:geometry => "48x48" , :format => 'png', :time => 5},
                                 :thumb0  => {:geometry => "130x80", :format => 'png', :time => 5}

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

@@ -1,7 +1,3 @@
-<% content_for :headers do %>
-	<%= stylesheet_link_tag "documents" %>
-<% end %>
-
 <%= div_for audio, :class => 'content_size' do %>
 
   <div class="attachment_thumb">
@@ -11,7 +7,7 @@
   </div>
   
   <div class="attachment_text">
-  	<%= t('audio.msg') %><%= link_to audio.file_file_name, 
+  	<%= t('audio.msg') %><%= link_to "\""+audio.file_file_name+"\"", 
     {:controller => "documents", :action => "download", :id => audio},  
     :class => "" %>
 
@@ -20,4 +16,4 @@
 	</audio>
   </div>
 
-<% end %>
+<% end %>

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

@@ -0,0 +1,2 @@
+$("#<%= dom_id(@post_activity) %>").hide();
+

data/app/views/documents/_document.html.erb

@@ -1,5 +1,5 @@
 <% content_for :headers do %>
-	<%= stylesheet_link_tag "documents" %>
+        <%= stylesheet_link_tag "documents" %>
 <% end %>
 
 <%= div_for document, :class => 'content_size' do %>
@@ -11,9 +11,9 @@
   </div>
 
   <div class="attachment_text">
-  	<%= t('document.msg') %><%= link_to document.file_file_name, 
+  	<%= t('document.msg') %><%= link_to "\""+document.file_file_name+"\"", 
     {:controller => "documents", :action => "download", :id => document},  
     :class => "" %>
   </div>
 
-<% end %>
+<% end %>

data/app/views/documents/_header.html.erb

@@ -1 +1,5 @@
-<%= image_tag("btn/document.png") %> <%=t('resource.title')%>
+<% content_for :headers do %>
+        <%= stylesheet_link_tag "documents" %>
+<% end %>
+
+<%= image_tag("btn/document.png", :class => "size_19px") %> <%=t('resource.title')%>

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

@@ -1,13 +1,14 @@
 <div class="attachment_section_header">
-	<h3><%= t('document.mine') %></h3>
+	<h3><%= @subject ? t('document.not_mine') : t('document.mine') %></h3>
 </div>
 <% @document_activities.each do |a| %>
 	<% document = a.activity_objects.first.document %>
 	<div class="attachment_tile">
 		<div class="attachment_tile_thumb">
-    		<%= link_to thumb_for(document), 
+    		<%= link_to big_thumb_for(document), 
                 {:controller => "documents", :action => "download", :id => document}, 
  				:type => document.type, 
+				:title => document.file_file_name,
 				:path => document_path(document) %>
   		</div>
 

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

@@ -0,0 +1,2 @@
+$("#<%= dom_id(@post_activity) %>").hide();
+

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

@@ -11,10 +11,18 @@
 	<%= javascript_include_tag 'documents' %>  
 <% end %>
 
+<%if @subject%>
 <%= location(
-  link_to(image_tag("btn/btn_resources.png", :class => "menu_icon")+t('resource.title'), documents_path,:remote => true)
-) %>
+  link_to(image_tag("btn/btn_profile.png", :class => "menu_icon")+ @subject.name, polymorphic_path(@subject),:remote => true),
+  link_to(image_tag("btn/btn_resource.png", :class => "menu_icon")+t('resource.title'), polymorphic_path([@subject, Document.new]),:remote => true)
+    ) %>
+  <% toolbar :profile => @subject %>
+<%else%>
+<%= location(
+  link_to(image_tag("btn/btn_resource.png", :class => "menu_icon")+t('resource.title'), @user ?  user_documents_path(@user) : documents_path,:remote => true)
+    ) %>
+  <% toolbar %>
+<%end%>
 
-<% toolbar %>
 
 <%= render :partial => 'index' %>

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

@@ -1,7 +1,3 @@
-<% content_for :headers do %>
-	<%= stylesheet_link_tag "documents" %>
-<% end %>
-
 <%= div_for picture, :class => 'content_size' do %>
 
   <div class="attachment_thumb">
@@ -11,9 +7,9 @@
   </div>
   
   <div class="attachment_text picture_summary_class">
-  	<%= t('picture.msg') %><%= link_to picture.file_file_name, 
+  	<%= t('picture.msg') %><%= link_to "\""+picture.file_file_name+"\"", 
     {:controller => "documents", :action => "download", :id => picture},  
     :class => "" %>
   </div>
 
-<% end %>
+<% end %>

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

@@ -0,0 +1,2 @@
+$("#<%= dom_id(@post_activity) %>").hide();
+

data/app/views/videos/_video.html.erb

@@ -1,7 +1,3 @@
-<% content_for :headers do %>
-	<%= stylesheet_link_tag "documents" %>
-<% end %>
-
 <%= div_for video, :class => 'content_size' do %>
 
   <div class="attachment_thumb">
@@ -11,7 +7,7 @@
   </div>
   
   <div class="attachment_text">
-  	<%= t('video.msg') %><%= link_to video.file_file_name, 
+  	<%= t('video.msg') %><%= link_to "\""+video.file_file_name+"\"", 
     {:controller => "documents", :action => "download", :id => video},  
     :class => "" %>
 
@@ -20,4 +16,4 @@
 	</video>
   </div>
 
-<% end %>
+<% end %>

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

@@ -0,0 +1,2 @@
+$("#<%= dom_id(@post_activity) %>").hide();
+

data/config/locales/en.yml

@@ -3,33 +3,36 @@ en:
     confirm_delete: "Delete audio?"
     title: "Audios"
     mine: "My audios"
-    msg: "Just uploaded an audio:"
+    msg: "Uploaded an audio:"
   conference:
     all: "All conferences"
     confirm_delete: "Delete conference?"
     title: "Conferences"
     mine: "My conferences"
-    msg: "Just uploaded a conference:"
+    msg: "Uploaded a conference:"
   document:
-    simple_all: "All"  
     all: "All documents"  
     confirm_delete: "Delete document?"
-    title: "Documents"
+    form:
+      title: "Resource"
     mine: "My documents"
-    msg: "Just uploaded a document:"
+    msg: "Uploaded a document:"
+    not_mine: "Documents"
+    simple_all: "All"  
+    title: "Documents"
   picture:
     confirm_delete: "Delete picture?"
     title: "Pictures"
     mine: "My pictures"  
-    msg: "Just uploaded a picture:"
+    msg: "Uploaded a picture:"
   resource:
     all: "All Resources"
     confirm_delete: "Delete resource?"
     title: "Resources"
     mine: "My resources"
-    msg: "Just uploaded a resource:"
+    msg: "Uploaded a resource:"
   video:
     confirm_delete: "Delete video?"
     title: "Videos"
     mine: "My videos"  
-    msg: "Just uploaded a video:" 
+    msg: "Uploaded a video:" 

data/config/routes.rb

@@ -6,4 +6,17 @@ Rails.application.routes.draw do
   resources :documents do
     get "download", :on => :member
   end
+  
+  # Social Stream subjects configured in config/initializers/social_stream.rb
+  SocialStream.subjects.each do |actor|
+    resources actor.to_s.pluralize do
+      resources :pictures
+      resources :audios
+      resources :videos
+
+      resources :documents do
+        get "download", :on => :member
+      end
+    end
+  end
 end

data/social_stream-documents.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "social_stream-documents"
-  s.version = "0.1.5"
+  s.version = "0.1.6"
   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."
@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base','~> 0.6.2')
+  s.add_runtime_dependency('social_stream-base','~> 0.7.0')
   s.add_runtime_dependency('paperclip-ffmpeg', '~> 0.6.0')
   s.add_runtime_dependency('paperclip','2.3.11')
   # Development Gem dependencies

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream-documents
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - "V\xC3\xADctor S\xC3\xA1nchez Belmar"
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-13 00:00:00 +02:00
+date: 2011-07-20 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,9 +30,9 @@ dependencies:
         hash: 3
         segments: 
         - 0
-        - 6
-        - 2
-        version: 0.6.2
+        - 7
+        - 0
+        version: 0.7.0
   name: social_stream-base
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -211,15 +211,26 @@ files:
 - app/assets/images/btn/btn_word.png
 - app/assets/images/btn/document.png
 - app/assets/images/formats/btn_documents.png
+- app/assets/images/formats/btn_video.png
 - app/assets/images/formats/default.png
 - app/assets/images/formats/doc.png
 - app/assets/images/formats/mpeg.png
 - app/assets/images/formats/pdf.png
+- app/assets/images/formats/photo.png
 - app/assets/images/formats/plain.png
+- app/assets/images/formats/ppt-big.png
 - app/assets/images/formats/ppt.png
+- app/assets/images/formats/rar-big.png
 - app/assets/images/formats/rar.png
 - app/assets/images/formats/xls.png
+- app/assets/images/formats/zip-big.png
 - app/assets/images/formats/zip.png
+- app/assets/images/formats_big/default.png
+- app/assets/images/formats_big/doc.png
+- app/assets/images/formats_big/pdf.png
+- app/assets/images/formats_big/ppt.png
+- app/assets/images/formats_big/rar.png
+- app/assets/images/formats_big/zip.png
 - app/assets/javascripts/documents.js
 - app/assets/stylesheets/documents.css
 - app/controllers/audios_controller.rb
@@ -235,6 +246,7 @@ files:
 - app/views/audios/_index.html.erb
 - app/views/audios/_mediapreviews.html.erb
 - app/views/audios/_new.html.erb
+- app/views/audios/destroy.js.erb
 - app/views/audios/index.html.erb
 - app/views/audios/index.js.erb
 - app/views/documents/_document.html.erb
@@ -242,18 +254,21 @@ files:
 - app/views/documents/_header.html.erb
 - app/views/documents/_index.html.erb
 - app/views/documents/_new.html.erb
+- app/views/documents/destroy.js.erb
 - app/views/documents/index.html.erb
 - app/views/documents/index.js.erb
 - app/views/pictures/_index.html.erb
 - app/views/pictures/_mediapreviews.html.erb
 - app/views/pictures/_new.html.erb
 - app/views/pictures/_picture.html.erb
+- app/views/pictures/destroy.js.erb
 - app/views/pictures/index.html.erb
 - app/views/pictures/index.js.erb
 - app/views/toolbar/_uploads_menu.html.erb
 - app/views/videos/_index.html.erb
 - app/views/videos/_new.html.erb
 - app/views/videos/_video.html.erb
+- app/views/videos/destroy.js.erb
 - app/views/videos/index.html.erb
 - app/worker/videoencoder.rb
 - config/locales/en.yml