social_stream-documents 0.4.8 → 0.5.0

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

@@ -41,6 +41,10 @@
   float: left;
   margin-left: 30px;
 }
+#document_info #description{
+  margin: 15px 40px; 
+  text-align: justify;
+}
 #document_info #actions{
   margin-top: 10px; 
   margin-left: 30px; 

data/app/controllers/documents_controller.rb

@@ -1,13 +1,11 @@
-class DocumentsController < InheritedResources::Base
+class DocumentsController < ApplicationController
   include ActionView::Helpers::SanitizeHelper
-  respond_to :html, :js
+  include SocialStream::Controllers::Objects
 
   belongs_to_subjects :optional => true
 
   before_filter :profile_subject!, :only => :index
 
-  load_and_authorize_resource :except => :index
-
   PER_PAGE=20
   SEND_FILE_METHOD = :default
   
@@ -67,12 +65,6 @@ class DocumentsController < InheritedResources::Base
     send_file(path, send_file_options)
   end
 
-  def destroy
-    @post_activity = resource.post_activity
-
-    destroy!
-  end
-
   private
 
   def collection

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

@@ -4,7 +4,7 @@
               :class => "" %>
 </div>
 <div class="attachment_text">
-  <%= t('audio.msg') %><%= link_to "\""+audio.file_file_name+"\"",
+  <%= t('audio.msg') %><%= link_to "\""+audio.title+"\"",
                                    audio_path(audio),
                                    :class => "attachment_text_link" %>
 </div>

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

@@ -2,6 +2,6 @@
   <%= thumb_for(audio, 16) %>
 </div>
 <div class="attachment_text">
-  <%= t('audio.msg') %><%= "\""+audio.file_file_name+"\"" %>
+  <%= t('audio.msg') %><%= "\""+audio.title+"\"" %>
   <div class="processing_text"><%= t('audio.processing')%></div>
 </div>

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

@@ -1,4 +1,9 @@
 <div id="document_info">
+  <% if document.description %>
+    <div id="description">
+    	<%= document.description %>
+    </div>
+  <% end %>
   <div id="actions">
     <%= link_to content_tag(:span,image_tag("btn/btn_write.png") + t('document.actions.details'), :class => :action, :id => :document_details_action), "javascript:toggleDocumentMenu('details');" %>
     <%= link_to content_tag(:span,image_tag("btn/download.png") + t('document.actions.download'), :class => :action), download_document_path(document) %>

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

@@ -7,7 +7,7 @@
   </div>
 
   <div class="attachment_text">
-  	<%= t('document.msg') %><%= link_to "\""+document.file_file_name+"\"", 
+  	<%= t('document.msg') %><%= link_to "\""+document.title+"\"", 
     document,  
     :class => "attachment_text_link" %>
   </div>

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

@@ -4,15 +4,15 @@
     <%= link_to thumb_for(picture, 16),
                  picture_path(picture),
                 :type => picture.type, 
-            		:title => picture.file_file_name,
+            		:title => picture.title,
             		:path => document_path(picture) %>
   </div>
   
   <div class="attachment_text picture_summary_class picture_link">
   	<%= t('picture.msg') %>
-  	<%= link_to "\""+picture.file_file_name+"\"", 
+  	<%= link_to "\""+picture.title+"\"", 
                 picture_path(picture),
-                :alt => picture.file_file_name,
+                :alt => picture.title,
                	:type => picture.type,
                	:path => document_path(picture),
                 :class => "attachment_text_link" %>
@@ -22,7 +22,7 @@
     <%= link_to thumb_for(picture, 130),
                 download_document_path(picture),
         :type => picture.type, 
-		:title => picture.file_file_name,
+		:title => picture.title,
 		:path => document_path(picture) %>
   </div>
 <% end %>

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

@@ -5,7 +5,7 @@
   :class => "" %>
 </div>
 <div class="attachment_text">
-  <%= t('video.msg') %><%= link_to "\""+video.file_file_name+"\"",
+  <%= t('video.msg') %><%= link_to "\""+video.title+"\"",
   video,
   :class => "attachment_text_link" %>
   <div id="video_thumbnail_<%= video.id%>" class="video_thumbnail_class">

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

@@ -2,6 +2,6 @@
   <%= thumb_for(video, 16) %>
 </div>
 <div class="attachment_text">
-  <%= t('video.msg') %><%= "\""+video.file_file_name+"\"" %>
+  <%= t('video.msg') %><%= "\""+video.title+"\"" %>
   <div class="processing_text"><%= t('video.processing')%></div>
 </div>

data/lib/social_stream/documents/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Documents
-    VERSION = "0.4.8".freeze
+    VERSION = "0.5.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.36')
+  s.add_runtime_dependency('social_stream-base', '~> 0.10.0')
   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/factories/document.rb

@@ -2,18 +2,19 @@ Factory.define :document do |d|
   d.file { Rack::Test::UploadedFile.new(File.join(File.dirname(__FILE__), 'files', 'small.pdf'),
                                        'application/pdf') }
 
-  d._contact_id { Factory(:friend).contact_id }
-  d._relation_ids { |q| Array(Contact.find(q._contact_id).sender.relation_customs.sort.first.id) }
+  d.author_id { Factory(:friend).receiver.id }
+  d.owner_id  { |q| Actor.find(q.author_id).received_ties.first.sender.id }
+  d.user_author_id { |q| q.author_id }
 end
 
 Factory.define :public_document, :parent => :document do |d|
