social_stream-documents 0.2.3 → 0.2.4

data/app/controllers/audios_controller.rb

@@ -1,3 +1,16 @@
 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/documents_controller.rb

@@ -9,10 +9,11 @@ class DocumentsController < CommonDocumentsController
     end
   end
   
+  #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} 
+    send_file_options = {:filename=>@document.file_file_name, :type => @document.file_content_type} 
 
     case SEND_FILE_METHOD
       when :apache then send_file_options[:x_sendfile] = true

data/app/controllers/videos_controller.rb

@@ -10,7 +10,7 @@ class VideosController < CommonDocumentsController
     end
     respond_to do |format|
       format.all {send_file path, 
-                  :type => params[:style]=="thumb" ? "image/png" : @video.file_content_type,
+                  :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

data/app/models/audio.rb

@@ -1,7 +1,20 @@
 class Audio < Document
- 
+  after_save :audioprocess
+  
+  has_attached_file :file, 
+                    :url => '/:class/:id.:extension',
+                    :path => ':rails_root/documents/:class/:id_partition/:style.:extension',
+                    :styles => {:webma => {:format => 'webm'}                                
+                    },:processors => [:ffmpeg]
+  
+  def audioprocess
+    Resque.enqueue(Audioencoder, self.id)
+  end
+     
+              
   # Thumbnail file
   def thumb(size, helper)
       "#{ size.to_s }/audio.png"
   end
+  
 end

data/app/models/document.rb

@@ -3,7 +3,9 @@ class Document < ActiveRecord::Base
 
   IMAGE_FORMATS = ["doc","ppt","xls","rar","zip","mpeg","plain","pdf"]
 
-  STYLE_FORMAT = {"webm" =>"webm", "flv"=>"flv", "thumb"=>"png", "thumb0"=>"png"}
+  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',

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

@@ -3,9 +3,11 @@
   $("#jpId<%=audio.id%>").jPlayer( {
     ready: function () {
       $(this).jPlayer("setMedia", {
-        mp3: "<%= download_document_path(audio) %>" // Defines the mp3 url
+        webma: "<%= audio_path(audio) + "?style=webma" %>" // Defines the webma url
       });
     },
+    supplied: "webma",
+    preload: "none",
 	swfPath: "assets",
 	cssSelectorAncestor: "#jp_interface_<%=audio.id%>"
   });

data/app/worker/audioencoder.rb

@@ -0,0 +1,7 @@
+class Audioencoder
+  @queue = :audios_queue
+  def self.perform(audio_id)
+    audio = Audio.find(audio_id)
+    Audio.file.reprocess!
+  end
+end

data/social_stream-documents.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "social_stream-documents"
-  s.version = "0.2.3"
+  s.version = "0.2.4"
   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: 17
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - "V\xC3\xADctor S\xC3\xA1nchez Belmar"
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-01 00:00:00 Z
+date: 2011-08-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: social_stream-base
@@ -255,6 +255,7 @@ files:
 - app/views/videos/destroy.js.erb
 - app/views/videos/index.html.erb
 - app/views/videos/show.html.erb
+- app/worker/audioencoder.rb
 - app/worker/videoencoder.rb
 - config/locales/en.yml
 - config/routes.rb