social_stream-documents 0.2.0 → 0.2.3

data/.gitignore

@@ -11,3 +11,4 @@ Gemfile.lock
 .idea/social_stream-documents.iml
 app/views/*/.tmp_*
 **.*swp
+.idea

data/Gemfile

@@ -1,5 +1,9 @@
 source "http://rubygems.org"
 
- gem 'social_stream-base', :path => '../social_stream-base'
+if File.exists?(File.join(File.dirname(__FILE__), '..', 'social_stream-base'))
+  gem 'social_stream-base', :path => '../social_stream-base'
+else
+  gem 'social_stream-base', :git => 'https://github.com/ging/social_stream-base.git'
+end
 
 gemspec

data/app/assets/stylesheets/documents.css

@@ -183,3 +183,8 @@
 	height:135px;
 }
 
+/* needed to hide the flash element when used */
+.jpId_size0{
+	width: 0px;
+	height: 0px;
+}

data/app/controllers/common_documents_controller.rb

@@ -1,7 +1,7 @@
 class CommonDocumentsController < InheritedResources::Base
   belongs_to_subjects :optional => true
 
-  before_filter :subject!, :only => :index
+  before_filter :profile_subject!, :only => :index
 
   load_and_authorize_resource :except => :index
 
@@ -26,20 +26,12 @@ class CommonDocumentsController < InheritedResources::Base
 
   private
 
-  def subject
-    @subject ||= association_chain[-1] || current_subject
-  end
-
-  def subject!
-    @subject ||= association_chain[-1] || warden.authenticate!(:user)
-  end
-
   def collection
-    @activities = subject.wall(:profile,
-                               :for => current_subject,
-                               :object_type => Array(self.class.index_object_type)).
-                          page(params[:page]).
-                          per(params[:per])
+    @activities = profile_subject.wall(:profile,
+                                       :for => current_subject,
+                                       :object_type => Array(self.class.index_object_type)).
+                                  page(params[:page]).
+                                  per(params[:per])
   end
 
   class << self

data/app/controllers/videos_controller.rb

@@ -1,14 +1,16 @@
 class VideosController < CommonDocumentsController
   respond_to :html,:js
   
+
+  
   def show
     path = @video.file.path(params[:style])
-    if(params[:style].present?)
-      path = path.split('.')[0]+'.'+params[:style]
+    if(params[:style].present?) && Document::STYLE_FORMAT[params[:style]]
+      path = path.split('.')[0]+'.'+Document::STYLE_FORMAT[params[:style]]
     end
     respond_to do |format|
       format.all {send_file path, 
-                  :type => @video.file_content_type,
+                  :type => params[:style]=="thumb" ? "image/png" : @video.file_content_type,
                   :disposition => "inline"}
     end
   end

data/app/models/audio.rb

@@ -2,10 +2,6 @@ class Audio < Document
  
   # Thumbnail file
   def thumb(size, helper)
-    if format && IMAGE_FORMATS.include?(format.to_s)
       "#{ size.to_s }/audio.png"
-    else
-      "#{ size.to_s }/audio.png"
-    end
   end
 end

data/app/models/document.rb

@@ -3,6 +3,8 @@ class Document < ActiveRecord::Base
 
   IMAGE_FORMATS = ["doc","ppt","xls","rar","zip","mpeg","plain","pdf"]
 
+  STYLE_FORMAT = {"webm" =>"webm", "flv"=>"flv", "thumb"=>"png", "thumb0"=>"png"}
+
   has_attached_file :file, 
                     :url => '/:class/:id.:extension',
                     :path => ':rails_root/documents/:class/:id_partition/:style.:extension'

data/app/models/video.rb

@@ -17,10 +17,7 @@ class Video < Document
                       
   # Thumbnail file
   def thumb(size, helper)
-    if format && IMAGE_FORMATS.include?(format.to_s)
       "#{ size.to_s }/video.png"
-    else
-      "#{ size.to_s }/video.png"
-    end
   end
+  
 end

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

@@ -26,7 +26,7 @@
 	    {:controller => "documents", :action => "download", :id => audio},  
 	    :class => "attachment_text_link" %>
 	  </div>
-	<div id="jpId<%=audio.id%>"></div>
+	<div id="jpId<%=audio.id%>" class="jpId_size0"></div>
 	
 	<div class="jp-audio">
     <div class="jp-type-single">

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

@@ -1 +1 @@
-<%=render(:partial => 'common/index') %>
+<%=render(:partial => 'common-documents/index') %>

data/app/views/{common → common-documents}/_index.html.erb

@@ -1,27 +1,27 @@
 <% content_for :title do %>
-  <%= @subject.name %> 
+  <%= profile_subject.name %> 
 <% end %>
 
 <% content_for :sidebar do %>
   <%= render :partial => 'home/sidebar' %>
 <% end %>
 
