social_stream-base 0.12.1 → 0.13.0

data/lib/social_stream/toolbar_config/base.rb

@@ -76,7 +76,7 @@ module SocialStream
             :url => new_message_path,
             :options => {:link =>{:remote=> false}}}
           items << { :key => :message_inbox,
-            :name => image_tag("btn/message_inbox.png")+t('message.inbox')+' (' + current_subject.mailbox.inbox(:unread => true).count.to_s + ')',
+            :name => image_tag("btn/message_inbox.png")+t('message.inbox')+' (' + current_subject.unread_messages_count.to_s + ')',
             :url => conversations_path,
             :options => {:link =>{:remote=> false}}}
           items << { :key => :message_sentbox,

data/lib/tasks/db/populate.rake

@@ -12,7 +12,7 @@ namespace :db do
       require 'forgery'
 
       LOGOS_PATH = File.join(Rails.root, 'lib', 'logos')
-      LOGOS_TOTAL = (ENV["LOGOS_TOTAL"] || 10).to_i if ENV["LOGOS_TOTAL"].present?
+      LOGOS_TOTAL = (ENV["LOGOS_TOTAL"] || 10).to_i
       USERS = (ENV["USERS"] || 9).to_i
       GROUPS = (ENV["GROUPS"] || 10).to_i
       CHEESECAKE = (ENV["CHEESECAKE"].present? || false)

data/social_stream-base.gemspec

@@ -34,11 +34,11 @@ Gem::Specification.new do |s|
   # Authorization
   s.add_runtime_dependency('cancan', '~> 1.6.4')
   # Pagination
-  s.add_runtime_dependency('kaminari', '~> 0.12.4')
+  s.add_runtime_dependency('kaminari', '~> 0.13.0')
   # OAuth client
   s.add_runtime_dependency('omniauth','~> 0.2.6')
   # Messages
-  s.add_runtime_dependency('mailboxer','~> 0.5.4')
+  s.add_runtime_dependency('mailboxer','~> 0.6.0')
   # Tagging
   s.add_runtime_dependency('acts-as-taggable-on','~> 2.0.6')
   # HTML Forms

data/spec/controllers/comments_controller_spec.rb

@@ -13,7 +13,7 @@ describe CommentsController do
 
     describe "comment from user" do
       before do
-        activity = Factory(:self_activity, :contact => Factory(:self_contact, :sender => @user.actor))
+        activity = Factory(:self_activity, :channel => @user.self_channel)
 
         model_attributes[:author_id] = @user.actor_id
         model_attributes[:owner_id]  = @user.actor_id
@@ -38,7 +38,7 @@ describe CommentsController do
     describe "comment to friend" do
       before do
         f = Factory(:friend, :contact => Factory(:contact, :receiver => @user.actor)).sender
-        activity = Factory(:self_activity, :contact => f.contact_to!(f))
+        activity = Factory(:self_activity, :channel => f.contact_to!(f).channel)
 
         model_attributes[:author_id] = @user.actor_id
         model_attributes[:owner_id]  = f.id
@@ -52,7 +52,7 @@ describe CommentsController do
     describe "post to acquaintance" do
       before do
         a = Factory(:acquaintance, :contact => Factory(:contact, :receiver => @user.actor)).sender
-        activity = Factory(:self_activity, :contact => a.contact_to!(a))
+        activity = Factory(:self_activity, :channel => a.self_channel)
 
         model_attributes[:author_id] = @user.actor_id
         model_attributes[:owner_id]  = a.id

data/spec/factories/activity.rb

@@ -23,14 +23,14 @@ end
 ## End of helpers
 
 Factory.define :activity do |a|
-  a.contact { Factory(:friend).contact }
+  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) }
 end
 
 Factory.define :self_activity, :parent => :activity do |a|
-  a.contact { Factory(:self_contact) }
+  a.channel { Factory(:self_contact).channel }
   a.relation_ids  { |b| Array(b.sender.relation_custom('friend').id) }
 end
 
@@ -40,7 +40,7 @@ end
 
 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.channel { |b| Factory(:friend, :sender => b.parent.sender).receiver.contact_to!(b.parent.sender).channel }
   a.activity_verb { ActivityVerb["like"] }
   a.relation_ids  { |b| b.parent.relation_ids }
   a.after_build{ |b| b.activity_object_ids = b.parent.activity_object_ids }

