social_stream-documents 1.1.4 → 2.0.0.beta1

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

@@ -60,7 +60,7 @@
       solution:"flash, html",
       preload: "none",
       supplied: "webmv, flv, mp4",
-      swfPath: "<%= asset_path("") %>",
+      swfPath: "<%= asset_path(nil) %>",
       cssSelectorAncestor: "#jp_interface_<%=video.id%>"
     });
   <% end %>

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

@@ -1 +1,3 @@
-<%= render :partial => 'common_documents/index', :locals => { :documents => @videos } %>
+<section id="videos">
+  <%= render :partial => 'common_documents/index', :locals => { :documents => @videos } %>
+</section>

data/config/locales/en.yml

@@ -3,6 +3,8 @@ en:
     attributes:
       document:
         title: "Title"
+    models:
+      document: "File"
   audio:
     confirm_delete: "Delete audio?"
     title: "Audios"
@@ -10,6 +12,7 @@ en:
     name: "audio"
     not_mine: "Audios"
     one: "an audio"
+    other: "audios"
     processing: "Processing audio clip. Please wait..."
     title:
       one: "Audio"
@@ -23,25 +26,39 @@ en:
       download: "Download"
       edit: "Edit"
     all: "All files"
+    by: "by %{author}"
     confirm_delete: "Delete file?"
+    description:
+      input: "Add a description here"
+    filter: "filter"
     form:
       title: "File"
     info:
+      author: "Author"
       date:
         created_at: "Created at"
         updated_at: "Updated at"
-      description:
-        title: "Description"
-      file:
-        title: "Upload"
-      title:
-        title: "Title"
+      description: "Description"
+      file: "File"
+      size: "Size"
+      tags: "Tags"
+      title: "Title"
     mine: "My files"
     name: "file"
+    new:
+      link: "Add file"
+      title: "New file"
+    new_activity:
+      attach: "Attach file"
     not_mine: "Files"
     one: "a file"
+    other: "files"
+    scope:
+      network: "Network"
+      own: "Own"
     simple_all: "All"  
     title:
+      input: "File title"
       one: "File"
       other: "Files"
   picture:
@@ -50,15 +67,10 @@ en:
     name: "picture"
     not_mine: "Pictures"
     one: "a picture"
+    other: "pictures"
     title:
       one: "Picture"
       other: "Pictures"
-  repository:
-    title: "Files"
-    order:
-      by: "Order by"
-      last_modified: "Last modified"
-      most_popular: "Most popular"
   resource:
     all: "All Resources"
     confirm_delete: "Delete resource?"
@@ -71,6 +83,7 @@ en:
     name: "video" 
     not_mine: "Videos"
     one: "a video"
+    other: "videos"
     processing: "Processing video. Please, wait..."
     title:
       one: "Video"

data/config/locales/es.yml

@@ -3,12 +3,15 @@ es:
     attributes:
       document:
         title: "Título"
+    models:
+      document: "Fichero"
   audio:
     confirm_delete: "¿Borrar audios?"
     mine: "Mis audios"
     name: "archivo de audio"
     not_mine: "Audios"
     one: "un archivo de audio"
+    other: "audios"
     processing: "Procesando fichero de audio. Espere, por favor..."
     title:
       one: "Audio"
@@ -22,25 +25,37 @@ es:
       download: "Descargar"
       edit: "Editar"
     all: "Todos los ficheros"
+    by: "por %{author}"
     confirm_delete: "¿Borrar fichero?"
+    description:
+      input: "Añade una descripción aquí"
+    filter: "filtrar"
     form:
       title: "Fichero"
     info:
+      author: "Autor"
       date:
         created_at: "Creado"
         updated_at: "Última modificación"
-      description:
-        title: "Descripción"
-      file:
-        title: "Subir"
-      title:
-        title: "Título"
+      description: "Descripción"
+      file: "Fichero"
+      title: "Título"
     mine: "Mis ficheros"
     name: "fichero"
+    new:
+      link: "Añadir fichero"
+      title: "Nuevo fichero"
+    new_activity:
+      attach: "Adjuntar fichero"
     not_mine: "Ficheros"
     one: "un fichero"
+    other: "ficheros"
+    scope:
+      network: "Red"
+      own: "Propios"
     simple_all: "Todos"
     title:
