social_stream-documents 0.2.8 → 0.3.0

data/app/models/audio.rb

@@ -5,7 +5,16 @@ class Audio < Document
                     :styles => {:webma => {:format => 'webm'}                                
                     },:processors => [:ffmpeg]
   
-  process_in_background :file     
+  process_in_background :file    
+  
+  define_index do
+    indexes title
+    indexes file_file_name, :as => :file_name
+    indexes description
+    indexes activity_object.tags.name, :as => :tags
+    
+    has created_at
+  end 
               
   # Thumbnail file
   def thumb(size, helper)

data/app/models/document.rb

@@ -13,6 +13,17 @@ class Document < ActiveRecord::Base
   
   validates_attachment_presence :file
   
+  define_index do
+    indexes title
+    indexes file_file_name, :as => :file_name
+    indexes description
+    indexes activity_object.tags.name, :as => :tags
+    
+    where "type IS NULL"
+    
+    has created_at
+  end
+  
   class << self 
     def new(*args)
       if !(self.name == "Document")

data/app/models/picture.rb

@@ -4,7 +4,16 @@ class Picture < Document
                     :path => ':rails_root/documents/:class/:id_partition/:style.:extension',
                     :styles => {:thumb  => ["48x48#"],
                                 :thumb0 => ["130x80#"]
-                               }                                  
+                               }                              
+                               
+  define_index do
+    indexes title
+    indexes file_file_name, :as => :file_name
+    indexes description
+    indexes activity_object.tags.name, :as => :tags
+    
+    has created_at
+  end    
   # Thumbnail file
   def thumb(size, helper)
     case size

data/app/models/video.rb

@@ -9,6 +9,15 @@ class Video < Document
                     },:processors => [:ffmpeg]
                     
   process_in_background :file
+  
+  define_index do
+    indexes title
+    indexes file_file_name, :as => :file_name
+    indexes description
+    indexes activity_object.tags.name, :as => :tags
+    
+    has created_at
+  end
                       
   # Thumbnail file
   def thumb(size, helper)

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

@@ -0,0 +1,3 @@
+<%= render :partial => 'documents/document_with_details',
+           :locals => {:document => audio} %>
+

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

@@ -0,0 +1,13 @@
+<div class="model_with_details">
+  <div class="logo">
+    <%= link_to thumb_for(document, 48), document  %>
+  </div>
+  <div class="sub-block">
+    <div class="name black" >
+      <%= link_to truncate_name(document.file_file_name), document %>
+    </div>
+    <div class="brief">
+      <%= t 'like.n',     :count => document.like_count %>
+    </div>
+   </div>
+</div>

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

@@ -0,0 +1,2 @@
+<%= render :partial => 'documents/document_with_details',
+           :locals => {:document => picture} %>

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

@@ -0,0 +1,2 @@
+<%= render :partial => 'documents/document_with_details',
+           :locals => {:document => video} %>

data/config/locales/en.yml

@@ -6,13 +6,6 @@ en:
     msg: "Uploaded an audio:"
     not_mine: "Audios"
     processing: "Processing audio clip"
-  conference:
-    all: "All conferences"
-    confirm_delete: "Delete conference?"
-    title: "Conferences"
-    mine: "My conferences"
-    msg: "Uploaded a conference:"
-    not_mine: "Conferences"
   document:
     all: "All documents"  
     confirm_delete: "Delete document?"

data/config/locales/es.yml

@@ -0,0 +1,38 @@
+es:
+  audio:
+    confirm_delete: "¿Borrar audios?"
+    title: "Audios"
+    mine: "Mis audios"
+    msg: "Subió un audio:"
+    not_mine: "Audios"
+    processing: "Procesando fichero de audio..."
+  document:
+    all: "Todos los documentos"
+    confirm_delete: "¿Borrar documento?"
+    form:
+      title: "Fichero"
+    mine: "Mis documentos"
+    msg: "Subió un documento:"
+    not_mine: "Documentos"
+    simple_all: "Todos"
+    title: "Documentos"
+  picture:
+    confirm_delete: "¿Borrar imagen?"
+    title: "Imágenes"
+    mine: "Mis imágenes"
+    msg: "Subió una imagen:"
+    not_mine: "Imágenes"
+  resource:
+    all: "Todos los recursos"
+    confirm_delete: "¿Borrar recursos?"
+    title: "Recursos"
+    mine: "Mis recursos"
+    msg: "Subió un recurso:"
+    not_mine: "Recursos"
+  video:
+    confirm_delete: "¿Borrar vídeo?"
+    title: "Vídeos"
+    mine: "Mis vídeos"  
+    msg: "Subió un vídeo:"
+    not_mine: "Vídeos"
+    processing: "Procesando vídeo..."

data/db/migrate/20111005112707_add_title_and_description_to_document.rb

@@ -0,0 +1,11 @@
+class AddTitleAndDescriptionToDocument < ActiveRecord::Migration
+    def self.up
+      add_column :documents, :title, :string
+      add_column :documents, :description, :text
+    end
+    
+    def self.down
+      remove_column :documents, :title
+      remove_column :documents, :description
+    end
+end

data/lib/social_stream/documents/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Documents
-    VERSION = "0.2.8".freeze
+    VERSION = "0.3.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.8')
+  s.add_runtime_dependency('social_stream-base', '~> 0.9.15')
   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: 7
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
-  - 8
-  version: 0.2.8
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - "V\xC3\xADctor S\xC3\xA1nchez Belmar"
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-27 00:00:00 +02:00
+date: 2011-10-06 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,12 +27,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 43
+        hash: 37
         segments: 
         - 0
         - 9
-        - 8
-        version: 0.9.8
+        - 15
+        version: 0.9.15
   name: social_stream-base
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -251,6 +251,7 @@ files:
 - app/views/audios/_audio.html.erb
 - app/views/audios/_audio_processed.html.erb
 - app/views/audios/_audio_processing.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
@@ -259,6 +260,7 @@ files:
 - app/views/audios/show.html.erb
 - app/views/common-documents/_index.html.erb
 - app/views/documents/_document.html.erb
+- app/views/documents/_document_with_details.html.erb
 - app/views/documents/_header.html.erb
 - app/views/documents/_new_activity.html.erb
 - app/views/documents/_new_activity_fields.html.erb
@@ -269,6 +271,7 @@ files:
 - app/views/pictures/_mediapreviews.html.erb
 - app/views/pictures/_new.html.erb
 - app/views/pictures/_picture.html.erb
+- 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
@@ -278,15 +281,18 @@ files:
 - app/views/videos/_video.html.erb
 - app/views/videos/_video_processed.html.erb
 - app/views/videos/_video_processing.html.erb
+- app/views/videos/_video_with_details.html.erb
 - 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/locales/es.yml
 - config/routes.rb
 - db/migrate/20110615143707_create_social_stream_documents.rb
 - db/migrate/20110922173707_add_file_processing_to_document.rb
+- db/migrate/20111005112707_add_title_and_description_to_document.rb
 - lib/generators/social_stream/documents/install_generator.rb
 - lib/social_stream-documents.rb
 - lib/social_stream/documents/engine.rb