social_stream-documents 0.4.0 → 0.4.1

data/app/assets/javascripts/documents.js.erb

@@ -48,3 +48,14 @@ showAllDocumentComments = function(id){
   //and hide the hide_show_comments
   $("#"+id).children(".hide_show_comments").hide();
 };
+
+toggleDocumentEdit = function(){
+  if($("#document_edit").css("display")=="none"){
+    $("#document_edit").show("slow");
+    $("#document_edit_action").addClass("selected");
+    
+  }else{
+    $("#document_edit").hide("slow");
+    $("#document_edit_action").removeClass("selected");
+  }
+}

data/app/assets/stylesheets/show.css.scss

@@ -45,13 +45,42 @@
   margin-left: 30px; 
 }
 #document_info #actions .action{
-  margin-right: 10px; 
+  margin-right: 10px;
+  padding: 5px;
+}
+#document_info #actions .action.selected{
+  border: thin solid $separation-color;
+  background: $secondary-color;
 }
 #document_info #actions .action img{
   width: 16px;
   height: 16px;
 }
 
+#document_edit {
+  margin: 5px 5px 0px 5px;
+  border: thin solid $separation-color;
+  background: $secondary-color;
+  
+}
+#document_edit textarea{
+  resize: none;
+  height: 75px;
+}
+#document_edit .form_row {
+  padding: 5px 10px;
+}
+#document_edit .form_label {
+  width: 100px;
+}
+#document_edit .form_field {
+  width: 415px;
+  padding: 0;
+}
+#document_edit .form_tag {
+  width: 100%;
+}
+
 #document_comments {
   margin-top: 20px;
   padding-top: 10px;

data/app/controllers/audios_controller.rb

@@ -1,2 +1,2 @@
-class AudiosController < CommonDocumentsController
+class AudiosController < DocumentsController
 end

data/app/controllers/documents_controller.rb

@@ -1,19 +1,44 @@
-class DocumentsController < CommonDocumentsController
+class DocumentsController < InheritedResources::Base
   respond_to :html, :js
-  
-  SEND_FILE_METHOD = :default
 
+  belongs_to_subjects :optional => true
+
+  before_filter :profile_subject!, :only => :index
+
+  load_and_authorize_resource :except => :index
+
+  SEND_FILE_METHOD = :default
   def create
     super do |format|
       format.all {redirect_to request.referer || home_path}
     end
   end
