social_stream-documents 0.2.6 → 0.2.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/.gitignore CHANGED
@@ -12,3 +12,4 @@ Gemfile.lock
12
12
  app/views/*/.tmp_*
13
13
  **.*swp
14
14
  .idea
15
+ spec/dummy/db/*sqlite3-journal
data/Gemfile CHANGED
@@ -1,9 +1,5 @@
1
1
  source "http://rubygems.org"
2
2
 
3
- if File.exists?(File.join(File.dirname(__FILE__), '..', 'social_stream-base'))
4
- gem 'social_stream-base', :path => '../social_stream-base'
5
- else
6
- gem 'social_stream-base', :git => 'https://github.com/ging/social_stream-base.git'
7
- end
3
+ gem 'social_stream-base', :path => '../base'
8
4
 
9
5
  gemspec
data/Rakefile CHANGED
@@ -27,3 +27,10 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
27
27
  end
28
28
 
29
29
  Bundler::GemHelper.install_tasks
30
+
31
+ # Modify this gem's tags
32
+ class Bundler::GemHelper
33
+ def version_tag
34
+ "documents#{version}"
35
+ end
36
+ end
@@ -163,6 +163,9 @@
163
163
  top:0px;
164
164
  width: 180px;
165
165
  z-index:1;
166
+ width: 180px;
167
+ height: 135px;
168
+ overflow: hidden;
166
169
  }
167
170
 
168
171
  .video_thumbnail_play_over {
@@ -188,3 +191,8 @@
188
191
  width: 0px;
189
192
  height: 0px;
190
193
  }
194
+
195
+
196
+ .processing_text{
197
+ padding: 10px 0px 10px 50px;
198
+ }
data/app/models/audio.rb CHANGED
@@ -1,16 +1,11 @@
1
- class Audio < Document
2
- after_save :audioprocess
3
-
1
+ class Audio < Document
4
2
  has_attached_file :file,
5
3
  :url => '/:class/:id.:extension',
6
4
  :path => ':rails_root/documents/:class/:id_partition/:style.:extension',
7
5
  :styles => {:webma => {:format => 'webm'}
8
6
  },:processors => [:ffmpeg]
9
7
 
10
- def audioprocess
11
- Resque.enqueue(Audioencoder, self.id)
12
- end
13
-
8
+ process_in_background :file
14
9
 
15
10
  # Thumbnail file
16
11
  def thumb(size, helper)
data/app/models/video.rb CHANGED
@@ -1,6 +1,4 @@
1
- class Video < Document
2
- after_save :videoprocess
3
-
1
+ class Video < Document
4
2
  has_attached_file :file,
5
3
  :url => '/:class/:id.:extension',
6
4
  :path => ':rails_root/documents/:class/:id_partition/:style.:extension',
@@ -10,10 +8,7 @@ class Video < Document
10
8
  :thumb0 => {:geometry => "130x80", :format => 'png', :time => 5}
11
9
  },:processors => [:ffmpeg]
12
10
 
13
- def videoprocess
14
- Resque.enqueue(Videoencoder, self.id)
15
- end
16
-
11
+ process_in_background :file
17
12
 
18
13
  # Thumbnail file
19
14
  def thumb(size, helper)
@@ -16,47 +16,12 @@
16
16
 
17
17
  <%= div_for audio, :class => 'content_size' do %>
18
18
 
19
- <div class="attachment_thumb">
20
- <%= link_to thumb_for(audio, 16),
21
- {:controller => "documents", :action => "download", :id => audio},
22
- :class => "" %>
23
- </div>
24
-
25
- <div class="attachment_content">
26
- <div class="attachment_text">
27
- <%= t('audio.msg') %><%= link_to "\""+audio.file_file_name+"\"",
28
- {:controller => "documents", :action => "download", :id => audio},
29
- :class => "attachment_text_link" %>
30
- </div>
31
- <div id="jpId<%=audio.id%>" class="jpId_size0"></div>
32
-
33
- <div class="jp-audio">
34
- <div class="jp-type-single">
35
- <div id="jp_interface_<%=audio.id%>" class="jp-interface">
36
- <ul class="jp-controls">
37
- <li><a href="#" class="jp-play" tabindex="1">play</a></li>
38
- <li><a href="#" class="jp-pause" tabindex="1">pause</a></li>
39
- <li><a href="#" class="jp-stop" tabindex="1">stop</a></li>
40
- <li><a href="#" class="jp-mute" tabindex="1">mute</a></li>
41
- <li><a href="#" class="jp-unmute" tabindex="1">unmute</a></li>
42
- </ul>
43
- <div class="jp-progress">
44
- <div class="jp-seek-bar">
45
- <div class="jp-play-bar"></div>
46
- </div>
47
- </div>
48
- <div class="jp-volume-bar">
49
- <div class="jp-volume-bar-value"></div>
50
- </div>
51
- <div class="jp-current-time"></div>
52
- <div class="jp-duration"></div>
53
- </div>
54
- <div id="jp_playlist_<%=audio.id%>" class="jp-playlist">
55
-
56
- </div>
57
- </div>
58
- </div>
59
-
60
- </div>
19
+
20
+ <% if audio.file_processing %>
21
+ <%= render :partial => 'audios/audio_processing', :locals => {:audio => audio}%>
22
+ <% else %>
23
+ <%= render :partial => 'audios/audio_processed', :locals => {:audio => audio}%>
24
+ <% end %>
25
+
61
26
 
62
27
  <% end %>
@@ -0,0 +1,45 @@
1
+ <div class="attachment_thumb">
2
+ <%= link_to thumb_for(audio, 16),
3
+ {:controller => "documents", :action => "download", :id => audio},
4
+ :class => "" %>
5
+ </div>
6
+ <div class="attachment_text">
7
+ <%= t('audio.msg') %><%= link_to "\""+audio.file_file_name+"\"",
8
+ {:controller => "documents", :action => "download", :id => audio},
9
+ :class => "attachment_text_link" %>
10
+ </div>
11
+ <div id="jpId<%= audio.id%>" class="jpId_size0"></div>
12
+ <div class="jp-audio">
13
+ <div class="jp-type-single">
14
+ <div id="jp_interface_<%= audio.id%>" class="jp-interface">
15
+ <ul class="jp-controls">
16
+ <li>
17
+ <a href="#" class="jp-play" tabindex="1">play</a>
18
+ </li>
19
+ <li>
20
+ <a href="#" class="jp-pause" tabindex="1">pause</a>
21
+ </li>
22
+ <li>
23
+ <a href="#" class="jp-stop" tabindex="1">stop</a>
24
+ </li>
25
+ <li>
26
+ <a href="#" class="jp-mute" tabindex="1">mute</a>
27
+ </li>
28
+ <li>
29
+ <a href="#" class="jp-unmute" tabindex="1">unmute</a>
30
+ </li>
31
+ </ul>
32
+ <div class="jp-progress">
33
+ <div class="jp-seek-bar">
34
+ <div class="jp-play-bar"></div>
35
+ </div>
36
+ </div>
37
+ <div class="jp-volume-bar">
38
+ <div class="jp-volume-bar-value"></div>
39
+ </div>
40
+ <div class="jp-current-time"></div>
41
+ <div class="jp-duration"></div>
42
+ </div>
43
+ <div id="jp_playlist_<%= audio.id%>" class="jp-playlist"></div>
44
+ </div>
45
+ </div>
@@ -0,0 +1,7 @@
1
+ <div class="attachment_thumb">
2
+ <%= thumb_for(audio, 16) %>
3
+ </div>
4
+ <div class="attachment_text">
5
+ <%= t('audio.msg') %><%= "\""+audio.file_file_name+"\"" %>
6
+ <div class="processing_text"><%= t('audio.processing')%></div>
7
+ </div>
@@ -8,13 +8,13 @@
8
8
 
9
9
  <%if profile_subject_is_current?%>
10
10
  <%= location(
11
- link_to(image_tag(("btn/btn_#{controller.controller_name.singularize}.png"), :class => "menu_icon")+t(controller.controller_name.singularize + '.title'), polymorphic_path(controller.controller_name),:remote => true)
11
+ link_to(t(controller.controller_name.singularize + '.title'), polymorphic_path(controller.controller_name),:remote => true)
12
12
  ) %>
13
13
  <% toolbar %>
14
14
  <%else%>
15
15
  <%= location(
16
- link_to(image_tag("btn/btn_profile.png", :class => "menu_icon")+ profile_subject.name, polymorphic_path(profile_subject),:remote => true),
17
- link_to(image_tag(("btn/btn_#{controller.controller_name.singularize}.png"), :class => "menu_icon")+t(controller.controller_name.singularize + '.title'), polymorphic_path([profile_subject, controller.controller_name]),:remote => true)
16
+ link_to(profile_subject.name, polymorphic_path(profile_subject),:remote => true),
17
+ link_to(t(controller.controller_name.singularize + '.title'), polymorphic_path([profile_subject, controller.controller_name]),:remote => true)
18
18
  ) %>
19
19
  <% toolbar :profile => profile_subject %>
20
20
  <%end%>
@@ -20,51 +20,10 @@
20
20
 
21
21
  <%= div_for video, :class => 'content_size' do %>
22
22
 
23
- <div class="attachment_thumb">
24
- <%= link_to thumb_for(video, 16),
25
- {:controller => "documents", :action => "download", :id => video},
26
- :class => "" %>
27
- </div>
28
-
29
- <div class="attachment_text">
30
- <%= t('video.msg') %><%= link_to "\""+video.file_file_name+"\"",
31
- {:controller => "documents", :action => "download", :id => video},
32
- :class => "attachment_text_link" %>
33
-
34
- <div id="video_thumbnail_<%=video.id%>" class="video_thumbnail_class">
35
- <%=image_tag(video_path(video)+"?style=thumb", :class => "video_thumbnail_image")%>
36
- <div id="<%=video.id%>" class="video_thumbnail_play_over"></div>
37
- </div>
38
-
39
-
40
- <div id="full_video_<%=video.id%>" class="jp-video jp-video-270p">
41
- <div class="jp-type-single">
42
- <div id="jpId<%=video.id%>" class="jp-jplayer"></div>
43
- <div id="jp_interface_<%=video.id%>" class="jp-interface">
44
- <div class="jp-video-play"></div>
45
- <ul class="jp-controls">
46
- <li><a href="#" class="jp-play" tabindex="1">play</a></li>
47
- <li><a href="#" class="jp-pause" tabindex="1">pause</a></li>
48
- <li><a href="#" class="jp-stop" tabindex="1">stop</a></li>
49
- <li><a href="#" class="jp-mute" tabindex="1">mute</a></li>
50
- <li><a href="#" class="jp-unmute" tabindex="1">unmute</a></li>
51
- </ul>
52
- <div class="jp-progress">
53
- <div class="jp-seek-bar">
54
- <div class="jp-play-bar"></div>
55
- </div>
56
- </div>
57
- <div class="jp-volume-bar">
58
- <div class="jp-volume-bar-value"></div>
59
- </div>
60
- <div class="jp-current-time"></div>
61
- <div class="jp-duration"></div>
62
- </div>
63
- <div id="jp_playlist_<%=video.id%>" class="jp-playlist">
64
- </div>
65
- </div>
66
- </div>
67
-
68
- </div>
23
+ <% if video.file_processing %>
24
+ <%= render :partial => 'videos/video_processing', :locals => {:video => video}%>
25
+ <% else %>
26
+ <%= render :partial => 'videos/video_processed', :locals => {:video => video}%>
27
+ <% end %>
69
28
 
70
29
  <% end %>
@@ -0,0 +1,49 @@
1
+ <div class="attachment_thumb">
2
+ <%= link_to thumb_for(video, 16),
3
+ {:controller => "documents", :action => "download", :id => video},
4
+ :class => "" %>
5
+ </div>
6
+ <div class="attachment_text">
7
+ <%= t('video.msg') %><%= link_to "\""+video.file_file_name+"\"",
8
+ {:controller => "documents", :action => "download", :id => video},
9
+ :class => "attachment_text_link" %>
10
+ <div id="video_thumbnail_<%= video.id%>" class="video_thumbnail_class">
11
+ <%= image_tag(video_path(video)+"?style=thumb", :class => "video_thumbnail_image", :alt => "")%> <div id="<%= video.id%>" class="video_thumbnail_play_over"></div>
12
+ </div>
13
+ <div id="full_video_<%= video.id%>" class="jp-video jp-video-270p">
14
+ <div class="jp-type-single">
15
+ <div id="jpId<%= video.id%>" class="jp-jplayer"></div>
16
+ <div id="jp_interface_<%= video.id%>" class="jp-interface">
17
+ <div class="jp-video-play"></div>
18
+ <ul class="jp-controls">
19
+ <li>
20
+ <a href="#" class="jp-play" tabindex="1">play</a>
21
+ </li>
22
+ <li>
23
+ <a href="#" class="jp-pause" tabindex="1">pause</a>
24
+ </li>
25
+ <li>
26
+ <a href="#" class="jp-stop" tabindex="1">stop</a>
27
+ </li>
28
+ <li>
29
+ <a href="#" class="jp-mute" tabindex="1">mute</a>
30
+ </li>
31
+ <li>
32
+ <a href="#" class="jp-unmute" tabindex="1">unmute</a>
33
+ </li>
34
+ </ul>
35
+ <div class="jp-progress">
36
+ <div class="jp-seek-bar">
37
+ <div class="jp-play-bar"></div>
38
+ </div>
39
+ </div>
40
+ <div class="jp-volume-bar">
41
+ <div class="jp-volume-bar-value"></div>
42
+ </div>
43
+ <div class="jp-current-time"></div>
44
+ <div class="jp-duration"></div>
45
+ </div>
46
+ <div id="jp_playlist_<%= video.id%>" class="jp-playlist"></div>
47
+ </div>
48
+ </div>
49
+ </div>
@@ -0,0 +1,7 @@
1
+ <div class="attachment_thumb">
2
+ <%= thumb_for(video, 16) %>
3
+ </div>
4
+ <div class="attachment_text">
5
+ <%= t('video.msg') %><%= "\""+video.file_file_name+"\"" %>
6
+ <div class="processing_text"><%= t('video.processing')%></div>
7
+ </div>
@@ -5,6 +5,7 @@ en:
5
5
  mine: "My audios"
6
6
  msg: "Uploaded an audio:"
7
7
  not_mine: "Audios"
8
+ processing: "Processing audio clip"
8
9
  conference:
9
10
  all: "All conferences"
10
11
  confirm_delete: "Delete conference?"
@@ -41,3 +42,4 @@ en:
41
42
  mine: "My videos"
42
43
  msg: "Uploaded a video:"
43
44
  not_mine: "Videos"
45
+ processing: "Processing video"
@@ -0,0 +1,9 @@
1
+ class AddFileProcessingToDocument < ActiveRecord::Migration
2
+ def self.up
3
+ add_column :documents, :file_processing, :boolean
4
+ end
5
+
6
+ def self.down
7
+ remove_column :documents, :file_processing
8
+ end
9
+ end
@@ -34,6 +34,11 @@ module SocialStream
34
34
  Mime::Type.register "video/x-flv", :flv
35
35
  end
36
36
 
37
+ initializer "social_stream-documents.toolbar_config" do
38
+ SocialStream::ToolbarConfig.module_eval do
39
+ include SocialStream::ToolbarConfig::Documents
40
+ end
41
+ end
37
42
  end
38
43
  end
39
44
  end
@@ -0,0 +1,5 @@
1
+ module SocialStream
2
+ module Documents
3
+ VERSION = "0.2.7".freeze
4
+ end
5
+ end
@@ -1,25 +1,9 @@
1
- require 'social_stream/migrations/base'
1
+ require 'social_stream/migrations/components'
2
2
 
3
3
  module SocialStream
4
4
  module Migrations
5
- class Documents < Base
6
- def initialize
7
- super
8
-
9
- @documents = find_migration('social_stream-documents')
10
- end
11
-
12
- def up
13
- super
14
-
15
- ActiveRecord::Migrator.migrate @documents
16
- end
17
-
18
- def down
19
- ActiveRecord::Migrator.migrate @documents, 0
20
-
21
- super
22
- end
5
+ # Migrate Documents
6
+ class Documents < Components
23
7
  end
24
8
  end
25
9
  end
@@ -0,0 +1,40 @@
1
+ module SocialStream
2
+ module ToolbarConfig
3
+ module Documents
4
+ def home_toolbar_items
5
+ items = super
6
+
7
+ # FIXME: insert
8
+ items << {
9
+ :key => :resources,
10
+ :name => image_tag("btn/btn_resource.png",:class =>"menu_icon")+t('resource.mine'),
11
+ :url => "#",
12
+ :options => {:link => {:id => "resources_menu"}},
13
+ :items => [
14
+ {:key => :resources_documents,:name => image_tag("btn/btn_document.png")+t('document.title'),:url => documents_path},
15
+ {:key => :resources_pictures,:name => image_tag("btn/btn_gallery.png")+t('picture.title'),:url => pictures_path},
16
+ {:key => :resources_videos,:name => image_tag("btn/btn_video.png")+t('video.title'),:url => videos_path},
17
+ {:key => :resources_audios,:name => image_tag("btn/btn_audio.png")+t('audio.title'),:url => audios_path}
18
+ ]
19
+ }
20
+ end
21
+
22
+ def profile_toolbar_items(subject = current_subject)
23
+ items = super
24
+
25
+ items << {
26
+ :key => :resources,
27
+ :name => image_tag("btn/btn_resource.png",:class =>"menu_icon")+t("resource.#{ subject == current_subject ? 'mine' : 'title' }"),
28
+ :url => "#",
29
+ :options => {:link => {:id => "resources_menu"}},
30
+ :items => [
31
+ {:key => :resources_documents,:name => image_tag("btn/btn_document.png")+t('document.title'),:url => polymorphic_path([subject, Document.new])},
32
+ {:key => :resources_pictures,:name => image_tag("btn/btn_gallery.png")+t('picture.title'),:url => polymorphic_path([subject, Picture.new])},
33
+ {:key => :resources_videos,:name => image_tag("btn/btn_video.png")+t('video.title'),:url => polymorphic_path([subject, Video.new])},
34
+ {:key => :resources_audios,:name => image_tag("btn/btn_audio.png")+t('audio.title'),:url => polymorphic_path([subject, Audio.new])}
35
+ ]
36
+ }
37
+ end
38
+ end
39
+ end
40
+ end
@@ -1,6 +1,11 @@
1
1
  require 'social_stream-base'
2
+ require 'delayed_paperclip'
2
3
 
3
4
  module SocialStream
5
+ module ToolbarConfig
6
+ autoload :Documents, 'social_stream/toolbar_config/documents'
7
+ end
8
+
4
9
  module Documents
5
10
  # Add :document to SocialStream.objects and SocialStream.activity_forms by default
6
11
  # It can be configured by users at application's config/initializers/social_stream.rb
@@ -1,6 +1,9 @@
1
+ # encoding: UTF-8
2
+ require File.join(File.dirname(__FILE__), 'lib', 'social_stream', 'documents', 'version')
3
+
1
4
  Gem::Specification.new do |s|
2
5
  s.name = "social_stream-documents"
3
- s.version = "0.2.6"
6
+ s.version = SocialStream::Documents::VERSION.dup
4
7
  s.authors = ["Víctor Sánchez Belmar", "GING - DIT - UPM"]
5
8
  s.summary = "File capabilities for Social Stream, the core for building social network websites"
6
9
  s.description = "Social Stream is a Ruby on Rails engine providing your application with social networking features and activity streams.\n\nThis gem allow you upload almost any kind of file as new social stream activity."
@@ -9,9 +12,10 @@ Gem::Specification.new do |s|
9
12
  s.files = `git ls-files`.split("\n")
10
13
 
11
14
  # Gem dependencies
12
- s.add_runtime_dependency('social_stream-base','>= 0.9.2')
15
+ s.add_runtime_dependency('social_stream-base', '~> 0.9.7')
13
16
  s.add_runtime_dependency('paperclip-ffmpeg', '~> 0.7.0')
14
17
  s.add_runtime_dependency('paperclip','2.3.11')
18
+ s.add_runtime_dependency('delayed_paperclip','>= 0.7.2')
15
19
  # Development Gem dependencies
16
20
  s.add_development_dependency('sqlite3-ruby')
17
21
  if RUBY_VERSION < '1.9'
@@ -1,4 +1,4 @@
1
- require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
1
+ require 'spec_helper'
2
2
 
3
3
  describe DocumentsController do
4
4
  render_views
@@ -1,4 +1,4 @@
1
- require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
1
+ require 'spec_helper'
2
2
 
3
3
  describe PicturesController do
4
4
  render_views
data/spec/support/db.rb CHANGED
@@ -1,5 +1,8 @@
1
1
  require 'social_stream/migrations/documents'
2
2
 
3
+
3
4
  SocialStream::Migrations::Documents.new.down
5
+ SocialStream::Migrations::Base.new.down
4
6
 
7
+ SocialStream::Migrations::Base.new.up
5
8
  SocialStream::Migrations::Documents.new.up
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: social_stream-documents
3
3
  version: !ruby/object:Gem::Version
4
- hash: 27
4
+ hash: 25
5
5
  prerelease:
6
6
  segments:
7
7
  - 0
8
8
  - 2
9
- - 6
10
- version: 0.2.6
9
+ - 7
10
+ version: 0.2.7
11
11
  platform: ruby
12
12
  authors:
13
13
  - "V\xC3\xADctor S\xC3\xA1nchez Belmar"
@@ -16,7 +16,7 @@ autorequire:
16
16
  bindir: bin
17
17
  cert_chain: []
18
18
 
19
- date: 2011-09-15 00:00:00 +02:00
19
+ date: 2011-09-26 00:00:00 +02:00
20
20
  default_executable:
21
21
  dependencies:
22
22
  - !ruby/object:Gem::Dependency
@@ -25,14 +25,14 @@ dependencies:
25
25
  requirement: &id001 !ruby/object:Gem::Requirement
26
26
  none: false
27
27
  requirements:
28
- - - ">="
28
+ - - ~>
29
29
  - !ruby/object:Gem::Version
30
- hash: 63
30
+ hash: 53
31
31
  segments:
32
32
  - 0
33
33
  - 9
34
- - 2
35
- version: 0.9.2
34
+ - 7
35
+ version: 0.9.7
36
36
  name: social_stream-base
37
37
  version_requirements: *id001
38
38
  - !ruby/object:Gem::Dependency
@@ -69,8 +69,24 @@ dependencies:
69
69
  version_requirements: *id003
70
70
  - !ruby/object:Gem::Dependency
71
71
  prerelease: false
72
- type: :development
72
+ type: :runtime
73
73
  requirement: &id004 !ruby/object:Gem::Requirement
74
+ none: false
75
+ requirements:
76
+ - - ">="
77
+ - !ruby/object:Gem::Version
78
+ hash: 7
79
+ segments:
80
+ - 0
81
+ - 7
82
+ - 2
83
+ version: 0.7.2
84
+ name: delayed_paperclip
85
+ version_requirements: *id004
86
+ - !ruby/object:Gem::Dependency
87
+ prerelease: false
88
+ type: :development
89
+ requirement: &id005 !ruby/object:Gem::Requirement
74
90
  none: false
75
91
  requirements:
76
92
  - - ">="
@@ -80,11 +96,11 @@ dependencies:
80
96
  - 0
81
97
  version: "0"
82
98
  name: sqlite3-ruby
83
- version_requirements: *id004
99
+ version_requirements: *id005
84
100
  - !ruby/object:Gem::Dependency
85
101
  prerelease: false
86
102
  type: :development
87
- requirement: &id005 !ruby/object:Gem::Requirement
103
+ requirement: &id006 !ruby/object:Gem::Requirement
88
104
  none: false
89
105
  requirements:
90
106
  - - ~>
@@ -96,11 +112,11 @@ dependencies:
96
112
  - 3
97
113
  version: 0.10.3
98
114
  name: ruby-debug
99
- version_requirements: *id005
115
+ version_requirements: *id006
100
116
  - !ruby/object:Gem::Dependency
101
117
  prerelease: false
102
118
  type: :development
103
- requirement: &id006 !ruby/object:Gem::Requirement
119
+ requirement: &id007 !ruby/object:Gem::Requirement
104
120
  none: false
105
121
  requirements:
106
122
  - - ~>
@@ -112,11 +128,11 @@ dependencies:
112
128
  - 0
113
129
  version: 2.6.0
114
130
  name: rspec-rails
115
- version_requirements: *id006
131
+ version_requirements: *id007
116
132
  - !ruby/object:Gem::Dependency
117
133
  prerelease: false
118
134
  type: :development
119
- requirement: &id007 !ruby/object:Gem::Requirement
135
+ requirement: &id008 !ruby/object:Gem::Requirement
120
136
  none: false
121
137
  requirements:
122
138
  - - ~>
@@ -128,11 +144,11 @@ dependencies:
128
144
  - 2
129
145
  version: 1.3.2
130
146
  name: factory_girl
131
- version_requirements: *id007
147
+ version_requirements: *id008
132
148
  - !ruby/object:Gem::Dependency
133
149
  prerelease: false
134
150
  type: :development
135
- requirement: &id008 !ruby/object:Gem::Requirement
151
+ requirement: &id009 !ruby/object:Gem::Requirement
136
152
  none: false
137
153
  requirements:
138
154
  - - ~>
@@ -144,11 +160,11 @@ dependencies:
144
160
  - 6
145
161
  version: 0.3.6
146
162
  name: forgery
147
- version_requirements: *id008
163
+ version_requirements: *id009
148
164
  - !ruby/object:Gem::Dependency
149
165
  prerelease: false
150
166
  type: :development
151
- requirement: &id009 !ruby/object:Gem::Requirement
167
+ requirement: &id010 !ruby/object:Gem::Requirement
152
168
  none: false
153
169
  requirements:
154
170
  - - ~>
@@ -160,7 +176,7 @@ dependencies:
160
176
  - 9
161
177
  version: 0.3.9
162
178
  name: capybara
163
- version_requirements: *id009
179
+ version_requirements: *id010
164
180
  description: |-
165
181
  Social Stream is a Ruby on Rails engine providing your application with social networking features and activity streams.
166
182
 
@@ -228,6 +244,8 @@ files:
228
244
  - app/models/picture.rb
229
245
  - app/models/video.rb
230
246
  - app/views/audios/_audio.html.erb
247
+ - app/views/audios/_audio_processed.html.erb
248
+ - app/views/audios/_audio_processing.html.erb
231
249
  - app/views/audios/_mediapreviews.html.erb
232
250
  - app/views/audios/_new.html.erb
233
251
  - app/views/audios/destroy.js.erb
@@ -253,6 +271,8 @@ files:
253
271
  - app/views/toolbar/_uploads_menu.html.erb
254
272
  - app/views/videos/_new.html.erb
255
273
  - app/views/videos/_video.html.erb
274
+ - app/views/videos/_video_processed.html.erb
275
+ - app/views/videos/_video_processing.html.erb
256
276
  - app/views/videos/destroy.js.erb
257
277
  - app/views/videos/index.html.erb
258
278
  - app/views/videos/show.html.erb
@@ -261,10 +281,13 @@ files:
261
281
  - config/locales/en.yml
262
282
  - config/routes.rb
263
283
  - db/migrate/20110615143707_create_social_stream_documents.rb
284
+ - db/migrate/20110922173707_add_file_processing_to_document.rb
264
285
  - lib/generators/social_stream/documents/install_generator.rb
265
286
  - lib/social_stream-documents.rb
266
287
  - lib/social_stream/documents/engine.rb
288
+ - lib/social_stream/documents/version.rb
267
289
  - lib/social_stream/migrations/documents.rb
290
+ - lib/social_stream/toolbar_config/documents.rb
268
291
  - social_stream-documents.gemspec
269
292
  - spec/controllers/documents_controller_spec.rb
270
293
  - spec/controllers/pictures_controller_spec.rb