social_stream-documents 0.1.1 → 0.1.2

data/app/assets/stylesheets/documents.css

@@ -95,3 +95,59 @@
 	right: 0px;
 	width: 24px;
 }
+
+#media_wall{
+	position: relative;
+	margin-left: auto;
+	margin-right: auto;
+	background-color: #e0edf2;
+	width: 100%;
+	margin-bottom: 20px;
+	height: 130px;
+}
+
+#media_wall_buttons{
+	position: relative;
+	margin-left: auto;
+	margin-right: auto;
+	width: 100%;
+	text-align: right;
+}
+
+#media_wall_buttons li{
+	display:inline;
+	margin-left:2px;
+	margin-right:2px;
+	padding: 0px;
+}
+
+.media_preview{
+	float:left;
+	margin: 10px;
+	width: 140px;
+	height: 110px;
+	text-align:center;
+}
+
+.media_preview_image{
+	position: relative;
+	top: 0px;
+	width:130px;	
+	height: 80px;
+}
+
+.media_preview_title{
+	position:relative;
+	width: 100%;
+	overflow:hidden;
+	font-size: 12px;
+	color: #2A3890;
+}
+
+.media_preview_detail{
+	position: relative;
+	width: 100%;
+	overflow:hidden;
+	font-size: 11px;
+	color: #2A3890;
+}

data/app/controllers/audios_controller.rb

@@ -13,7 +13,7 @@ class AudiosController < InheritedResources::Base
   def index
     @document_activities = current_subject.wall(:profile,
                                         :for => current_subject,
-                                        :object_type => :Audio).all;
+                                        :object_type => :Audio).page(params[:page]).per(params[:per])
   end
   
 end

data/app/controllers/documents_controller.rb

@@ -30,7 +30,7 @@ class DocumentsController < InheritedResources::Base
   def index
     @document_activities = current_subject.wall(:profile,
                                         :for => current_subject,
-                                        :object_type => [:Audio,:Video,:Picture,:Document]).all;
+                                        :object_type => [:Audio,:Video,:Picture,:Document]).page(params[:page]).per(params[:per])
   end
     
   def create

data/app/controllers/pictures_controller.rb

@@ -13,6 +13,6 @@ class PicturesController < InheritedResources::Base
   def index
     @document_activities = current_subject.wall(:profile,
                                         :for => current_subject,
-                                        :object_type => :Picture).all;
+                                        :object_type => :Picture).page(params[:page]).per(params[:per])
   end
 end  

data/app/controllers/videos_controller.rb

@@ -16,7 +16,7 @@ class VideosController < InheritedResources::Base
   def index
     @document_activities = current_subject.wall(:profile,
                                         :for => current_subject,
-                                        :object_type => :Video).all;
+                                        :object_type => :Video).page(params[:page]).per(params[:per])
   end
     
 end

data/app/helpers/documents_helper.rb

@@ -8,13 +8,19 @@ module DocumentsHelper
       image_tag 'formats/'+format.split('/')[1]+'.png' 
     else
       if is_image?(document)
-        image_tag document.file.url(:thumb)+"?style=thumb"
+        format = Mime::Type.lookup(document.file_content_type)
+        image_tag url_for(document)+"."+format.to_sym.to_s+"?style=thumb"
       else
         image_tag 'formats/default.png'
       end
     end
   end
   
+  def link_for_wall(document)
+    format = Mime::Type.lookup(document.file_content_type)
+    url_for(document)+"."+format.to_sym.to_s+"?style=thumb0"
+  end
+  
   def wrap_file_name(name)
     name
     if(name.length > 12)

data/app/models/picture.rb

@@ -2,5 +2,7 @@ class Picture < Document
   has_attached_file :file, 
                     :url => '/:class/:id.:extension',
                     :path => ':rails_root/documents/:class/:id_partition/:style.:extension',
-                    :styles => {:thumb => ["48x48#", :png]}                                  
+                    :styles => {:thumb  => ["48x48#"],
+                                :thumb0 => ["130x80#"]
+                               }                                  
 end

data/app/models/video.rb

@@ -5,7 +5,8 @@ class Video < Document
                     :url => '/:class/:id.:extension',
                     :path => ':rails_root/documents/:class/:id_partition/:style.:extension',
                     :styles => {:webm => {:format => 'webm'},
-                                :thumb   => {:geometry => "48x48#", :format => 'png', :time => 5}
+                                :thumb   => {:geometry => "48x48#" , :format => 'png', :time => 5},
+                                :thumb0  => {:geometry => "130x80#", :format => 'png', :time => 5}
                     },:processors => [:ffmpeg]
                     
   def videoprocess

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

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

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

@@ -1 +1 @@
-<%= image_tag("btn/document.png") %> <%=t('document.title')%>
+<%= image_tag("btn/document.png") %> <%=t('resource.title')%>

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

