social_stream 0.12.14 → 0.13.0

data/base/spec/controllers/comments_controller_spec.rb

@@ -14,9 +14,10 @@ describe CommentsController do
     describe "comment from user" do
       before do
         activity = Factory(:self_activity, :contact => Factory(:self_contact, :sender => @user.actor))
-        contact = @user.contact_to!(@user)
 
-        model_attributes[:_contact_id] = contact.id
+        model_attributes[:author_id] = @user.actor_id
+        model_attributes[:owner_id]  = @user.actor_id
+        model_attributes[:user_author_id] = @user.actor_id
         model_attributes[:_activity_parent_id] = activity.id
       end
 
@@ -38,9 +39,10 @@ describe CommentsController do
       before do
         f = Factory(:friend, :contact => Factory(:contact, :receiver => @user.actor)).sender
         activity = Factory(:self_activity, :contact => f.contact_to!(f))
-        contact = @user.contact_to!(f)
 
-        model_attributes[:_contact_id] = contact.id
+        model_attributes[:author_id] = @user.actor_id
+        model_attributes[:owner_id]  = f.id
+        model_attributes[:user_author_id] = @user.actor_id
         model_attributes[:_activity_parent_id] = activity.id
       end
 
@@ -51,9 +53,10 @@ describe CommentsController do
       before do
         a = Factory(:acquaintance, :contact => Factory(:contact, :receiver => @user.actor)).sender
         activity = Factory(:self_activity, :contact => a.contact_to!(a))
-        contact = @user.contact_to!(a)
 
-        model_attributes[:_contact_id] = contact.id
+        model_attributes[:author_id] = @user.actor_id
+        model_attributes[:owner_id]  = a.id
+        model_attributes[:user_author_id] = @user.actor_id
         model_attributes[:_activity_parent_id] = activity.id
       end
 

data/base/spec/controllers/groups_controller_spec.rb

@@ -26,9 +26,7 @@ describe GroupsController do
 
     context "faking a new group" do
       it "should deny creating" do
-        post :create, :group => { :name => "Test",
-                                  :_contact_id => Factory(:user).ego_contact.id
-                                }
+        post :create, :group => { :name => "Test" }
 
         response.should redirect_to(new_user_session_path)
       end
@@ -79,7 +77,8 @@ describe GroupsController do
 
     context "a new own group" do
       before do
-        model_attributes[:_contact_id] = @user.ego_contact.id
+        model_attributes[:author_id] = @user.actor_id
+        model_attributes[:user_author_id] = @user.actor_id
       end
 
       it "should allow creating" do
@@ -125,7 +124,10 @@ describe GroupsController do
 
     context "a new fake group" do
       before do
-        model_attributes[:_contact_id] = Factory(:user).ego_contact.id
+        user = Factory(:user)
+
+        model_attributes[:author_id] = user.actor_id
+        model_attributes[:user_author_id] = user.actor_id
       end
 
       it_should_behave_like "Deny Creating"

data/base/spec/controllers/posts_controller_spec.rb

@@ -1,6 +1,5 @@
 require 'spec_helper'
 
-
 describe PostsController do
   include SocialStream::TestHelpers
   include SocialStream::TestHelpers::Controllers
@@ -19,7 +18,10 @@ describe PostsController do
           contact = @user.contact_to!(@user)
           relation = @user.relation_customs.sort.first
           model_assigned_to @user.contact_to!(@user), relation
-          @current_model = Factory(:post, :_contact_id => contact.id, :_relation_ids => Array(relation.id))
+          @current_model = Factory(:post, :author_id => @user.actor_id,
+                                          :owner_id  => @user.actor_id,
+                                          :user_author_id => @user.actor_id,
+                                          :_relation_ids => Array(relation.id))
         end
 
         it_should_behave_like "Allow Creating"
@@ -31,7 +33,10 @@ describe PostsController do
           contact = @user.contact_to!(@user)
           relation = @user.relation_customs.sort.last
           model_assigned_to @user.contact_to!(@user), relation
-          @current_model = Factory(:post, :_contact_id => contact.id, :_relation_ids => Array(relation.id))
+          @current_model = Factory(:post, :author_id => @user.actor_id,
+                                          :owner_id  => @user.actor_id,
+                                          :user_author_id => @user.actor_id,
+                                          :_relation_ids => Array(relation.id))
         end
 
         it_should_behave_like "Allow Creating"
@@ -43,7 +48,9 @@ describe PostsController do
           contact = @user.contact_to!(@user)
           relation = @user.relation_public
           model_assigned_to @user.contact_to!(@user), relation
