social_stream-base 0.17.3 → 0.18.0

data/lib/social_stream/models/object.rb

@@ -38,9 +38,7 @@ module SocialStream
 
       # Build the post activity when this object is not saved
       def build_post_activity
-        Activity.new :author       => author,
-                     :user_author  => user_author,
-                     :owner        => owner,
+        Activity.new :channel      => channel!,
                      :relation_ids => Array(_relation_ids)
       end
 

data/lib/social_stream/models/subtype.rb

@@ -1,21 +1,12 @@
 module SocialStream #:nodoc:
   module Models
     # Common methods for models that have a {SocialStream::Models::Supertype}
+    #
+    # Examples of subtypes are {User} and {Group}, which have {Actor} as supertype,
+    # or {Post} and {Comment}, which have {ActivityObject} as supertype
+    #
+    # Methods are documented taking User as example of {SocialStream::Models::Subtype}
     module Subtype
-      # Add the class method {#subtype_of} to ActiveRecord::Base
-      module ActiveRecord
-        extend ActiveSupport::Concern
-
-        module ClassMethods
-          # This class is a subtype. Its supertype class is name
-          def subtype_of name, options = {}
-            @supertype_name = name
-            @supertype_options = options
-            include SocialStream::Models::Subtype
-          end
-        end
-      end
-
       extend ActiveSupport::Concern
 
       included do
@@ -23,29 +14,30 @@ module SocialStream #:nodoc:
           attr_reader :supertype_name, :supertype_options
         end
 
-        belongs_to supertype_name, {
-                    :validate  => true,
-                    :autosave  => true,
-                    :dependent => :destroy
-                  }.merge(supertype_options[:belongs] || {})
+        belongs_to supertype_name, {                          # belongs_to :actor, {
+                    :validate  => true,                       #   :validate => true
+                    :autosave  => true,                       #   :autosave => true
+                    :dependent => :destroy                    #   :dependent => :destroy
+                  }.merge(supertype_options[:belongs] || {})  #   }.merge(supertype_options[:belongs] || {})
 
         class_eval <<-EOS
-          def #{ supertype_name }!                                      # def actor!
-            #{ supertype_name } ||                                      #   actor ||
+          def #{ supertype_name }!                                              # def actor!
+            #{ supertype_name } ||                                              #   actor ||
               # FIXME: ruby1.9 remove .inspect
               build_#{ supertype_name }(#{ supertype_options[:build].inspect }) #     build_actor(:subject_type => "User")
-          end                                                           # end
+          end                                                                   # end
 
         EOS
 
-        alias_method :supertype!, "#{ supertype_name }!"
+        alias_method :supertype!, "#{ supertype_name }!" # alias_method :supertype!, :actor!
 
-        before_validation :supertype!
+        # Load the supertype to ensure it is saved along with this instance
+        before_validation :supertype! # before_validation :actor!
       end
 
       module ClassMethods
         def supertype_foreign_key
-          "#{ supertype_name }_id"
+          "#{ supertype_name }_id" # "actor_id"
         end 
       end
 
@@ -77,6 +69,20 @@ module SocialStream #:nodoc:
 
         ! exceptions.include?(method)
       end
+
+      # Add the class method {#subtype_of} to ActiveRecord::Base
+      module ActiveRecord
+        extend ActiveSupport::Concern
+
+        module ClassMethods
+          # This class is a subtype. Its supertype class is name
+          def subtype_of name, options = {}
+            @supertype_name = name
+            @supertype_options = options
+            include SocialStream::Models::Subtype
+          end
+        end
+      end
     end
   end
 end

data/lib/social_stream/models/supertype.rb

@@ -2,36 +2,58 @@ module SocialStream #:nodoc:
   module Models
     # Common methods for models having many {SocialStream::Models::Subtype subtypes}.
     # Currently, there are two {SocialStream::Models::Supertype supertypes}:
