social_stream-base 0.19.2 → 0.20.0

data/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/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/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/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/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/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/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/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/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/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/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
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream-base
 version: !ruby/object:Gem::Version
-  version: 0.19.2
+  version: 0.20.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-11 00:00:00.000000000Z
+date: 2012-04-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70579860 !ruby/object:Gem::Requirement
+  requirement: &90062230 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70579860
+  version_requirements: *90062230
 - !ruby/object:Gem::Dependency
   name: ancestry
-  requirement: &70578930 !ruby/object:Gem::Requirement
+  requirement: &90061980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *70578930
+  version_requirements: *90061980
 - !ruby/object:Gem::Dependency
   name: foreigner
-  requirement: &70577950 !ruby/object:Gem::Requirement
+  requirement: &90061750 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70577950
+  version_requirements: *90061750
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &70574700 !ruby/object:Gem::Requirement
+  requirement: &90061520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 1.5.3
   type: :runtime
   prerelease: false
-  version_requirements: *70574700
+  version_requirements: *90061520
 - !ruby/object:Gem::Dependency
   name: inherited_resources
-  requirement: &70573480 !ruby/object:Gem::Requirement
+  requirement: &90061290 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70573480
+  version_requirements: *90061290
 - !ruby/object:Gem::Dependency
   name: stringex
-  requirement: &70572580 !ruby/object:Gem::Requirement
+  requirement: &90061060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70572580
+  version_requirements: *90061060
 - !ruby/object:Gem::Dependency
   name: avatars_for_rails
-  requirement: &70571860 !ruby/object:Gem::Requirement
+  requirement: &90060830 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 0.2.5
   type: :runtime
   prerelease: false
-  version_requirements: *70571860
+  version_requirements: *90060830
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70570810 !ruby/object:Gem::Requirement
+  requirement: &90060600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: 1.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *70570810
+  version_requirements: *90060600
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &70569990 !ruby/object:Gem::Requirement
+  requirement: &90060370 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +110,10 @@ dependencies:
         version: 1.6.4
   type: :runtime
   prerelease: false
-  version_requirements: *70569990
+  version_requirements: *90060370
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &70550640 !ruby/object:Gem::Requirement
+  requirement: &90060140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -121,10 +121,10 @@ dependencies:
         version: 0.13.0
   type: :runtime
   prerelease: false
-  version_requirements: *70550640
+  version_requirements: *90060140
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &70535050 !ruby/object:Gem::Requirement
+  requirement: &90059910 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,10 +132,10 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70535050
+  version_requirements: *90059910
 - !ruby/object:Gem::Dependency
   name: omniauth-facebook
-  requirement: &70516810 !ruby/object:Gem::Requirement
+  requirement: &90059680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -143,10 +143,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70516810
+  version_requirements: *90059680
 - !ruby/object:Gem::Dependency
   name: omniauth-linkedin
-  requirement: &70478590 !ruby/object:Gem::Requirement
+  requirement: &90059450 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -154,10 +154,10 @@ dependencies:
         version: 0.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *70478590
+  version_requirements: *90059450
 - !ruby/object:Gem::Dependency
   name: mailboxer
-  requirement: &70462090 !ruby/object:Gem::Requirement
+  requirement: &90059220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -165,10 +165,10 @@ dependencies:
         version: 0.6.5
   type: :runtime
   prerelease: false
-  version_requirements: *70462090
+  version_requirements: *90059220
 - !ruby/object:Gem::Dependency
   name: acts-as-taggable-on
-  requirement: &70455800 !ruby/object:Gem::Requirement
+  requirement: &90058990 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -176,10 +176,10 @@ dependencies:
         version: 2.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70455800
+  version_requirements: *90058990
 - !ruby/object:Gem::Dependency
   name: formtastic
-  requirement: &70441270 !ruby/object:Gem::Requirement
+  requirement: &90058760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -187,10 +187,10 @@ dependencies:
         version: 1.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *70441270
+  version_requirements: *90058760
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &70424240 !ruby/object:Gem::Requirement
+  requirement: &90058530 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -198,10 +198,10 @@ dependencies:
         version: 1.20.0
   type: :runtime
   prerelease: false
-  version_requirements: *70424240
+  version_requirements: *90058530
 - !ruby/object:Gem::Dependency
   name: modernizr-rails
-  requirement: &70418210 !ruby/object:Gem::Requirement
+  requirement: &90058300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -209,10 +209,10 @@ dependencies:
         version: 2.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *70418210
+  version_requirements: *90058300
 - !ruby/object:Gem::Dependency
   name: thinking-sphinx
-  requirement: &70399320 !ruby/object:Gem::Requirement
+  requirement: &90058070 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -220,10 +220,10 @@ dependencies:
         version: 2.0.8
   type: :runtime
   prerelease: false
-  version_requirements: *70399320
+  version_requirements: *90058070
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &70397610 !ruby/object:Gem::Requirement
+  requirement: &90057840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -231,10 +231,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70397610
+  version_requirements: *90057840
 - !ruby/object:Gem::Dependency
   name: rails_autolink
-  requirement: &70395670 !ruby/object:Gem::Requirement
+  requirement: &90073990 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -242,10 +242,10 @@ dependencies:
         version: 1.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *70395670