-          @current_model = Factory(:post, :_contact_id => contact.id)
+          @current_model = Factory(:post, :author_id => @user.actor_id,
+                                          :owner_id  => @user.actor_id,
+                                          :user_author_id => @user.actor_id)
         end
 
         it_should_behave_like "Allow Creating"
@@ -82,7 +89,10 @@ describe PostsController do
           relation = @group.relation_custom('member')
 
           model_assigned_to contact, relation
-          @current_model = Factory(:post, :_contact_id => contact.id, :_relation_ids => Array(relation.id))
+          @current_model = Factory(:post, :author_id => contact.sender.id,
+                                          :owner_id  => contact.receiver.id,
+                                          :user_author_id => contact.sender.id,
+                                          :_relation_ids => Array(relation.id))
         end
 
         it_should_behave_like "Allow Creating"
@@ -99,7 +109,10 @@ describe PostsController do
             contact = @group.contact_to!(@group)
             relation = @group.relation_customs.sort.first
             model_assigned_to contact, relation
-            @current_model = Factory(:post, :_contact_id => contact.id, :_relation_ids => Array(relation.id))
+            @current_model = Factory(:post, :author_id => contact.sender.id,
+                                            :owner_id  => contact.receiver.id,
+                                            :user_author_id => contact.sender.id,
+                                            :_relation_ids => Array(relation.id))
           end
 
           it_should_behave_like "Allow Creating"
@@ -111,7 +124,10 @@ describe PostsController do
             contact = @group.contact_to!(@group)
             relation = @group.relation_customs.sort.last
             model_assigned_to contact, relation
-            @current_model = Factory(:post, :_contact_id => contact.id, :_relation_ids => Array(relation.id))
+            @current_model = Factory(:post, :author_id => contact.sender.id,
+                                            :owner_id  => contact.receiver.id,
+                                            :user_author_id => contact.sender.id,
+                                            :_relation_ids => Array(relation.id))
           end
 
           it_should_behave_like "Allow Creating"
@@ -123,7 +139,10 @@ describe PostsController do
             contact = @group.contact_to!(@group)
             relation = @group.relation_public
             model_assigned_to contact, relation
-            @current_model = Factory(:post, :_contact_id => contact.id, :_relation_ids => Array(relation.id))
+            @current_model = Factory(:post,  :author_id => contact.sender.id,
+                                             :owner_id  => contact.receiver.id,
+                                             :user_author_id => contact.sender.id,
+                                             :_relation_ids => Array(relation.id))
           end
 
           it_should_behave_like "Allow Creating"
@@ -143,7 +162,7 @@ describe PostsController do
       sign_in @tie.receiver_subject
 
       post :create, :post => { :text => "Test",
-                               :_contact_id => @tie.contact.inverse!.id,
+                               :owner_id  => @tie.contact.sender.id
                              }
 
       post = assigns(:post)
@@ -151,6 +170,23 @@ describe PostsController do
       post.should be_valid
       post.post_activity.relations.should include(@tie.relation)
     end
+
+    it "should assign activity to member" do
+      sign_in @tie.receiver_subject
+
+      post :create, :post => { :text => "Test",
+                               :owner_id  => @tie.contact.sender.id
+                             },
+                    :format => :js
+                             
+
+      post = assigns(:post)
+
+      post.should be_valid
+      post.post_activity.relations.should include(@tie.relation)
+
+      response.should be_success
+    end
   end
 
   context "creating public post" do

data/base/spec/controllers/users_controller_spec.rb

@@ -74,7 +74,9 @@ describe UsersController do
     it "should render other's page with activity" do
       tie = Factory(:friend, :receiver => @user.actor)
       friend = tie.sender