-    # * {Actor}: participates in the social network and has {Tie Ties} with other actors. Its subtypes are {SocialStream::Models::Subject subjects}, such as {User} or {Group}
-    # * {ActivityObject}: created and managed by {Actor Actors} in {Activity Activities}. Its subtypes are {SocialStream::Models::Object objects}, like {Post} or {Comment}
+    # * {Actor}: participates in the social network and has {Tie Ties} with other actors.
+    #   Its subtypes are {SocialStream::Models::Subject subjects}, such as {User} or {Group}
+    # * {ActivityObject}: created and managed by {Actor Actors} in {Activity Activities}.
+    #   Its subtypes are {SocialStream::Models::Object objects}, like {Post} or {Comment}
+    #
+    # Methods are documented for the case of {Actor} supertype
     module Supertype
-      # Include the class method {#supertype_of} to ActiveRecord::Base
-      module ActiveRecord
-        extend ActiveSupport::Concern
-
-        module ClassMethods
-          # This class is a supertype. Subtype classes are known as name
-          def supertype_of name
-            @subtypes_name = name
-            include SocialStream::Models::Supertype
-          end
-        end
-      end
       extend ActiveSupport::Concern
 
       included do
-        subtypes.each do |s|
-          has_one s, :dependent => :destroy
-        end
+        subtypes.each do |s|                # [ :user, :group ].each do |s|
+          has_one s, :dependent => :destroy #   has_one s, :dependent => :destroy
+        end                                 # end
       end
 
       module ClassMethods
-        def subtypes_name
+        def subtypes_name # :subject
           @subtypes_name
         end
 
         def subtypes
-          SocialStream.__send__ subtypes_name.to_s.tableize # SocialStream.subjects # in Actor
+          SocialStream.__send__ subtypes_name.to_s.tableize # SocialStream.subjects # => [:user, :group ]
+        end
+
+        # Get the supertype id from an object, if possible
+        def normalize_id(a)
+          case a
+          when Integer
+            a
+          when Array
+            a.map{ |e| normalize_id(e) }
+          else
+            normalize(a).id
+          end
+        end
+
+        # Get supertype from object, if possible
+        def normalize(a)
+          case a
+          when self
+            a
+          when Integer
+            find a
+          when Array
+            a.map{ |e| normalize(e) }
+          else
+            begin
+              a.supertype!
+            rescue
+              raise "Unable to normalize #{ self } #{ a.inspect }"
+            end
+          end
         end
       end 
 
@@ -41,6 +63,19 @@ module SocialStream #:nodoc:
           __send__ object_class.constantize.base_class.to_s.underscore  #   __send__ "document"
                      end                                                # end
       end
+
+      # Include the class method {#supertype_of} to ActiveRecord::Base
+      module ActiveRecord
+        extend ActiveSupport::Concern
+
+        module ClassMethods
+          # This class is a supertype. Subtype classes are known as name
+          def supertype_of name
+            @subtypes_name = name
+            include SocialStream::Models::Supertype
+          end
+        end
+      end
     end
   end
 end

data/lib/social_stream/views/toolbar/base.rb

