social_stream 0.4.1 → 0.4.2

data/lib/generators/social_stream/templates/relations.yml

@@ -36,6 +36,7 @@ group:
       - [ read,    activity, star_ties ]      # read activities from other members
       - [ update,  activity, weak_star_ties ] # update and destroy activities to members,
       - [ destroy, activity, weak_star_ties ] # acquaintance and public
+      - [ read,    tie,      weak_star_ties ]
   partner:
     name: partner
     parent: member # member is stronger than partner

data/lib/paperclip/social_stream.rb

@@ -1,6 +1,6 @@
 # Create new Paperclip::Interpolations method for subtype class
 module Paperclip::Interpolations #:nodoc:
   def subtype_class attachment, style_name
-    attachment.instance.subject_type.to_s.underscore
+    attachment.instance.actor.subject_type.to_s.underscore
   end
 end

data/lib/social_stream/ability.rb

@@ -3,6 +3,7 @@ module SocialStream
     include CanCan::Ability
 
     def initialize(user)
+      # Activity Objects
       (SocialStream.objects - [ :actor ]).map{ |obj|
         obj.to_s.classify.constantize
       }.each do |klass|

data/lib/social_stream/controllers/helpers.rb

@@ -8,6 +8,26 @@ module SocialStream
         helper_method :current_subject
       end
 
+      module ClassMethods
+        # Add to controllers that have nested subjects. Examples are:
+        #
+        #   class ProfilesController < InheritedResources::Base
+        #     belongs_to_subjects(:singleton => true) # provides /users/demo/profile
+        #   end
+        #
+        #   class ActivitiesController < InheritedResources::Base
+        #     belongs_to_subjects # provides /users/demo/activities
+        #   end
+        #
+        def belongs_to_subjects(options = {})
+          opts = { :polymorphic => true, :finder => :find_by_slug! }.update(options)
+
+          args = SocialStream.subjects + [ opts ]
+
+          belongs_to *args
+        end
+      end
+
       module InstanceMethods
         # Current subject represented by the user. Defaults to the own user
         def current_subject

data/lib/social_stream/models/subject.rb

@@ -30,17 +30,22 @@ module SocialStream
         
         has_one :profile, :through => :actor
         
-        accepts_nested_attributes_for :profile
-        
         validates_presence_of :name
         
-        scope :alphabetic, includes(:actor).order('actors.name')
+        accepts_nested_attributes_for :profile
+        
+        scope :alphabetic, joins(:actor).merge(Actor.alphabetic)
+
+        scope :letter, lambda{ |param|
+          joins(:actor).merge(Actor.letter(param))
+        }
+
         scope :search, lambda{ |param|
-          joins(:actor).where('actors.name like ?', param)
+          joins(:actor).merge(Actor.search(param))
         }