@@ -0,0 +1,7 @@
+<% @document_activities.each do |a| %>
+	<div class="media_preview all">
+		<img src="#" class="media_preview_image" />
+		<div class="media_preview_title">Some document</div>
+		<div class="media_preview_detail">some detail</div>
+	</div>
+<% end %> 

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

@@ -0,0 +1,111 @@
+<div id="media_wall_buttons">
+	<ul>
+    	<li>
+      		<%= link_to( image_tag("btn/btn_conferences.png",
+          	:media => "conference"), videos_path, :remote => true) %>
+    	</li>
+		<li>
+	      <%= link_to( image_tag("btn/btn_gallery.png",
+	            :media => "picture"), pictures_path, :remote => true, :page => 1, :per => 1) %>
+	    </li>
+		<li>
+			<%= link_to( image_tag("btn/btn_video.png", 
+			    :media => "video"), videos_path, :remote => true) %>
+		</li>
+		<li>
+			<%= link_to( image_tag("btn/btn_audio.png",
+			:media => "audio"), audios_path, :remote => true) %>
+		</li>
+		<li>
+			<%= link_to(t('document.simple_all'), documents_path, :remote => true) %>
+		</li>
+	</ul>
+</div>
+
+<div id="media_wall">
+	<div class="media_preview conference">
+		<img src="#" class="media_preview_image" />
+		<div class="media_preview_title">Some conference</div>
+		<div class="media_preview_detail">some detail</div>
+	</div>
+	
+	<div class="media_preview conference">
+		<img src="#" class="media_preview_image" />
+		<div class="media_preview_title">Some conference</div>
+		<div class="media_preview_detail">some detail</div>
+	</div>
+	
+	<div class="media_preview conference">
+		<img src="#" class="media_preview_image" />
+		<div class="media_preview_title">Some conference</div>
+		<div class="media_preview_detail">some detail</div>
+	</div>
+	
+	<div class="media_preview picture">
+		<img src="#" class="media_preview_image" />
+		<div class="media_preview_title">Some picture</div>
+		<div class="media_preview_detail">some detail</div>
+	</div>
+	
+	<div class="media_preview picture">
+		<img src="#" class="media_preview_image" />
+		<div class="media_preview_title">Some picture</div>
+		<div class="media_preview_detail">some detail</div>
+	</div>
+	
+	<div class="media_preview picture">
+		<img src="#" class="media_preview_image" />
+		<div class="media_preview_title">Some picture</div>
+		<div class="media_preview_detail">some detail</div>
+	</div>
+	
+	<div class="media_preview video">
+		<img src="#" class="media_preview_image" />
+		<div class="media_preview_title">Some video</div>
+		<div class="media_preview_detail">some detail</div>
+	</div>
+	
+	<div class="media_preview video">
+		<img src="#" class="media_preview_image" />
+		<div class="media_preview_title">Some video</div>
+		<div class="media_preview_detail">some detail</div>
+	</div>
+	
+	<div class="media_preview video">
+		<img src="#" class="media_preview_image" />
+		<div class="media_preview_title">Some video</div>
+		<div class="media_preview_detail">some detail</div>
+	</div>
+	
+	<div class="media_preview audio">
+		<img src="#" class="media_preview_image" />
+		<div class="media_preview_title">Some audio</div>
+		<div class="media_preview_detail">some detail</div>
+	</div>
+	
+	<div class="media_preview audio">
+		<img src="#" class="media_preview_image" />
+		<div class="media_preview_title">Some audio</div>
+		<div class="media_preview_detail">some detail</div>
+	</div>
+	
+	<div class="media_preview audio">
+		<img src="#" class="media_preview_image" />
+		<div class="media_preview_title">Some audio</div>
+		<div class="media_preview_detail">some detail</div>
+	</div>
+</div>
+
+<% content_for :headers do %>
+	<%= stylesheet_link_tag "documents" %>
+<% end %>
+
+<script>
+	$('#media_wall div.media_preview').hide();
+	$('#media_wall div.conference').show();
+	
+	$('#media_wall_buttons a').click(function(e){
+		$('#media_wall div.media_preview').hide("fast");
+	//	$('#media_wall div.'+$(this).children('img').attr('media')).show("slow");
+	});
+</script>

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

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

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

@@ -0,0 +1,8 @@
+<% @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

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

data/config/locales/en.yml

@@ -11,6 +11,7 @@ en:
     mine: "My conferences"
     msg: "Just uploaded a conference:"
   document:
+    simple_all: "All"  
     all: "All documents"  
     confirm_delete: "Delete document?"
     title: "Documents"

data/lib/social_stream/documents/engine.rb

@@ -2,12 +2,8 @@ module SocialStream
   module Documents
     class Engine < Rails::Engine
     
