social_stream-documents 0.13.2 → 0.14.0

data/app/controllers/documents_controller.rb

@@ -10,7 +10,7 @@ class DocumentsController < ApplicationController
   
   def index
     super do |format|
-      format.json { render :json => collection.map{|a| a.activity_objects.first.document.to_json} }
+      format.json { render :json => collection.map{|a| a.activity_objects.first.document} }
       if params[:no_layout].present?
         format.html { render :action => :index, :layout => false }      
       else  

data/app/models/audio.rb

@@ -8,12 +8,9 @@ class Audio < Document
   process_in_background :file    
   
   define_index do
-    indexes activity_object.title
+    activity_object_index
+
     indexes file_file_name, :as => :file_name
-    indexes activity_object.description
-    indexes activity_object.tags.name, :as => :tags
-    
-    has created_at
   end 
               
   # Thumbnail file

data/app/models/document.rb

@@ -15,14 +15,11 @@ class Document < ActiveRecord::Base
   end
   
   define_index do
-    indexes activity_object.title
+    activity_object_index
+
     indexes file_file_name, :as => :file_name
-    indexes activity_object.description
-    indexes activity_object.tags.name, :as => :tags
     
     where "type IS NULL"
-    
-    has created_at
   end
   
   class << self 
@@ -70,13 +67,13 @@ class Document < ActiveRecord::Base
   end
 
  # JSON, generic version for most documents
-  def to_json me=self
-    {:id => activity_object_id,
+  def as_json(options = nil)
+    {:id => id,
      :title => title,
      :description => description,
      :author => author.name,
      :src => file.to_s
-    }.to_json
+    }
   end
   
   protected

data/app/models/picture.rb

@@ -10,12 +10,9 @@ class Picture < Document
                                }                              
                                
   define_index do
-    indexes activity_object.title
+    activity_object_index
+
     indexes file_file_name, :as => :file_name
-    indexes activity_object.description
-    indexes activity_object.tags.name, :as => :tags
-    
-    has created_at
   end    
 
   # Thumbnail file

data/app/models/video.rb

@@ -1,6 +1,7 @@
 class Video < Document  
   has_attached_file :file, 
                     :url => '/:class/:id.:extension',
+                    :default_url => 'missing_:style.png',
                     :path => ':rails_root/documents/:class/:id_partition/:style',
                     :styles => {
                       :webm => {:format => 'webm'},
@@ -15,12 +16,9 @@ class Video < Document
   process_in_background :file
   
   define_index do
-    indexes activity_object.title
+    activity_object_index
+
     indexes file_file_name, :as => :file_name
-    indexes activity_object.description
-    indexes activity_object.tags.name, :as => :tags
-    
-    has created_at
   end
                       
   # Thumbnail file
@@ -29,8 +27,8 @@ class Video < Document
   end
 
  # JSON, special edition for video files
-  def to_json me=self
-    {:id => activity_object_id,
+  def as_json(options = nil)
+    {:id => id,
      :title => title,
      :description => description,
      :author => author.name,
@@ -39,7 +37,7 @@ class Video < Document
                    { :type => Mime::MP4.to_s,   :src => file(:mp4).to_s },
                    { :type => Mime::FLV.to_s, :src => file(:flv).to_s }
                  ]
-    }.to_json
+    }
   end
   
 end

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

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

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

@@ -7,9 +7,18 @@
   </div>
 
   <div class="attachment_text">
-  	<%= t('document.msg') %><%= link_to "\""+document.title+"\"", 
-    document,  
-    :class => "attachment_text_link" %>
+   <div class="title">
+    <%= document.title %>
+   </div>
+
+   <%= simple_format auto_link(document.description) %>
+
+   <%= link_to t('details.msg'),
+       document_path(document),
+       :alt => t('details.msg'),
+       :type => document.type,
+       :path => document_path(document),
+       :class => "attachment_text_link document_link" %>
   </div>
 
 <% end %>

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

