social_stream 0.25.2 → 0.26.0

data/base/lib/tasks/db/populate.rake

@@ -176,7 +176,7 @@ namespace :db do
                         :author_id  => author.id,
                         :owner_id   => owner.id,
                         :user_author_id => user_author.id,
-                        :_relation_ids => Array(t.relation_id)
+                        :relation_ids => Array(t.relation_id)
 
         p.post_activity.update_attributes(:created_at => p.created_at,
                                           :updated_at => p.updated_at)

data/base/lib/thinking-sphinx/social_stream.rb

@@ -0,0 +1,3 @@
+require 'social_stream/base/thinking-sphinx'
+
+ThinkingSphinx::Index::Builder.send :include, SocialStream::Base::ThinkingSphinx::Index::Builder

data/base/spec/controllers/groups_controller_spec.rb

@@ -170,16 +170,16 @@ describe GroupsController do
 
       it "should allow creating" do
         count = Group.count
-        post :create, :group => { :name => "Test" }
+        post :create, :group => { :name => "Test new group" }
 
-        group = assigns(:group)
+        new_group = assigns(:group)
 
-        group.should be_valid
+        new_group.should be_valid
         Group.count.should eq(count + 1)
-        assigns(:current_subject).should eq(group)
+        assigns(:current_subject).should eq(new_group)
         response.should redirect_to(:home)
-        @user.receivers.should include(group.actor)
-        @group.receivers.should include(group.actor)
+        @user.senders.should include(new_group.actor)
+        @group.senders.should include(new_group.actor)
       end
     end
   end

data/base/spec/controllers/posts_controller_spec.rb

@@ -53,7 +53,7 @@ describe PostsController do
             @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))
+                                     :relation_ids => Array(relation.id))
           end
 
           it_should_behave_like "Allow Creating"
@@ -78,7 +78,7 @@ describe PostsController do
             @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))
+                                     :relation_ids => Array(relation.id))
           end
 
           it_should_behave_like "Allow Creating"
@@ -149,7 +149,7 @@ describe PostsController do
             @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))
+                                     :relation_ids => Array(relation.id))
           end
 
           it_should_behave_like "Allow Creating"
@@ -170,7 +170,7 @@ describe PostsController do
               @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))
+                                       :relation_ids => Array(relation.id))
             end
 
             it_should_behave_like "Allow Creating"
@@ -186,7 +186,7 @@ describe PostsController do
               @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))
+                                       :relation_ids => Array(relation.id))
             end
 
             it_should_behave_like "Allow Creating"
@@ -202,7 +202,7 @@ describe PostsController do
               @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))
+                                       :relation_ids => Array(relation.id))
             end
 
             it_should_behave_like "Allow Creating"

data/base/spec/controllers/users_controller_spec.rb

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

data/base/spec/dummy/config/initializers/social_stream.rb

@@ -41,3 +41,6 @@ SocialStream.setup do |config|
   # Cleditor controls. It is used in new message editor, for example
   # config.cleditor_controls = "bold italic underline strikethrough subscript superscript | size style | bullets | image link unlink"
 end
+
+# You can customize toolbar, sidebar and location bar from here
+# See https://github.com/ging/social_stream/wiki/How-to-customize-the-toolbar,-sidebar-and-location

data/base/spec/factories/activity.rb

@@ -26,12 +26,35 @@ Factory.define :activity do |a|
   a.channel { Factory(:friend).contact.channel }
   a.activity_verb { ActivityVerb["post"] }
   a.relation_ids  { |b| Array(b.sender.relation_custom('friend').id) }
-  a.activity_object_ids { Array(Factory(:post_spec_helper).activity_object_spec_helper.id) }
+  a.activity_object_ids { |b|
+    # Create post
+    post = Factory(:post,
+                   :author_id => b.author_id,
+                   :owner_id  => b.owner_id,
+                   :user_author => b.user_author_id)
+
+    post.activities.delete_all
+
+    [post.activity_object_id]
+  }
 end
 
 Factory.define :self_activity, :parent => :activity do |a|
   a.channel { Factory(:self_contact).channel }
   a.relation_ids  { |b| Array(b.sender.relation_custom('friend').id) }
+  a.activity_object_ids { |b|
+    # Create post
+    post = Factory(:post,
+                   :author_id => b.author_id,
+                   :owner_id  => b.owner_id,
+                   :user_author => b.user_author_id,
+                   :relation_ids => b.relation_ids)
+
+    post.activities.delete_all
+
+    [post.activity_object_id]
+  }
+
 end
 
 Factory.define :public_activity, :parent => :activity do |a|