+  version_requirements: *90073990
 - !ruby/object:Gem::Dependency
   name: social_cheesecake
-  requirement: &70393090 !ruby/object:Gem::Requirement
+  requirement: &90073760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -253,10 +253,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70393090
+  version_requirements: *90073760
 - !ruby/object:Gem::Dependency
   name: i18n-js
-  requirement: &70386590 !ruby/object:Gem::Requirement
+  requirement: &90073530 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -264,10 +264,10 @@ dependencies:
         version: 2.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70386590
+  version_requirements: *90073530
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70383160 !ruby/object:Gem::Requirement
+  requirement: &90073300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -275,10 +275,10 @@ dependencies:
         version: 0.3.9
   type: :development
   prerelease: false
-  version_requirements: *70383160
+  version_requirements: *90073300
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &70365160 !ruby/object:Gem::Requirement
+  requirement: &90073110 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -286,10 +286,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70365160
+  version_requirements: *90073110
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70362610 !ruby/object:Gem::Requirement
+  requirement: &90072870 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -297,10 +297,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70362610
+  version_requirements: *90072870
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70361030 !ruby/object:Gem::Requirement
+  requirement: &90072620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -308,10 +308,10 @@ dependencies:
         version: 2.6.1
   type: :development
   prerelease: false
-  version_requirements: *70361030
+  version_requirements: *90072620
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70359470 !ruby/object:Gem::Requirement
+  requirement: &90072370 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -319,10 +319,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *70359470
+  version_requirements: *90072370
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &70357500 !ruby/object:Gem::Requirement
+  requirement: &90072140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -330,10 +330,10 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *70357500
+  version_requirements: *90072140
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &70344680 !ruby/object:Gem::Requirement
+  requirement: &90071910 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -341,10 +341,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70344680
+  version_requirements: *90071910
 - !ruby/object:Gem::Dependency
   name: nifty-generators
-  requirement: &70339170 !ruby/object:Gem::Requirement
+  requirement: &90071680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -352,7 +352,7 @@ dependencies:
         version: 0.4.5
   type: :development
   prerelease: false
-  version_requirements: *70339170
+  version_requirements: *90071680
 description: ! 'Social Stream is a Ruby on Rails engine providing your application
   with social networking features and activity streams.
 
@@ -548,6 +548,7 @@ files:
 - app/assets/javascripts/social_stream.action.js
 - app/assets/javascripts/social_stream.activity.js
 - app/assets/javascripts/social_stream.comments.js
+- app/assets/javascripts/social_stream.follow.js
 - app/assets/javascripts/social_stream.objects.js
 - app/assets/javascripts/social_stream.search.js.erb
 - app/assets/javascripts/social_stream.timeline.js
@@ -643,6 +644,7 @@ files:
 - app/models/activity_action.rb
 - app/models/activity_object.rb
 - app/models/activity_object_activity.rb
+- app/models/activity_object_audience.rb
 - app/models/activity_object_property.rb
 - app/models/activity_verb.rb
 - app/models/actor.rb
@@ -878,6 +880,9 @@ files:
 - db/migrate/20120316093946_create_activity_actions.rb
 - db/migrate/20120316113728_activity_action_follow.rb
 - db/migrate/20120326083509_object_channels_to_actions.rb
+- db/migrate/20120403175913_create_activity_object_audiences.rb
+- db/migrate/20120411132550_add_visit_count_to_activity_object.rb
+- db/migrate/20120411151413_relation_public_permissions.rb
 - lib/acts_as_taggable_on/acts_as_taggable_on/dirty.rb
 - lib/acts_as_taggable_on/social_stream.rb
 - lib/generators/social_stream/base/install_generator.rb
@@ -893,6 +898,7 @@ files:
 - lib/social_stream/ability/base.rb
 - lib/social_stream/base/dependencies.rb
 - lib/social_stream/base/engine.rb
+- lib/social_stream/base/thinking-sphinx.rb
 - lib/social_stream/base/version.rb
 - lib/social_stream/controllers/cancan_devise_integration.rb
 - lib/social_stream/controllers/helpers.rb
@@ -915,11 +921,13 @@ files:
 - lib/social_stream/test_helpers.rb
 - lib/social_stream/test_helpers/controllers.rb
 - lib/social_stream/views/list.rb
+- lib/social_stream/views/location.rb
 - lib/social_stream/views/settings/base.rb
 - lib/social_stream/views/sidebar/base.rb
 - lib/social_stream/views/toolbar/base.rb
 - lib/tasks/db/populate.rake
 - lib/tasks/workers.rake
+- lib/thinking-sphinx/social_stream.rb
 - social_stream-base.gemspec
 - spec/controllers/comments_controller_spec.rb
 - spec/controllers/contacts_controller_spec.rb
@@ -991,6 +999,7 @@ files:
 - spec/models/like_spec.rb
 - spec/models/post_spec.rb
 - spec/models/profile_spec.rb
+- spec/models/relation_follow_spec.rb
 - spec/models/relation_spec.rb
 - spec/models/tie_spec.rb
 - spec/models/user_spec.rb