+      input: "Título del fichero"
       one: "Fichero"
       other: "Ficheros"
   picture:
@@ -49,15 +64,10 @@ es:
     name: "imagen"
     not_mine: "Imágenes"
     one: "una imagen"
+    other: "imagenes"
     title:
       one: "Imagen"
       other: "Imágenes"
-  repository:
-    title: "Ficheros"
-    order:
-      by: "Ordenar por"
-      last_modified: "Última modificación"
-      most_popular: "Popularidad"
   resource:
     all: "Todos los recursos"
     confirm_delete: "¿Borrar recursos?"
@@ -70,6 +80,7 @@ es:
     name: "vídeo"
     not_mine: "Vídeos"
     one: "un vídeo"
+    other: "videos"
     processing: "Procesando vídeo. Espere, por favor..."
     title:
       one: "Vídeo"

data/lib/generators/social_stream/documents/install_generator.rb

@@ -21,8 +21,7 @@ class SocialStream::Documents::InstallGenerator < Rails::Generators::Base
   end
 
   def require_stylesheets
-    inject_into_file 'app/assets/stylesheets/application.css',
-                     " *= require social_stream-documents\n",
-                     :before => ' *= require_tree .'
+    append_file 'app/assets/stylesheets/social_stream.css.sass',
+                "@import social_stream-documents\n"
   end
 end

data/lib/generators/social_stream/documents/templates/initializer.rb

@@ -2,16 +2,30 @@ SocialStream::Documents.setup do |config|
   # Configure picture thumbnails
   #
   # config.picture_styles = {
-  #    :thumb48sq  => ["48x48"],
-  #    :thumbwall => ["130x97#"],
-  #    # midwall preserves A4 proportion: 210x297
-  #    :midwall => ["80x113#"],
-  #    :preview => ["500>"]
+  #   :"170x127#" => ["170x127#"],
+  #   # this one preserves A4 proportion: 210x297
+  #   :"80x113#" => ["80x113#"],
+  #   :"500" => ["500>"]
   #  }
 
   # Configure audio thumbnails
   #
-  # config.audio_styles = { :webma => {:format => 'webm'} }
+  # config.audio_styles = {
+  #    webma: {
+  #      format: 'webm',
+  #      processors: [ :ffmpeg ]
+  #    },
+  #    waveform: {
+  #      format: :png,
+  #      convert_options: {
+  #        color: :transparent,
+  #        background_color: 'ffffff',
+  #        width: 460,
+  #        height: 75
+  #      },
+  #      processors: [ :waveform ]
+  #    }
+  # }
 
   # Configure video thumbnails
   #
@@ -19,8 +33,22 @@ SocialStream::Documents.setup do |config|
   #    :webm => { :format => 'webm' },
   #    :flv  => { :format => 'flv' },
   #    :mp4  => { :format => 'mp4' },
-  #    :poster  => { :format => 'png', :time => 5 },
-  #    :thumb48sq  => { :geometry => "48x48" , :format => 'png', :time => 5 },
-  #    :thumbwall => { :geometry => "130x97#", :format => 'png', :time => 5 }
+  #    :"170x127#" => { :geometry => "170x127#", :format => 'png', :time => 5 }
+  #  }
+
+  # List of mime types that have an icon defined
+  # config.icon_mime_types  = {
+  #    default: :default,
+  #    types: [
+  #      :text, :image, :audio, :video
+  #    ],
+  #    subtypes: [
+  #      :txt, :ps, :pdf, :sla, 
+  #      :odt, :odp, :ods, :doc, :ppt, :xls, :rtf,
+  #      :rar, :zip,
+  #      :jpeg, :gif, :png, :bmp, :xcf,
+  #      :wav, :ogg, :webma, :mpeg,
+  #      :flv, :webm, :mp4
+  #    ]
   #  }
 end

data/lib/social_stream/documents/dependencies.rb

@@ -1,5 +1,6 @@
 require 'social_stream-base'
 require 'paperclip'
 require 'paperclip-ffmpeg'
+require 'paperclip_waveform'
 require 'delayed_paperclip'
 require 'delayed_paperclip/social_stream-documents'

data/lib/social_stream/documents/engine.rb