data/spec/factories/contact.rb

@@ -1,6 +1,7 @@
 Factory.define :contact do |c|
   c.sender   { |s| Factory(:user).actor }
   c.receiver { |r| Factory(:user).actor }
+  c.user_author { |d| d.sender }
 end
 
 Factory.define :self_contact, :parent => :contact do |c|
@@ -9,6 +10,7 @@ end
 
 Factory.define :group_contact, :parent => :contact do |g|
   g.sender { |s| Factory(:group).actor }
+  g.after_build { |h| h.user_author = h.sender.user_author }
 end
 
 Factory.define :g2g_contact, :parent => :group_contact do |g|

data/spec/models/activity_authorization_spec.rb

@@ -281,7 +281,11 @@ describe Activity do
     describe "build to non replied contact" do
       before do
         @tie = Factory(:friend, :contact => Factory(:contact, :sender => @user.actor))
-        @activity = Activity.new :contact_id => @tie.contact.id
+        partner = @tie.receiver
+        @activity = Activity.new :author => @user.actor,
+                                 :user_author => @user.author,
+                                 :owner => partner
+
         create_ability_accessed_by @tie.sender_subject
       end
 

data/spec/models/like_spec.rb

@@ -20,7 +20,7 @@ describe Like do
   describe "actor" do
     shared_examples_for "creates activity" do
       it "should recognize the user who likes it" do
-        Like.build(@sender, @receiver).save
+        Like.build(@sender, @sender, @receiver).save
 
         assert @receiver.liked_by?(@sender)
       end
@@ -28,13 +28,13 @@ describe Like do
       it "should increment like count" do
         count = @receiver.like_count
 
-        Like.build(@sender, @receiver).save
+        Like.build(@sender, @sender, @receiver).save
 
         @receiver.like_count.should eq(count + 1)
       end
 
       it "should decrement like count" do
-        @like = Like.build(@sender, @receiver)
+        @like = Like.build(@sender, @sender, @receiver)
         @like.save
 
         count = @receiver.like_count

data/spec/models/tie_spec.rb

@@ -41,8 +41,8 @@ describe Tie do
     end
 
     it "should create activity with follow verb" do
-      @tie.contact.activities.should be_present
-      @tie.contact.activities.first.verb.should eq('follow')
+      @tie.contact.channel.activities.should be_present
+      @tie.contact.channel.activities.first.verb.should eq('follow')
     end
 
     context "reciprocal" do
@@ -51,8 +51,8 @@ describe Tie do
       end
 
       it "should create activity with make-friend verb" do
-        @reciprocal.contact.activities.should be_present
-        @reciprocal.contact.activities.first.verb.should eq('make-friend')
+        @reciprocal.contact.channel.activities.should be_present
+        @reciprocal.contact.channel.activities.first.verb.should eq('make-friend')
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream-base
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.13.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-13 00:00:00.000000000Z
+date: 2012-01-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &81513820 !ruby/object:Gem::Requirement
+  requirement: &87147360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *81513820
+  version_requirements: *87147360
 - !ruby/object:Gem::Dependency
   name: ancestry
-  requirement: &81511060 !ruby/object:Gem::Requirement
+  requirement: &87146580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *81511060
+  version_requirements: *87146580
 - !ruby/object:Gem::Dependency
   name: foreigner
-  requirement: &81510560 !ruby/object:Gem::Requirement
+  requirement: &87146010 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *81510560
+  version_requirements: *87146010
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &81510130 !ruby/object:Gem::Requirement
+  requirement: &87145600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 1.4.5
   type: :runtime
   prerelease: false
-  version_requirements: *81510130
+  version_requirements: *87145600
 - !ruby/object:Gem::Dependency
   name: inherited_resources
-  requirement: &81509650 !ruby/object:Gem::Requirement
+  requirement: &87145150 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *81509650
+  version_requirements: *87145150
 - !ruby/object:Gem::Dependency
   name: stringex
-  requirement: &81509240 !ruby/object:Gem::Requirement
+  requirement: &87144860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *81509240
+  version_requirements: *87144860
 - !ruby/object:Gem::Dependency
   name: avatars_for_rails