@@ -0,0 +1,143 @@
+module SocialStream
+  module Views
+    module Toolbar
+      module Base
+        def toolbar_items type, options = {}
+          SocialStream::Views::List.new.tap do |items|
+            case type
+            when :home, :messages
+              items << {
+                :key => :subject,
+                :html => render(:partial => 'toolbar/subject')
+              }
+
+              items << {
+                :key => :menu,
+                :html => toolbar_menu(type, options)
+              }
+            when :profile
+              subject = options[:subject]
+              raise "Need a subject options for profile toolbar" if subject.blank?
+
+              items << {
+                :key => :logo,
+                :html => render(:partial => 'toolbar/logo', :locals => { :subject => subject })
+              }
+
+              items << {
+                :key => :menu,
+                :html => toolbar_menu(type, options)
+              }
+            end
+          end
+        end
+
+        def toolbar_menu_items type, options = {}
+          SocialStream::Views::List.new.tap do |items|
+            case type
+            when :home
+              #Contacts
+              items << {
+                :key => :contacts,
+                :html => link_to(image_tag("btn/btn_friend.png")+t('contact.other'), "#", :id => 'toolbar_menu-contacts'),
+                :items => [
+                  {
+                    :key => :current,
+                    :html => link_to(image_tag("btn/btn_friend.png")+t('contact.current'), contacts_path)
+                  },
+                  {
+                    :key => :contacts_graph,
+                    :html => link_to(image_tag("btn/btn_friend.png")+t('contact.graph.one'), ties_path)
+                  },
+                  {
+                    :key => :pending,
+                    :html => link_to(image_tag("btn/btn_friend.png")+t('contact.pending.other'), pending_contacts_path)
+                  },
+                  {
+                    :key => :invitations,
+                    :html => link_to(image_tag("btn/btn_invitation.png")+t('invitation.toolbar'), new_invitation_path)
+                  }
+                ]
+              }
+
+              # Groups
+              items << {
+                :key  => :groups,
+                :html => link_to(image_tag("btn/btn_group.png") + t('group.other'), '#', :id => "toolbar_menu-groups"),
+                :items => [
+                  {
+                  :key => :new_group ,
+                  :html => link_to(image_tag("btn/btn_group.png")+t('group.new.action'), new_group_path)
+                  }
+                ]
+              }
+            when :profile
+              subject = options[:subject]
+              raise "Need a subject options for profile toolbar" if subject.blank?
+
+              #Information button
+              items << {
+                :key => :subject_info,
+                :html => link_to(image_tag("btn/btn_edit.png")+t('menu.information'), [subject, :profile])
+              }
+
+              if subject != current_subject
+                #Like button
+                items << {
+                  :key => :like_button,
+                  :html => link_to(link_like_params(subject)[0],
+                                   link_like_params(subject)[1],
+                                   :id => link_like_params(subject)[2])
+                }
+
+                if user_signed_in?
+                  #Relation button
+                  items << {
+                    :key => :subject_relation,
+                    :html => link_to(image_tag("btn/btn_friend.png") + current_subject.contact_to!(subject).status,
+                                     edit_contact_path(current_subject.contact_to!(subject)))
+                  }
+
+                  #Send message button
+                  items << {
+                    :key => :send_message,
+                    :html => link_to(image_tag("btn/btn_send.png")+t('message.send'),
+                                     new_message_path(:receiver => subject.slug))
+                  }
+                end
+              end
+            when :messages
+              # Messages
+              items << {
+                :key => :message_new,
+                :html => link_to(image_tag("btn/message_new.png")+ t('message.new'),
+                                 new_message_path,
+                                 :remote=> false)
+              }
+
+              items << {
+                :key => :message_inbox,
+                :html => link_to(image_tag("btn/message_inbox.png")+t('message.inbox')+' (' + current_subject.unread_messages_count.to_s + ')',
+                                 conversations_path,
+                                 :remote=> false)
+              }
+
+              items << {
+                :key => :message_sentbox,
+                :html => link_to(image_tag("btn/message_sentbox.png")+t('message.sentbox'),
+                                 conversations_path(:box => :sentbox),
+                                 :remote=> false)
+              }
+
+              items << {
+                :key => :message_trash,
+                :html => link_to(image_tag("btn/message_trash.png")+t('message.trash'),
+                                 conversations_path(:box => :trash))
+              }
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/tasks/db/populate.rake

@@ -266,7 +266,7 @@ namespace :db do
           if avatar.present? && File.exists?(avatar)
             Avatar.copy_to_temp_file(avatar)
             dimensions = Avatar.get_image_dimensions(avatar)
-            l = Avatar.new(:actor => i.actor,:logo => File.open(avatar), :name => File.basename(avatar), :crop_x => 0, :crop_y => 0, :crop_w => dimensions[:width], :crop_h => dimensions[:height] )
+            l = Avatar.new(:actor => i.actor, :name => File.basename(avatar), :crop_x => 0, :crop_y => 0, :crop_w => dimensions[:width], :crop_h => dimensions[:height] )
             l.active = true
             l.save!
           end

data/social_stream-base.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   # Slug generation
   s.add_runtime_dependency('stringex', '~> 1.3.0')
   # Avatar attachments
-  s.add_runtime_dependency('avatars_for_rails', '~> 0.2.2')
+  s.add_runtime_dependency('avatars_for_rails', '~> 0.2.5')
   # jQuery
   s.add_runtime_dependency('jquery-rails', '>= 1.0.9')
   # Authorization