@@ -15,9 +15,9 @@
 
 	<%= simple_format auto_link(picture.description) %>
 
-        <%= link_to t('picture.msg'),
+        <%= link_to t('details.msg'),
               picture_path(picture),
-              :alt => t('picture.msg'),
+              :alt => t('details.msg'),
               :type => picture.type,
               :path => document_path(picture),
               :class => "attachment_text_link picture_link" %>

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

@@ -10,9 +10,9 @@
 
   <%= simple_format auto_link(video.description) %>
 
-  <%= link_to t('video.msg'),
+  <%= link_to t('details.msg'),
     video,
-    :alt => t('picture.msg'),
+    :alt => t('details.msg'),
     :type => video.type,
     :path => document_path(video),
     :class => "attachment_text_link video_link" %>

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

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

data/config/locales/en.yml

@@ -7,7 +7,6 @@ en:
     confirm_delete: "Delete audio?"
     title: "Audios"
     mine: "My audios"
-    msg: "Uploaded an audio:"
     name: "audio"
     not_mine: "Audios"
     one: "an audio"
@@ -15,6 +14,8 @@ en:
     title:
       one: "Audio"
       other: "Audios"
+  details:
+    msg: "See details..."
   document:
     actions:
       delete: "Delete"
@@ -36,7 +37,6 @@ en:
       title:
         title: "Title"
     mine: "My files"
-    msg: "Uploaded a file:"
     name: "file"
     not_mine: "Files"
     one: "a file"
@@ -47,7 +47,6 @@ en:
   picture:
     confirm_delete: "Delete picture?"
     mine: "My pictures"  
-    msg: "See details..."
     name: "picture"
     not_mine: "Pictures"
     one: "a picture"
@@ -65,12 +64,10 @@ en:
     confirm_delete: "Delete resource?"
     title: "Resources"
     mine: "My resources"
-    msg: "Uploaded a resource:"
     not_mine: "Resources"
   video:
     confirm_delete: "Delete video?"
     mine: "My videos"  
-    msg: "See details..."
     name: "video" 
     not_mine: "Videos"
     one: "a video"

data/config/locales/es.yml

@@ -6,7 +6,6 @@ es:
   audio:
     confirm_delete: "¿Borrar audios?"
     mine: "Mis audios"
-    msg: "Subió un audio:"
     name: "archivo de audio"
     not_mine: "Audios"
     one: "un archivo de audio"
@@ -14,6 +13,8 @@ es:
     title:
       one: "Audio"
       other: "Audios"
+  details:
+    msg: "Ver detalles..."
   document:
     actions:
       delete: "Borrar"
@@ -35,7 +36,6 @@ es:
       title:
         title: "Título"
     mine: "Mis ficheros"
-    msg: "Subió un fichero:"
     name: "fichero"
     not_mine: "Ficheros"
     one: "un fichero"
@@ -46,7 +46,6 @@ es:
   picture:
     confirm_delete: "¿Borrar imagen?"
     mine: "Mis imágenes"
-    msg: "Ver detalles..."
     name: "imagen"
     not_mine: "Imágenes"
     one: "una imagen"
@@ -64,12 +63,10 @@ es:
     confirm_delete: "¿Borrar recursos?"
     title: "Recursos"
     mine: "Mis recursos"
-    msg: "Subió un recurso:"
     not_mine: "Recursos"
   video:
     confirm_delete: "¿Borrar vídeo?"
     mine: "Mis vídeos"  
-    msg: "Ver detalles..."
     name: "vídeo"
     not_mine: "Vídeos"
     one: "un vídeo"

data/lib/social_stream/documents/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Documents
-    VERSION = "0.13.2".freeze
+    VERSION = "0.14.0".freeze
   end
 end

data/lib/tasks/db/populate_documents.rake