-<%if @subject == current_subject%>
+<%if profile_subject_is_current?%>
   <%= location(
     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)
     ) %>
   <% toolbar %>
 <%else%>
   <%= location(
-    link_to(image_tag("btn/btn_profile.png", :class => "menu_icon")+ @subject.name, polymorphic_path(@subject),:remote => true),
-    link_to(image_tag(("btn/btn_#{controller.controller_name.singularize}.png"), :class => "menu_icon")+t(controller.controller_name.singularize + '.title'), polymorphic_path([@subject, controller.controller_name]),:remote => true)
+    link_to(image_tag("btn/btn_profile.png", :class => "menu_icon")+ profile_subject.name, polymorphic_path(profile_subject),:remote => true),
+    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)
     ) %>
-  <% toolbar :profile => @subject %>
+  <% toolbar :profile => profile_subject %>
 <%end%>
 
 
 <div class="attachment_section_header">
-	<h3><%= @subject == current_subject ? t(controller.controller_name.singularize + '.mine') : t(controller.controller_name.singularize + '.not_mine') %></h3>
+	<h3><%= profile_subject_is_current? ? t(controller.controller_name.singularize + '.mine') : t(controller.controller_name.singularize + '.not_mine') %></h3>
 </div>
 <% @activities.each do |a| %>
 	<% document = a.activity_objects.first.document %>

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

@@ -1 +1 @@
-<%=render(:partial => 'common/index') %>
+<%=render(:partial => 'common-documents/index') %>

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

@@ -1 +1 @@
-<%=render(:partial => 'common/index') %>
+<%=render(:partial => 'common-documents/index') %>

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

@@ -32,7 +32,7 @@
     :class => "attachment_text_link" %>
 
   <div id="video_thumbnail_<%=video.id%>" class="video_thumbnail_class">
-    <%=image_tag(video_path(video)+"?style=png", :class => "video_thumbnail_image")%>
+    <%=image_tag(video_path(video)+"?style=thumb", :class => "video_thumbnail_image")%>
 	<div id="<%=video.id%>" class="video_thumbnail_play_over"></div>
   </div>
 

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

@@ -1 +1 @@
-<%=render(:partial => 'common/index') %>
+<%=render(:partial => 'common-documents/index') %>

data/social_stream-documents.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "social_stream-documents"
-  s.version = "0.2.0"
+  s.version = "0.2.3"
   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."

data/spec/controllers/pictures_controller_spec.rb

@@ -9,6 +9,12 @@ describe PicturesController do
     end
 
     it "should render index" do
+      get :index
+
+      response.should redirect_to(:new_user_session)
+    end
+
+    it "should render receiver's index" do
       get :index, :user_id => @picture.post_activity.receiver.to_param
 
       response.should be_success

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream-documents
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - "V\xC3\xADctor S\xC3\xA1nchez Belmar"
@@ -16,13 +16,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-28 00:00:00 +02:00
-default_executable: 
+date: 2011-08-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: social_stream-base
   prerelease: false
-  type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -33,12 +32,12 @@ dependencies:
         - 7
         - 10
         version: 0.7.10
-  name: social_stream-base
-  version_requirements: *id001
+  type: :runtime
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
+  name: paperclip-ffmpeg
   prerelease: false
-  type: :runtime
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -49,12 +48,12 @@ dependencies:
         - 7
         - 0
         version: 0.7.0
-  name: paperclip-ffmpeg
-  version_requirements: *id002
+  type: :runtime
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
+  name: paperclip
   prerelease: false
-  type: :runtime
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -65,12 +64,12 @@ dependencies:
         - 3
         - 11
         version: 2.3.11
-  name: paperclip
-  version_requirements: *id003
+  type: :runtime
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
+  name: sqlite3-ruby
   prerelease: false
-  type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -79,12 +78,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: sqlite3-ruby
-  version_requirements: *id004
+  type: :development
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
+  name: ruby-debug
   prerelease: false
-  type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -95,12 +94,12 @@ dependencies:
         - 10
         - 3
         version: 0.10.3
-  name: ruby-debug
-  version_requirements: *id005
+  type: :development
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
+  name: rspec-rails
   prerelease: false
-  type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -111,12 +110,12 @@ dependencies:
         - 6
         - 0
         version: 2.6.0
-  name: rspec-rails
-  version_requirements: *id006
+  type: :development
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
+  name: factory_girl
   prerelease: false
-  type: :development
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -127,12 +126,12 @@ dependencies:
         - 3
         - 2
         version: 1.3.2
-  name: factory_girl
-  version_requirements: *id007
+  type: :development
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
+  name: forgery
   prerelease: false
-  type: :development
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -143,12 +142,12 @@ dependencies:
         - 3
         - 6
         version: 0.3.6
