social_stream-documents 0.1.6 → 0.1.7

data/.gitignore

@@ -9,4 +9,4 @@ Gemfile.lock
 .project
 .idea/*
 .idea/social_stream-documents.iml
-
+app/views/*/.tmp_*

data/app/assets/javascripts/{documents.js → documents.js.erb}

@@ -14,7 +14,7 @@ $('.attachment_tile a').live("click",function(e){
 		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='assets/formats/default.png' /></a>");
+		$('body').append("<a href='"+download_link+"'><img id='downloadButton' src='<%= asset_path "formats/default.png" %>' /></a>");
 		return;
 	}
 	if(this.type == "Video"){
@@ -23,14 +23,14 @@ $('.attachment_tile a').live("click",function(e){
 		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='assets/formats/default.png' /></a>");
+		$('body').append("<a href='"+download_link+"'><img id='downloadButton' src='<%= asset_path "formats/default.png" %>' /></a>");
 		return;
 	}
 	if(this.type == "Picture"){
 		removePlayers();
 		$(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>");
+		$('body').append("<img class='player' id='picture_player' src='"+download_link+"' />");	
+		$('body').append("<a href='" + download_link + "'><img id='downloadButton' src='<%= asset_path "formats/default.png" %>' /></a>");
 	}		
 });
 

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

@@ -0,0 +1 @@
+//= require_tree .

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

@@ -0,0 +1,3 @@
+/*
+ *= require_tree .
+ */

data/app/controllers/audios_controller.rb

@@ -1,25 +1,3 @@
-class AudiosController < InheritedResources::Base
-  load_and_authorize_resource
-  
-  def show
-    path = @audio.file.path(params[:style])
-    respond_to do |format|
-      format.all {send_file path, 
-                  :type => @audio.file_content_type,
-                  :disposition => "inline"}
-    end
-  end
-  
-  def index
-    @document_activities = current_subject.wall(:profile,
-                                        :for => current_subject,
-                                        :object_type => :Audio).page(params[:page]).per(params[:per])
-  end
-  
-  
-  def destroy
-    @post_activity = resource.post_activity
-
-    destroy!
-  end
-end
+class AudiosController < CommonDocumentsController
+  respond_to :html,:js
+end

data/app/controllers/common_documents_controller.rb

@@ -0,0 +1,37 @@
+class CommonDocumentsController < InheritedResources::Base
+  belongs_to_subjects :optional => true
+
+  load_and_authorize_resource
+
+  def index
+    @activities = subject.wall(:profile,
+                               :for => current_subject,
+                               :object_type => [:Picture]).
+                          page(params[:page]).
+                          per(params[:per])
+  end
+ 
+  def show
+    path = resource.file.path(params[:style])
+
+    respond_to do |format|
+      format.all {
+        send_file path, 
+                  :type => resource.file_content_type,
+                  :disposition => "inline"
+      }
+    end
+  end
+  
+  def destroy
+    @post_activity = resource.post_activity
+    
+    destroy!
+  end
+
+  private
+
+  def subject
+    @subject ||= parent || current_subject
+  end
+end

data/app/controllers/documents_controller.rb

@@ -1,16 +1,19 @@
-class DocumentsController < InheritedResources::Base
-  load_and_authorize_resource
-  
+class DocumentsController < CommonDocumentsController
   respond_to :html,:js,:png,:jpeg,:bmp,:gif
   
   SEND_FILE_METHOD = :default
-  
-  def show
-    path = @document.file.path(params[:style])
-    respond_to do |format|
-      format.all {send_file path, 
-                  :type => @document.file_content_type,
-                  :disposition => "inline"}
+
+  def index
+    @activities = subject.wall(:profile,
+                               :for => current_subject,
+                               :object_type => [:Audio,:Video,:Picture,:Document]).
+                          page(params[:page]).
+                          per(params[:per])
+  end
+
+  def create
+    super do |format|
+      format.all {redirect_to request.referer || home_path}
     end
   end
   
@@ -26,26 +29,4 @@ class DocumentsController < InheritedResources::Base
 
     send_file(path, send_file_options)
   end
-  
-  def index
-    @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
-    
-  def create
-    super do |format|
-      format.all {redirect_to request.referer || home_path}
-    end
-  end
-  
-  def destroy
-    @post_activity = resource.post_activity
-
-    destroy!
-  end
-
-end
+end

data/app/controllers/pictures_controller.rb

@@ -1,24 +1,3 @@
-class PicturesController < InheritedResources::Base
-  load_and_authorize_resource
-  
-  def show
-    path = @picture.file.path(params[:style])
-    respond_to do |format|
-      format.all {send_file path, 
-                  :type => @picture.file_content_type,
-                  :disposition => "inline"}
-    end
-  end
-  
-  def index
-    @document_activities = current_subject.wall(:profile,
-                                        :for => current_subject,
-                                        :object_type => :Picture).page(params[:page]).per(params[:per])
-  end
-  
-  def destroy
-    @post_activity = resource.post_activity
-
-    destroy!
-  end
-end  
+class PicturesController < CommonDocumentsController
+  respond_to :html,:js
+end  

data/app/controllers/videos_controller.rb

@@ -1,5 +1,5 @@
-class VideosController < InheritedResources::Base
-  load_and_authorize_resource
+class VideosController < CommonDocumentsController
+  respond_to :html,:js
   
   def show
     path = @video.file.path(params[:style])
@@ -12,16 +12,4 @@ class VideosController < InheritedResources::Base
                   :disposition => "inline"}
     end
   end
-  
-  def index
-    @document_activities = current_subject.wall(:profile,
-                                        :for => current_subject,
-                                        :object_type => :Video).page(params[:page]).per(params[:per])
-  end
-    
-  def destroy
-    @post_activity = resource.post_activity
-
-    destroy!
-  end
-end
+end

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/:basename.:extension'
+                    :path => ':rails_root/documents/:class/:id_partition/:style.:extension'
   
   validates_attachment_presence :file
   

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_:basename.:extension',
+                    :path => ':rails_root/documents/:class/:id_partition/:style.:extension',
                     :styles => {:thumb  => ["48x48#"],
                                 :thumb0 => ["130x80#"]
                                }                                  

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_:basename.: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}

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

