social_stream 1.1.12 → 2.0.0.beta1

data/base/social_stream-base.gemspec

@@ -6,8 +6,7 @@ Gem::Specification.new do |s|
   s.version = SocialStream::Base::VERSION.dup
   s.summary = "Basic features 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 packages the basic functionality, along with basic actors (user, group) and activity objects (post and comments)"
-  s.authors = [ "GING - DIT - UPM",
-                "CISE - ESPOL" ]
+  s.authors = [ "GING - DIT - UPM" ]
   s.homepage = "http://social-stream.dit.upm.es/"
   s.files = `git ls-files`.split("\n")
 
@@ -26,28 +25,29 @@ Gem::Specification.new do |s|
   # SQL foreign keys
   s.add_runtime_dependency('foreigner', '~> 1.1.1')
   # Authentication
-  s.add_runtime_dependency('devise', '~> 2.1.2')
+  s.add_runtime_dependency('devise', '~> 2.2.3')
   # CRUD controllers
   s.add_runtime_dependency('inherited_resources', '~> 1.3.0')
   # Slug generation
-  s.add_runtime_dependency('stringex', '~> 1.3.0')
+  s.add_runtime_dependency('stringex', '~> 1.5.1')
   # Avatar attachments
-  s.add_runtime_dependency('avatars_for_rails', '~> 0.2.8')
+  s.add_runtime_dependency('avatars_for_rails', '~> 1.0.4')
   # jQuery
-  s.add_runtime_dependency('jquery-rails', '~> 2.1.4')
+  s.add_runtime_dependency('jquery-rails', '>= 1.0.9')
+  # Select2 javascript library
+  s.add_runtime_dependency('select2-rails', '~> 3.3.0')
   # Authorization
   s.add_runtime_dependency('cancan', '~> 1.6.7')
   # Pagination
   s.add_runtime_dependency('kaminari', '~> 0.13.0')
   # OAuth client
+  s.add_runtime_dependency('omniauth-socialstream', '~> 0.1.2')
   s.add_runtime_dependency('omniauth-facebook','~> 1.4.1')
   s.add_runtime_dependency('omniauth-linkedin','~> 0.0.6')
   # Messages
-  s.add_runtime_dependency('mailboxer','~> 0.6.5')
+  s.add_runtime_dependency('mailboxer','~> 0.10.2')
   # Tagging
   s.add_runtime_dependency('acts-as-taggable-on','~> 2.2.2')
-  # HTML Forms
-  s.add_runtime_dependency('formtastic','>= 1.2.3')
   # Background jobs
   s.add_runtime_dependency('resque','~> 1.23.0')
   # Modernizr.js javascript library
@@ -56,14 +56,18 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('thinking-sphinx', '~> 2.0.8')
   # Syntactically Awesome Stylesheets
   s.add_runtime_dependency('sass-rails', '>= 3.1.0')
+  # Bootstrap for Sass
+  s.add_runtime_dependency('bootstrap-sass', '~> 2.2.2.0')
+  # Customize ERB views
+  s.add_runtime_dependency('deface', '~> 0.9.1')
   # Autolink text blocks
   s.add_runtime_dependency('rails_autolink', '~> 1.0.4')
-  # SocialCheesecake
-  s.add_runtime_dependency('social_cheesecake','~> 0.5.0')
   # I18n-js
   s.add_runtime_dependency('i18n-js','~>2.1.2')
   # Strong Parameters
   s.add_runtime_dependency('strong_parameters','~> 0.1.5')
+  # Flash messages
+  s.add_runtime_dependency('flashy','~> 0.0.1')
 
   # Development gem dependencies
   #

data/base/spec/controllers/contacts_controller_spec.rb

@@ -11,26 +11,32 @@ describe ContactsController do
     @user = @tie.sender_subject
   end
 
-  it "should render index" do
-    sign_in @user
+  context "anonymous" do
+    it "should render index" do
+      get 'index', user_id: @user.to_param
 
-    get 'index'
-    response.should be_success
+      response.should be_success
+    end
   end
 
-  it "should render pending" do
-    sign_in @user
+  context "authenticated" do
+    before do
+      sign_in @user
+    end
 
-    get 'pending'
-    response.should be_success
+    it "should render index" do
+      get 'index'
+
+      response.should be_success
+    end
   end
 
-  it "should render edit" do
-    sign_in @user
+  it "should render pending" do
+    pending
 
-    get :edit, :id => @tie.contact_id
+    get 'pending'
 