-      Factory(:post, :_contact_id  => tie.contact_id,
+      Factory(:post, :author_id  => tie.sender.id,
+                     :owner_id   => tie.receiver.id,
+                     :user_author_id => tie.sender.id,
                      :_relation_ids => Array(tie.relation_id))
 
       get :show, :id => friend.to_param

data/base/spec/factories/activity.rb

@@ -38,11 +38,12 @@ Factory.define :public_activity, :parent => :activity do |a|
   a.relation_ids  { |b| Array(b.sender.relation_public.id) }
 end
 
-Factory.define :like_activity, :parent => :activity do |a|
+Factory.define :like_activity, :class => 'Activity' do |a|
   a.association :parent, :factory => :activity
   a.contact { |b| Factory(:friend, :sender => b.parent.sender).receiver.contact_to!(b.parent.sender) }
   a.activity_verb { ActivityVerb["like"] }
-  a.relation_ids { |b| Array(b.parent.contact.ties.first.relation.id) }
+  a.relation_ids  { |b| b.parent.relation_ids }
+  a.after_build{ |b| b.activity_object_ids = b.parent.activity_object_ids }
 end
 
 

data/base/spec/factories/comment.rb

@@ -1,5 +1,6 @@
 Factory.define :comment do |p|
   p.sequence(:text)  { |n| "Comment #{ n }" }
-  p._contact_id { Factory(:friend).contact_id }
-  p._relation_ids { |q| Array(Contact.find(q._contact_id).sender.relation_customs.sort.first.id) }
+  p.author_id { Factory(:friend).receiver.id }
+  p.owner_id  { |q| Actor.find(q.author_id).received_ties.first.sender.id }
+  p.user_author_id { |q| q.author_id }
 end

data/base/spec/factories/group.rb

@@ -1,4 +1,5 @@
 Factory.define :group do |g|
   g.sequence(:name) { |n| "Group #{ n }" }
-  g._contact_id { |g| Factory(:user).ego_contact.id }
+  g.author_id { |h| Factory(:user).actor_id }
+  g.user_author_id { |h| h.author_id }
 end

data/base/spec/factories/post.rb

@@ -1,10 +1,11 @@
 Factory.define :post do |p|
   p.sequence(:text)  { |n| "Post #{ n }" }
-  p._contact_id { Factory(:friend).contact_id }
-  p._relation_ids { |q| Array(Contact.find(q._contact_id).sender.relation_customs.sort.first.id) }
+  p.author_id { Factory(:friend).receiver.id }
+  p.owner_id  { |q| Actor.find(q.author_id).received_ties.first.sender.id }
+  p.user_author_id { |q| q.author_id }
 end
 
 Factory.define :public_post, :parent => :post do |p|
-  p._contact_id { Factory(:self_contact).id }
-  p._relation_ids { |q| Array(Contact.find(q._contact_id).sender.relation_public.id) }
+  p.owner_id  { |q| q.author_id }
+  p._relation_ids { |q| Array(q.author.relation_public.id) }
 end

data/base/spec/models/activity_authorization_spec.rb

@@ -2,10 +2,11 @@ require 'spec_helper'
 
 module ActivityTestHelper
   def create_activity(contact, relations)
-    @activity = Factory(:activity,
-                        :contact_id => contact.id,
-                        :relation_ids => Array(Relation.normalize_id(relations)))
-
+    @activity = Factory(:post,
+                        :author_id => contact.sender.id,
+                        :owner_id  => contact.receiver.id,
+                        :user_author_id => contact.sender.id,
+                        :_relation_ids => Array(Relation.normalize_id(relations))).post_activity
   end
 
   def create_ability_accessed_by(subject)

data/base/spec/models/group_spec.rb

@@ -2,9 +2,12 @@ require 'spec_helper'
 
 describe Group do
   it "should save description" do
-    g = Group.create(:name => "Test",
+    user = Factory(:user)
+
+    g = Group.create :name => "Test",
                      :description => "Testing description",
-                     :_contact_id => Factory(:user).ego_contact.id)
+                     :author_id => user.actor.id,
+                     :user_author_id => user.actor.id
 
     g.reload.description.should be_present
   end

data/base/spec/models/post_spec.rb

@@ -36,7 +36,9 @@ describe Post do
       tie = Factory(:friend)
 
       post = Post.new :text => "testing",
-                      :_contact_id => tie.contact.inverse!.id
+                      :author_id => tie.receiver.id,
+                      :owner_id => tie.sender.id,
+                      :user_author_id => tie.receiver.id
 
       assert post.build_post_activity.allow? tie.receiver_subject, 'create'
 
@@ -49,7 +51,9 @@ describe Post do
       tie = Factory(:friend)
 
       post = Post.new :text => "testing",
-                      :_contact_id => tie.contact.inverse!.id
+                      :author_id => tie.receiver.id,
+                      :owner_id => tie.sender.id,
+                      :user_author_id => tie.receiver.id
 
       post.save!
 

data/documents/app/assets/stylesheets/show.css.scss

@@ -41,6 +41,10 @@
   float: left;
   margin-left: 30px;
 }
+#document_info #description{
+  margin: 15px 40px; 
+  text-align: justify;
+}
 #document_info #actions{
   margin-top: 10px; 
   margin-left: 30px; 

data/documents/app/controllers/documents_controller.rb