-  
+
+  def update
+    update! do |success, failure|
+      failure.html { render :action => :show }
+      success.html { render :action => :show }
+    end
+  end
+
+  def show
+    respond_to do |format|
+      format.html {render :action => :show}
+      format.all {
+        path = resource.file.path(params[:style] || params[:format])
+
+        send_file path,
+        :filename => resource.file_file_name,
+        :disposition => "inline"
+      }
+    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) 
+    head(:bad_request) and return unless File.exist?(path)
 
     send_file_options = {
       :filename => @document.file_file_name,
@@ -22,13 +47,29 @@ class DocumentsController < CommonDocumentsController
 
     # Ask Victor about the rationale of this:
     case SEND_FILE_METHOD
-      when :apache then send_file_options[:x_sendfile] = true
-      when :nginx then head(:x_accel_redirect => path.gsub(Rails.root, ''))
+    when :apache then send_file_options[:x_sendfile] = true
+    when :nginx then head(:x_accel_redirect => path.gsub(Rails.root, ''))
     end
 
     send_file(path, send_file_options)
   end
 
+  def destroy
+    @post_activity = resource.post_activity
+
+    destroy!
+  end
+
+  private
+
+  def collection
+    @activities = profile_subject.wall(:profile,
+    :for => current_subject,
+    :object_type => Array(self.class.index_object_type)).
+    page(params[:page]).
+    per(params[:per])
+  end
+
   class << self
     def index_object_type
       [ :Audio, :Video, :Picture, :Document ]

data/app/controllers/pictures_controller.rb

@@ -1,2 +1,2 @@
-class PicturesController < CommonDocumentsController
+class PicturesController < DocumentsController
 end  

data/app/controllers/videos_controller.rb

@@ -1,2 +1,2 @@
-class VideosController < CommonDocumentsController
+class VideosController < DocumentsController
 end

data/app/models/document.rb

@@ -8,8 +8,11 @@ class Document < ActiveRecord::Base
                     :path => ':rails_root/documents/:class/:id_partition/:style/:filename.:extension'
   
   validates_attachment_presence :file
+  validates_presence_of :title
   
-  before_create :set_title_and_description
+  before_validation(:on => :create) do
+    set_title_and_description
+  end
   
   define_index do
     indexes title

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

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

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

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

data/app/views/{common_documents → common}/_document_info.html.erb

@@ -24,11 +24,12 @@
   </div>
   <br class="clearfloat" />
   <div id="actions">
-    <%= link_to image_tag("btn/download.png") + t('document.actions.download'), download_document_path(document), :class => :action %>
-    <%= link_to image_tag("btn/edit.png") + t('document.actions.edit'), "javascript:toggleEdit();", :class => :action %>
+    <%= link_to content_tag(:span,image_tag("btn/download.png") + t('document.actions.download'), :class => :action), download_document_path(document) %>
+    <%= link_to content_tag(:span,image_tag("btn/edit.png") + t('document.actions.edit'), :class => :action, :id => :document_edit_action), "javascript:toggleDocumentEdit();" %>
     <% if document.post_activity.delete_object_by?(current_subject) %>
-      <%= link_to image_tag("btn/error.png") + t('document.actions.delete'), document.post_activity.direct_object , :confirm => t('confirm_delete',
+      <%= link_to content_tag(:span,image_tag("btn/error.png") + t('document.actions.delete'), :class => :action), document.post_activity.direct_object , :confirm => t('confirm_delete',
         :scope => document.post_activity.direct_object.class.to_s.underscore), :method => :delete %>
     <% end %>
   </div>
 </div>
+<%= render :partial => "common/edit_form", :locals => {:document => document} %>

data/app/views/common/_edit_form.html.erb

@@ -0,0 +1,49 @@
+<div class="block" id="document_edit" style="display:none;">
+  <%= form_for(document, :html => { :method => :put }) do |f| %>
+  <% if document and document.errors.any? %>
+  <%= javascript_tag do %>
+    $(document).ready(function(){
+      toggleDocumentEdit();
+    });
+  <% end %>
+  <div class="error">
+    <ul>
+      <% document.errors.full_messages.each do |msg| %>
+      <li>
+        <%= msg %>
+      </li>
+      <% end %>
+    </ul>
+  </div>
+  <% end %>
+  <div class="form_row">
+    <div class="form_label">
+      <%= f.label t('document.info.title.title') %>
+    </div>
+    <div class="form_field">
+      <%= f.text_field :title, :class => "form_tag" %>
+    </div>
+  </div>
+  <div class="form_row">
+    <div class="form_label">
+      <%= f.label t('document.info.description.title') %>
+    </div>
+    <div class="form_field">
+      <%= f.text_area :description, :class => "form_tag" %>
+    </div>
+  </div>
+  <!-- 
+  <div class="form_row">
+    <div class="form_label">
+      <%#= f.label t('document.info.file.title') %>
+    </div>
+    <div class="form_field">
+      <%#= f.file_field :file, :class => "form_tag" %>
+    </div>
+  </div>  
+  -->
+  <div class="actions center">
+    <%= f.submit t('document.actions.edit'), :class => "button" %>
+  </div>
+  <% end %>
+</div>

data/app/views/{common_documents → common}/_show.html.erb

@@ -28,7 +28,7 @@
 
 <%= show_view_for document %>
 
-<%= render :partial => "document_info", :locals => {:document => document} %>
+<%= render :partial => "common/document_info", :locals => {:document => document} %>
 
 <div id="document_comments">
   <%= render :partial => 'activities/comments', :locals => { :activity => document.post_activity } %>

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

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

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

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

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

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

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

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

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

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

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

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

data/config/locales/en.yml

@@ -21,6 +21,8 @@ en:
         updated_at: "Updated at"
       description:
         title: "Description"
+      file:
+        title: "Upload"
       title:
         title: "Title"
     mine: "My documents"
@@ -43,7 +45,7 @@ en:
   resource:
     all: "All Resources"
     confirm_delete: "Delete resource?"
-    title: "Resources"
+    title: "Repository"
     mine: "My resources"
     msg: "Uploaded a resource:"
     not_mine: "Resources"

data/config/locales/es.yml

@@ -21,6 +21,8 @@ es:
         updated_at: "Última modificación"
       description:
         title: "Descripción"
+      file:
+        title: "Subir"
       title:
         title: "Título"
     mine: "Mis documentos"
@@ -43,7 +45,7 @@ es:
   resource:
     all: "Todos los recursos"
     confirm_delete: "¿Borrar recursos?"
-    title: "Recursos"
+    title: "Repositorio"
     mine: "Mis recursos"
     msg: "Subió un recurso:"
     not_mine: "Recursos"

data/lib/social_stream/documents/version.rb

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

data/lib/social_stream/toolbar_config/documents.rb

@@ -6,17 +6,22 @@ module SocialStream
 
         items << {
           :key => :resources,
-          :name => image_tag("btn/btn_resource.png",:class =>"menu_icon")+t("resource.#{ subject == current_subject ? 'mine' : 'title' }"),
-          :url => "#",
-          :options => {:link => {:id => "resources_menu"}},
-          :items => [
-            {:key => :resources_documents,:name => image_tag("btn/btn_document.png")+t('document.title'),:url => polymorphic_path([subject, Document.new])},
-            {:key => :resources_pictures,:name => image_tag("btn/btn_gallery.png")+t('picture.title'),:url => polymorphic_path([subject, Picture.new])},
-            {:key => :resources_videos,:name => image_tag("btn/btn_video.png")+t('video.title'),:url => polymorphic_path([subject, Video.new])},
-            {:key => :resources_audios,:name => image_tag("btn/btn_audio.png")+t('audio.title'),:url => polymorphic_path([subject, Audio.new])}
-            ]
+          :name => image_tag("btn/btn_resource.png",:class =>"menu_icon")+t("resource.title"),
+          :url => polymorphic_path([subject, Document.new]),
+          :options => {:link => {:id => "resources_menu"}}
         }
       end
+      
+      def home_toolbar_items
+        items = super
+
+        items << {
+          :key => :resources,
+          :name => image_tag("btn/btn_resource.png",:class =>"menu_icon")+t("resource.title"),
+          :url => polymorphic_path([current_subject, Document.new]),
+          :options => {:link => {:id => "resources_menu"}}
+        }
+      end      
     end
   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.23')
+  s.add_runtime_dependency('social_stream-base', '~> 0.9.24')
   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')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream-documents
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - "V\xC3\xADctor S\xC3\xA1nchez Belmar"
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-28 00:00:00 +02:00
+date: 2011-10-31 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,12 +27,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 11
         segments: 
         - 0
         - 9
-        - 23
-        version: 0.9.23
+        - 24
+        version: 0.9.24
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -235,7 +235,6 @@ files:
 - app/assets/stylesheets/show.css.scss
 - 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
@@ -257,9 +256,10 @@ files:
 - app/views/audios/index.html.erb
 - app/views/audios/index.js.erb
 - app/views/audios/show.html.erb
-- app/views/common_documents/_document_info.html.erb
-- app/views/common_documents/_index.html.erb
-- app/views/common_documents/_show.html.erb
+- app/views/common/_document_info.html.erb
+- app/views/common/_edit_form.html.erb
+- app/views/common/_index.html.erb
+- app/views/common/_show.html.erb
 - app/views/documents/_document.html.erb
 - app/views/documents/_document_focus_search.html.erb
 - app/views/documents/_document_global_search.html.erb

data/app/controllers/common_documents_controller.rb

@@ -1,45 +0,0 @@
-class CommonDocumentsController < InheritedResources::Base
-  respond_to :html, :js
-
-  belongs_to_subjects :optional => true
-
-  before_filter :profile_subject!, :only => :index
-
-  load_and_authorize_resource :except => :index
-
-
-  def show
-    respond_to do |format|
-      format.html {render :action => :show}
-      format.all {
-        path = resource.file.path(params[:style] || params[:format])
-
-        send_file path, 
-                  :filename => resource.file_file_name,
-                  :disposition => "inline"
-      }
-    end
-  end
-  
-  def destroy
-    @post_activity = resource.post_activity
-    
-    destroy!
-  end
-
-  private
-
-  def collection
-    @activities = profile_subject.wall(:profile,
-                                       :for => current_subject,
-                                       :object_type => Array(self.class.index_object_type)).
-                                  page(params[:page]).
-                                  per(params[:per])
-  end
-
-  class << self
-    def index_object_type
-      controller_name.classify
-    end
-  end
-end