@@ -45,8 +45,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('acts-as-taggable-on','~> 2.2.2')
   # HTML Forms
   s.add_runtime_dependency('formtastic','~> 1.2.3')
-  # Simple navigation for menu
-  s.add_runtime_dependency('simple-navigation', '~> 3.5.1')
   # Background jobs
   s.add_runtime_dependency('resque','~> 1.20.0')
   # Modernizr.js javascript library

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

@@ -20,6 +20,13 @@ SocialStream.setup do |config|
   # You can write your own activity objects
   #
   # config.activity_forms = [ :post, :document, :foo, :bar ]
+
+  # Config the relation model of your network
+  #
+  # :custom - users define their own relation types, and post with privacy, like Google+
+  # :follow - user just follow other users, like Twitter
+  #
+  # config.relation_model = :custom
   
   # Quick search (header) and Extended search models and its order. Remember to create
   # the indexes with thinking-sphinx if you are using customized models.

data/spec/models/activity_action_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe ActivityAction do
+  context "a following contact" do
+    before do
+      @tie = Factory(:friend)
+    end
+
+    it "should create follow action" do
+      action = @tie.sender.action_to(@tie.receiver)
+
+      action.should be_present
+      action.should be_follow
+    end
+
+    it "should remove follow action" do
+      action = @tie.sender.action_to(@tie.receiver)
+
+      action.should be_present
+
+      @tie.destroy
+
+      action.reload.should_not be_follow
+    end
+  end
+end

data/spec/models/tie_spec.rb

@@ -13,8 +13,8 @@ describe Tie do
                           merge(Permission.follow).
                           first
 
-      Tie.create :contact_id => sender.contact_to!(receiver).id,
-                 :relation_id => follower_relation.id
+      Tie.create! :contact_id => sender.contact_to!(receiver).id,
+                  :relation_id => follower_relation.id
 
       receiver.reload.follower_count.should eq(count + 1)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream-base
 version: !ruby/object:Gem::Version
-  version: 0.17.3
+  version: 0.18.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-13 00:00:00.000000000Z
+date: 2012-03-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &79141040 !ruby/object:Gem::Requirement
+  requirement: &76396110 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *79141040
+  version_requirements: *76396110
 - !ruby/object:Gem::Dependency
   name: ancestry
-  requirement: &79140240 !ruby/object:Gem::Requirement
+  requirement: &76394200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *79140240
+  version_requirements: *76394200
 - !ruby/object:Gem::Dependency
   name: foreigner
-  requirement: &79139670 !ruby/object:Gem::Requirement
+  requirement: &76392840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *79139670
+  version_requirements: *76392840
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &79139300 !ruby/object:Gem::Requirement
+  requirement: &76391820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 1.5.3
   type: :runtime
   prerelease: false
-  version_requirements: *79139300
+  version_requirements: *76391820
 - !ruby/object:Gem::Dependency
   name: inherited_resources
-  requirement: &79138900 !ruby/object:Gem::Requirement
+  requirement: &76390440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *79138900
+  version_requirements: *76390440
 - !ruby/object:Gem::Dependency
   name: stringex
-  requirement: &79138540 !ruby/object:Gem::Requirement
+  requirement: &76359230 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,21 +77,21 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *79138540
+  version_requirements: *76359230
 - !ruby/object:Gem::Dependency
   name: avatars_for_rails
-  requirement: &79138140 !ruby/object:Gem::Requirement
+  requirement: &76358080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.5
   type: :runtime
   prerelease: false
-  version_requirements: *79138140
+  version_requirements: *76358080
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &79137790 !ruby/object:Gem::Requirement
+  requirement: &76357470 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: 1.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *79137790
+  version_requirements: *76357470
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &79137410 !ruby/object:Gem::Requirement
+  requirement: &76356530 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +110,10 @@ dependencies:
         version: 1.6.4
   type: :runtime
   prerelease: false
-  version_requirements: *79137410
+  version_requirements: *76356530
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &79137050 !ruby/object:Gem::Requirement
+  requirement: &76355900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -121,10 +121,10 @@ dependencies:
         version: 0.13.0
   type: :runtime
   prerelease: false
