social_stream 0.3.6 → 0.4.0

data/spec/controllers/contacts_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe ContactsController do
 

data/spec/controllers/groups_controller_spec.rb

@@ -42,6 +42,14 @@ describe GroupsController do
 
       assert_response :success
     end
+
+    it "should update contact group" do
+      @group = Factory(:member, :receiver => @user.actor).sender_subject
+      put :update, :id => @group.to_param,
+                   "group" => { "profile_attributes" => { "organization" => "Social Stream" } }
+
+      response.should redirect_to(@group)
+    end
   end
 end
 

data/spec/controllers/home_controller_spec.rb

@@ -1,6 +1,8 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe HomeController do
+  include SocialStream::TestHelpers
+
   render_views
 
   describe "when Anonymous" do
@@ -19,6 +21,19 @@ describe HomeController do
       get :index
       assert_response :success
     end
+
+    describe "when representing" do
+      before do
+        @represented = represent(Factory(:group))
+      end
+
+      it "should render represented home" do
+        get :index
+
+        assert_response :success
+        assigns(:current_subject).should == @represented
+      end
+    end
   end
 end
 

data/spec/controllers/likes_controller_spec.rb

@@ -0,0 +1,29 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe LikesController do
+  render_views
+
+  it "should create like" do
+    @activity = Factory(:activity)
+    @subject  = @activity.receiver_subject
+
+    sign_in @subject
+
+    post :create, :activity_id => @activity.id
+
+    assert @activity.liked_by?(@subject)
+  end
+
+  it "should destroy like" do
+    @like_activity = Factory(:like_activity)
+    @activity = @like_activity.parent
+    @subject =  @like_activity.sender_subject
+
+    sign_in @subject
+
+    delete :destroy, :activity_id => @activity.id
+
+    assert ! @activity.liked_by?(@subject)
+  end
+end
+

data/spec/controllers/posts_controller_spec.rb

@@ -0,0 +1,41 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+
+describe PostsController do
+  include SocialStream::TestHelpers::Controllers
+
+  render_views
+
+  describe "authorizing" do
+    before do
+      @user = Factory(:user)
+      sign_in @user
+    end
+
+    describe "posts to user" do
+      before do
+        model_assigned_to @user.sent_ties.received_by(@user).related_by(@user.relations.sort.first).first
+      end
+
+      it_should_behave_like "Allow Creating"
+    end
+
+    describe "post to friend" do
+      before do
+        model_assigned_to Factory(:friend, :receiver => @user.actor)
+      end
+
+      it_should_behave_like "Allow Creating"
+    end
+
+    describe "post to acquaintance" do
+      before do
+        model_assigned_to Factory(:acquaintance, :receiver => @user.actor)
+      end
+
+      it_should_behave_like "Deny Creating"
+    end
+
+  end
+end
+

data/spec/controllers/profiles_controller_spec.rb

@@ -0,0 +1,46 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe ProfilesController do
+  render_views
+
+  context "for a user" do
+    before do
+      @user = Factory(:user)
+    end
+
+    it "should render show" do
+      get :show, :user_id => @user.to_param
+
+      assert_response :success
+    end
+
+    it "should render edit" do
+      pending
+
+      get :edit, :user_id => @user.to_param
+
+      assert_response :success
+    end
+  end
+
+  context "for a group" do
+    before do
+      @group = Factory(:group)
+    end
+
+    it "should render show" do
+      get :show, :group_id => @group.to_param
+
+      assert_response :success
+    end
+
+    it "should render edit" do
+      pending
+
+      get :edit, :group_id => @group.to_param
+
+      assert_response :success
+    end
+  end
+end
+

data/spec/controllers/users_controller_spec.rb

@@ -11,7 +11,7 @@ describe UsersController do
     end
 
     it "should render show" do
-      get :show, :id => Factory(:user).to_param
+      get :show, :id => Factory(:friend, :receiver => Factory(:group).actor).sender_subject.to_param
 
       assert_response :success
     end
@@ -19,7 +19,7 @@ describe UsersController do
 
   describe "when authenticated" do
     before do
-      @user = Factory(:user)
+      @user = Factory(:friend, :receiver => Factory(:group).actor).sender_subject
 
       sign_in @user
     end

data/spec/dummy/.gitignore