-    assert_response :success
+    response.should be_success
   end
 
   it "should render update" do
@@ -93,14 +99,6 @@ describe ContactsController do
       @contact = @user.ego_contact
     end
 
-    it "should redirect edit" do
-      sign_in @user
-
-      get :edit, :id => @contact
-
-      response.should redirect_to(home_path)
-    end
-
     it "should render update" do
       sign_in @user
 

data/base/spec/controllers/explore_controller_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+describe ExploreController do
+  render_views
+
+  describe 'explore' do
+    it "should render" do
+      get :index
+
+      response.should be_success
+    end
+  end
+
+  describe 'participants' do
+    it "should render" do
+      get :index, section: :participants
+
+      response.should be_success
+    end
+  end
+
+  describe 'resources' do
+    it "should render" do
+      get :index, section: :resources
+
+      response.should be_success
+    end
+  end
+
+  describe 'timeline' do
+    before do
+      Factory(:public_activity)
+    end
+
+    it "should render" do
+      get :index, section: 'timeline'
+
+      response.should be_success
+    end
+  end
+end

data/base/spec/controllers/groups_controller_spec.rb

@@ -7,18 +7,6 @@ describe GroupsController do
   render_views
 
   describe "when Anonymous" do
-    it "should render index" do
-      get :index
-
-      assert_response :success
-    end
-
-    it "should render index with most followed" do
-      get :index, :most => 'followed'
-
-      response.should be_success
-    end
-
     it "should render show" do
       get :show, :id => Factory(:group).to_param
 
@@ -56,18 +44,12 @@ describe GroupsController do
       sign_in @user
     end
 
-    it "should render index" do
-      get :index
-
-      assert_response :success
-    end
-
     it "should render contact group" do
       @group = Factory(:member, :contact => Factory(:group_contact, :receiver => @user.actor)).sender_subject
       get :show, :id => @group.to_param
 
       response.should be_success
-      response.body.should =~ /activities_share_btn/
+      response.body.should =~ /new_post/
     end
 
     it "should render other group" do
@@ -93,7 +75,7 @@ describe GroupsController do
         Group.count.should eq(count + 1)
         assigns(:current_subject).should eq(group)
         response.should redirect_to(:home)
-        @user.receivers.should include(group.actor)
+        @user.senders.should include(group.actor)
       end
 
       context "with participants" do
@@ -106,7 +88,7 @@ describe GroupsController do
           count = Group.count
           post :create,
                :group => { :name => "Test group",
-                           :_participants => [ @user_participant.actor_id, @group_participant.actor_id ] }
+                           :_participants => [ @user_participant.actor_id, @group_participant.actor_id ].join(',') }
 
           group = assigns(:group)
 

data/base/spec/controllers/home_controller_spec.rb

@@ -22,7 +22,7 @@ describe HomeController do
       get :index
 
       response.should be_success
-      response.body.should =~ /activities_share_btn/
+      response.body.should =~ /new_post/
     end
 
     context "with a group" do
@@ -35,7 +35,7 @@ describe HomeController do
         get :index
 
         response.should be_success
-        response.body.should =~ /activities_share_btn/
+        response.body.should =~ /new_post/
       end
     end
 

data/base/spec/controllers/notifications_controller_spec.rb

@@ -34,7 +34,7 @@ describe NotificationsController do
     put :update_all
     @receipt.notification.is_unread?(@actor).should==false
     @receipt2.notification.is_unread?(@actor).should==false
-    assert_response :success
+    response.should redirect_to(notifications_path)
   end
   
   it "should send to trash" do

data/base/spec/controllers/permissions_controller_spec.rb

@@ -18,7 +18,7 @@ describe PermissionsController do
       end
 
       it "should render index" do
-        get :index, :relation_id => @relation.id, :format => "js"
+        get :index, :relation_id => @relation.id, :format => "html"
 
         response.should be_success
       end
@@ -31,10 +31,10 @@ describe PermissionsController do
 
       it "should not render index" do
         begin
-          get :index, :relation_id => @relation.id, :format => "js"
+          get :index, :relation_id => @relation.id, :format => "html"
 
           assert false
-        rescue CanCan::AccessDenied
+        rescue ActiveRecord::RecordNotFound
           assigns(:permissions).should be_nil
         end
       end

data/base/spec/controllers/profiles_controller_spec.rb

@@ -11,25 +11,21 @@ describe ProfilesController do
     end
 
     it "should render show" do