-  version_requirements: *79137050
+  version_requirements: *76355900
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &79136800 !ruby/object:Gem::Requirement
+  requirement: &76355320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,10 +132,10 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *79136800
+  version_requirements: *76355320
 - !ruby/object:Gem::Dependency
   name: omniauth-facebook
-  requirement: &79136470 !ruby/object:Gem::Requirement
+  requirement: &76354690 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -143,10 +143,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *79136470
+  version_requirements: *76354690
 - !ruby/object:Gem::Dependency
   name: omniauth-linkedin
-  requirement: &79136100 !ruby/object:Gem::Requirement
+  requirement: &76353230 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -154,10 +154,10 @@ dependencies:
         version: 0.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *79136100
+  version_requirements: *76353230
 - !ruby/object:Gem::Dependency
   name: mailboxer
-  requirement: &79135620 !ruby/object:Gem::Requirement
+  requirement: &76343090 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -165,10 +165,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *79135620
+  version_requirements: *76343090
 - !ruby/object:Gem::Dependency
   name: acts-as-taggable-on
-  requirement: &79124280 !ruby/object:Gem::Requirement
+  requirement: &76342140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -176,10 +176,10 @@ dependencies:
         version: 2.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *79124280
+  version_requirements: *76342140
 - !ruby/object:Gem::Dependency
   name: formtastic
-  requirement: &79123910 !ruby/object:Gem::Requirement
+  requirement: &76341120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -187,21 +187,10 @@ dependencies:
         version: 1.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *79123910
-- !ruby/object:Gem::Dependency
-  name: simple-navigation
-  requirement: &79123680 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.5.1
-  type: :runtime
-  prerelease: false
-  version_requirements: *79123680
+  version_requirements: *76341120
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &79123440 !ruby/object:Gem::Requirement
+  requirement: &76340160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -209,10 +198,10 @@ dependencies:
         version: 1.20.0
   type: :runtime
   prerelease: false
-  version_requirements: *79123440
+  version_requirements: *76340160
 - !ruby/object:Gem::Dependency
   name: modernizr-rails
-  requirement: &79123100 !ruby/object:Gem::Requirement
+  requirement: &76338660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -220,10 +209,10 @@ dependencies:
         version: 2.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *79123100
+  version_requirements: *76338660
 - !ruby/object:Gem::Dependency
   name: thinking-sphinx
-  requirement: &79122720 !ruby/object:Gem::Requirement
+  requirement: &76337660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -231,10 +220,10 @@ dependencies:
         version: 2.0.8
   type: :runtime
   prerelease: false
-  version_requirements: *79122720
+  version_requirements: *76337660
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &79122370 !ruby/object:Gem::Requirement
+  requirement: &76335890 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -242,10 +231,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *79122370
+  version_requirements: *76335890
 - !ruby/object:Gem::Dependency
   name: rails_autolink
-  requirement: &79121960 !ruby/object:Gem::Requirement
+  requirement: &76330610 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -253,10 +242,10 @@ dependencies:
         version: 1.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *79121960
+  version_requirements: *76330610
 - !ruby/object:Gem::Dependency
   name: social_cheesecake
-  requirement: &79121650 !ruby/object:Gem::Requirement
+  requirement: &76330050 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -264,10 +253,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *79121650
+  version_requirements: *76330050
 - !ruby/object:Gem::Dependency
   name: i18n-js
-  requirement: &79121220 !ruby/object:Gem::Requirement
+  requirement: &76329160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -275,10 +264,10 @@ dependencies:
         version: 2.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *79121220
+  version_requirements: *76329160
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &79120840 !ruby/object:Gem::Requirement
+  requirement: &76328570 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -286,10 +275,10 @@ dependencies:
         version: 0.3.9
   type: :development
   prerelease: false
-  version_requirements: *79120840
+  version_requirements: *76328570
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &79120530 !ruby/object:Gem::Requirement
+  requirement: &76327780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -297,10 +286,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *79120530
+  version_requirements: *76327780
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &79119930 !ruby/object:Gem::Requirement
+  requirement: &76326580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -308,10 +297,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *79119930
+  version_requirements: *76326580
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &79119150 !ruby/object:Gem::Requirement
+  requirement: &76325080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -319,10 +308,10 @@ dependencies:
         version: 2.6.1
   type: :development
   prerelease: false