@@ -1,13 +1,11 @@
-class DocumentsController < InheritedResources::Base
+class DocumentsController < ApplicationController
   include ActionView::Helpers::SanitizeHelper
-  respond_to :html, :js
+  include SocialStream::Controllers::Objects
 
   belongs_to_subjects :optional => true
 
   before_filter :profile_subject!, :only => :index
 
-  load_and_authorize_resource :except => :index
-
   PER_PAGE=20
   SEND_FILE_METHOD = :default
   
@@ -67,12 +65,6 @@ class DocumentsController < InheritedResources::Base
     send_file(path, send_file_options)
   end
 
-  def destroy
-    @post_activity = resource.post_activity
-
-    destroy!
-  end
-
   private
 
   def collection

data/documents/app/views/audios/_audio_processed.html.erb

@@ -4,7 +4,7 @@
               :class => "" %>
 </div>
 <div class="attachment_text">
-  <%= t('audio.msg') %><%= link_to "\""+audio.file_file_name+"\"",
+  <%= t('audio.msg') %><%= link_to "\""+audio.title+"\"",
                                    audio_path(audio),
                                    :class => "attachment_text_link" %>
 </div>

data/documents/app/views/audios/_audio_processing.html.erb

@@ -2,6 +2,6 @@
   <%= thumb_for(audio, 16) %>
 </div>
 <div class="attachment_text">
-  <%= t('audio.msg') %><%= "\""+audio.file_file_name+"\"" %>
+  <%= t('audio.msg') %><%= "\""+audio.title+"\"" %>
   <div class="processing_text"><%= t('audio.processing')%></div>
 </div>

data/documents/app/views/common_documents/_document_info.html.erb

@@ -1,4 +1,9 @@
 <div id="document_info">
+  <% if document.description %>
+    <div id="description">
+    	<%= document.description %>
+    </div>
+  <% end %>
   <div id="actions">
     <%= link_to content_tag(:span,image_tag("btn/btn_write.png") + t('document.actions.details'), :class => :action, :id => :document_details_action), "javascript:toggleDocumentMenu('details');" %>
     <%= link_to content_tag(:span,image_tag("btn/download.png") + t('document.actions.download'), :class => :action), download_document_path(document) %>

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

@@ -7,7 +7,7 @@
   </div>
 
   <div class="attachment_text">
-  	<%= t('document.msg') %><%= link_to "\""+document.file_file_name+"\"", 
+  	<%= t('document.msg') %><%= link_to "\""+document.title+"\"", 
     document,  
     :class => "attachment_text_link" %>
   </div>

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

@@ -4,15 +4,15 @@
     <%= link_to thumb_for(picture, 16),
                  picture_path(picture),
                 :type => picture.type, 
-            		:title => picture.file_file_name,
+            		:title => picture.title,
             		:path => document_path(picture) %>
   </div>
   
   <div class="attachment_text picture_summary_class picture_link">
   	<%= t('picture.msg') %>
-  	<%= link_to "\""+picture.file_file_name+"\"", 
+  	<%= link_to "\""+picture.title+"\"", 
                 picture_path(picture),
-                :alt => picture.file_file_name,
+                :alt => picture.title,
                	:type => picture.type,
                	:path => document_path(picture),
                 :class => "attachment_text_link" %>
@@ -22,7 +22,7 @@
     <%= link_to thumb_for(picture, 130),
                 download_document_path(picture),
         :type => picture.type, 
-		:title => picture.file_file_name,
+		:title => picture.title,
 		:path => document_path(picture) %>
   </div>
 <% end %>

data/documents/app/views/videos/_video_processed.html.erb

@@ -5,7 +5,7 @@
   :class => "" %>
 </div>
 <div class="attachment_text">
-  <%= t('video.msg') %><%= link_to "\""+video.file_file_name+"\"",
+  <%= t('video.msg') %><%= link_to "\""+video.title+"\"",
   video,
   :class => "attachment_text_link" %>
   <div id="video_thumbnail_<%= video.id%>" class="video_thumbnail_class">

data/documents/app/views/videos/_video_processing.html.erb

@@ -2,6 +2,6 @@
   <%= thumb_for(video, 16) %>
 </div>
 <div class="attachment_text">
-  <%= t('video.msg') %><%= "\""+video.file_file_name+"\"" %>
+  <%= t('video.msg') %><%= "\""+video.title+"\"" %>
   <div class="processing_text"><%= t('video.processing')%></div>
 </div>

data/documents/lib/social_stream/documents/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Documents
-    VERSION = "0.4.8".freeze
+    VERSION = "0.5.0".freeze
   end
 end