@@ -1,7 +1,7 @@
 <div class="attachment_section_header">
 	<h3><%= t('audio.mine') %></h3>
 </div>
-<% @document_activities.each do |a| %>
+<% @activities.each do |a| %>
 	<% document = a.activity_objects.first.document %>
 	<div class="attachment_tile">
 		<div class="attachment_tile_thumb">
@@ -19,4 +19,4 @@
  				:path => document_path(document) %>
   		</div>
 	</div>
-<% end %>
+<% end %>

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

@@ -1,2 +1 @@
-$("#<%= dom_id(@post_activity) %>").hide();
-
+<%=render(:partial => 'objects/destroy') %>

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

@@ -6,11 +6,6 @@
   <%= render :partial => 'home/sidebar' %>
 <% end %>
 
-<% content_for :headers do %>
-	<%= stylesheet_link_tag "documents" %>
-	<%= javascript_include_tag 'documents' %>  
-<% end %>
-
 <%= location(
     link_to(image_tag("btn/btn_audio.png", :class => "menu_icon")+t('audio.title'), audios_path,:remote => true)
 ) %>

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

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

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

@@ -1,7 +1,7 @@
 <div class="attachment_section_header">
 	<h3><%= @subject ? t('document.not_mine') : t('document.mine') %></h3>
 </div>
-<% @document_activities.each do |a| %>
+<% @activities.each do |a| %>
 	<% document = a.activity_objects.first.document %>
 	<div class="attachment_tile">
 		<div class="attachment_tile_thumb">
@@ -20,4 +20,4 @@
  				:path => document_path(document) %>
   		</div>
 	</div>
-<% end %>
+<% end %>

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

@@ -1,2 +1 @@
-$("#<%= dom_id(@post_activity) %>").hide();
-
+<%=render(:partial => 'objects/destroy') %>

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

@@ -6,11 +6,6 @@
   <%= render :partial => 'home/sidebar' %>
 <% end %>
 