@@ -24,7 +24,7 @@ namespace :db do
                              :author_id  => author.id,
                              :owner_id   => owner.id,
                              :user_author_id => user_author.id,
-                             :_relation_ids => [Relation::Public.instance.id]
+                             :relation_ids => [Relation::Public.instance.id]
         d.save!
       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.19.2')
+  s.add_runtime_dependency('social_stream-base', '~> 0.20.0')
   s.add_runtime_dependency('paperclip-ffmpeg', '~> 0.7.0')
   s.add_runtime_dependency('paperclip','= 2.4.5')
   s.add_runtime_dependency('delayed_paperclip','2.4.5.1')

data/spec/factories/document.rb

@@ -10,12 +10,12 @@ end
 
 Factory.define :public_document, :parent => :document do |d|
   d.owner_id  { |q| q.author_id }
-  d._relation_ids { |q| Array(Relation::Public.instance.id) }
+  d.relation_ids { |q| Array(Relation::Public.instance.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.owner_id  { |q| q.author_id }
-  d._relation_ids  { |q| Actor.find(q.author_id).relation_customs.sort.first.id }
+  d.relation_ids  { |q| Actor.find(q.author_id).relation_customs.sort.first.id }
 end

data/spec/factories/picture.rb

@@ -10,13 +10,13 @@ end
 
 Factory.define :public_picture, :parent => :picture do |p|
   p.owner_id  { |q| q.author_id }
-  p._relation_ids { |q| Array(Relation::Public.instance.id) }
+  p.relation_ids { |q| Array(Relation::Public.instance.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.owner_id  { |q| q.author_id }
-  p._relation_ids  { |q| Actor.find(q.author_id).relation_customs.sort.first.id }
+  p.relation_ids  { |q| Actor.find(q.author_id).relation_customs.sort.first.id }
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream-documents
 version: !ruby/object:Gem::Version
-  version: 0.13.2
+  version: 0.14.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,22 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-11 00:00:00.000000000Z
+date: 2012-04-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: social_stream-base
-  requirement: &81873720 !ruby/object:Gem::Requirement
+  requirement: &84319120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.19.2
+        version: 0.20.0
   type: :runtime
   prerelease: false
-  version_requirements: *81873720
+  version_requirements: *84319120
 - !ruby/object:Gem::Dependency
   name: paperclip-ffmpeg
-  requirement: &81868870 !ruby/object:Gem::Requirement
+  requirement: &84318870 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *81868870
+  version_requirements: *84318870
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &81867500 !ruby/object:Gem::Requirement
+  requirement: &84318640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -44,10 +44,10 @@ dependencies:
         version: 2.4.5
   type: :runtime
   prerelease: false
-  version_requirements: *81867500
+  version_requirements: *84318640
 - !ruby/object:Gem::Dependency
   name: delayed_paperclip
-  requirement: &81865980 !ruby/object:Gem::Requirement
+  requirement: &84318410 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -55,10 +55,10 @@ dependencies:
         version: 2.4.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *81865980
+  version_requirements: *84318410
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &81864070 !ruby/object:Gem::Requirement
+  requirement: &84318220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *81864070
+  version_requirements: *84318220
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &81861120 !ruby/object:Gem::Requirement
+  requirement: &84317940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *81861120
+  version_requirements: *84317940
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &81857440 !ruby/object:Gem::Requirement
+  requirement: &84317690 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *81857440
+  version_requirements: *84317690
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &81855520 !ruby/object:Gem::Requirement
+  requirement: &84317460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,10 +99,10 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *81855520
+  version_requirements: *84317460
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &81851410 !ruby/object:Gem::Requirement
+  requirement: &84317230 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,7 +110,7 @@ dependencies:
         version: 0.3.9
   type: :development
   prerelease: false
-  version_requirements: *81851410
+  version_requirements: *84317230
 description: ! 'Social Stream is a Ruby on Rails engine providing your application
   with social networking features and activity streams.