-        scope :with_sent_ties,     joins(:actor => :sent_ties)
-        scope :with_received_ties, joins(:actor => :received_ties)
-        scope :distinct_initials, joins(:actor).select('DISTINCT SUBSTR(actors.name,1,1) as initial').order("initial ASC")
+
+        scope :distinct_initials, joins(:actor).merge(Actor.distinct_initials)
+
         scope :popular, lambda { 
           joins(:actor => :received_ties).
             select("DISTINCT #{ table_name }.*, COUNT(#{ table_name}.id) AS popularity").
@@ -62,11 +67,7 @@ module SocialStream
         def method_missing(method, *args, &block)
           super
         rescue NameError => subject_error 
-          begin
-            actor!.__send__ method, *args, &block
-          rescue NameError
-            raise subject_error
-          end
+          actor!.__send__ method, *args, &block
         end
 
         # {Actor} handles some methods

data/lib/social_stream/rails.rb

@@ -16,6 +16,8 @@ require 'devise'
 require 'cancan'
 # REST controllers
 require 'inherited_resources'
+# Scopes in controllers
+require 'has_scope'
 # Logo attachments
 require 'paperclip'
 require 'paperclip/social_stream'
@@ -29,7 +31,7 @@ require 'rails_css_themes'
 module SocialStream
   class Engine < ::Rails::Engine #:nodoc:
     config.app_generators.authentication :devise
-    config.app_generators.javascript :jquery
+    config.app_generators.messages :mailboxer
 
     config.to_prepare do
       %w( actor activity_object ).each do |supertype|
@@ -40,6 +42,7 @@ module SocialStream
       ApplicationController.helper ActivitiesHelper
       ApplicationController.helper SubjectsHelper
       ApplicationController.helper TiesHelper
+      ApplicationController.helper LocationHelper
     end
 
     initializer "social_stream.inflections" do

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "0.4.1".freeze
+  VERSION = "0.4.2".freeze
 end

data/lib/tasks/db/populate.rake

@@ -15,11 +15,21 @@ namespace :db do
       def set_logos(klass)
         klass.all.each do |i|
           logo = Dir[File.join(LOGOS_PATH, klass.to_s.tableize, "#{ i.id }.*")].first
-          
+          avatar = Dir[File.join(LOGOS_PATH, klass.to_s.tableize, "#{ i.id }.*")].first
+=begin          
           if logo.present? && File.exists?(logo)
-            i.logo = File.new(logo)
-            i.logo.reprocess!
-            i.save!
+            Logo.copy_to_temp_file(logo)
+            dimensions = Logo.get_image_dimensions(logo)
+            l = Logo.new(:actor => i.actor,:logo => File.open(logo), :name => File.basename(logo), :crop_x => 0, :crop_y => 0, :crop_w => dimensions[:width], :crop_h => dimensions[:height] )
+            l.save(false)
+          end
+=end          
+          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.active = true
+            l.save(false)
           end
         end
       end

data/social_stream.gemspec

@@ -9,33 +9,59 @@ Gem::Specification.new do |s|
                 "CISE - ESPOL" ]
   s.homepage = "http://social-stream.dit.upm.es/"
   s.files = `git ls-files`.split("\n")
+
+  # Gem dependencies
+  #
+  # Activity hierarchies
   s.add_runtime_dependency('atd-ancestry', '1.3.0')
+  # Relation hierarchies
   s.add_runtime_dependency('nested_set', '~> 1.5.3')
+  # SQL foreign keys
   s.add_runtime_dependency('foreigner', '~> 0.9.1')
+  # Authentication
   s.add_runtime_dependency('devise', '~> 1.2.rc')
+  # CRUD controllers
   s.add_runtime_dependency('inherited_resources', '~> 1.1.2')
+  # Slug generation
   s.add_runtime_dependency('stringex', '~> 1.2.0')
+  # Avatar attachments
   s.add_runtime_dependency('paperclip', '~> 2.3.4')
+  # jQuery
   s.add_runtime_dependency('jquery-rails', '~> 0.2.5')
+  # Authorization
   s.add_runtime_dependency('cancan', '~> 1.6.2')
+  # Pagination
   s.add_runtime_dependency('will_paginate', '~> 3.0.pre2')
+  # OAuth client
   s.add_runtime_dependency('omniauth','~> 0.2.0.beta5')	
+  # OAuth provider
   s.add_runtime_dependency('oauth-plugin','~> 0.4.0.pre1')	
+  # Theme support
   s.add_runtime_dependency('rails_css_themes','~> 1.0.0')	
+  # Messages
+  s.add_runtime_dependency('mailboxer','~> 0.0.14')
+  # Avatar manipulation
+  s.add_runtime_dependency('rmagick','~> 2.13.1')
+
+
+  # Development Gem dependencies
   s.add_development_dependency('rails', '~> 3.0.5')
+  # Integration testing
   s.add_development_dependency('capybara', '~> 0.3.9')
+  # Testing database
   s.add_development_dependency('sqlite3-ruby')
+  # Debugging
   if RUBY_VERSION < '1.9'
     s.add_development_dependency('ruby-debug', '~> 0.10.3')
   end
+  # Specs
   s.add_development_dependency('rspec-rails', '~> 2.5.0')
+  # Fixtures
   s.add_development_dependency('factory_girl', '~> 1.3.2')