@@ -9,7 +9,7 @@ module SocialStream
         Mime::Type.register "application/postscript", :ps, [ "application/ps" ]
         Mime::Type.register "application/vnd.oasis.opendocument.text", :odt
         Mime::Type.register "application/vnd.oasis.opendocument.presentation", :odp
-        Mime::Type.register "application/vnd.oasis.opendocument.presentation", :ods
+        Mime::Type.register "application/vnd.oasis.opendocument.spreadsheet", :ods
         Mime::Type.register "application/vnd.ms-word", :doc, [ "application/msword" ]
         Mime::Type.register "application/vnd.ms-powerpoint", :ppt, [ "application/mspowerpoint" ]
         Mime::Type.register "application/vnd.ms-excel", :xls, [ "application/msexcel" ]
@@ -36,11 +36,7 @@ module SocialStream
           Mime::Type.register "image/png",  :png,  [ "image/x-png" ]
         end
         unless defined? Mime::BMP
-          Mime::Type.register "image/bmp",  :bmp, [ "image/x-ms-bmp" ]
-        else
-          # Manually register synonym
-          Mime::BMP.instance_variable_get("@synonyms") << "image/x-ms-bmp"
-          Mime::LOOKUP["image/x-ms-bmp"] = Mime::BMP
+          Mime::Type.register "image/bmp",  :bmp
         end
 
         # Audio
@@ -48,8 +44,9 @@ module SocialStream
         Mime::Type.register "audio/x-vorbis+ogg", :ogg, [ "application/ogg" ]
         Mime::Type.register "audio/webm", :webma
         # These are already defined in Rails 3.2
-        unless defined? Mime::MPEG
-          Mime::Type.register "audio/mpeg", :mpeg
+        # MPEG is currently reserved to 'video/mpeg'
+        unless defined? Mime::MP3
+          Mime::Type.register "audio/mpeg", :mp3
         end
 
         # Video
@@ -64,12 +61,6 @@ module SocialStream
         SocialStream::ActivityStreams.register :audio
         SocialStream::ActivityStreams.register :video
       end
-
-      initializer "social_stream-documents.views.toolbar" do
-        SocialStream::Views::Toolbar.module_eval do
-          include SocialStream::Views::Toolbar::Documents
-        end
-      end
     end
   end
 end

data/lib/social_stream/documents/models/activity_object.rb

@@ -0,0 +1,18 @@
+module SocialStream
+  module Documents
+    module Models
+      module ActivityObject
+        extend ActiveSupport::Concern
+        extend ::ActivityObject::Properties::HolderMethods
+
+        included do
+          property_reflections SocialStream::Documents.subtypes,
+                               source: :document,
+                               conditions: true
+        end
+
+        holder_methods SocialStream::Documents.subtypes
+      end
+    end
+  end
+end

data/lib/social_stream/documents/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Documents
-    VERSION = "1.1.4".freeze
+    VERSION = "2.0.0.beta1".freeze
   end
 end

data/lib/social_stream-documents.rb

@@ -1,9 +1,9 @@
 require 'social_stream/documents/dependencies'
 
 module SocialStream
-  module Views
-    module Toolbar
-      autoload :Documents, 'social_stream/views/toolbar/documents'
+  module Documents
+    module Models
+      autoload :ActivityObject, 'social_stream/documents/models/activity_object'
     end
   end
 
@@ -11,30 +11,73 @@ module SocialStream
     # Picture thumbnails
     mattr_accessor :picture_styles
     @@picture_styles = {
-      :thumb48sq  => ["48x48"],
-      :thumbwall => ["130x97#"],
-      # midwall preserves A4 proportion: 210x297
-      :midwall => ["80x113#"],
-      :preview => ["500>"]
+      :"170x127#" => ["170x127#"],
+      # this one preserves A4 proportion: 210x297
+      :"80x113#" => ["80x113#"],
+      :"500" => ["500>"]
     }
 
     mattr_accessor :audio_styles
