social_stream-documents 0.2.4 → 0.2.5

data/app/assets/javascripts/documents.js.erb

@@ -1,4 +1,4 @@
-$('.attachment_tile a').live("click",function(e){
+$('.attachment_tile a, .picture_link a').live("click",function(e){
 	if(this.type ==""){
 		return true;
 	}
@@ -6,15 +6,17 @@ $('.attachment_tile a').live("click",function(e){
 	
 	var download_link = this;
 
+    /*
 	if($('.player').length > 0 && $('.attachment_tile.selected').length==1){
 		removePlayers();
 		return;
 	}
+	*/
 	if(this.type == "Audio"){
 		removePlayers();
 		$(this).parent().parent().addClass("selected");
 		$('body').append("<audio class='player' autoplay='autoplay' id='audio_player' src='"+this+"' controls='controls'></audio>");
-		$('body').append("<a href='"+download_link+"'><img id='downloadButton' src='<%= asset_path "formats/default.png" %>' /></a>");
+		$('body').append("<a href='"+download_link+"'><img id='downloadButton' src='<%= asset_path "16/default.png" %>' /></a>");
 		return;
 	}
 	if(this.type == "Video"){
@@ -23,14 +25,14 @@ $('.attachment_tile a').live("click",function(e){
 		var show = (this+"").split('/download')[0];
 		show = show.replace("documents","videos");
 		$('body').append("<video class='player' autoplay='autoplay' id='video_player' src='"+show+"?style=webm' controls='controls'></video>");		
-		$('body').append("<a href='"+download_link+"'><img id='downloadButton' src='<%= asset_path "formats/default.png" %>' /></a>");
+		$('body').append("<a href='"+download_link+"'><img id='downloadButton' src='<%= asset_path "16/default.png" %>' /></a>");
 		return;
 	}
 	if(this.type == "Picture"){
 		removePlayers();
 		$(this).parent().parent().addClass("selected");
 		$('body').append("<img class='player' id='picture_player' src='"+download_link+"' />");	
-		$('body').append("<a href='" + download_link + "'><img id='downloadButton' src='<%= asset_path "formats/default.png" %>' /></a>");
+		$('body').append("<a href='" + download_link + "'><img id='downloadButton' src='<%= asset_path "16/default.png" %>' /></a>");
 	}		
 });
 

data/app/assets/stylesheets/documents.css

@@ -88,7 +88,7 @@
 }
 
 .player{
-	position: absolute;
+	position: fixed;
 	border-left: 24px solid #2A3890;
 	border-right: 24px solid #2A3890;
 	background-color: #e0edf2;
@@ -98,7 +98,7 @@
 }
 
 #downloadButton{
-	position: absolute;
+	position: fixed;
 	bottom: 5px;
 	right: 0px;
 	width: 24px;

data/app/models/picture.rb

@@ -11,7 +11,9 @@ class Picture < Document
       when 16
         "#{ size.to_s }/photo.png"
       when 48
-        helper.picture_path self, :format => format, :style => 'thumb'    
+        helper.picture_path self, :format => format, :style => 'thumb'   
+      when 130
+        helper.picture_path self, :format => format, :style => 'thumb0'    
     end
   end
     

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

@@ -1,15 +1,27 @@
 <%= div_for picture, :class => 'content_size' do %>
 
-  <div class="attachment_thumb">
+  <div class="attachment_thumb picture_link">
     <%= link_to thumb_for(picture, 16),
         {:controller => "documents", :action => "download", :id => picture}, 
-        :class => "" %>
+        :type => picture.type, 
+		:title => picture.file_file_name,
+		:path => document_path(picture) %>
   </div>
   
-  <div class="attachment_text picture_summary_class">
+  <div class="attachment_text picture_summary_class picture_link">
   	<%= t('picture.msg') %><%= link_to "\""+picture.file_file_name+"\"", 
     {:controller => "documents", :action => "download", :id => picture},  
+    :alt => picture.file_file_name,
+ 	:type => picture.type,
+ 	:path => document_path(picture),
     :class => "attachment_text_link" %>
   </div>
-
+  
+  <div class="picture_link">
+    <%= link_to thumb_for(picture, 130),
+        {:controller => "documents", :action => "download", :id => picture}, 
+        :type => picture.type, 
+		:title => picture.file_file_name,
+		:path => document_path(picture) %>
+  </div>
 <% end %>

data/social_stream-documents.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "social_stream-documents"
-  s.version = "0.2.4"
+  s.version = "0.2.5"
   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."
@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base','~> 0.7.10')
+  s.add_runtime_dependency('social_stream-base','>= 0.8.0')
   s.add_runtime_dependency('paperclip-ffmpeg', '~> 0.7.0')
   s.add_runtime_dependency('paperclip','2.3.11')
   # Development Gem dependencies

data/spec/controllers/documents_controller_spec.rb

@@ -0,0 +1,80 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe DocumentsController do
+  render_views
+
+  context "with public document" do
+    before do
+      @public_document = Factory(:public_document)      
+    end
+
+    describe "when not authenticated" do
+      it "should redirect to login" do
+        get :index  
+        response.should redirect_to(:new_user_session)
+      end
+  
+      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/
+      end
+      
+      it "should render receiver's show" do
+        get :show, :id => @public_document.to_param
+        response.should be_success
+        response.headers["Content-Type"].should include('application/pdf')
+      end
+    end
+    
+    describe "when authenticated" do
+      before do
+        sign_in Factory(:user)
+      end
+
+      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/
+      end
+      
+      it "should render show" do
+        get :show, :id => @public_document.to_param
+        response.should be_success
+        response.headers["Content-Type"].should include('application/pdf')
+      end
+    end
+  end #end of the context
+  
+  context "with private document" do
+    before do     
+      @private_document = Factory(:private_document)
+    end
+    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/
+      end
+    end
+    
+    describe "when authenticated" do
+      before do
+        sign_in Factory(:user)
+      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/
+      end
+      
+      it "should render show" do
+        lambda {get :show, :id => @private_document.to_param}.should raise_error(CanCan::AccessDenied)
+      end
+    end
+  end
+end

data/spec/controllers/pictures_controller_spec.rb

@@ -5,19 +5,76 @@ describe PicturesController do
 
   context "with public picture" do
     before do
-      @picture = Factory(:public_picture)
+      @public_picture = Factory(:public_picture)      
     end
 
-    it "should render index" do
-      get :index
-
-      response.should redirect_to(:new_user_session)
+    describe "when not authenticated" do
+      it "should redirect to login" do
+        get :index  
+        response.should redirect_to(:new_user_session)
+      end
+  
+      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/
+      end
+      
+      it "should render receiver's show" do
+        get :show, :id => @public_picture.to_param
+        response.should be_success
+        response.headers["Content-Type"].should include('image/png')
+      end
     end
+    
+    describe "when authenticated" do
+      before do
+        sign_in Factory(:user)
+      end
 
-    it "should render receiver's index" do
-      get :index, :user_id => @picture.post_activity.receiver.to_param
-
-      response.should be_success
+      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/
+      end
+      
+      it "should render show" do
+        get :show, :id => @public_picture.to_param
+        response.should be_success
+        response.headers["Content-Type"].should include('image/png')
+      end
+    end
+  end #end of the context
+  
+  context "with private picture" do
+    before do     
+      @private_picture = Factory(:private_picture)
+    end
+    describe "when not authenticated" 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/
+      end
+    end
+    
+    describe "when authenticated" do
+      before do
+        sign_in Factory(:user)
+      end
+      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/
+      end
+      
+      it "should render show" do
+        lambda {get :show, :id => @private_picture.to_param}.should raise_error(CanCan::AccessDenied)
+      end
     end
   end
 end

data/spec/factories/document.rb

@@ -0,0 +1,19 @@
+Factory.define :document do |d|
+  d.file { Rack::Test::UploadedFile.new(File.join(File.dirname(__FILE__), 'files', 'small.pdf'),
+                                       'application/pdf') }
+
+  d._contact_id { Factory(:friend).contact_id }
+  d._relation_ids { |q| Array(Contact.find(q._contact_id).sender.relation_customs.sort.first.id) }
+end
+
+Factory.define :public_document, :parent => :document do |d|
+  d._contact_id { Factory(:self_contact).id }
+  d._relation_ids { |q| Array(Contact.find(q._contact_id).sender.relation_public.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._contact_id { Factory(:self_contact).id }
+  d._relation_ids { |q| Array(Contact.find(q._contact_id).sender.relation_customs.sort.first.id) }
+end

data/spec/factories/files/small.pdf

@@ -0,0 +1,157 @@
+%PDF-1.2 
+%����
+ 
+9 0 obj
+<<
+/Length 10 0 R
+/Filter /FlateDecode 
+>>
+stream
+H�͐�J�0�� ��{��f�$M��n�-���[&je���ۤ�~�$���}�Ʌ�Ij���s����~�X�-],��$Y���)�'N�u�1!���V�?��?
+�b1Rbb�҉�H�[��TD:#�&ح��X���i�$qnf�����]������a��{��أ���q|J�Ls]�Q�I��j�%��9��`�঺��U�ite�z�$����OeB�Ēү�R��@zܗ���g���<���
+endstream
+endobj
+10 0 obj
+246
+endobj
+4 0 obj
+<<
+/Type /Page
+/Parent 5 0 R
+/Resources <<
+/Font <<
+/F0 6 0 R 
+/F1 7 0 R 
+>>
+/ProcSet 2 0 R
+>>
+/Contents 9 0 R
+>>
+endobj
+6 0 obj
+<<
+/Type /Font
+/Subtype /TrueType
+/Name /F0
+/BaseFont /Arial
+/Encoding /WinAnsiEncoding
+>>
+endobj
+7 0 obj
+<<
+/Type /Font
+/Subtype /TrueType
+/Name /F1
+/BaseFont /BookAntiqua,Bold
+/FirstChar 31
+/LastChar 255
+/Widths [ 750 250 278 402 606 500 889 833 227 333 333 444 606 250 333 250 
+296 500 500 500 500 500 500 500 500 500 500 250 250 606 606 606 
+444 747 778 667 722 833 611 556 833 833 389 389 778 611 1000 833 
+833 611 833 722 611 667 778 778 1000 667 667 667 333 606 333 606 
+500 333 500 611 444 611 500 389 556 611 333 333 611 333 889 611 
+556 611 611 389 444 333 611 556 833 500 556 500 310 606 310 606 
+750 500 750 333 500 500 1000 500 500 333 1000 611 389 1000 750 750 
+750 750 278 278 500 500 606 500 1000 333 998 444 389 833 750 750 
+667 250 278 500 500 606 500 606 500 333 747 438 500 606 333 747 
+500 400 549 361 361 333 576 641 250 333 361 488 500 889 890 889 
+444 778 778 778 778 778 778 1000 722 611 611 611 611 389 389 389 
+389 833 833 833 833 833 833 833 606 833 778 778 778 778 667 611 
+611 500 500 500 500 500 500 778 444 500 500 500 500 333 333 333 
+333 556 611 556 556 556 556 556 549 556 611 611 611 611 556 611 
+556 ]
+/Encoding /WinAnsiEncoding
+/FontDescriptor 8 0 R
+>>
+endobj
+8 0 obj
+<<
+/Type /FontDescriptor
+/FontName /BookAntiqua,Bold
+/Flags 16418
+/FontBBox [ -250 -260 1236 930 ]
+/MissingWidth 750
+/StemV 146
+/StemH 146
+/ItalicAngle 0
+/CapHeight 930
+/XHeight 651
+/Ascent 930
+/Descent 260
+/Leading 210
+/MaxWidth 1030
+/AvgWidth 460
+>>
+endobj
+2 0 obj
+[ /PDF /Text  ]
+endobj
+5 0 obj
+<<
+/Kids [4 0 R ]
+/Count 1
+/Type /Pages
+/MediaBox [ 0 0 612 792 ]
+>>
+endobj
+1 0 obj
+<<
+/Creator (1725.fm)
+/CreationDate (1-Jan-3 18:15PM)
+/Title (1725.PDF)
+/Author (Unknown)
+/Producer (Acrobat PDFWriter 3.02 for Windows)
+/Keywords ()
+/Subject ()
+>>
+endobj
+3 0 obj
+<<
+/Pages 5 0 R
+/Type /Catalog
+/DefaultGray 11 0 R
+/DefaultRGB  12 0 R
+>>
+endobj
+11 0 obj
+[/CalGray
+<<
+/WhitePoint [0.9505 1 1.0891 ]
+/Gamma 0.2468 
+>>
+]
+endobj
+12 0 obj
+[/CalRGB
+<<
+/WhitePoint [0.9505 1 1.0891 ]
+/Gamma [0.2468 0.2468 0.2468 ]
+/Matrix [0.4361 0.2225 0.0139 0.3851 0.7169 0.0971 0.1431 0.0606 0.7141 ]
+>>
+]
+endobj
+xref
+0 13
+0000000000 65535 f
+0000002172 00000 n
+0000002046 00000 n
+0000002363 00000 n
+0000000375 00000 n
+0000002080 00000 n
+0000000518 00000 n
+0000000633 00000 n
+0000001760 00000 n
+0000000021 00000 n
+0000000352 00000 n
+0000002460 00000 n
+0000002548 00000 n
+trailer
+<<
+/Size 13
+/Root 3 0 R
+/Info 1 0 R
+/ID [<47149510433dd4882f05f8c124223734><47149510433dd4882f05f8c124223734>]
+>>
+startxref
+2726
+%%EOF

data/spec/factories/picture.rb

@@ -10,3 +10,11 @@ Factory.define :public_picture, :parent => :picture do |p|
   p._contact_id { Factory(:self_contact).id }
   p._relation_ids { |q| Array(Contact.find(q._contact_id).sender.relation_public.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._contact_id { Factory(:self_contact).id }
+  p._relation_ids { |q| Array(Contact.find(q._contact_id).sender.relation_customs.sort.first.id) }
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream-documents
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 2
-  - 4
-  version: 0.2.4
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - "V\xC3\xADctor S\xC3\xA1nchez Belmar"
@@ -16,28 +16,29 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-04 00:00:00 Z
+date: 2011-09-06 00:00:00 +02:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: social_stream-base
   prerelease: false
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 63
         segments: 
         - 0
-        - 7
-        - 10
-        version: 0.7.10
-  type: :runtime
-  requirement: *id001
+        - 8
+        - 0
+        version: 0.8.0
+  name: social_stream-base
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: paperclip-ffmpeg
   prerelease: false
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -48,12 +49,12 @@ dependencies:
         - 7
         - 0
         version: 0.7.0
-  type: :runtime
-  requirement: *id002
+  name: paperclip-ffmpeg
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: paperclip
   prerelease: false
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -64,12 +65,12 @@ dependencies:
         - 3
         - 11
         version: 2.3.11
-  type: :runtime
-  requirement: *id003
+  name: paperclip
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
   prerelease: false
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -78,12 +79,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  requirement: *id004
+  name: sqlite3-ruby
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: ruby-debug
   prerelease: false
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -94,12 +95,12 @@ dependencies:
         - 10
         - 3
         version: 0.10.3
-  type: :development
-  requirement: *id005
+  name: ruby-debug
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: rspec-rails
   prerelease: false
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -110,12 +111,12 @@ dependencies:
         - 6
         - 0
         version: 2.6.0
-  type: :development
-  requirement: *id006
+  name: rspec-rails
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: factory_girl
   prerelease: false
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -126,12 +127,12 @@ dependencies:
         - 3
         - 2
         version: 1.3.2
-  type: :development
-  requirement: *id007
+  name: factory_girl
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: forgery
   prerelease: false
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -142,12 +143,12 @@ dependencies:
         - 3
         - 6
         version: 0.3.6
-  type: :development
-  requirement: *id008
+  name: forgery
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: capybara
   prerelease: false
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -158,8 +159,8 @@ dependencies:
         - 3
         - 9
         version: 0.3.9
-  type: :development
-  requirement: *id009
+  name: capybara
+  version_requirements: *id009
 description: |-
   Social Stream is a Ruby on Rails engine providing your application with social networking features and activity streams.
   
@@ -265,6 +266,7 @@ files:
 - lib/social_stream/documents/engine.rb
 - lib/social_stream/migrations/documents.rb
 - social_stream-documents.gemspec
+- spec/controllers/documents_controller_spec.rb
 - spec/controllers/pictures_controller_spec.rb
 - spec/dummy/.gitignore
 - spec/dummy/Rakefile
@@ -302,7 +304,10 @@ files:
 - spec/dummy/public/javascripts/rails.js
 - spec/dummy/public/stylesheets/.gitkeep
 - spec/dummy/script/rails
+- spec/factories/document.rb
+- spec/factories/files/privado.png
 - spec/factories/files/rails.png
+- spec/factories/files/small.pdf
 - spec/factories/picture.rb
 - spec/integration/navigation_spec.rb
 - spec/models/video_spec.rb
@@ -318,6 +323,7 @@ files:
 - vendor/assets/stylesheets/jplayer.blue.monday.video.play.hover.png
 - vendor/assets/stylesheets/jplayer.blue.monday.video.play.png
 - vendor/assets/stylesheets/pbar-ani.gif
+has_rdoc: true
 homepage: http://github.com/ging/social_stream-documents
 licenses: []
 
@@ -347,7 +353,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: File capabilities for Social Stream, the core for building social network websites