-      get :show, :user_id => @user.to_param
+      get :show
 
       assert_response :success
     end
 
-    it "should render edit" do
-      get :edit, :user_id => @user.to_param
+    it "should render show.json" do
+      get :show, format: :json
 
       assert_response :success
     end
 
-    it "should not render others edit" do
-      begin
-        get :edit, :user_id => Factory(:user).to_param
+    it "should render show with user param" do
+      get :show, :user_id => @user.to_param
 
-        assert false
-      rescue CanCan::AccessDenied
-        assert true
-      end
+      assert_response :success
     end
 
     it "should update" do
@@ -73,22 +69,6 @@ describe ProfilesController do
       assert_response :success
     end
 
-    it "should render edit" do
-      get :edit, :group_id => @group.to_param
-
-      assert_response :success
-    end
-
-    it "should not render others edit" do
-      begin
-        get :edit, :group_id => Factory(:group).to_param
-
-        assert false
-      rescue CanCan::AccessDenied
-        assert true
-      end
-    end
-
     it "should update" do
       put :update, :group_id => @group.to_param, :profile => { :organization => "Social Stream" }
 

data/base/spec/controllers/users_controller_spec.rb

@@ -4,12 +4,6 @@ describe UsersController do
   render_views
 
   describe "when Anonymous" do
-    it "should render index" do
-      get :index
-
-      assert_response :success
-    end
-
     it "should render show" do
       get :show, :id => Factory(:friend, :receiver => Factory(:group).actor).sender_subject.to_param
 
@@ -53,12 +47,6 @@ describe UsersController do
       sign_in @user
     end
 
-    it "should render index" do
-      get :index
-
-      assert_response :success
-    end
-
     it "should render self page" do
       get :show, :id => @user.to_param
 

data/base/spec/factories/activity.rb

@@ -1,11 +1,11 @@
 # Helpers for building the post activity
 #
 class ActivityObjectSpecHelper < ActiveRecord::Base
-  set_table_name "activity_objects"
+  self.table_name = "activity_objects"
 end
 
 class PostSpecHelper < ActiveRecord::Base
-  set_table_name "posts"
+  self.table_name = "posts"
 
   belongs_to :activity_object_spec_helper, :foreign_key => "activity_object_id"
 end

data/base/spec/models/activity_object_property_spec.rb

@@ -0,0 +1,59 @@
+require 'spec_helper'
+
+describe ActivityObjectProperty do
+  describe "siblings" do
+    it "should work" do
+      holder, one, two, three = 4.times.map{ Factory(:post) }
+
+      p = ActivityObjectProperty.create! activity_object_id: holder.activity_object_id,
+                                         property_id:        one.activity_object_id
+
+      p.siblings.should be_blank
+      p.main.should be_true
+
+      q = ActivityObjectProperty.create! activity_object_id: holder.activity_object_id,
+                                         property_id:        two.activity_object_id
+
+      p.siblings.should include(q)
+      p.reload.main.should be_true
+      q.main.should be_false
+
+      r = ActivityObjectProperty.create! activity_object_id: holder.activity_object_id,
+                                         property_id:        three.activity_object_id,
+                                         main:               true
+
+      r.siblings.should include(p)
+      r.siblings.should include(q)
+
+      p.reload.main.should be_false
+      q.reload.main.should be_false
+      r.main.should be_true
+    end
+  end
+
+  context "with main_holder_object_ids" do
+    it "should be created" do
+      @holder = Factory(:post)
+
+      prop = Post.create! text: "Text",
+                          author: @holder.author,
+                          main_holder_object_ids: [ @holder.activity_object_id ]
+
+      @holder.posts.should include(prop)
+      @holder.main_post.should eq(prop)
+    end
+  end
+
+  context "with add_holder_post_id" do
+    it "should be created" do
+      @holder = Factory(:post)
+
+      prop = Post.create! text: "Text",
+                          author: @holder.author,
+                          add_holder_post_id: @holder.id
+
+      @holder.posts.should include(prop)
+      @holder.main_post.should eq(prop)
+    end
+  end
+end

data/base/spec/models/activity_spec.rb

@@ -10,45 +10,48 @@ describe Activity do
 
       describe "sender home" do
         it "should include activity" do
-          @activity.sender.wall(:home).should include(@activity)
+          Activity.timeline(:home, @activity.sender).should include(@activity)
         end
       end
 
       describe "receiver home" do
         it "should include activity" do