-  name: forgery
-  version_requirements: *id008
+  type: :development
+  requirement: *id008
 - !ruby/object:Gem::Dependency 
+  name: capybara
   prerelease: false
-  type: :development
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -159,8 +158,8 @@ dependencies:
         - 3
         - 9
         version: 0.3.9
-  name: capybara
-  version_requirements: *id009
+  type: :development
+  requirement: *id009
 description: |-
   Social Stream is a Ruby on Rails engine providing your application with social networking features and activity streams.
   
@@ -174,11 +173,6 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
-- .idea/encodings.xml
-- .idea/misc.xml
-- .idea/modules.xml
-- .idea/social_stream-documents.iml
-- .idea/vcs.xml
 - .rspec
 - Gemfile
 - MIT-LICENSE
@@ -239,7 +233,7 @@ files:
 - app/views/audios/index.html.erb
 - app/views/audios/index.js.erb
 - app/views/audios/show.html.erb
-- app/views/common/_index.html.erb
+- app/views/common-documents/_index.html.erb
 - app/views/documents/_document.html.erb
 - app/views/documents/_fields.html.erb
 - app/views/documents/_header.html.erb
@@ -294,6 +288,7 @@ files:
 - spec/dummy/config/navigation.rb
 - spec/dummy/config/relations.yml
 - spec/dummy/config/routes.rb
+- spec/dummy/db/.gitkeep
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -322,7 +317,6 @@ 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: []
 
@@ -352,7 +346,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: File capabilities for Social Stream, the core for building social network websites

data/.idea/encodings.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
-</project>
-

data/.idea/misc.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="DependencyValidationManager">
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="Ruby SDK 1.8.7 (/home/dcarrera/.rvm/rubies/ruby-1.8.7-p334/bin/ruby)" project-jdk-type="RUBY_SDK" />
-</project>
-

data/.idea/modules.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/social_stream-documents.iml" filepath="$PROJECT_DIR$/.idea/social_stream-documents.iml" />
-    </modules>
-  </component>
-</project>
-

data/.idea/social_stream-documents.iml

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="RUBY_MODULE" version="4">
-  <component name="GemRequirementsHolder" version="3">
-    <requirement>
-      <requirement>
-        <dependency name="paperclip-ffmpeg" version="0.6.0" bound="LATEST_IN_BRANCH" git="false" path="false" doRequire="true" />
-      </requirement>
-      <source from="Gemfile" />
-    </requirement>
-    <requirement>
-      <requirement>
-        <dependency name="social_stream-base" version="0.6.0" bound="LATEST_IN_BRANCH" git="false" path="false" doRequire="true" />
-      </requirement>
-      <source from="Gemfile" />
-    </requirement>
-  </component>
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="[gem] bundler (v1.0.13, /home/dcarrera/.rvm/gems/ruby-1.8.7-p334/gems/bundler-1.0.13)" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="[gem] paperclip-ffmpeg (v0.6.0, /home/dcarrera/.rvm/gems/ruby-1.8.7-p334/gems/paperclip-ffmpeg-0.6.0)" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="[gem] multi_json (v1.0.3, /home/dcarrera/.rvm/gems/ruby-1.8.7-p334/gems/multi_json-1.0.3)" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="[gem] builder (v3.0.0, /home/dcarrera/.rvm/gems/ruby-1.8.7-p334/gems/builder-3.0.0)" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="[gem] tzinfo (v0.3.28, /home/dcarrera/.rvm/gems/ruby-1.8.7-p334/gems/tzinfo-0.3.28)" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="[gem] activerecord (v3.1.0.rc4, /home/dcarrera/.rvm/gems/ruby-1.8.7-p334/gems/activerecord-3.1.0.rc4)" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="[gem] activesupport (v3.1.0.rc4, /home/dcarrera/.rvm/gems/ruby-1.8.7-p334/gems/activesupport-3.1.0.rc4)" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="[gem] bcrypt-ruby (v2.1.4, /home/dcarrera/.rvm/gems/ruby-1.8.7-p334/gems/bcrypt-ruby-2.1.4)" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="[gem] activemodel (v3.1.0.rc4, /home/dcarrera/.rvm/gems/ruby-1.8.7-p334/gems/activemodel-3.1.0.rc4)" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="[gem] paperclip (v2.3.11, /home/dcarrera/.rvm/gems/ruby-1.8.7-p334/gems/paperclip-2.3.11)" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="[gem] i18n (v0.6.0, /home/dcarrera/.rvm/gems/ruby-1.8.7-p334/gems/i18n-0.6.0)" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="[gem] arel (v2.1.1, /home/dcarrera/.rvm/gems/ruby-1.8.7-p334/gems/arel-2.1.1)" level="application" />
-  </component>
-</module>
-

data/.idea/vcs.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
-