-    @@audio_styles = { :webma => {:format => 'webm'} }
+    @@audio_styles = {
+      webma: {
+        format: 'webm',
+        processors: [ :ffmpeg ]
+      },
+      waveform: {
+        format: :png,
+        convert_options: {
+          color: :transparent,
+          background_color: 'ffffff',
+          width: 460,
+          height: 75
+        },
+        processors: [ :waveform ]
+      }
+    }
 
     mattr_accessor :video_styles
     @@video_styles = {
       :webm => { :format => 'webm' },
       :flv  => { :format => 'flv' },
       :mp4  => { :format => 'mp4' },
-      :poster  => { :format => 'png', :time => 5 },
-      :thumb48sq  => { :geometry => "48x48" , :format => 'png', :time => 5 },
-      :thumbwall => { :geometry => "130x97#", :format => 'png', :time => 5 }
+      :"170x127#" => { :geometry => "170x127#", :format => 'png', :time => 5 }
+    }
+
+    # List of mime types that have an icon defined
+    mattr_accessor :icon_mime_types
+    @@icon_mime_types = {
+      default: :default,
+      types: [
+        :text, :image, :audio, :video
+      ],
+      subtypes: [
+        :txt, :ps, :pdf, :sla, 
+        :odt, :odp, :ods, :doc, :ppt, :xls, :rtf,
+        :rar, :zip,
+        :jpeg, :gif, :png, :bmp, :xcf,
+        :wav, :ogg, :webma, :mp3,
+        :flv, :webm, :mp4
+      ]
+    }
+
+    # Mapping between subtype classes of Document (audio, video, etc) and
+    # the mime_types they handle
+    mattr_accessor :subtype_classes_mime_types
+    @@subtype_classes_mime_types = {
+      picture: [ :jpeg, :gif, :png, :bmp, :xcf ],
+      audio:   [ :wav, :ogg, :webma, :mp3 ],
+      video:   [ :flv, :webm, :mp4, :mpeg ]
     }
 
     class << self
       def setup
         yield self
       end
+
+      # The symbols for the STI classes of {Document}: [ :picture, :audio, :video ]
+      def subtypes
+        subtype_classes_mime_types.keys
+      end
     end
 
     # Add :document to SocialStream.objects and SocialStream.activity_forms by default
@@ -44,7 +87,7 @@ module SocialStream
     SocialStream.extended_search_models.push(o) unless SocialStream.extended_search_models.include?(o)
     end
     
-    %w(objects activity_forms).each do |m|
+    %w(objects activity_forms repository_models).each do |m|
       SocialStream.__send__(m).push(:document) unless SocialStream.__send__(m).include?(:document)
     end
   end

data/lib/tasks/db/populate.rake

@@ -0,0 +1,21 @@
+namespace :db do
+  namespace :populate do
+
+    desc "Create populate data with documents"
+    task :create => 'create:documents'
+
+    namespace :create do
+      desc "Add documents to populate data"
+      task :documents => :read_environment do
+        SS_DOCS_PATH=Gem::Specification.find_by_name('social_stream-documents').full_gem_path
+        doc_files = Forgery::Extensions::Array.new(Dir.glob(File.join(SS_DOCS_PATH, 'lib', 'samples', "*")))
+
+        SocialStream::Population::ActivityObject.new Document do |d|
+          d.file  = File.open(doc_files.random, "r")
+          d.title = Forgery::LoremIpsum.words(rand(4), :random => true)
+          d.description = Forgery::LoremIpsum.sentences(rand(4), :random => true)
+        end
+      end
+    end
+  end
+end

data/social_stream-documents.gemspec

@@ -12,10 +12,13 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 1.1.11')
+  s.add_runtime_dependency('social_stream-base', '~> 2.0.0.beta1')
   s.add_runtime_dependency('paperclip','~> 3.3.0')
   s.add_runtime_dependency('paperclip-ffmpeg', '~> 0.9.0')
   s.add_runtime_dependency('delayed_paperclip','>= 2.4.5.2')
+  s.add_runtime_dependency('paperclip_waveform')
+
+
   # Development Gem dependencies
   s.add_development_dependency('sqlite3-ruby')
   if RUBY_VERSION < '1.9'

data/spec/controllers/documents_controller_spec.rb

@@ -16,9 +16,9 @@ describe DocumentsController do
   
       it "should render receiver's index with public document included" do
         get :index, :user_id => @public_document.post_activity.receiver.to_param  
+
         response.should be_success
-        response.body.should =~ /attachment_tile/
-        response.body.should =~ /small.pdf/
+        response.body.should =~ /#{ controller.dom_id(@public_document) }/
       end
       
       it "should render receiver's html show" do
