social_stream-documents 0.1.4 → 0.1.5

data/app/assets/stylesheets/documents.css

@@ -6,7 +6,7 @@
 .attachment_text
 {
 	position: relative;
-	width: 90%;
+	width: 70%;
 	vertical-align: middle;
 	line-height: 20px;
 	height: auto;
@@ -46,6 +46,7 @@
 	margin-left: 15px;
 	margin-bottom: 10px;
 	clear: both;
+	text-align: left;
 }
 
 .attachment_tile{
@@ -96,31 +97,6 @@
 	width: 24px;
 }
 
-#media_wall{
-	position: relative;
-	margin-left: auto;
-	margin-right: auto;
-	background-color: #e0edf2;
-	width: 100%;
-	margin-bottom: 20px;
-	height: 130px;
-}
-
-#media_wall_buttons{
-	position: relative;
-	margin-left: auto;
-	margin-right: auto;
-	width: 100%;
-	text-align: right;
-}
-
-#media_wall_buttons li{
-	display:inline;
-	margin-left:2px;
-	margin-right:2px;
-	padding: 0px;
-}
-
 .media_preview{
 	float:left;
 	margin: 10px;
@@ -150,4 +126,9 @@
 	overflow:hidden;
 	font-size: 11px;
 	color: #2A3890;
-}
+}
+
+.picture_summary_class{
+	margin-top: 14px;
+}
+

data/app/controllers/documents_controller.rb

@@ -35,7 +35,7 @@ class DocumentsController < InheritedResources::Base
     
   def create
     super do |format|
-      format.all {redirect_to documents_path}
+      format.all {redirect_to request.referer || home_path}
     end
   end
 

data/app/helpers/documents_helper.rb

@@ -3,17 +3,7 @@ module DocumentsHelper
   FORMATS = ["msword","vnd.ms-powerpoint","msexcel","rar","zip","mp3","plain","pdf"]
   
   def thumb_for(document)
-    format = document.file_content_type 
-    if FORMATS.include?(format.split('/')[1])
-      image_tag 'formats/'+format.split('/')[1]+'.png' 
-    else
-      if is_image?(document)
-        format = Mime::Type.lookup(document.file_content_type)
-        image_tag url_for(document)+"."+format.to_sym.to_s+"?style=thumb"
-      else
-        image_tag 'formats/default.png'
-      end
-    end
+    image_tag document.thumb(self)
   end
   
   def link_for_wall(document)
@@ -27,8 +17,4 @@ module DocumentsHelper
       name[0,12]+"..."
     end
   end
-
-  def is_image?(document)
-    !(document.file_content_type =~ /^image.*/).nil?
-  end
-end
+end

data/app/models/audio.rb

@@ -1,3 +1,3 @@
 class Audio < Document
-  
+ 
 end

data/app/models/document.rb

@@ -1,6 +1,8 @@
 class Document < ActiveRecord::Base
   include SocialStream::Models::Object
 
+  IMAGE_FORMATS = ["doc","ppt","xls","rar","zip","mpeg","plain","pdf"]
+
   has_attached_file :file, 
                     :url => '/:class/:id.:extension',
                     :path => ':rails_root/documents/:class/:id_partition/:style.:extension'
@@ -33,5 +35,22 @@ class Document < ActiveRecord::Base
       return doc
     end
   end
+
+  def mime_type
+    Mime::Type.lookup(file_content_type)
+  end
+
+  def format
+    mime_type.to_sym
+  end
+
+  # Thumbnail file
+  def thumb helper
+    if format && IMAGE_FORMATS.include?(format.to_s)
+      "formats/#{ format }.png"
+    else
+      "formats/default.png"
+    end
+  end
   
 end

data/app/models/picture.rb

@@ -5,4 +5,7 @@ class Picture < Document
                     :styles => {:thumb  => ["48x48#"],
                                 :thumb0 => ["130x80#"]
                                }                                  
-end
+  def thumb helper
+    helper.picture_path self, :format => format, :style => 'thumb'
+  end
+end

data/app/models/video.rb

@@ -5,12 +5,12 @@ class Video < Document
                     :url => '/:class/:id.:extension',
                     :path => ':rails_root/documents/:class/:id_partition/:style.:extension',
                     :styles => {:webm => {:format => 'webm'},
-                                :thumb   => {:geometry => "48x48#" , :format => 'png', :time => 5},
-                                :thumb0  => {:geometry => "130x80#", :format => 'png', :time => 5}
+                                :thumb   => {:geometry => "48x48" , :format => 'png', :time => 5},
+                                :thumb0  => {:geometry => "130x80", :format => 'png', :time => 5}
                     },:processors => [:ffmpeg]
                     
   def videoprocess
     Resque.enqueue(Videoencoder, self.id)
   end
                       
