social_stream-documents 0.1.9 → 0.1.10

data/.rspec

@@ -0,0 +1 @@
+--color

data/app/controllers/common_documents_controller.rb

@@ -1,16 +1,10 @@
 class CommonDocumentsController < InheritedResources::Base
   belongs_to_subjects :optional => true
 
-  load_and_authorize_resource
+  before_filter :subject!, :only => :index
+
+  load_and_authorize_resource :except => :index
 
-  def index
-    @activities = subject.wall(:profile,
-                               :for => current_subject,
-                               :object_type => Array(self.class.index_object_type)).
-                          page(params[:page]).
-                          per(params[:per])
-  end
- 
   def show
     path = resource.file.path(params[:style])
 
@@ -33,7 +27,19 @@ class CommonDocumentsController < InheritedResources::Base
   private
 
   def subject
-    @subject ||= parent || current_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])
   end
 
   class << self

data/social_stream-documents.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "social_stream-documents"
-  s.version = "0.1.9"
+  s.version = "0.1.10"
   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: 9
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 1
-  - 9
-  version: 0.1.9
+  - 10
+  version: 0.1.10
 platform: ruby
 authors: 
 - "V\xC3\xADctor S\xC3\xA1nchez Belmar"
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-21 00:00:00 +02:00
+date: 2011-07-22 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -197,6 +197,7 @@ files:
 - .idea/modules.xml
 - .idea/social_stream-documents.iml
 - .idea/vcs.xml
+- .rspec
 - Gemfile
 - MIT-LICENSE
 - README.rdoc