data/base/spec/factories/post.rb

@@ -7,7 +7,7 @@ end
 
 Factory.define :public_post, :parent => :post do |p|
   p.owner_id  { |q| q.author_id }
-  p._relation_ids { |q| Array(Relation::Public.instance.id) }
+  p.relation_ids { |q| Array(Relation::Public.instance.id) }
 end
 
 Factory.define :self_post, :parent => :post do |p|

data/base/spec/models/activity_authorization_spec.rb

@@ -6,7 +6,7 @@ module ActivityTestHelper
                         :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
+                        :relation_ids => Array(Relation.normalize_id(relations))).post_activity
   end
 
   def create_ability_accessed_by(subject)

data/base/spec/models/post_spec.rb

@@ -53,8 +53,6 @@ describe Post do
                         :owner_id => tie.sender.id,
                         :user_author_id => tie.receiver.id
 
-        assert post.build_post_activity.allow? tie.receiver_subject, 'create'
-
         ability = Ability.new(tie.receiver_subject)
 
         ability.should be_able_to(:create, post)
@@ -88,8 +86,6 @@ describe Post do
           :owner_id => tie.sender.id,
           :user_author_id => tie.receiver.id
 
-        assert post.build_post_activity.allow? tie.receiver_subject, 'create'
-
         ability = Ability.new(tie.receiver_subject)
 
         ability.should be_able_to(:create, post)

data/base/spec/models/relation_follow_spec.rb

@@ -0,0 +1,8 @@
+require 'spec_helper'
+
+describe Relation::Follow do
+  it "should have permissions" do
+    Relation::Follow.instance.permissions.should include(Permission.find_or_create_by_action_and_object('follow', nil))
+  end
+end
+

data/documents/app/controllers/documents_controller.rb

@@ -10,7 +10,7 @@ class DocumentsController < ApplicationController
   
   def index
     super do |format|
-      format.json { render :json => collection.map{|a| a.activity_objects.first.document.to_json} }
+      format.json { render :json => collection.map{|a| a.activity_objects.first.document} }
       if params[:no_layout].present?
         format.html { render :action => :index, :layout => false }      
       else  

data/documents/app/models/audio.rb

@@ -8,12 +8,9 @@ class Audio < Document
   process_in_background :file    
   
   define_index do
-    indexes activity_object.title
+    activity_object_index
+
     indexes file_file_name, :as => :file_name
-    indexes activity_object.description
-    indexes activity_object.tags.name, :as => :tags
-    
-    has created_at
   end 
               
   # Thumbnail file

data/documents/app/models/document.rb

@@ -15,14 +15,11 @@ class Document < ActiveRecord::Base
   end
   
   define_index do
-    indexes activity_object.title
+    activity_object_index
+
     indexes file_file_name, :as => :file_name
-    indexes activity_object.description
-    indexes activity_object.tags.name, :as => :tags
     
     where "type IS NULL"
-    
-    has created_at
   end
   
   class << self 
@@ -70,13 +67,13 @@ class Document < ActiveRecord::Base
   end
 
  # JSON, generic version for most documents
-  def to_json me=self
-    {:id => activity_object_id,
+  def as_json(options = nil)
+    {:id => id,
      :title => title,
      :description => description,
      :author => author.name,
      :src => file.to_s
-    }.to_json
+    }
   end
   
   protected

data/documents/app/models/picture.rb

@@ -10,12 +10,9 @@ class Picture < Document
                                }                              
                                
   define_index do
-    indexes activity_object.title
+    activity_object_index
+
     indexes file_file_name, :as => :file_name
-    indexes activity_object.description
-    indexes activity_object.tags.name, :as => :tags
-    
-    has created_at
   end    
 
   # Thumbnail file

data/documents/app/models/video.rb

@@ -1,6 +1,7 @@
 class Video < Document  
   has_attached_file :file, 
                     :url => '/:class/:id.:extension',
+                    :default_url => 'missing_:style.png',
                     :path => ':rails_root/documents/:class/:id_partition/:style',
                     :styles => {
                       :webm => {:format => 'webm'},
@@ -15,12 +16,9 @@ class Video < Document
   process_in_background :file
   
   define_index do
-    indexes activity_object.title
+    activity_object_index
+
     indexes file_file_name, :as => :file_name
-    indexes activity_object.description
-    indexes activity_object.tags.name, :as => :tags
-    
-    has created_at
   end
                       
   # Thumbnail file
@@ -29,8 +27,8 @@ class Video < Document
   end
 
  # JSON, special edition for video files
-  def to_json me=self
-    {:id => activity_object_id,
+  def as_json(options = nil)
+    {:id => id,
      :title => title,
      :description => description,
      :author => author.name,
@@ -39,7 +37,7 @@ class Video < Document
                    { :type => Mime::MP4.to_s,   :src => file(:mp4).to_s },
                    { :type => Mime::FLV.to_s, :src => file(:flv).to_s }
                  ]
-    }.to_json
+    }
   end
   
 end

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

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

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