+  # Population
   s.add_development_dependency('forgery', '~> 0.3.6')
+  # Continous integration
   s.add_development_dependency('ci_reporter', '~> 1.6.4')
+  # Scaffold generator
   s.add_development_dependency('nifty-generators','~> 0.4.5')
-  
-  #mailboxer  
-  s.add_runtime_dependency('mailboxer','~> 0.0.11')
-  s.add_runtime_dependency('rmagick','~> 2.13.1')
-
 end

data/spec/controllers/contacts_controller_spec.rb

@@ -2,6 +2,12 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe ContactsController do
 
+  render_views
+
+  before do
+    sign_in Factory(:friend).sender_subject
+  end
+
   describe "GET 'index'" do
     it "should be successful" do
       get 'index'

data/spec/controllers/profiles_controller_spec.rb

@@ -1,11 +1,13 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe ProfilesController do
+  include SocialStream::TestHelpers
   render_views
 
   context "for a user" do
     before do
       @user = Factory(:user)
+      sign_in @user
     end
 
     it "should render show" do
@@ -15,8 +17,6 @@ describe ProfilesController do
     end
 
     it "should render edit" do
-      pending
-
       get :edit, :user_id => @user.to_param
 
       assert_response :success
@@ -26,6 +26,7 @@ describe ProfilesController do
   context "for a group" do
     before do
       @group = Factory(:group)
+      represent @group
     end
 
     it "should render show" do
@@ -35,8 +36,6 @@ describe ProfilesController do
     end
 
     it "should render edit" do
-      pending
-
       get :edit, :group_id => @group.to_param
 
       assert_response :success

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

@@ -160,7 +160,10 @@ Devise.setup do |config|
   # Add a new OmniAuth provider. Check the wiki for more information on setting
   # up on your models and hooks.
   # config.omniauth :github, 'APP_ID', 'APP_SECRET', :scope => 'user,public_repo'
-
+  config.omniauth :linked_in, "ekxfXU8nueVSMQ9fc5KJAryBkyztUlCBYMW3DoQPzbE79WhivvzhQloRNHCHgPeB", "WYiHFT-KKFgjd45W3-pEAficmXRHmN6_6DGwj1C_ZILJlSO1gBvv6VNYXU9tybGY"
+                      
+  config.omniauth :facebook, "129571360447856","eef39dce5e20e76f77495c59623bdb38"
+ 
   # ==> Warden configuration
   # If you want to use other strategies, that are not supported by Devise, or
   # change the failure app, you can configure them inside the config.warden block.

data/spec/dummy/config/relations.yml

@@ -36,6 +36,7 @@ group:
       - [ read,    activity, star_ties ]      # read activities from other members
       - [ update,  activity, weak_star_ties ] # update and destroy activities to members,
       - [ destroy, activity, weak_star_ties ] # acquaintance and public
+      - [ read,    tie,      weak_star_ties ]
   partner:
     name: partner
     parent: member # member is stronger than partner

data/spec/models/activity_spec.rb

@@ -89,6 +89,30 @@ describe Activity do
     end
   end
 
+  describe "wall" do
+    before do
+      @activity = Factory(:activity)
+    end
+
+    describe "type home" do
+      it "should include activity" do
+        @activity.sender.wall(:home).should include(@activity)
+        @activity.receiver.wall(:home).should include(@activity)
+      end
+    end
+
+    describe "type profile" do
+      it "should include activity" do
+        @activity.sender.wall(:profile, :for => @activity.sender).should include(@activity)
+        @activity.sender.wall(:profile, :for => @activity.receiver).should include(@activity)
+        @activity.sender.wall(:profile,
+                              :for => @activity.receiver,
+                              :relation => @activity.tie.relation).should include(@activity)
+
+      end
+    end
+  end
+
   describe "belonging to friend" do
     before do
       create_activity_assigned_to(Factory(:friend))

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - GING - DIT - UPM
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-25 00:00:00 +01:00
+date: 2011-03-31 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -230,9 +230,41 @@ dependencies:
   type: :runtime
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
-  name: rails
+  name: mailboxer
   prerelease: false
   requirement: &id014 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        - 0