-  version_requirements: *79119150
+  version_requirements: *76325080
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &79118400 !ruby/object:Gem::Requirement
+  requirement: &76322830 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -330,10 +319,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *79118400
+  version_requirements: *76322830
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &79117550 !ruby/object:Gem::Requirement
+  requirement: &76318040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -341,10 +330,10 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *79117550
+  version_requirements: *76318040
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &79117020 !ruby/object:Gem::Requirement
+  requirement: &76316960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -352,10 +341,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *79117020
+  version_requirements: *76316960
 - !ruby/object:Gem::Dependency
   name: nifty-generators
-  requirement: &79116570 !ruby/object:Gem::Requirement
+  requirement: &76316040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -363,7 +352,7 @@ dependencies:
         version: 0.4.5
   type: :development
   prerelease: false
-  version_requirements: *79116570
+  version_requirements: *76316040
 description: ! 'Social Stream is a Ruby on Rails engine providing your application
   with social networking features and activity streams.
 
@@ -493,6 +482,7 @@ files:
 - app/assets/images/cleditor/toolbar.gif
 - app/assets/images/flags/en.png
 - app/assets/images/flags/es.png
+- app/assets/images/flags/pt.png
 - app/assets/images/frontpage/collaborate.png
 - app/assets/images/frontpage/comments.png
 - app/assets/images/frontpage/green_sq.png
@@ -560,9 +550,9 @@ files:
 - app/assets/javascripts/social_stream.objects.js
 - app/assets/javascripts/social_stream.search.js.erb
 - app/assets/javascripts/social_stream.timeline.js
+- app/assets/javascripts/social_stream.toolbar.js
 - app/assets/javascripts/social_stream.wall.js.erb
 - app/assets/javascripts/ties.js
-- app/assets/javascripts/toolbar.js
 - app/assets/javascripts/users.js
 - app/assets/stylesheets/_colors.scss
 - app/assets/stylesheets/activities.css.scss.erb
@@ -605,12 +595,14 @@ files:
 - app/assets/stylesheets/toolbar.css
 - app/assets/stylesheets/users.css
 - app/controllers/activities_controller.rb
+- app/controllers/activity_actions_controller.rb
 - app/controllers/api_controller.rb
 - app/controllers/authentications_controller.rb
 - app/controllers/cheesecake_controller.rb
 - app/controllers/comments_controller.rb
 - app/controllers/contacts_controller.rb
 - app/controllers/conversations_controller.rb
+- app/controllers/followers_controller.rb
 - app/controllers/frontpage_controller.rb
 - app/controllers/groups_controller.rb
 - app/controllers/home_controller.rb
@@ -630,7 +622,9 @@ files:
 - app/controllers/ties_controller.rb
 - app/controllers/users_controller.rb
 - app/helpers/activities_helper.rb
+- app/helpers/activity_actions_helper.rb
 - app/helpers/contacts_helper.rb
+- app/helpers/followers_helper.rb
 - app/helpers/groups_helper.rb
 - app/helpers/location_helper.rb
 - app/helpers/notifications_helper.rb
@@ -645,6 +639,7 @@ files:
 - app/mailers/invitation_mailer.rb
 - app/models/ability.rb
 - app/models/activity.rb
+- app/models/activity_action.rb
 - app/models/activity_object.rb
 - app/models/activity_object_activity.rb
 - app/models/activity_object_property.rb
@@ -662,6 +657,7 @@ files:
 - app/models/profile.rb
 - app/models/relation.rb
 - app/models/relation/custom.rb
+- app/models/relation/follow.rb
 - app/models/relation/public.rb
 - app/models/relation/reject.rb
 - app/models/relation/single.rb
@@ -679,6 +675,11 @@ files:
 - app/views/activities/_wall.html.erb
 - app/views/activities/index.html.erb
 - app/views/activities/index.js.erb