@@ -7,9 +7,18 @@
   </div>
 
   <div class="attachment_text">
-  	<%= t('document.msg') %><%= link_to "\""+document.title+"\"", 
-    document,  
-    :class => "attachment_text_link" %>
+   <div class="title">
+    <%= document.title %>
+   </div>
+
+   <%= simple_format auto_link(document.description) %>
+
+   <%= link_to t('details.msg'),
+       document_path(document),
+       :alt => t('details.msg'),
+       :type => document.type,
+       :path => document_path(document),
+       :class => "attachment_text_link document_link" %>
   </div>
 
 <% end %>

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

@@ -15,9 +15,9 @@
 
 	<%= simple_format auto_link(picture.description) %>
 
-        <%= link_to t('picture.msg'),
+        <%= link_to t('details.msg'),
               picture_path(picture),
-              :alt => t('picture.msg'),
+              :alt => t('details.msg'),
               :type => picture.type,
               :path => document_path(picture),
               :class => "attachment_text_link picture_link" %>

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

@@ -10,9 +10,9 @@
 
   <%= simple_format auto_link(video.description) %>
 
-  <%= link_to t('video.msg'),
+  <%= link_to t('details.msg'),
     video,
-    :alt => t('picture.msg'),
+    :alt => t('details.msg'),
     :type => video.type,
     :path => document_path(video),
     :class => "attachment_text_link video_link" %>

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

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

data/documents/config/locales/en.yml

@@ -7,7 +7,6 @@ en:
     confirm_delete: "Delete audio?"
     title: "Audios"
     mine: "My audios"
-    msg: "Uploaded an audio:"
     name: "audio"
     not_mine: "Audios"
     one: "an audio"
@@ -15,6 +14,8 @@ en:
     title:
       one: "Audio"
       other: "Audios"
+  details:
+    msg: "See details..."
   document:
     actions:
       delete: "Delete"
@@ -36,7 +37,6 @@ en:
       title:
         title: "Title"
     mine: "My files"
-    msg: "Uploaded a file:"
     name: "file"
     not_mine: "Files"
     one: "a file"
@@ -47,7 +47,6 @@ en:
   picture:
     confirm_delete: "Delete picture?"
     mine: "My pictures"  
-    msg: "See details..."
     name: "picture"
     not_mine: "Pictures"
     one: "a picture"
@@ -65,12 +64,10 @@ en:
     confirm_delete: "Delete resource?"
     title: "Resources"
     mine: "My resources"
-    msg: "Uploaded a resource:"
     not_mine: "Resources"
   video:
     confirm_delete: "Delete video?"
     mine: "My videos"  
-    msg: "See details..."
     name: "video" 
     not_mine: "Videos"
     one: "a video"

data/documents/config/locales/es.yml

@@ -6,7 +6,6 @@ es:
   audio:
     confirm_delete: "¿Borrar audios?"
     mine: "Mis audios"
-    msg: "Subió un audio:"
     name: "archivo de audio"
     not_mine: "Audios"
     one: "un archivo de audio"
@@ -14,6 +13,8 @@ es:
     title:
       one: "Audio"
       other: "Audios"
+  details:
+    msg: "Ver detalles..."
   document:
     actions:
       delete: "Borrar"
@@ -35,7 +36,6 @@ es:
       title:
         title: "Título"
     mine: "Mis ficheros"
-    msg: "Subió un fichero:"
     name: "fichero"
     not_mine: "Ficheros"
     one: "un fichero"
@@ -46,7 +46,6 @@ es:
   picture:
     confirm_delete: "¿Borrar imagen?"
     mine: "Mis imágenes"
-    msg: "Ver detalles..."
     name: "imagen"
     not_mine: "Imágenes"
     one: "una imagen"
@@ -64,12 +63,10 @@ es:
     confirm_delete: "¿Borrar recursos?"
     title: "Recursos"
     mine: "Mis recursos"
-    msg: "Subió un recurso:"
     not_mine: "Recursos"
   video:
     confirm_delete: "¿Borrar vídeo?"
     mine: "Mis vídeos"  
-    msg: "Ver detalles..."
     name: "vídeo"
     not_mine: "Vídeos"
     one: "un vídeo"