social_stream-documents 0.3.3 → 0.4.0

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

@@ -0,0 +1,36 @@
+<% profile_subject ||= document.post_activity.receiver_subject %>
+
+<% 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>
+<h2><%= document.title.nil? ? document.file_file_name : document.title %></h2>
+<div class="space_center"></div>
+
+<%= show_view_for document %>
+
+<%= render :partial => "document_info", :locals => {:document => document} %>
+
+<div id="document_comments">
+  <%= render :partial => 'activities/comments', :locals => { :activity => document.post_activity } %>
+  <%= render :partial => 'comments/new', :locals => { :activity => document.post_activity } %>
+</div>

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

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

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

@@ -0,0 +1,7 @@
+<%= div_for document, :class => 'content_size' do %>
+
+  <div class="document_show">
+    <%= thumb_for(document, 48) %>
+  </div>
+
+<% end %>

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

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

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

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

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

@@ -2,24 +2,25 @@
 
   <div class="attachment_thumb picture_link">
     <%= link_to thumb_for(picture, 16),
-        {:controller => "documents", :action => "download", :id => picture}, 
-        :type => picture.type, 
-		:title => picture.file_file_name,
-		:path => document_path(picture) %>
+                 picture_path(picture),
+                :type => picture.type, 
+            		:title => picture.file_file_name,
+            		:path => document_path(picture) %>
   </div>
   
   <div class="attachment_text picture_summary_class picture_link">
-  	<%= t('picture.msg') %><%= link_to "\""+picture.file_file_name+"\"", 
-    {:controller => "documents", :action => "download", :id => picture},  
-    :alt => picture.file_file_name,
- 	:type => picture.type,
- 	:path => document_path(picture),
-    :class => "attachment_text_link" %>
+  	<%= t('picture.msg') %>
+  	<%= link_to "\""+picture.file_file_name+"\"", 
+                picture_path(picture),
+                :alt => picture.file_file_name,
+               	:type => picture.type,
+               	:path => document_path(picture),
+                :class => "attachment_text_link" %>
   </div>
   
   <div class="picture_link picture_thumbnail_show">
     <%= link_to thumb_for(picture, 130),
-        picture, 
+                download_document_path(picture),
         :type => picture.type, 
 		:title => picture.file_file_name,
 		:path => document_path(picture) %>
@@ -38,4 +39,4 @@
       imageBtnNext: 'assets/lightbox-btn-next.gif',
       imageBlank: 'assets/lightbox-blank.gif'});    
   })
-<% end %>
+<% end %>

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

@@ -0,0 +1,26 @@
+<%= div_for picture, :class => 'content_size' do %>
+  <div class="picture_show">
+    <%= link_to image_tag_for(picture),
+        download_document_path(picture),
+        :id => dom_id(picture) + "_a",
+        :type => picture.type, 
+		    :title => picture.file_file_name,
+		    :path => document_path(picture) %>
+  </div>
+<% end %>
+
+
+<%= javascript_tag do %>
+  $(document).ready(function() {
+    $("#<%= dom_id picture %> #<%= dom_id picture %>_img").aeImageResize({ height: 500, width: 500 });
+    $("#<%= dom_id picture %> #<%= dom_id picture %>_a").lightBox({ 
+      maxHeight: 920,
+      maxWidth: 920,
+      imageLoading: '../assets/lightbox-ico-loading.gif',
+      imageBtnClose: '../assets/lightbox-btn-close.gif',
+      imageBtnPrev: '../assets/lightbox-btn-prev.gif',
+      imageBtnNext: '../assets/lightbox-btn-next.gif',
+      imageBlank: '../assets/lightbox-blank.gif'});    
+      
+  })  
+<% end %>

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

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

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

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

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