@@ -0,0 +1,4 @@
+log/*log
+db/*.sqlite3
+db/*.sqlite3-journal
+public/images/tmp/

data/spec/dummy/config/database.yml

@@ -15,6 +15,14 @@ test:
   pool: 5
   timeout: 5000
 
+test_pg:
+  adapter: postgresql
+  encoding: unicode
+  database: social_stream_test
+  pool: 5
+  username: social_stream
+  password:
+
 production:
   adapter: sqlite3
   database: db/production.sqlite3

data/spec/dummy/config/environments/test_pg.rb

@@ -0,0 +1,35 @@
+Dummy::Application.configure do
+  # Settings specified here will take precedence over those in config/environment.rb
+
+  # The test environment is used exclusively to run your application's
+  # test suite.  You never need to work with it otherwise.  Remember that
+  # your test database is "scratch space" for the test suite and is wiped
+  # and recreated between test runs.  Don't rely on the data there!
+  config.cache_classes = true
+
+  # Log error messages when you accidentally call methods on nil.
+  config.whiny_nils = true
+
+  # Show full error reports and disable caching
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
+
+  # Raise exceptions instead of rendering exception templates
+  config.action_dispatch.show_exceptions = false
+
+  # Disable request forgery protection in test environment
+  config.action_controller.allow_forgery_protection    = false
+
+  # Tell Action Mailer not to deliver emails to the real world.
+  # The :test delivery method accumulates sent emails in the
+  # ActionMailer::Base.deliveries array.
+  config.action_mailer.delivery_method = :test
+
+  # Use SQL instead of Active Record's schema dumper when creating the test database.
+  # This is necessary if your schema can't be completely dumped by the schema dumper,
+  # like if you have constraints or database-specific column types
+  # config.active_record.schema_format = :sql
+
+  # Print deprecation notices to the stderr
+  config.active_support.deprecation = :stderr
+end

data/spec/dummy/config/routes.rb

@@ -1,4 +1,6 @@
 Dummy::Application.routes.draw do
+  devise_for :users, :controllers => {:omniauth_callbacks => 'omniauth_callbacks'}
+
   # The priority is based upon order of creation:
   # first created -> highest priority.
 

data/spec/factories/group.rb

@@ -1,4 +1,4 @@
 Factory.define :group do |g|
   g.sequence(:name) { |n| "Group #{ n }" }
-  g._founder { |g| Factory(:user).permalink }
+  g._founder { |g| Factory(:user).slug }
 end

data/spec/integration/navigation_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe "Navigation" do
   include Capybara

data/spec/models/actor_spec.rb

@@ -1,16 +1,16 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Actor do
-  it "should generate permalink" do
-    assert Factory(:actor).permalink.present?
+  it "should generate slug" do
+    assert Factory(:actor).slug.present?
   end
 
-  it "should generate different permalink" do
+  it "should generate different slug" do
     a = Factory(:actor)
     b = Factory(:actor, :name => a.name)
 
     a.name.should == b.name
-    a.permalink.should_not == b.permalink
+    a.slug.should_not == b.slug
   end
 
   it "should generate relations" do

data/spec/models/user_spec.rb

@@ -1,10 +1,10 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe User do
-  it "should find by permalink" do
+  it "should find by slug" do
     user = Factory(:user)
 
-    assert user.should == User.find_by_permalink(user.permalink)
+    assert user.should == User.find_by_slug(user.slug)
   end
 
   it "should represent" do

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
 # Configure Rails Envinronment
-ENV["RAILS_ENV"] = "test"
+ENV["RAILS_ENV"] ||= "test"
 
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 require "rspec/rails"

data/spec/support/db.rb

@@ -1,4 +1,11 @@
 require File.join(Rails.root, '../../lib/generators/social_stream/templates/migration')
+
+begin
+  CreateSocialStream.down
+rescue
+  puts "WARNING: SocialStream migration failed to rollback"
+end
+
 CreateSocialStream.up
 
 require File.expand_path("../../dummy/db/seeds", __FILE__)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 6
-  version: 0.3.6
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - GING - DIT - UPM
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-09 00:00:00 +01:00
+date: 2011-03-22 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -155,12 +155,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 11
         segments: 
         - 1
-        - 5
-        - 1
-        version: 1.5.1
+        - 6
+        - 2
+        version: 1.6.2
   type: :runtime
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
@@ -214,9 +214,25 @@ dependencies:
   type: :runtime
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
-  name: rails
+  name: rails_css_themes
   prerelease: false
   requirement: &id013 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :runtime
+  version_requirements: *id013
+- !ruby/object:Gem::Dependency 
+  name: rails
+  prerelease: false
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -228,11 +244,11 @@ dependencies:
         - 5
         version: 3.0.5
   type: :development
-  version_requirements: *id013
+  version_requirements: *id014
 - !ruby/object:Gem::Dependency 
   name: capybara
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -244,11 +260,11 @@ dependencies:
         - 9
         version: 0.3.9
   type: :development
-  version_requirements: *id014
+  version_requirements: *id015
 - !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
   prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -258,11 +274,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id015
+  version_requirements: *id016
 - !ruby/object:Gem::Dependency 
   name: ruby-debug
   prerelease: false
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -274,11 +290,11 @@ dependencies:
         - 3
         version: 0.10.3
   type: :development
-  version_requirements: *id016
+  version_requirements: *id017
 - !ruby/object:Gem::Dependency 
   name: rspec-rails
   prerelease: false
-  requirement: &id017 !ruby/object:Gem::Requirement 
+  requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -290,11 +306,11 @@ dependencies:
         - 0
         version: 2.5.0
   type: :development
-  version_requirements: *id017
+  version_requirements: *id018
 - !ruby/object:Gem::Dependency 
   name: factory_girl
   prerelease: false
-  requirement: &id018 !ruby/object:Gem::Requirement 
+  requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -306,11 +322,11 @@ dependencies:
         - 2
         version: 1.3.2
   type: :development
-  version_requirements: *id018
+  version_requirements: *id019
 - !ruby/object:Gem::Dependency 
   name: forgery
   prerelease: false
-  requirement: &id019 !ruby/object:Gem::Requirement 
+  requirement: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -322,11 +338,11 @@ dependencies:
         - 6
         version: 0.3.6
   type: :development
-  version_requirements: *id019
+  version_requirements: *id020
 - !ruby/object:Gem::Dependency 
   name: ci_reporter
   prerelease: false
-  requirement: &id020 !ruby/object:Gem::Requirement 
+  requirement: &id021 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -338,11 +354,11 @@ dependencies:
         - 4
         version: 1.6.4
   type: :development
-  version_requirements: *id020
+  version_requirements: *id021
 - !ruby/object:Gem::Dependency 
   name: nifty-generators
   prerelease: false
-  requirement: &id021 !ruby/object:Gem::Requirement 
+  requirement: &id022 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -354,7 +370,39 @@ dependencies:
         - 5
         version: 0.4.5
   type: :development
-  version_requirements: *id021
+  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: 15
+        segments: 
+        - 0
+        - 0
+        - 8
+        version: 0.0.8
+  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: 
 executables: []
@@ -372,6 +420,7 @@ files:
 - README.rdoc
 - Rakefile
 - app/controllers/activities_controller.rb
+- app/controllers/api_controller.rb
 - app/controllers/authentications_controller.rb
 - app/controllers/comments_controller.rb
 - app/controllers/contacts_controller.rb
@@ -379,15 +428,19 @@ files:
 - app/controllers/groups_controller.rb
 - app/controllers/home_controller.rb
 - app/controllers/likes_controller.rb
-- app/controllers/messages_controller.rb
+- app/controllers/logos_controller.rb
+- app/controllers/mailbox/conversation_controller.rb
+- app/controllers/mailbox_controller.rb
 - app/controllers/omniauth_callbacks_controller.rb
 - app/controllers/posts_controller.rb
+- app/controllers/profiles_controller.rb
 - app/controllers/representations_controller.rb
 - app/controllers/ties_controller.rb
 - app/controllers/users_controller.rb
 - app/helpers/activities_helper.rb
 - app/helpers/contacts_helper.rb
 - app/helpers/groups_helper.rb
+- app/helpers/subjects_helper.rb
 - app/helpers/ties_helper.rb
 - app/helpers/users_helper.rb
 - app/models/ability.rb
@@ -399,7 +452,8 @@ files:
 - app/models/authentication.rb
 - app/models/comment.rb
 - app/models/group.rb
-- app/models/message.rb
+- app/models/like.rb
+- app/models/logo.rb
 - app/models/permission.rb
 - app/models/post.rb
 - app/models/profile.rb
@@ -418,56 +472,89 @@ files:
 - app/views/activities/_options.html.erb
 - app/views/activities/_root.html.erb
 - app/views/activity_objects/_activity_object.html.erb
+- app/views/api/activity_atom_feed.atom.builder
 - 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/devise/passwords/edit.html.erb
+- app/views/devise/passwords/new.html.erb
 - app/views/devise/registrations/new.html.erb
+- app/views/devise/sessions/new.html.erb
 - app/views/frontpage/_header.html.erb
+- app/views/frontpage/_search.html.erb
 - app/views/frontpage/_sponsor.html.erb
 - app/views/frontpage/index.html.erb
 - app/views/groups/_group.html.erb
 - app/views/groups/_index.html.erb
 - app/views/groups/_location.html.erb
 - app/views/groups/_logo.html.erb
-- app/views/groups/_middle_index.html.erb
-- app/views/groups/_middle_show.html.erb
 - app/views/groups/_new.html.erb
-- app/views/groups/_right_index.html.erb
-- app/views/groups/_right_show.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/_tabs.html.erb
+- app/views/groups/_toolbar_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/_middle.html.erb
-- app/views/home/_options.html.erb
-- app/views/home/_right.html.erb
+- app/views/home/_sidebar.html.erb
 - app/views/home/index.html.erb
 - app/views/layouts/_footer.html.erb
 - app/views/layouts/_header.erb
 - app/views/layouts/_representation.html.erb
 - app/views/layouts/application.html.erb
 - app/views/layouts/frontpage.html.erb
+- app/views/layouts/test.html
 - app/views/likes/create.js.erb
 - app/views/likes/destroy.js.erb
-- app/views/messages/_form.html.erb
-- app/views/messages/_index.html.erb
-- app/views/messages/_location.html.erb
-- app/views/messages/_message.html.erb
-- app/views/messages/_messages.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/show.html.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/mailbox/_conversation.html.erb
+- app/views/mailbox/_conversations.html.erb
+- app/views/mailbox/_index.html.erb
+- app/views/mailbox/_location.html.erb
+- app/views/mailbox/_menu_options.html.erb
+- app/views/mailbox/_show.html.erb
+- app/views/mailbox/conversation/_conversation.html.erb
+- app/views/mailbox/conversation/_form.html.erb
+- app/views/mailbox/conversation/_location.html.erb
+- app/views/mailbox/conversation/_new.html.erb
+- app/views/mailbox/conversation/_show.html.erb
+- app/views/mailbox/conversation/edit.html.erb
+- app/views/mailbox/conversation/new.html.erb
+- app/views/mailbox/conversation/new.js.erb
+- app/views/mailbox/conversation/show.html.erb
+- app/views/mailbox/edit.html.erb
+- app/views/mailbox/index.html.erb
+- app/views/mailbox/index.js.erb
+- app/views/mailbox/new.html.erb
+- app/views/mailbox/show.html.erb
+- app/views/mailbox/show.js.erb
+- app/views/menu/_group.html.erb
+- app/views/menu/_home_user.html.erb
+- app/views/menu/_options.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/posts/_post.html.erb
 - app/views/posts/create.js.erb
 - app/views/posts/destroy.js.erb
+- app/views/profiles/show.html.erb
 - app/views/subjects/_contacts.html.erb
+- app/views/subjects/_menu_options.html.erb
+- app/views/subjects/_toolbar.html.erb
 - app/views/ties/_form.html.erb
 - app/views/ties/_new.html.erb
 - app/views/ties/_pendings.html.erb
@@ -482,17 +569,16 @@ files:
 - app/views/users/_index.html.erb
 - app/views/users/_location.html.erb
 - app/views/users/_logo.html.erb
-- app/views/users/_menu.html.erb
-- app/views/users/_middle_index.html.erb
-- app/views/users/_middle_show.html.erb
-- app/views/users/_options.html.erb
 - app/views/users/_profile.html.erb
-- app/views/users/_right_index.html.erb
-- app/views/users/_right_show.html.erb
+- app/views/users/_sidebar_index.html.erb
+- app/views/users/_sidebar_show.html.erb
+- app/views/users/_toolbar_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
@@ -506,6 +592,7 @@ files:
 - lib/generators/social_stream/templates/public/images/boxy/boxy-nw.png
 - lib/generators/social_stream/templates/public/images/boxy/boxy-se.png
 - lib/generators/social_stream/templates/public/images/boxy/boxy-sw.png
+- lib/generators/social_stream/templates/public/images/btn/1-facebook.png
 - lib/generators/social_stream/templates/public/images/btn/_notes/btn_certificates.png.mno
 - lib/generators/social_stream/templates/public/images/btn/arrows-ffffff.png
 - lib/generators/social_stream/templates/public/images/btn/bold.png
@@ -548,7 +635,6 @@ files:
 - lib/generators/social_stream/templates/public/images/btn/btn_rank.png
 - lib/generators/social_stream/templates/public/images/btn/btn_security.png
 - lib/generators/social_stream/templates/public/images/btn/btn_send.png
-- lib/generators/social_stream/templates/public/images/btn/btn_share.png
 - lib/generators/social_stream/templates/public/images/btn/btn_spam.png
 - lib/generators/social_stream/templates/public/images/btn/btn_star.png
 - lib/generators/social_stream/templates/public/images/btn/btn_tag.png
@@ -556,6 +642,7 @@ files:
 - lib/generators/social_stream/templates/public/images/btn/btn_write.png
 - lib/generators/social_stream/templates/public/images/btn/close.png
 - lib/generators/social_stream/templates/public/images/btn/date.png
+- lib/generators/social_stream/templates/public/images/btn/edit.png
 - lib/generators/social_stream/templates/public/images/btn/facebook.png
 - lib/generators/social_stream/templates/public/images/btn/flag.png
 - lib/generators/social_stream/templates/public/images/btn/flyer.png
@@ -564,6 +651,7 @@ files:
 - lib/generators/social_stream/templates/public/images/btn/index_71.png
 - lib/generators/social_stream/templates/public/images/btn/italic.png
 - 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/new.png
 - lib/generators/social_stream/templates/public/images/btn/next_conference.png
@@ -577,17 +665,15 @@ files:
 - lib/generators/social_stream/templates/public/images/btn/subtime.png
 - lib/generators/social_stream/templates/public/images/btn/tag_cloud.png
 - lib/generators/social_stream/templates/public/images/btn/time.png
+- lib/generators/social_stream/templates/public/images/btn/twitter-follow-icon.png
+- lib/generators/social_stream/templates/public/images/btn/twitter.png
 - lib/generators/social_stream/templates/public/images/btn/uno.png
 - lib/generators/social_stream/templates/public/images/btn/viewer.png
-- lib/generators/social_stream/templates/public/images/favicon.ico
 - lib/generators/social_stream/templates/public/images/fcbkcomplete/close.gif
-- lib/generators/social_stream/templates/public/images/frontpage/collaborate.gif
 - lib/generators/social_stream/templates/public/images/frontpage/collaborate.png
 - lib/generators/social_stream/templates/public/images/frontpage/comments.png
-- lib/generators/social_stream/templates/public/images/frontpage/facebook.png
 - lib/generators/social_stream/templates/public/images/frontpage/green_sq.png
 - lib/generators/social_stream/templates/public/images/frontpage/join.gif
-- lib/generators/social_stream/templates/public/images/frontpage/meet.gif
 - lib/generators/social_stream/templates/public/images/frontpage/meet.png
 - lib/generators/social_stream/templates/public/images/frontpage/people.png
 - lib/generators/social_stream/templates/public/images/frontpage/purple_sq.png
@@ -597,11 +683,11 @@ files:
 - lib/generators/social_stream/templates/public/images/frontpage/right_social.gif
 - lib/generators/social_stream/templates/public/images/frontpage/right_tags.gif
 - lib/generators/social_stream/templates/public/images/frontpage/right_webcam.gif
-- lib/generators/social_stream/templates/public/images/frontpage/share.gif
 - lib/generators/social_stream/templates/public/images/frontpage/share.png
 - lib/generators/social_stream/templates/public/images/frontpage/tags.png
 - lib/generators/social_stream/templates/public/images/frontpage/yellow_sq.png
 - lib/generators/social_stream/templates/public/images/header-logo.png
+- lib/generators/social_stream/templates/public/images/icons/favicon.ico
 - lib/generators/social_stream/templates/public/images/left.png
 - lib/generators/social_stream/templates/public/images/loader.gif
 - lib/generators/social_stream/templates/public/images/logo.png
@@ -615,11 +701,14 @@ files:
 - lib/generators/social_stream/templates/public/images/logos/tie/user.png
 - lib/generators/social_stream/templates/public/images/right.png
 - lib/generators/social_stream/templates/public/images/title_background.png
+- lib/generators/social_stream/templates/public/images/w3c_css.png
+- lib/generators/social_stream/templates/public/images/w3c_xhtml.png
 - lib/generators/social_stream/templates/public/javascripts/ajax.paginate.js
-- lib/generators/social_stream/templates/public/javascripts/hoverIntent.js
 - lib/generators/social_stream/templates/public/javascripts/jqcloud-0.1.3.min.js
 - lib/generators/social_stream/templates/public/javascripts/jquery-ui-1.8.4.custom.min.js
+- lib/generators/social_stream/templates/public/javascripts/jquery-ui-personalized-1.5.2.packed.js
 - lib/generators/social_stream/templates/public/javascripts/jquery-ui.min.js
+- lib/generators/social_stream/templates/public/javascripts/jquery.Jcrop.min.js
 - lib/generators/social_stream/templates/public/javascripts/jquery.ba-url.js
 - lib/generators/social_stream/templates/public/javascripts/jquery.boxy.js
 - lib/generators/social_stream/templates/public/javascripts/jquery.fcbkcomplete.min.js
@@ -627,57 +716,52 @@ files:
 - lib/generators/social_stream/templates/public/javascripts/jquery.livequery.js
 - lib/generators/social_stream/templates/public/javascripts/jquery.min.js
 - lib/generators/social_stream/templates/public/javascripts/jquery.validate.js
+- lib/generators/social_stream/templates/public/javascripts/main.js
+- lib/generators/social_stream/templates/public/javascripts/menu-collapsed.js
 - lib/generators/social_stream/templates/public/javascripts/menu.js
 - lib/generators/social_stream/templates/public/javascripts/rails.js
+- lib/generators/social_stream/templates/public/javascripts/superfish.js
 - lib/generators/social_stream/templates/public/javascripts/ui.dropdownchecklist.js
-- lib/generators/social_stream/templates/public/stylesheets/activities.css
-- lib/generators/social_stream/templates/public/stylesheets/base.css
-- lib/generators/social_stream/templates/public/stylesheets/boxy.css
-- lib/generators/social_stream/templates/public/stylesheets/browse.css
-- lib/generators/social_stream/templates/public/stylesheets/carousel.css
-- lib/generators/social_stream/templates/public/stylesheets/edit_user.css
-- lib/generators/social_stream/templates/public/stylesheets/fcbkComplete.css
-- lib/generators/social_stream/templates/public/stylesheets/frontpage.css
-- lib/generators/social_stream/templates/public/stylesheets/header.css
-- lib/generators/social_stream/templates/public/stylesheets/home.css
-- lib/generators/social_stream/templates/public/stylesheets/images/ui-bg_flat_0_aaaaaa_40x100.png
-- lib/generators/social_stream/templates/public/stylesheets/images/ui-bg_flat_75_ffffff_40x100.png
-- lib/generators/social_stream/templates/public/stylesheets/images/ui-bg_glass_55_fbf9ee_1x400.png
-- lib/generators/social_stream/templates/public/stylesheets/images/ui-bg_glass_65_ffffff_1x400.png
-- lib/generators/social_stream/templates/public/stylesheets/images/ui-bg_glass_75_dadada_1x400.png
-- lib/generators/social_stream/templates/public/stylesheets/images/ui-bg_glass_75_e6e6e6_1x400.png
-- lib/generators/social_stream/templates/public/stylesheets/images/ui-bg_glass_95_fef1ec_1x400.png
-- lib/generators/social_stream/templates/public/stylesheets/images/ui-bg_highlight-soft_75_cccccc_1x100.png
-- lib/generators/social_stream/templates/public/stylesheets/images/ui-icons_222222_256x240.png
-- lib/generators/social_stream/templates/public/stylesheets/images/ui-icons_2e83ff_256x240.png
-- lib/generators/social_stream/templates/public/stylesheets/images/ui-icons_454545_256x240.png
-- lib/generators/social_stream/templates/public/stylesheets/images/ui-icons_888888_256x240.png
-- lib/generators/social_stream/templates/public/stylesheets/images/ui-icons_cd0a0a_256x240.png
-- lib/generators/social_stream/templates/public/stylesheets/index.css
-- lib/generators/social_stream/templates/public/stylesheets/jqcloud.css
-- lib/generators/social_stream/templates/public/stylesheets/jquery-ui.css
-- lib/generators/social_stream/templates/public/stylesheets/menu.css
-- lib/generators/social_stream/templates/public/stylesheets/message.css
-- lib/generators/social_stream/templates/public/stylesheets/middle.css
-- lib/generators/social_stream/templates/public/stylesheets/right.css
-- lib/generators/social_stream/templates/public/stylesheets/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
-- lib/generators/social_stream/templates/public/stylesheets/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
-- lib/generators/social_stream/templates/public/stylesheets/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
-- lib/generators/social_stream/templates/public/stylesheets/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
-- lib/generators/social_stream/templates/public/stylesheets/smoothness/images/ui-bg_glass_75_dadada_1x400.png
-- lib/generators/social_stream/templates/public/stylesheets/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
-- lib/generators/social_stream/templates/public/stylesheets/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
-- lib/generators/social_stream/templates/public/stylesheets/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
-- lib/generators/social_stream/templates/public/stylesheets/smoothness/images/ui-icons_222222_256x240.png
-- lib/generators/social_stream/templates/public/stylesheets/smoothness/images/ui-icons_2e83ff_256x240.png
-- lib/generators/social_stream/templates/public/stylesheets/smoothness/images/ui-icons_454545_256x240.png
-- lib/generators/social_stream/templates/public/stylesheets/smoothness/images/ui-icons_888888_256x240.png
-- lib/generators/social_stream/templates/public/stylesheets/smoothness/images/ui-icons_cd0a0a_256x240.png
-- lib/generators/social_stream/templates/public/stylesheets/smoothness/jquery-ui-1.7.3.custom.css
-- lib/generators/social_stream/templates/public/stylesheets/smoothness/jquery-ui-1.8.4.custom.css
-- lib/generators/social_stream/templates/public/stylesheets/social_stream.css
-- lib/generators/social_stream/templates/public/stylesheets/ui.dropdownchecklist.css
-- lib/generators/social_stream/templates/public/stylesheets/users.css
+- lib/generators/social_stream/templates/public/stylesheets/default/activities.css
+- lib/generators/social_stream/templates/public/stylesheets/default/base.css
+- lib/generators/social_stream/templates/public/stylesheets/default/carousel.css
+- lib/generators/social_stream/templates/public/stylesheets/default/fcbkComplete.css
+- lib/generators/social_stream/templates/public/stylesheets/default/footer.css
+- lib/generators/social_stream/templates/public/stylesheets/default/frontpage.css
+- lib/generators/social_stream/templates/public/stylesheets/default/header.css
+- lib/generators/social_stream/templates/public/stylesheets/default/home.css
+- lib/generators/social_stream/templates/public/stylesheets/default/images/ui-bg_flat_0_aaaaaa_40x100.png
+- lib/generators/social_stream/templates/public/stylesheets/default/images/ui-bg_flat_75_ffffff_40x100.png
+- lib/generators/social_stream/templates/public/stylesheets/default/images/ui-bg_glass_55_fbf9ee_1x400.png
+- lib/generators/social_stream/templates/public/stylesheets/default/images/ui-bg_glass_65_ffffff_1x400.png
+- lib/generators/social_stream/templates/public/stylesheets/default/images/ui-bg_glass_75_dadada_1x400.png
+- lib/generators/social_stream/templates/public/stylesheets/default/images/ui-bg_glass_75_e6e6e6_1x400.png
+- lib/generators/social_stream/templates/public/stylesheets/default/images/ui-bg_glass_95_fef1ec_1x400.png
+- lib/generators/social_stream/templates/public/stylesheets/default/images/ui-bg_highlight-soft_75_cccccc_1x100.png
+- lib/generators/social_stream/templates/public/stylesheets/default/images/ui-icons_222222_256x240.png
+- lib/generators/social_stream/templates/public/stylesheets/default/images/ui-icons_2e83ff_256x240.png
+- lib/generators/social_stream/templates/public/stylesheets/default/images/ui-icons_454545_256x240.png
+- lib/generators/social_stream/templates/public/stylesheets/default/images/ui-icons_888888_256x240.png
+- lib/generators/social_stream/templates/public/stylesheets/default/images/ui-icons_cd0a0a_256x240.png
+- lib/generators/social_stream/templates/public/stylesheets/default/jqcloud.css
+- lib/generators/social_stream/templates/public/stylesheets/default/jquery-ui.css
+- lib/generators/social_stream/templates/public/stylesheets/default/jquery.Jcrop.css
+- lib/generators/social_stream/templates/public/stylesheets/default/menu.css
+- lib/generators/social_stream/templates/public/stylesheets/default/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
+- lib/generators/social_stream/templates/public/stylesheets/default/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
+- lib/generators/social_stream/templates/public/stylesheets/default/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
+- lib/generators/social_stream/templates/public/stylesheets/default/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
+- lib/generators/social_stream/templates/public/stylesheets/default/smoothness/images/ui-bg_glass_75_dadada_1x400.png
+- lib/generators/social_stream/templates/public/stylesheets/default/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
+- lib/generators/social_stream/templates/public/stylesheets/default/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
+- lib/generators/social_stream/templates/public/stylesheets/default/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
+- lib/generators/social_stream/templates/public/stylesheets/default/smoothness/images/ui-icons_222222_256x240.png
+- lib/generators/social_stream/templates/public/stylesheets/default/smoothness/images/ui-icons_2e83ff_256x240.png
+- lib/generators/social_stream/templates/public/stylesheets/default/smoothness/images/ui-icons_454545_256x240.png
+- lib/generators/social_stream/templates/public/stylesheets/default/smoothness/images/ui-icons_888888_256x240.png
+- lib/generators/social_stream/templates/public/stylesheets/default/smoothness/images/ui-icons_cd0a0a_256x240.png
+- lib/generators/social_stream/templates/public/stylesheets/default/smoothness/jquery-ui-1.7.3.custom.css
+- lib/generators/social_stream/templates/public/stylesheets/default/smoothness/jquery-ui-1.8.4.custom.css
 - lib/generators/social_stream/templates/relations.yml
 - lib/paperclip/social_stream.rb
 - lib/social_stream.rb
@@ -689,6 +773,8 @@ files:
 - lib/social_stream/populate.rb
 - lib/social_stream/rails.rb
 - lib/social_stream/relations.rb
+- lib/social_stream/test_helpers.rb
+- lib/social_stream/test_helpers/controllers.rb
 - lib/social_stream/version.rb
 - lib/tasks/db/populate.rake
 - social_stream.gemspec
@@ -696,8 +782,12 @@ files:
 - spec/controllers/frontpage_controller_spec.rb
 - spec/controllers/groups_controller_spec.rb
 - spec/controllers/home_controller_spec.rb
+- spec/controllers/likes_controller_spec.rb
+- spec/controllers/posts_controller_spec.rb
+- spec/controllers/profiles_controller_spec.rb
 - spec/controllers/ties_controller_spec.rb
 - spec/controllers/users_controller_spec.rb
+- spec/dummy/.gitignore
 - spec/dummy/Rakefile
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
@@ -709,6 +799,7 @@ files:
 - spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/production.rb
 - spec/dummy/config/environments/test.rb
+- spec/dummy/config/environments/test_pg.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
 - spec/dummy/config/initializers/devise.rb
 - spec/dummy/config/initializers/inflections.rb
@@ -719,22 +810,13 @@ files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/relations.yml
 - spec/dummy/config/routes.rb
-- spec/dummy/db/.gitignore
 - spec/dummy/db/migrate/.gitkeep
 - spec/dummy/db/schema.rb
 - spec/dummy/db/seeds.rb
-- spec/dummy/log/.gitignore
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
-- spec/dummy/public/javascripts/application.js
-- spec/dummy/public/javascripts/controls.js
-- spec/dummy/public/javascripts/dragdrop.js
-- spec/dummy/public/javascripts/effects.js
-- spec/dummy/public/javascripts/prototype.js
-- spec/dummy/public/javascripts/rails.js
-- spec/dummy/public/stylesheets/.gitkeep
 - spec/dummy/script/rails
 - spec/factories/activity.rb
 - spec/factories/actor.rb