-<% content_for :headers do %>
-	<%= stylesheet_link_tag "documents" %>
-	<%= javascript_include_tag 'documents' %>  
-<% end %>
-
 <%if @subject%>
 <%= location(
   link_to(image_tag("btn/btn_profile.png", :class => "menu_icon")+ @subject.name, polymorphic_path(@subject),:remote => true),

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

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

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

@@ -1,7 +1,7 @@
 <div class="attachment_section_header">
 	<h3><%= t('picture.mine') %></h3>
 </div>
-<% @document_activities.each do |a| %>
+<% @activities.each do |a| %>
 	<% document = a.activity_objects.first.document %>
 	<div class="attachment_tile">
 		<div class="attachment_tile_thumb">
@@ -19,4 +19,4 @@
  				:path => document_path(document) %>
   		</div>
 	</div>
-<% end %>
+<% end %>

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

@@ -1,2 +1 @@
-$("#<%= dom_id(@post_activity) %>").hide();
-
+<%=render(:partial => 'objects/destroy') %>

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

@@ -6,11 +6,6 @@
   <%= render :partial => 'home/sidebar' %>
 <% end %>
 
-<% content_for :headers do %>
-	<%= stylesheet_link_tag "documents" %>
-	<%= javascript_include_tag 'documents' %>  
-<% end %>
-
 <%= location(
     link_to(image_tag("btn/btn_gallery.png", :class => "menu_icon")+t('picture.title'), pictures_path,:remote => true)
 ) %>

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

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

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

@@ -1,7 +1,7 @@
 <div class="attachment_section_header">
 	<h3><%= t('video.mine') %></h3>
 </div>
-<% @document_activities.each do |a| %>
+<% @activities.each do |a| %>
 	<% document = a.activity_objects.first.document %>
 	<div class="attachment_tile">
 		<div class="attachment_tile_thumb">
@@ -19,4 +19,4 @@
  				:path => document_path(document) %>
   		</div>
 	</div>
-<% end %>
+<% end %>

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

@@ -1,2 +1 @@
-$("#<%= dom_id(@post_activity) %>").hide();
-
+<%=render(:partial => 'objects/destroy') %>

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

@@ -6,11 +6,6 @@
   <%= render :partial => 'home/sidebar' %>
 <% end %>
 
-<% content_for :headers do %>
-	<%= stylesheet_link_tag "documents" %>
-	<%= javascript_include_tag 'documents' %>  
-<% end %>
-
 <%= location(
     link_to(image_tag("btn/btn_video.png", :class => "menu_icon")+t('video.title'), videos_path,:remote => true)
 ) %>

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

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

data/social_stream-documents.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "social_stream-documents"
-  s.version = "0.1.6"
+  s.version = "0.1.7"
   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.7.0')
+  s.add_runtime_dependency('social_stream-base','~> 0.7.2')
   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: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - "V\xC3\xADctor S\xC3\xA1nchez Belmar"
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-20 00:00:00 +02:00
+date: 2011-07-21 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,12 +27,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 7
         segments: 
         - 0
         - 7
-        - 0
-        version: 0.7.0
+        - 2
+        version: 0.7.2
   name: social_stream-base
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -231,9 +231,12 @@ files:
 - 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/javascripts/documents.js.erb
+- app/assets/javascripts/social_stream-documents.js
 - app/assets/stylesheets/documents.css
+- app/assets/stylesheets/social_stream-documents.css
 - app/controllers/audios_controller.rb
+- app/controllers/common_documents_controller.rb
 - app/controllers/documents_controller.rb
 - app/controllers/pictures_controller.rb
 - app/controllers/videos_controller.rb
@@ -249,6 +252,7 @@ files:
 - app/views/audios/destroy.js.erb
 - app/views/audios/index.html.erb
 - app/views/audios/index.js.erb
+- app/views/audios/show.html.erb
 - app/views/documents/_document.html.erb
 - app/views/documents/_fields.html.erb
 - app/views/documents/_header.html.erb
@@ -257,6 +261,7 @@ files:
 - app/views/documents/destroy.js.erb
 - app/views/documents/index.html.erb
 - app/views/documents/index.js.erb
+- app/views/documents/show.html.erb
 - app/views/pictures/_index.html.erb
 - app/views/pictures/_mediapreviews.html.erb
 - app/views/pictures/_new.html.erb
@@ -264,12 +269,14 @@ files:
 - app/views/pictures/destroy.js.erb
 - app/views/pictures/index.html.erb
 - app/views/pictures/index.js.erb
+- app/views/pictures/show.html.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/views/videos/show.html.erb
 - app/worker/videoencoder.rb
 - config/locales/en.yml
 - config/routes.rb