-end
+end

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

@@ -9,7 +9,7 @@
         {:controller => "documents", :action => "download", :id => document}, 
         :class => "" %>
   </div>
-  
+
   <div class="attachment_text">
   	<%= t('document.msg') %><%= link_to document.file_file_name, 
     {:controller => "documents", :action => "download", :id => document},  

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

@@ -10,7 +10,7 @@
         :class => "" %>
   </div>
   
-  <div class="attachment_text">
+  <div class="attachment_text picture_summary_class">
   	<%= t('picture.msg') %><%= link_to picture.file_file_name, 
     {:controller => "documents", :action => "download", :id => picture},  
     :class => "" %>

data/lib/social_stream/documents/engine.rb

@@ -3,10 +3,35 @@ module SocialStream
     class Engine < Rails::Engine
     
       initializer "social_stream-documents.register_mime_types" do
+        # Documents
+        Mime::Type.register "text/plain", :txt
+        Mime::Type.register "application/zip", :zip
+        Mime::Type.register "application/x-rar", :rar
+        Mime::Type.register "application/pdf", :pdf
+        Mime::Type.register "application/postscript", :ps, [ "application/ps" ]
+        Mime::Type.register "application/vnd.oasis.opendocument.text", :odt
+        Mime::Type.register "application/vnd.oasis.opendocument.presentation", :odp
+        Mime::Type.register "application/vnd.oasis.opendocument.presentation", :ods
+        Mime::Type.register "application/vnd.ms-word", :doc, [ "application/msword" ]
+        Mime::Type.register "application/vnd.ms-powerpoint", :ppt, [ "application/mspowerpoint" ]
+        Mime::Type.register "application/vnd.ms-excel", :xls, [ "application/msexcel" ]
+        Mime::Type.register "application/rtf", :rtf
+        Mime::Type.register "application/vnd.scribus", :sla
+
+        # Picture
         Mime::Type.register "image/jpeg", :jpeg, ["image/pjpeg","image/jpg"]
-        Mime::Type.register "image/gif", :gif
-        Mime::Type.register "image/png", :png, [ "image/x-png" ]
-        Mime::Type.register "image/bmp", :bmp
+        Mime::Type.register "image/gif",  :gif
+        Mime::Type.register "image/png",  :png,  [ "image/x-png" ]
+        Mime::Type.register "image/bmp",  :bmp
+        Mime::Type.register "image/x-xcf", :xcf
+
+        # Audio
+        Mime::Type.register "audio/x-wav", :wav, [ "audio/wav" ]
+        Mime::Type.register "audio/mpeg", :mpeg
+        Mime::Type.register "audio/x-vorbis+ogg", :ogg, [ "application/ogg" ]
+
+        # Video
+        Mime::Type.register "video/x-flv", :flv
       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.4"
+  s.version = "0.1.5"
   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."

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream-documents
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - "V\xC3\xADctor S\xC3\xA1nchez Belmar"
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-06 00:00:00 +02:00
+date: 2011-07-13 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -212,13 +212,13 @@ files:
 - app/assets/images/btn/document.png
 - app/assets/images/formats/btn_documents.png
 - app/assets/images/formats/default.png
-- app/assets/images/formats/mp3.png
-- app/assets/images/formats/msexcel.png
-- app/assets/images/formats/msword.png
+- app/assets/images/formats/doc.png
+- app/assets/images/formats/mpeg.png
 - app/assets/images/formats/pdf.png
 - app/assets/images/formats/plain.png
+- app/assets/images/formats/ppt.png
 - app/assets/images/formats/rar.png
-- app/assets/images/formats/vnd.ms-powerpoint.png
+- app/assets/images/formats/xls.png
 - app/assets/images/formats/zip.png
 - app/assets/javascripts/documents.js
 - app/assets/stylesheets/documents.css
@@ -241,8 +241,6 @@ files:
 - app/views/documents/_fields.html.erb
 - app/views/documents/_header.html.erb
 - app/views/documents/_index.html.erb