-  requirement: &81508890 !ruby/object:Gem::Requirement
+  requirement: &87144600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 0.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *81508890
+  version_requirements: *87144600
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &81508570 !ruby/object:Gem::Requirement
+  requirement: &87144290 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,10 +99,10 @@ dependencies:
         version: 1.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *81508570
+  version_requirements: *87144290
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &81508100 !ruby/object:Gem::Requirement
+  requirement: &87144010 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,21 +110,21 @@ dependencies:
         version: 1.6.4
   type: :runtime
   prerelease: false
-  version_requirements: *81508100
+  version_requirements: *87144010
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &81507680 !ruby/object:Gem::Requirement
+  requirement: &87143760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.12.4
+        version: 0.13.0
   type: :runtime
   prerelease: false
-  version_requirements: *81507680
+  version_requirements: *87143760
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &81506890 !ruby/object:Gem::Requirement
+  requirement: &87143510 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,21 +132,21 @@ dependencies:
         version: 0.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *81506890
+  version_requirements: *87143510
 - !ruby/object:Gem::Dependency
   name: mailboxer
-  requirement: &81491250 !ruby/object:Gem::Requirement
+  requirement: &87143260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *81491250
+  version_requirements: *87143260
 - !ruby/object:Gem::Dependency
   name: acts-as-taggable-on
-  requirement: &81488420 !ruby/object:Gem::Requirement
+  requirement: &87142970 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -154,10 +154,10 @@ dependencies:
         version: 2.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *81488420
+  version_requirements: *87142970
 - !ruby/object:Gem::Dependency
   name: formtastic
-  requirement: &81484750 !ruby/object:Gem::Requirement
+  requirement: &87136950 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -165,10 +165,10 @@ dependencies:
         version: 1.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *81484750
+  version_requirements: *87136950
 - !ruby/object:Gem::Dependency
   name: simple-navigation
-  requirement: &81478410 !ruby/object:Gem::Requirement
+  requirement: &87136310 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -176,10 +176,10 @@ dependencies:
         version: 3.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *81478410
+  version_requirements: *87136310
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &81476140 !ruby/object:Gem::Requirement
+  requirement: &87135970 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -187,10 +187,10 @@ dependencies:
         version: 1.19.0
   type: :runtime
   prerelease: false
-  version_requirements: *81476140
+  version_requirements: *87135970
 - !ruby/object:Gem::Dependency
   name: modernizr-rails
-  requirement: &81472400 !ruby/object:Gem::Requirement
+  requirement: &87135410 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -198,10 +198,10 @@ dependencies:
         version: 2.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *81472400
+  version_requirements: *87135410
 - !ruby/object:Gem::Dependency
   name: thinking-sphinx
-  requirement: &82552000 !ruby/object:Gem::Requirement
+  requirement: &87134490 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -209,10 +209,10 @@ dependencies:
         version: 2.0.8
   type: :runtime
   prerelease: false
-  version_requirements: *82552000
+  version_requirements: *87134490
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &82558110 !ruby/object:Gem::Requirement
+  requirement: &87133610 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -220,10 +220,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *82558110
+  version_requirements: *87133610
 - !ruby/object:Gem::Dependency
   name: rails_autolink
-  requirement: &82566760 !ruby/object:Gem::Requirement
+  requirement: &87133290 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -231,10 +231,10 @@ dependencies:
         version: 1.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *82566760
+  version_requirements: *87133290
 - !ruby/object:Gem::Dependency
   name: social_cheesecake
-  requirement: &82569140 !ruby/object:Gem::Requirement
+  requirement: &87132800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -242,10 +242,10 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *82569140
+  version_requirements: *87132800
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &82570980 !ruby/object:Gem::Requirement
+  requirement: &87132280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -253,10 +253,10 @@ dependencies:
         version: 0.3.9
   type: :development
   prerelease: false
-  version_requirements: *82570980
+  version_requirements: *87132280
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &82584710 !ruby/object:Gem::Requirement
+  requirement: &87131910 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -264,10 +264,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *82584710
+  version_requirements: *87131910
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &83226840 !ruby/object:Gem::Requirement
+  requirement: &87131520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -275,10 +275,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *83226840
+  version_requirements: *87131520
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &84254960 !ruby/object:Gem::Requirement
+  requirement: &87131120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -286,10 +286,10 @@ dependencies:
         version: 2.6.1
   type: :development
   prerelease: false