-          @activity.receiver.wall(:home).should include(@activity)
+          Activity.timeline(:home, @activity.receiver).should include(@activity)
         end
       end
 
       describe "alien home" do
         it "should not include activity" do
-          Factory(:user).wall(:home).should_not include(@activity)
+          Activity.timeline(:home, Factory(:user)).should_not include(@activity)
         end
       end
 
       describe "friend's profile" do
         it "should not include activity" do
           friend = Factory(:friend, :contact => Factory(:contact, :sender => @activity.sender)).receiver
-          friend.wall(:profile, :for => @activity.sender).should_not include(@activity)
+          Activity.timeline(friend, @activity.sender).should_not include(@activity)
         end
       end
 
       describe "sender profile" do
         context "for sender" do
           it "should include activity" do
-            @activity.sender.wall(:profile, :for => @activity.sender).should include(@activity)
+            Activity.timeline(@activity.sender, @activity.sender).should include(@activity)
           end
         end
 
         context "for receiver" do
           it "should include activity" do
-            @activity.sender.wall(:profile, :for => @activity.receiver).should include(@activity)
-            @activity.sender.wall(:profile,
-                                  :for => @activity.receiver,
-                                  :relation => @activity.relations.first).should include(@activity)
+            Activity.timeline(@activity.sender, @activity.receiver).should include(@activity)
           end
         end
       end
+
+      describe "public timeline" do
+        it "should not include activity" do
+          Activity.timeline.should_not include(@activity)
+        end
+      end
     end
 
     context "with a self friend activity" do
@@ -59,7 +62,13 @@ describe Activity do
       describe "friend's profile" do
         it "should not include activity" do
           friend = Factory(:friend, :contact => Factory(:contact, :sender => @activity.sender)).receiver
-          friend.wall(:profile, :for => @activity.sender).should_not include(@activity)
+          Activity.timeline(friend, @activity.sender).should_not include(@activity)
+        end
+      end
+
+      describe "public timeline" do
+        it "should not include activity" do
+          Activity.timeline.should_not include(@activity)
         end
       end
     end
@@ -71,38 +80,38 @@ describe Activity do
 
       describe "sender home" do
         it "should include activity" do
-          @activity.sender.wall(:home).should include(@activity)
+          Activity.timeline(:home, @activity.sender).should include(@activity)
         end
       end
 
       describe "receiver home" do
         it "should include activity" do
-          @activity.receiver.wall(:home).should include(@activity)
+          Activity.timeline(:home, @activity.receiver).should include(@activity)
         end
       end
 
       describe "alien home" do
         it "should not include activity" do
-          Factory(:user).wall(:home).should_not include(@activity)
+          Activity.timeline(:home, Factory(:user)).should_not include(@activity)
         end
       end
 
       describe "sender profile" do
         context "for sender" do
           it "should include activity" do
-            @activity.sender.wall(:profile, :for => @activity.sender).should include(@activity)
+            Activity.timeline(@activity.sender, @activity.sender).should include(@activity)
           end
         end
 
         context "for receiver" do
           it "should include activity" do
-            @activity.sender.wall(:profile, :for => @activity.receiver).should include(@activity)
+            Activity.timeline(@activity.sender, @activity.receiver).should include(@activity)
           end
         end
 
         context "for Anonymous" do
           it "should include activity" do
-            @activity.sender.wall(:profile, :for => nil).should include(@activity)
+            Activity.timeline(@activity.sender, nil).should include(@activity)
           end
         end
       end
@@ -110,22 +119,28 @@ describe Activity do
       describe "receiver profile" do
         context "for sender" do
           it "should include activity" do
-            @activity.receiver.wall(:profile, :for => @activity.sender).should include(@activity)
+            Activity.timeline(@activity.receiver, @activity.sender).should include(@activity)
           end
         end
 
         context "for receiver" do
           it "should include activity" do
-            @activity.receiver.wall(:profile, :for => @activity.receiver).should include(@activity)
+            Activity.timeline(@activity.receiver, @activity.receiver).should include(@activity)
           end
         end
 
         context "for Anonymous" do
           it "should include activity" do
-            @activity.receiver.wall(:profile, :for => nil).should include(@activity)
+            Activity.timeline(@activity.receiver, nil).should include(@activity)
           end
         end
       end
+
+      describe "public timeline" do
+        it "should include activity" do
+          Activity.timeline.should include(@activity)
+        end
+      end
     end
   end
 end