-- app/views/documents/_mediapreviews.html.erb
-- app/views/documents/_mediawall.html.erb
 - app/views/documents/_new.html.erb
 - app/views/documents/index.html.erb
 - app/views/documents/index.js.erb

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

@@ -1,7 +0,0 @@
-<% @document_activities.each do |a| %>
-	<div class="media_preview all">
-		<img src="#" class="media_preview_image" />
-		<div class="media_preview_title">Some document</div>
-		<div class="media_preview_detail">some detail</div>
-	</div>
-<% end %> 

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

@@ -1,111 +0,0 @@
-<div id="media_wall_buttons">
-	<ul>
-    	<li>
-      		<%= link_to( image_tag("btn/btn_conferences.png",
-          	:media => "conference"), videos_path, :remote => true) %>
-    	</li>
-		<li>
-	      <%= link_to( image_tag("btn/btn_gallery.png",
-	            :media => "picture"), pictures_path, :remote => true, :page => 1, :per => 1) %>
-	    </li>
-		<li>
-			<%= link_to( image_tag("btn/btn_video.png", 
-			    :media => "video"), videos_path, :remote => true) %>
-		</li>
-		<li>
-			<%= link_to( image_tag("btn/btn_audio.png",
-			:media => "audio"), audios_path, :remote => true) %>
-		</li>
-		<li>
-			<%= link_to(t('document.simple_all'), documents_path, :remote => true) %>
-		</li>
-	</ul>
-</div>
-
-<div id="media_wall">
-	<div class="media_preview conference">
-		<img src="#" class="media_preview_image" />
-		<div class="media_preview_title">Some conference</div>
-		<div class="media_preview_detail">some detail</div>
-	</div>
-	
-	<div class="media_preview conference">
-		<img src="#" class="media_preview_image" />
-		<div class="media_preview_title">Some conference</div>
-		<div class="media_preview_detail">some detail</div>
-	</div>
-	
-	<div class="media_preview conference">
-		<img src="#" class="media_preview_image" />
-		<div class="media_preview_title">Some conference</div>
-		<div class="media_preview_detail">some detail</div>
-	</div>
-	
-	<div class="media_preview picture">
-		<img src="#" class="media_preview_image" />
-		<div class="media_preview_title">Some picture</div>
-		<div class="media_preview_detail">some detail</div>
-	</div>
-	
-	<div class="media_preview picture">
-		<img src="#" class="media_preview_image" />
-		<div class="media_preview_title">Some picture</div>
-		<div class="media_preview_detail">some detail</div>
-	</div>
-	
-	<div class="media_preview picture">
-		<img src="#" class="media_preview_image" />
-		<div class="media_preview_title">Some picture</div>
-		<div class="media_preview_detail">some detail</div>
-	</div>
-	
-	<div class="media_preview video">
-		<img src="#" class="media_preview_image" />
-		<div class="media_preview_title">Some video</div>
-		<div class="media_preview_detail">some detail</div>
-	</div>
-	
-	<div class="media_preview video">
-		<img src="#" class="media_preview_image" />
-		<div class="media_preview_title">Some video</div>
-		<div class="media_preview_detail">some detail</div>
-	</div>
-	
-	<div class="media_preview video">
-		<img src="#" class="media_preview_image" />
-		<div class="media_preview_title">Some video</div>
-		<div class="media_preview_detail">some detail</div>
-	</div>
-	
-	<div class="media_preview audio">
-		<img src="#" class="media_preview_image" />
-		<div class="media_preview_title">Some audio</div>
-		<div class="media_preview_detail">some detail</div>
-	</div>
-	
-	<div class="media_preview audio">
-		<img src="#" class="media_preview_image" />
-		<div class="media_preview_title">Some audio</div>
-		<div class="media_preview_detail">some detail</div>
-	</div>
-	
-	<div class="media_preview audio">
-		<img src="#" class="media_preview_image" />
-		<div class="media_preview_title">Some audio</div>
-		<div class="media_preview_detail">some detail</div>
-	</div>
-</div>
-
-<% content_for :headers do %>
-	<%= stylesheet_link_tag "documents" %>
-<% end %>
-
-<script>
-	$('#media_wall div.media_preview').hide();
-	$('#media_wall div.conference').show();
-	
-	$('#media_wall_buttons a').click(function(e){
-		$('#media_wall div.media_preview').hide("fast");
-	//	$('#media_wall div.'+$(this).children('img').attr('media')).show("slow");
-	});
-</script>