-  version_requirements: *84254960
+  version_requirements: *87131120
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &84656010 !ruby/object:Gem::Requirement
+  requirement: &87130760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -297,10 +297,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *84656010
+  version_requirements: *87130760
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &84751720 !ruby/object:Gem::Requirement
+  requirement: &87130370 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -308,10 +308,10 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *84751720
+  version_requirements: *87130370
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &84867950 !ruby/object:Gem::Requirement
+  requirement: &87129950 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -319,10 +319,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *84867950
+  version_requirements: *87129950
 - !ruby/object:Gem::Dependency
   name: nifty-generators
-  requirement: &84959500 !ruby/object:Gem::Requirement
+  requirement: &87129440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -330,7 +330,7 @@ dependencies:
         version: 0.4.5
   type: :development
   prerelease: false
-  version_requirements: *84959500
+  version_requirements: *87129440
 description: ! 'Social Stream is a Ruby on Rails engine providing your application
   with social networking features and activity streams.
 
@@ -454,6 +454,8 @@ files:
 - app/assets/images/cancel.png
 - app/assets/images/cleditor/buttons.gif
 - app/assets/images/cleditor/toolbar.gif
+- app/assets/images/flags/en.png
+- app/assets/images/flags/es.png
 - app/assets/images/frontpage/collaborate.png
 - app/assets/images/frontpage/comments.png
 - app/assets/images/frontpage/green_sq.png
@@ -519,7 +521,6 @@ files:
 - app/assets/javascripts/ties.js
 - app/assets/javascripts/toolbar.js
 - app/assets/javascripts/users.js
-- app/assets/stylesheets/0_devise_sign.css
 - app/assets/stylesheets/_colors.scss
 - app/assets/stylesheets/activities.css.scss
 - app/assets/stylesheets/base.css.scss
@@ -589,6 +590,7 @@ files:
 - app/helpers/contacts_helper.rb
 - app/helpers/groups_helper.rb
 - app/helpers/location_helper.rb
+- app/helpers/notifications_helper.rb
 - app/helpers/permissions_helper.rb
 - app/helpers/profiles_helper.rb
 - app/helpers/search_helper.rb
@@ -639,8 +641,10 @@ files:
 - app/views/api/activity_atom_feed.atom.builder
 - app/views/avatars/index.html.erb
 - app/views/avatars/update.js.erb
+- app/views/cheesecake/_cheesecake.html.erb
 - app/views/cheesecake/_index.html.erb
 - app/views/cheesecake/index.html.erb
+- app/views/cheesecake/update.js.erb
 - app/views/comments/_comment.html.erb
 - app/views/comments/_new.html.erb
 - app/views/comments/create.js.erb
@@ -704,6 +708,7 @@ files:
 - app/views/invitations/new.html.erb
 - app/views/invitations/new.js.erb
 - app/views/layouts/_account.html.erb
+- app/views/layouts/_devise_style.html.erb
 - app/views/layouts/_flash.html.erb
 - app/views/layouts/_footer.html.erb
 - app/views/layouts/_header.erb
@@ -822,6 +827,7 @@ files:
 - db/migrate/20120103103125_add_channels.rb
 - db/migrate/20120109081509_update_notify_permissions.rb
 - db/migrate/20120111120920_remove_language_default.rb
+- db/migrate/20120111141717_activity_channels.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
@@ -844,6 +850,7 @@ files:
 - lib/social_stream/d3.rb
 - lib/social_stream/migrations/base.rb
 - lib/social_stream/migrations/components.rb
+- lib/social_stream/models/channeled.rb
 - lib/social_stream/models/object.rb
 - lib/social_stream/models/subject.rb
 - lib/social_stream/models/subtype.rb
@@ -952,7 +959,6 @@ files:
 - vendor/assets/javascripts/jquery.validate.js
 - vendor/assets/javascripts/jquery.validate.old.js
 - vendor/assets/javascripts/jquery.watermarkinput.js
-- vendor/assets/javascripts/menu.js
 - vendor/assets/javascripts/superfish.js
 - vendor/assets/stylesheets/carousel.css
 - vendor/assets/stylesheets/chosen-sprite.png