-      initializer "social_stream-documents.documents_in_social_stream_objects" do
-        SocialStream.objects.push(:document) unless SocialStream.objects.include?(:document)
-      end
-      
       initializer "social_stream-documents.register_mime_types" do
-        Mime::Type.register "image/jpeg", :jpeg, [ "image/pjpeg" ]
+        Mime::Type.register "image/jpeg", :jpeg, ["image/pjpeg","image/jpg"]
         Mime::Type.register "image/gif", :gif
         Mime::Type.register "image/png", :png, [ "image/x-png" ]
         Mime::Type.register "image/bmp", :bmp

data/lib/social_stream-documents.rb

@@ -2,6 +2,11 @@ require 'social_stream-base'
 
 module SocialStream
   module Documents
+    # Add :document to SocialStream.objects and SocialStream.activity_forms by default
+    # It can be configured by users at application's config/initializers/social_stream.rb
+    %w(objects activity_forms).each do |m|
+      SocialStream.__send__(m).push(:document) unless SocialStream.__send__(m).include?(:document)
+    end
   end
 end
 

data/social_stream-documents.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "social_stream-documents"
-  s.version = "0.1.1"
+  s.version = "0.1.2"
   s.authors = ["Víctor Sánchez Belmar", "GING - DIT - UPM"]
   s.summary = "File capabilities for Social Stream, the core for building social network websites"
   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."

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream-documents
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - "V\xC3\xADctor S\xC3\xA1nchez Belmar"
@@ -16,12 +16,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-04 00:00:00 +02:00
-default_executable: 
+date: 2011-07-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: social_stream-base
   prerelease: false
-  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -33,11 +32,11 @@ dependencies:
         - 6
         - 0
         version: 0.6.0
-  name: social_stream-base
+  type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
+  name: paperclip-ffmpeg
   prerelease: false
-  type: :runtime
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -49,11 +48,11 @@ dependencies:
         - 6
         - 0
         version: 0.6.0
-  name: paperclip-ffmpeg
+  type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
+  name: rails
   prerelease: false
-  type: :development
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -67,11 +66,11 @@ dependencies:
         - rc
         - 4
         version: 3.1.0.rc4
-  name: rails
+  type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
+  name: sqlite3-ruby
   prerelease: false
-  type: :development
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -81,11 +80,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: sqlite3-ruby
+  type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
+  name: ruby-debug
   prerelease: false
-  type: :development
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -97,11 +96,11 @@ dependencies:
         - 10
         - 3
         version: 0.10.3
-  name: ruby-debug
+  type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
+  name: rspec-rails
   prerelease: false
-  type: :development
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -113,11 +112,11 @@ dependencies:
         - 5
         - 0
         version: 2.5.0
-  name: rspec-rails
+  type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
+  name: factory_girl
   prerelease: false
-  type: :development
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -129,11 +128,11 @@ dependencies:
         - 3
         - 2
         version: 1.3.2
-  name: factory_girl
+  type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
+  name: forgery
   prerelease: false
-  type: :development
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -145,11 +144,11 @@ dependencies:
         - 3
         - 6
         version: 0.3.6
-  name: forgery
+  type: :development
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
+  name: capybara
   prerelease: false
-  type: :development
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -161,7 +160,7 @@ dependencies:
         - 3
         - 9
         version: 0.3.9
-  name: capybara
+  type: :development
   version_requirements: *id009
 description: |-
   Social Stream is a Ruby on Rails engine providing your application with social networking features and activity streams.
@@ -217,18 +216,25 @@ files:
 - app/models/video.rb
 - app/views/audios/_audio.html.erb
 - app/views/audios/_index.html.erb
+- app/views/audios/_mediapreviews.html.erb
 - app/views/audios/_new.html.erb
 - app/views/audios/index.html.erb
+- app/views/audios/index.js.erb
 - app/views/documents/_document.html.erb
 - app/views/documents/_fields.html.erb
 - app/views/documents/_header.html.erb
 - app/views/documents/_index.html.erb
+- app/views/documents/_mediapreviews.html.erb
+- app/views/documents/_mediawall.html.erb
 - app/views/documents/_new.html.erb
 - app/views/documents/index.html.erb
+- app/views/documents/index.js.erb
 - app/views/pictures/_index.html.erb
+- app/views/pictures/_mediapreviews.html.erb
 - app/views/pictures/_new.html.erb
 - app/views/pictures/_picture.html.erb
 - app/views/pictures/index.html.erb
+- app/views/pictures/index.js.erb
 - app/views/toolbar/_uploads_menu.html.erb
 - app/views/videos/_index.html.erb
 - app/views/videos/_new.html.erb
@@ -276,7 +282,6 @@ files:
 - spec/integration/navigation_spec.rb
 - spec/socialstream_documents_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/ging/social_stream-documents
 licenses: []
 
@@ -306,7 +311,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: File capabilities for Social Stream, the core for building social network websites