+        - 14
+        version: 0.0.14
+  type: :runtime
+  version_requirements: *id014
+- !ruby/object:Gem::Dependency 
+  name: rmagick
+  prerelease: false
+  requirement: &id015 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 57
+        segments: 
+        - 2
+        - 13
+        - 1
+        version: 2.13.1
+  type: :runtime
+  version_requirements: *id015
+- !ruby/object:Gem::Dependency 
+  name: rails
+  prerelease: false
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -244,11 +276,11 @@ dependencies:
         - 5
         version: 3.0.5
   type: :development
-  version_requirements: *id014
+  version_requirements: *id016
 - !ruby/object:Gem::Dependency 
   name: capybara
   prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -260,11 +292,11 @@ dependencies:
         - 9
         version: 0.3.9
   type: :development
-  version_requirements: *id015
+  version_requirements: *id017
 - !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
   prerelease: false
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -274,11 +306,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id016
+  version_requirements: *id018
 - !ruby/object:Gem::Dependency 
   name: ruby-debug
   prerelease: false
-  requirement: &id017 !ruby/object:Gem::Requirement 
+  requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -290,11 +322,11 @@ dependencies:
         - 3
         version: 0.10.3
   type: :development
-  version_requirements: *id017
+  version_requirements: *id019
 - !ruby/object:Gem::Dependency 
   name: rspec-rails
   prerelease: false
-  requirement: &id018 !ruby/object:Gem::Requirement 
+  requirement: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -306,11 +338,11 @@ dependencies:
         - 0
         version: 2.5.0
   type: :development
-  version_requirements: *id018
+  version_requirements: *id020
 - !ruby/object:Gem::Dependency 
   name: factory_girl
   prerelease: false
-  requirement: &id019 !ruby/object:Gem::Requirement 
+  requirement: &id021 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -322,11 +354,11 @@ dependencies:
         - 2
         version: 1.3.2
   type: :development
-  version_requirements: *id019
+  version_requirements: *id021
 - !ruby/object:Gem::Dependency 
   name: forgery
   prerelease: false
-  requirement: &id020 !ruby/object:Gem::Requirement 
+  requirement: &id022 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -338,11 +370,11 @@ dependencies:
         - 6
         version: 0.3.6
   type: :development
-  version_requirements: *id020
+  version_requirements: *id022
 - !ruby/object:Gem::Dependency 
   name: ci_reporter
   prerelease: false
-  requirement: &id021 !ruby/object:Gem::Requirement 
+  requirement: &id023 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -354,11 +386,11 @@ dependencies:
         - 4
         version: 1.6.4
   type: :development
-  version_requirements: *id021
+  version_requirements: *id023
 - !ruby/object:Gem::Dependency 
   name: nifty-generators
   prerelease: false
-  requirement: &id022 !ruby/object:Gem::Requirement 
+  requirement: &id024 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -370,38 +402,6 @@ dependencies:
         - 5
         version: 0.4.5
   type: :development
-  version_requirements: *id022
-- !ruby/object:Gem::Dependency 
-  name: mailboxer
-  prerelease: false
-  requirement: &id023 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 0
-        - 0
-        - 11
-        version: 0.0.11
-  type: :runtime
-  version_requirements: *id023
-- !ruby/object:Gem::Dependency 
-  name: rmagick
-  prerelease: false
-  requirement: &id024 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 57
-        segments: 
-        - 2
-        - 13
-        - 1
-        version: 2.13.1
-  type: :runtime
   version_requirements: *id024
 description: Ruby on Rails engine supporting social networking features and activity streams.
 email: 
@@ -422,13 +422,14 @@ files:
 - app/controllers/activities_controller.rb
 - app/controllers/api_controller.rb
 - app/controllers/authentications_controller.rb
+- app/controllers/avatars_controller.rb
 - app/controllers/comments_controller.rb
 - app/controllers/contacts_controller.rb