@@ -3,8 +3,8 @@
   $("#jpId<%=video.id%>").jPlayer( {
     ready: function () {
       $(this).jPlayer("setMedia", {
-        webmv: "<%= video_path(video)+"?style=webm" %>", // Defines the webm url
-		flv: "<%= video_path(video)+"?style=flv" %>"
+        webmv: "<%= video_url(video, :format => 'webm' ) %>", // Defines the webm url
+        flv:   "<%= video_url(video, :format => 'flv') %>"
       });
     },
 	solution:"flash, html",

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

@@ -1,14 +1,15 @@
 <div class="attachment_thumb">
   <%= link_to thumb_for(video, 16),
-  {:controller => "documents", :action => "download", :id => video},
+  video_path(video),
+  :id => video,
   :class => "" %>
 </div>
 <div class="attachment_text">
   <%= t('video.msg') %><%= link_to "\""+video.file_file_name+"\"",
-  {:controller => "documents", :action => "download", :id => video},
+  video,
   :class => "attachment_text_link" %>
   <div id="video_thumbnail_<%= video.id%>" class="video_thumbnail_class">
-    <%= image_tag(video_path(video)+"?style=thumb", :class => "video_thumbnail_image", :alt => "")%> <div id="<%= video.id%>" class="video_thumbnail_play_over"></div>
+    <%= image_tag(video_path(video, :format => :png, :style => 'thumb0'), :class => "video_thumbnail_image", :alt => "")%> <div id="<%= video.id%>" class="video_thumbnail_play_over"></div>
   </div>
   <div id="full_video_<%= video.id%>" class="jp-video jp-video-270p">
     <div class="jp-type-single">

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

@@ -0,0 +1,64 @@
+<% content_for :javascript do %>
+
+  $("#jpId<%=video.id%>").jPlayer( {
+    ready: function () {
+      $(this).jPlayer("setMedia", {
+        webmv: "<%= video_url(video, :format => 'webm' ) %>", // Defines the webm url
+        flv:   "<%= video_url(video, :format => 'flv') %>"
+      });
+    },
+  solution:"flash, html",
+  preload: "none",
+  supplied: "webmv, flv",
+  swfPath: "assets",
+  cssSelectorAncestor: "#jp_interface_<%=video.id%>"
+  });
+  
+<% end %>
+
+<%= div_for video, :class => 'content_size' do %>
+<div class="video_show">
+  <% if video.file_processing %>
+  <div class="processing_text">
+    <%= t('video.processing')%>
+  </div>
+  <% else %>
+  <div id="full_video_<%= video.id%>" class="jp-video jp-video-270p">
+    <div class="jp-type-single">
+      <div id="jpId<%= video.id%>" class="jp-jplayer"></div>
+      <div id="jp_interface_<%= video.id%>" class="jp-interface">
+        <div class="jp-video-play"></div>
+        <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_<%= video.id%>" class="jp-playlist"></div>
+    </div>
+  </div>
+  <% end %>
+</div>
+<% end %> 

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

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

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

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

data/config/locales/en.yml

@@ -7,10 +7,22 @@ en:
     not_mine: "Audios"
     processing: "Processing audio clip"
   document:
-    all: "All documents"  
+    actions:
+      delete: "Delete"
+      download: "Download"
+      edit: "Edit"
+    all: "All documents"
     confirm_delete: "Delete document?"
     form:
       title: "File"
+    info:
+      date:
+        created_at: "Created at"
+        updated_at: "Updated at"
+      description:
+        title: "Description"
+      title:
+        title: "Title"
     mine: "My documents"
     msg: "Uploaded a document:"
     not_mine: "Documents"
@@ -22,6 +34,12 @@ en:
     mine: "My pictures"  
     msg: "Uploaded a picture:"
     not_mine: "Pictures"
+  repository:
+    title: "Repository"
+    order:
+      by: "Order by"
+      last_modified: "Last modified"
+      most_popular: "Most popular"
   resource:
     all: "All Resources"
     confirm_delete: "Delete resource?"

data/config/locales/es.yml

@@ -7,10 +7,22 @@ es:
     not_mine: "Audios"
     processing: "Procesando fichero de audio..."
   document:
+    actions:
+      delete: "Borrar"
+      download: "Descargar"
+      edit: "Editar"
     all: "Todos los documentos"
     confirm_delete: "¿Borrar documento?"
     form:
       title: "Fichero"
+    info:
+      date:
+        created_at: "Creado"
+        updated_at: "Última modificación"
+      description:
+        title: "Descripción"
+      title:
+        title: "Título"
     mine: "Mis documentos"
     msg: "Subió un documento:"
     not_mine: "Documentos"
@@ -22,6 +34,12 @@ es:
     mine: "Mis imágenes"
     msg: "Subió una imagen:"
     not_mine: "Imágenes"
+  repository:
+    title: "Repositorio"
+    order:
+      by: "Ordenar por"
+      last_modified: "Última modificación"
+      most_popular: "Popularidad"
   resource:
     all: "Todos los recursos"
     confirm_delete: "¿Borrar recursos?"

data/lib/social_stream/documents/engine.rb

@@ -29,9 +29,11 @@ module SocialStream
         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" ]
+        Mime::Type.register "audio/webm", :webma
 
         # Video
         Mime::Type.register "video/x-flv", :flv
+        Mime::Type.register "video/webm", :webm
       end
 
       initializer "social_stream-documents.toolbar_config" do

data/lib/social_stream/documents/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Documents
-    VERSION = "0.3.3".freeze
+    VERSION = "0.4.0".freeze
   end
 end

data/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.9.22')
+  s.add_runtime_dependency('social_stream-base', '~> 0.9.23')
   s.add_runtime_dependency('paperclip-ffmpeg', '~> 0.7.0')
   s.add_runtime_dependency('paperclip','2.3.11')
   s.add_runtime_dependency('delayed_paperclip','>= 0.7.2')

data/spec/controllers/documents_controller_spec.rb

@@ -21,9 +21,15 @@ describe DocumentsController do
         response.body.should =~ /small.pdf/
       end
       
-      it "should render receiver's show" do
+      it "should render receiver's html show" do
         get :show, :id => @public_document.to_param
         response.should be_success
+        response.headers["Content-Type"].should include('text/html')
+      end
+      
+      it "should render receiver's format pdf download" do
+        get :download, :id => @public_document.to_param
+        response.should be_success
         response.headers["Content-Type"].should include('application/pdf')
       end
     end
@@ -40,9 +46,15 @@ describe DocumentsController do
         response.body.should =~ /small.pdf/
       end
       
-      it "should render show" do
+      it "should render html show" do
         get :show, :id => @public_document.to_param
         response.should be_success
+        response.headers["Content-Type"].should include('text/html')
+      end
+      
+      it "should render format pdf download" do
+        get :download, :id => @public_document.to_param, :format => :pdf
+        response.should be_success
         response.headers["Content-Type"].should include('application/pdf')
       end
     end
@@ -77,4 +89,30 @@ describe DocumentsController do
       end
     end
   end
+
+  context "with public picture" do
+    before do
+      @public_picture = Factory(:public_picture)      
+    end
+
+    describe "when not authenticated" do
+      it "should render receiver's format png download" do
+        get :download, :id => @public_picture.to_param
+        response.should be_success
+        response.headers["Content-Type"].should include('image/png')
+      end
+    end
+
+    describe "when authenticated" do
+      before do
+        sign_in Factory(:user)
+      end
+
+      it "should render format png download" do
+        get :download, :id => @public_picture.to_param
+        response.should be_success
+        response.headers["Content-Type"].should include('image/png')
+      end
+    end
+  end
 end

data/spec/controllers/pictures_controller_spec.rb

@@ -21,10 +21,10 @@ describe PicturesController do
         response.body.should =~ /rails.png/
       end
       
-      it "should render receiver's show" do
+      it "should render receiver's html show" do
         get :show, :id => @public_picture.to_param
         response.should be_success
-        response.headers["Content-Type"].should include('image/png')
+        response.headers["Content-Type"].should include('text/html')
       end
     end
     
@@ -40,10 +40,10 @@ describe PicturesController do
         response.body.should =~ /rails.png/
       end
       
-      it "should render show" do
+      it "should render html show" do
         get :show, :id => @public_picture.to_param
         response.should be_success
-        response.headers["Content-Type"].should include('image/png')
+        response.headers["Content-Type"].should include('text/html')
       end
     end
   end #end of the context

data/spec/dummy/config/environments/development.rb

@@ -11,7 +11,6 @@ Dummy::Application.configure do
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
-  config.action_view.debug_rjs             = true
   config.action_controller.perform_caching = false
 
   # Don't care if the mailer can't send

data/spec/dummy/config/environments/test.rb

@@ -32,4 +32,6 @@ Dummy::Application.configure do
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
+
+  config.assets.enabled = true
 end