+- app/views/activity_actions/_follow_form.html.erb
+- app/views/activity_actions/_follow_sentence.html.erb
+- app/views/activity_actions/_update_form.js.erb
+- app/views/activity_actions/create.js.erb
+- app/views/activity_actions/update.js.erb
 - app/views/activity_objects/_activity_object.html.erb
 - app/views/actors/_actor.html.erb
 - app/views/actors/_actor_cheesecake.html.erb
@@ -700,7 +701,8 @@ files:
 - app/views/contacts/_contact.html.erb
 - app/views/contacts/_form.html.erb
 - app/views/contacts/_index.html.erb
-- app/views/contacts/_link.html.erb
+- app/views/contacts/_link_custom.html.erb
+- app/views/contacts/_link_follow.html.erb
 - app/views/contacts/_pendings.html.erb
 - app/views/contacts/_suggestions.html.erb
 - app/views/contacts/_suggestions_and_pendings.html.erb
@@ -729,6 +731,9 @@ files:
 - app/views/devise/registrations/new.html.erb
 - app/views/devise/sessions/new.html.erb
 - app/views/devise/shared/_links.erb
+- app/views/followers/destroy.js.erb
+- app/views/followers/index.html.erb
+- app/views/followers/update.js.erb
 - app/views/frontpage/_caracteristics.html.erb
 - app/views/frontpage/_social_networks.html.erb
 - app/views/frontpage/_sponsor.html.erb
@@ -766,7 +771,6 @@ files:
 - app/views/layouts/_header_signed_out.erb
 - app/views/layouts/_representation.html.erb
 - app/views/layouts/_search.html.erb
-- app/views/layouts/_settings.html.erb
 - app/views/layouts/application.html.erb
 - app/views/layouts/frontpage.html.erb
 - app/views/likes/create.js.erb
@@ -844,10 +848,7 @@ files:
 - app/views/subjects/_subject.html.erb
 - app/views/subjects/_subject_with_details.html.erb
 - app/views/ties/index.html.erb
-- app/views/toolbar/_home.html.erb
 - app/views/toolbar/_logo.html.erb
-- app/views/toolbar/_messages.html.erb
-- app/views/toolbar/_profile.html.erb
 - app/views/toolbar/_subject.html.erb
 - app/views/users/_groups.html.erb
 - app/views/users/_index.html.erb
@@ -864,7 +865,9 @@ files:
 - app/views/users/show.xml.builder
 - config/locales/en.yml
 - config/locales/es.yml
+- config/locales/pt.yml
 - config/locales/rails.es.yml
+- config/locales/rails.pt.yml
 - config/routes.rb
 - db/migrate/20110610112023_create_social_stream.rb
 - db/migrate/20110705103202_empty_ties_count.rb
@@ -880,15 +883,18 @@ files:
 - db/migrate/20120201185454_singleton_single_relations.rb
 - db/migrate/20120208135718_group_title_and_description_in_activity_object.rb
 - db/migrate/20120302215722_activity_object_properties.rb
+- db/migrate/20120316093946_create_activity_actions.rb
+- db/migrate/20120316113728_activity_action_follow.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
 - lib/generators/social_stream/base/templates/initializer.rb
-- lib/generators/social_stream/base/templates/navigation.rb
 - lib/generators/social_stream/base/templates/relations.yml
 - lib/generators/social_stream/base/templates/sphinx.yml
 - lib/i18n-js/social_stream-base.rb
+- lib/inherited_resources/social_stream.rb
 - lib/paperclip/social_stream.rb
+- lib/rails/social_stream.rb
 - lib/social_stream-base.rb
 - lib/social_stream/ability.rb
 - lib/social_stream/ability/base.rb
@@ -912,10 +918,10 @@ files:
 - lib/social_stream/populate.rb
 - lib/social_stream/test_helpers.rb
 - lib/social_stream/test_helpers/controllers.rb
-- lib/social_stream/toolbar_config/base.rb
 - lib/social_stream/views/list.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
 - social_stream-base.gemspec
@@ -978,6 +984,7 @@ files:
 - spec/factories/tie.rb
 - spec/factories/user.rb
 - spec/integration/navigation_spec.rb
+- spec/models/activity_action_spec.rb
 - spec/models/activity_authorization_spec.rb
 - spec/models/activity_spec.rb
 - spec/models/actor_spec.rb