+- app/controllers/conversations_controller.rb
 - app/controllers/frontpage_controller.rb
 - app/controllers/groups_controller.rb
 - app/controllers/home_controller.rb
 - app/controllers/likes_controller.rb
-- app/controllers/logos_controller.rb
 - app/controllers/messages_controller.rb
 - app/controllers/omniauth_callbacks_controller.rb
 - app/controllers/posts_controller.rb
@@ -441,6 +442,7 @@ files:
 - app/helpers/activities_helper.rb
 - app/helpers/contacts_helper.rb
 - app/helpers/groups_helper.rb
+- app/helpers/location_helper.rb
 - app/helpers/subjects_helper.rb
 - app/helpers/ties_helper.rb
 - app/helpers/users_helper.rb
@@ -451,10 +453,10 @@ files:
 - app/models/activity_verb.rb
 - app/models/actor.rb
 - app/models/authentication.rb
+- app/models/avatar.rb
 - app/models/comment.rb
 - app/models/group.rb
 - app/models/like.rb
-- app/models/logo.rb
 - app/models/permission.rb
 - app/models/post.rb
 - app/models/profile.rb
@@ -464,21 +466,42 @@ files:
 - app/models/tie.rb
 - app/models/tie_activity.rb
 - app/models/user.rb
-- app/views/activities/_activities.html.erb
 - app/views/activities/_activity.html.erb
 - app/views/activities/_child.html.erb
 - app/views/activities/_comments.html.erb
+- app/views/activities/_index.html.erb
 - app/views/activities/_jquery.html.erb
 - app/views/activities/_new.html.erb
 - app/views/activities/_options.html.erb
 - app/views/activities/_root.html.erb
+- app/views/activities/_walls.html.erb
+- app/views/activities/index.js.erb
 - app/views/activity_objects/_activity_object.html.erb
 - app/views/api/activity_atom_feed.atom.builder
+- app/views/avatars/_form.html.erb
+- app/views/avatars/_precrop.html.erb
+- app/views/avatars/edit.html.erb
+- app/views/avatars/index.html.erb
+- app/views/avatars/new.html.erb
+- app/views/avatars/show.html.erb
 - app/views/comments/_comment.html.erb
 - app/views/comments/_new.html.erb
 - app/views/comments/create.js.erb
 - app/views/comments/destroy.js.erb
+- app/views/contacts/_index.html.erb
 - app/views/contacts/index.html.erb
+- app/views/contacts/index.js.erb
+- app/views/conversations/_conversation.html.erb
+- app/views/conversations/_conversation_full.html.erb
+- app/views/conversations/_conversations.html.erb
+- app/views/conversations/_index.html.erb
+- app/views/conversations/_menu_options.html.erb
+- app/views/conversations/_show.html.erb
+- app/views/conversations/edit.html.erb
+- app/views/conversations/index.html.erb
+- app/views/conversations/index.js.erb
+- app/views/conversations/show.html.erb
+- app/views/conversations/show.js.erb
 - app/views/devise/passwords/edit.html.erb
 - app/views/devise/passwords/new.html.erb
 - app/views/devise/registrations/new.html.erb
@@ -493,17 +516,15 @@ files:
 - app/views/groups/_location.html.erb
 - app/views/groups/_logo.html.erb
 - app/views/groups/_new.html.erb
-- app/views/groups/_profile.html.erb
 - app/views/groups/_sidebar_index.html.erb
 - app/views/groups/_sidebar_show.html.erb
-- app/views/groups/edit.html.erb
 - app/views/groups/index.html.erb
 - app/views/groups/index.js.erb
 - app/views/groups/new.html.erb
 - app/views/groups/show.html.erb
-- app/views/groups/update.js.erb
 - app/views/home/_groups.html.erb
 - app/views/home/_location.html.erb
+- app/views/home/_menu.html.erb
 - app/views/home/_sidebar.html.erb
 - app/views/home/index.html.erb
 - app/views/layouts/_footer.html.erb
@@ -514,40 +535,19 @@ files:
 - app/views/layouts/test.html
 - app/views/likes/create.js.erb
 - app/views/likes/destroy.js.erb