-  d._contact_id { Factory(:self_contact).id }
-  d._relation_ids { |q| Array(Contact.find(q._contact_id).sender.relation_public.id) }
+  d.owner_id  { |q| q.author_id }
+  d._relation_ids { |q| Array(q.author.relation_public.id) }
 end
 
 Factory.define :private_document, :parent => :document do |d|
   d.file { Rack::Test::UploadedFile.new(File.join(File.dirname(__FILE__), 'files', 'small.pdf'),
                                        'application/pdf') }
-  d._contact_id { Factory(:self_contact).id }
-  d._relation_ids { |q| Array(Contact.find(q._contact_id).sender.relation_customs.sort.first.id) }
+  d.owner_id  { |q| q.author_id }
+  d._relation_ids  { |q| Actor.find(q.author_id).relation_customs.sort.first.id }
 end

data/spec/factories/picture.rb

@@ -2,19 +2,20 @@ Factory.define :picture do |p|
   p.file { Rack::Test::UploadedFile.new(File.join(File.dirname(__FILE__), 'files', 'rails.png'),
                                        'image/png') }
 
-  p._contact_id { Factory(:friend).contact_id }
-  p._relation_ids { |q| Array(Contact.find(q._contact_id).sender.relation_customs.sort.first.id) }
+  p.author_id { Factory(:friend).receiver.id }
+  p.owner_id  { |q| Actor.find(q.author_id).received_ties.first.sender.id }
+  p.user_author_id { |q| q.author_id }
 end
 
 Factory.define :public_picture, :parent => :picture do |p|
-  p._contact_id { Factory(:self_contact).id }
-  p._relation_ids { |q| Array(Contact.find(q._contact_id).sender.relation_public.id) }
+  p.owner_id  { |q| q.author_id }
+  p._relation_ids { |q| Array(q.author.relation_public.id) }
 end
 
 Factory.define :private_picture, :parent => :picture do |p|
   p.file { Rack::Test::UploadedFile.new(File.join(File.dirname(__FILE__), 'files', 'privado.png'),
                                        'image/png') }
-  p._contact_id { Factory(:self_contact).id }
-  p._relation_ids { |q| Array(Contact.find(q._contact_id).sender.relation_customs.sort.first.id) }
+  p.owner_id  { |q| q.author_id }
+  p._relation_ids  { |q| Actor.find(q.author_id).relation_customs.sort.first.id }
 end
 

data/spec/spec_helper.rb

@@ -23,7 +23,12 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 # Load Factories
 require 'factory_girl'
-base_path = File.join(Gem::GemPathSearcher.new.find('social_stream-base').full_gem_path, 'spec')
+
+if (Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.8.0'))
+  base_path = File.join(Gem::Specification.find_by_name('social_stream-base').full_gem_path, 'spec')
+else
+  base_path = File.join(Gem::GemPathSearcher.new.find('social_stream-base').full_gem_path, 'spec')
+end
 [ base_path,  File.dirname(__FILE__) ].each do |path|
   Dir["#{path}/factories/*.rb"].each {|f| require f}
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream-documents
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 11
   prerelease: 
   segments: 
   - 0
-  - 4
-  - 8
-  version: 0.4.8
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - "V\xC3\xADctor S\xC3\xA1nchez Belmar"
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-21 00:00:00 +01:00
+date: 2011-11-28 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,12 +27,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 115
+        hash: 55
         segments: 
         - 0
-        - 9
-        - 36
-        version: 0.9.36
+        - 10
+        - 0
+        version: 0.10.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -250,11 +250,9 @@ files:
 - app/views/audios/_audio_processing.html.erb
 - app/views/audios/_audio_show.html.erb
 - app/views/audios/_audio_with_details.html.erb
-- app/views/audios/_mediapreviews.html.erb
 - app/views/audios/_new.html.erb
 - 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/common_documents/_document_info.html.erb
 - app/views/common_documents/_edit_form.html.erb
@@ -270,9 +268,7 @@ files:
 - app/views/documents/_new_activity_fields.html.erb
 - 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/_mediapreviews.html.erb
 - app/views/pictures/_new.html.erb
 - app/views/pictures/_picture.html.erb
 - app/views/pictures/_picture_focus_search.html.erb
@@ -281,7 +277,6 @@ files:
 - app/views/pictures/_picture_with_details.html.erb
 - 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/videos/_new.html.erb
 - app/views/videos/_video.html.erb

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

@@ -1 +0,0 @@
-$('#media_wall').html("<%= escape_javascript(render :partial =>"audios/mediapreviews") %>");

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

@@ -1 +0,0 @@
-$('#media_wall').html("<%= escape_javascript(render :partial =>"documents/mediapreviews") %>");

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

@@ -1,8 +0,0 @@
-<% @document_activities.each do |a| %>
-	<% document = a.activity_objects.first.document %>
-	<div class="media_preview picture">
-		<img src="<%= link_for_wall(document) %>" class="media_preview_image" />
-		<div class="media_preview_title"><%= document.file_file_name %></div>
-		<div class="media_preview_detail">some detail</div>
-	</div>
-<% end %>

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

@@ -1 +0,0 @@
-$('#media_wall').html("<%= escape_javascript(render :partial =>"pictures/mediapreviews") %>");