@@ -41,9 +41,9 @@ describe DocumentsController do
 
       it "should render index" do
         get :index, :user_id => @public_document.post_activity.receiver.to_param  
+
         response.should be_success
-        response.body.should =~ /attachment_tile/
-        response.body.should =~ /small.pdf/
+        response.body.should =~ /#{ controller.dom_id(@public_document) }/
       end
       
       it "should render html show" do
@@ -51,7 +51,13 @@ describe DocumentsController do
         response.should be_success
         response.headers["Content-Type"].should include('text/html')
       end
-      
+
+      it "should render html new" do
+        get :new
+        response.should be_success
+        response.headers["Content-Type"].should include('text/html')
+      end
+     
       it "should render format pdf download" do
         get :download, :id => @public_document.to_param, :format => :pdf
         response.should be_success
@@ -67,9 +73,9 @@ describe DocumentsController do
     describe "when not authenticated" do
       it "should render receiver's index without private document" do
         get :index, :user_id => @private_document.post_activity.receiver.to_param  
+
         response.should be_success
-        response.body.should_not =~ /attachment_tile/
-        response.body.should_not =~ /small.pdf/
+        response.body.should_not =~ /#{ controller.dom_id @private_document }/
       end
     end
     
@@ -79,9 +85,9 @@ describe DocumentsController do
       end
       it "should render index" do
         get :index, :user_id => @private_document.post_activity.receiver.to_param  
+
         response.should be_success
-        response.body.should_not =~ /attachment_tile/
-        response.body.should_not =~ /small.pdf/
+        response.body.should_not =~ /#{ controller.dom_id @private_document }/
       end
       
       it "should render show" do

data/spec/controllers/pictures_controller_spec.rb

@@ -16,9 +16,9 @@ describe PicturesController do
   
       it "should render receiver's index with public picture included" do
         get :index, :user_id => @public_picture.post_activity.receiver.to_param  
+
         response.should be_success
-        response.body.should =~ /attachment_tile/
-        response.body.should =~ /rails.png/
+        response.body.should =~ /#{ controller.dom_id @public_picture }/
       end
       
       it "should render receiver's html show" do
@@ -35,9 +35,9 @@ describe PicturesController do
 
       it "should render index" do
         get :index, :user_id => @public_picture.post_activity.receiver.to_param  
+
         response.should be_success
-        response.body.should =~ /attachment_tile/
-        response.body.should =~ /rails.png/
+        response.body.should =~ /#{ controller.dom_id @public_picture }/
       end
       
       it "should render html show" do
@@ -56,8 +56,8 @@ describe PicturesController do
       it "should render receiver's index without private picture" do
         get :index, :user_id => @private_picture.post_activity.receiver.to_param  
         response.should be_success
-        response.body.should_not =~ /attachment_tile/
-        response.body.should_not =~ /privado.png/
+
+        response.body.should_not =~ /#{ controller.dom_id @private_picture }/
       end
     end
     
@@ -68,8 +68,8 @@ describe PicturesController do
       it "should render index" do
         get :index, :user_id => @private_picture.post_activity.receiver.to_param  
         response.should be_success
-        response.body.should_not =~ /attachment_tile/
-        response.body.should_not =~ /privado.png/
+
+        response.body.should_not =~ /#{ controller.dom_id @private_picture }/
       end
       
       it "should render show" do

data/spec/socialstream_documents_spec.rb

@@ -4,4 +4,10 @@ describe SocialStream::Documents do
   it "should be valid" do
     SocialStream::Documents.should be_a(Module)
   end
+
+  describe "subtypes" do
+    it "should return expected value" do
+      SocialStream::Documents.subtypes.should eq([ :picture, :audio, :video ])
+    end
+  end
 end

data/vendor/assets/stylesheets/jplayer.blue.monday.css

@@ -320,6 +320,7 @@ div.jp-volume-bar-value {
 	width:0px;
 	height:5px;
 }
+//*
 div.jp-current-time,
 div.jp-duration {
 	position: absolute;
@@ -347,7 +348,7 @@ div.jp-video div.jp-duration {
 	left:0px;
 	width:98%;
 	padding:0 1%;
-}
+}*//
 div.jp-playlist {
 	/* width:418px; */
 	width:100%;