-- app/views/logos/_form.html.erb
-- app/views/logos/_precrop.html.erb
-- app/views/logos/edit.html.erb
-- app/views/logos/index.html.erb
-- app/views/logos/new.html.erb
-- app/views/logos/show.html.erb
-- app/views/menu/_group.html.erb
-- app/views/menu/_home_user.html.erb
-- app/views/menu/_optionsGroups.html.erb
-- app/views/menu/_optionsUser.html.erb
-- app/views/menu/_services.html.erb
-- app/views/menu/_tiesGroup.html.erb
-- app/views/menu/_tiesUser.html.erb
-- app/views/menu/_user.html.erb
-- app/views/messages/_conversation.html.erb
-- app/views/messages/_conversation_full.html.erb
-- app/views/messages/_conversations.html.erb
+- app/views/location/_location.html.erb
 - app/views/messages/_form.html.erb
-- app/views/messages/_index.html.erb
-- app/views/messages/_location.html.erb
-- app/views/messages/_menu_options.html.erb
+- app/views/messages/_message.html.erb
 - app/views/messages/_new.html.erb
-- app/views/messages/_show.html.erb
-- app/views/messages/edit.html.erb
-- app/views/messages/index.html.erb
-- app/views/messages/index.js.erb
 - app/views/messages/new.html.erb
 - app/views/messages/new.js.erb
-- app/views/messages/show.html.erb
-- app/views/messages/show.js.erb
 - app/views/posts/_post.html.erb
 - app/views/posts/create.js.erb
 - app/views/posts/destroy.js.erb
+- app/views/profiles/_profile.html.erb
+- app/views/profiles/edit.html.erb
 - app/views/profiles/show.html.erb
+- app/views/profiles/update.js.erb
 - app/views/subjects/_contacts.html.erb
 - app/views/subjects/_tabs.html.erb
 - app/views/subjects/_toolbar_home.html.erb
@@ -555,6 +555,7 @@ files:
 - app/views/subjects/_toolbar_home_menu_options.html.erb
 - app/views/subjects/_toolbar_home_menu_options_subjects.html.erb
 - app/views/subjects/_toolbar_logo.html.erb
+- app/views/subjects/_toolbar_message_menu.html.erb
 - app/views/subjects/_toolbar_profile.html.erb
 - app/views/subjects/_toolbar_profile_menu.html.erb
 - app/views/subjects/_toolbar_profile_menu_basic_options.html.erb
@@ -572,16 +573,12 @@ files:
 - app/views/users/_groups.html.erb
 - app/views/users/_index.html.erb
 - app/views/users/_location.html.erb
-- app/views/users/_profile.html.erb
 - app/views/users/_sidebar_index.html.erb
-- app/views/users/_sidebar_show.html.erb
-- app/views/users/edit.html.erb
 - app/views/users/index.html.erb
 - app/views/users/index.js.erb
 - app/views/users/info.html.erb
 - app/views/users/show.html.erb
 - app/views/users/show.xml.builder
-- app/views/users/update.js.erb
 - bin/social_stream
 - bin/social_stream_heroku
 - config/locales/en.yml
@@ -655,6 +652,11 @@ files:
 - lib/generators/social_stream/templates/public/images/btn/keynote.png
 - lib/generators/social_stream/templates/public/images/btn/linkedin.png
 - lib/generators/social_stream/templates/public/images/btn/live.png
+- lib/generators/social_stream/templates/public/images/btn/message_conversation.png
+- lib/generators/social_stream/templates/public/images/btn/message_inbox.png
+- lib/generators/social_stream/templates/public/images/btn/message_new.png
+- lib/generators/social_stream/templates/public/images/btn/message_sentbox.png
+- lib/generators/social_stream/templates/public/images/btn/message_trash.png
 - lib/generators/social_stream/templates/public/images/btn/new.png
 - lib/generators/social_stream/templates/public/images/btn/next_conference.png
 - lib/generators/social_stream/templates/public/images/btn/next_space.png