social_stream 0.4.4 → 0.4.5

data/spec/models/actor_spec.rb

@@ -14,6 +14,6 @@ describe Actor do
   end
 
   it "should generate relations" do
-    assert Factory(:actor).relations.present?
+    assert Factory(:actor).relation_customs.present?
   end
 end

data/spec/models/group_spec.rb

@@ -0,0 +1,12 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Group do
+  it "should save description" do
+    g = Group.create(:name => "Test",
+                     :description => "Testing description",
+                     :_founder => Factory(:user).slug)
+
+    g.reload.description.should be_present
+  end
+end
+

data/spec/models/like_spec.rb

@@ -0,0 +1,68 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Like do
+
+  describe "activity" do
+    before do
+      @like_activity = Factory(:like_activity)
+      @activity = @like_activity.parent
+    end
+
+    it "should recognize the user who likes it" do
+      assert @activity.liked_by?(@like_activity.sender)
+    end
+
+    it "should not recognize the user who does not like it" do
+      assert ! @activity.liked_by?(Factory(:user))
+    end
+  end
+
+  describe "actor" do
+    shared_examples_for "creates activity" do
+      it "should recognize the user who likes it" do
+        Like.build(@sender, @receiver).save
+
+        assert @receiver.liked_by?(@sender)
+      end
+
+      it "should increment like count" do
+        count = @receiver.like_count
+
+        Like.build(@sender, @receiver).save
+
+        @receiver.like_count.should eq(count + 1)
+      end
+
+      it "should decrement like count" do
+        @like = Like.build(@sender, @receiver)
+        @like.save
+
+        count = @receiver.like_count
+
+        @like.destroy
+
+        @receiver.like_count.should eq(count - 1)
+      end
+    end
+
+    context "friend" do
+      before do
+        tie = Factory(:friend)
+        @sender = tie.sender
+        @receiver = tie.receiver
+      end
+
+      it_should_behave_like "creates activity"
+    end
+
+    context "alien" do
+      before do
+        @sender, @receiver = 2.times.map{ Factory(:user) }
+      end
+
+      it_should_behave_like "creates activity"
+    end
+  end
+end
+
+

data/spec/models/profile_spec.rb

@@ -22,7 +22,8 @@ describe Profile do
 
     context "accessed by other" do
       before do
-        @ability = Ability.new(Factory(:user))
+        u = Factory(:user)
+        @ability = Ability.new(u)
       end
 
       it "should allow read" do

data/spec/models/relation_custom_spec.rb

@@ -0,0 +1,14 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Relation::Custom do
+  it "should assign parent" do
+    parent = Factory(:relation_custom)
+    sphere = parent.sphere
+
+    r = Relation::Custom.create! :name => "test",
+                                 :sphere_id => sphere.id
+
+    r.parent.should eq(parent)
+  end
+end
+

data/spec/models/tie_spec.rb

@@ -7,7 +7,7 @@ describe Tie do
     end
 
     it "should be created from relation name" do
-      relation = @sender.relations.first
+      relation = @sender.relation_customs.first
 
       tie = Tie.create :sender_id => @sender.actor_id,
                        :receiver_id => @receiver.actor_id,
@@ -30,6 +30,30 @@ describe Tie do
     end
   end
 
+  describe "follower_count" do
+    it "should be incremented" do
+      sender, receiver = 2.times.map{ Factory(:user) }
+
+      count = receiver.follower_count
+
+      Tie.create :sender_id => sender.actor_id,
+                 :receiver_id => receiver.actor_id,
+                 :relation_id => sender.relation_customs.sort.first.id
+
+      receiver.reload.follower_count.should eq(count + 1)
+    end
+    
+    it "should be decremented" do
+      tie = Factory(:friend)
+      receiver = tie.receiver
+      count = receiver.follower_count
+
+      tie.destroy
+
+      receiver.reload.follower_count.should eq(count - 1)
+    end
+  end
+
   context "replied" do
     before do
       @sent = Factory(:friend)
@@ -147,7 +171,7 @@ describe Tie do
       end
 
       it "updates activity" do
-        Tie.allowing(@s, 'update', 'activity').should include(@tie)
+        Tie.allowing(@s, 'update', 'activity').should_not include(@tie)
       end
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream
 version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: false
+  hash: 5
+  prerelease: 
   segments: 
   - 0
   - 4
-  - 4
-  version: 0.4.4
+  - 5
+  version: 0.4.5
 platform: ruby
 authors: 
 - GING - DIT - UPM
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-19 00:00:00 +02:00
+date: 2011-05-31 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -75,12 +75,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 27
         segments: 
         - 1
-        - 1
         - 2
-        version: 1.1.2
+        - 2
+        version: 1.2.2
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -116,9 +116,25 @@ dependencies:
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: jquery-rails
+  name: avatars_for_rails
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 0
+        - 0
+        - 9
+        version: 0.0.9
+  type: :runtime
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: jquery-rails
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -130,11 +146,11 @@ dependencies:
         - 5
         version: 0.2.5
   type: :runtime
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: cancan
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -146,61 +162,62 @@ dependencies:
         - 4
         version: 1.6.4
   type: :runtime
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: will_paginate
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 270495401
+        hash: -223651731
         segments: 
         - 3
         - 0
-        - pre2
+        - pre
+        - 2
         version: 3.0.pre2
   type: :runtime
-  version_requirements: *id009
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: omniauth
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 299253593
+        hash: 29
         segments: 
         - 0
         - 2
-        - 0
-        - beta5
-        version: 0.2.0.beta5
+        - 5
+        version: 0.2.5
   type: :runtime
-  version_requirements: *id010
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: oauth-plugin
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 270495424
+        hash: -223651605
         segments: 
         - 0
         - 4
         - 0
-        - pre1
+        - pre
+        - 1
         version: 0.4.0.pre1
   type: :runtime
-  version_requirements: *id011
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: rails_css_themes
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -212,27 +229,27 @@ dependencies:
         - 0
         version: 1.0.0
   type: :runtime
-  version_requirements: *id012
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   name: mailboxer
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 63
+        hash: 19
         segments: 
         - 0
-        - 0
-        - 16
-        version: 0.0.16
+        - 1
+        - 4
+        version: 0.1.4
   type: :runtime
-  version_requirements: *id013
+  version_requirements: *id014
 - !ruby/object:Gem::Dependency 
   name: rmagick
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -244,11 +261,11 @@ dependencies:
         - 1
         version: 2.13.1
   type: :runtime
-  version_requirements: *id014
+  version_requirements: *id015
 - !ruby/object:Gem::Dependency 
   name: acts-as-taggable-on
   prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -260,11 +277,27 @@ dependencies:
         - 6
         version: 2.0.6
   type: :runtime
-  version_requirements: *id015
+  version_requirements: *id016
+- !ruby/object:Gem::Dependency 
+  name: formtastic
+  prerelease: false
+  requirement: &id017 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 1
+        - 2
+        - 3
+        version: 1.2.3
+  type: :runtime
+  version_requirements: *id017
 - !ruby/object:Gem::Dependency 
   name: rails
   prerelease: false
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -276,11 +309,11 @@ dependencies:
         - 7
         version: 3.0.7
   type: :development
-  version_requirements: *id016
+  version_requirements: *id018
 - !ruby/object:Gem::Dependency 
   name: capybara
   prerelease: false
-  requirement: &id017 !ruby/object:Gem::Requirement 
+  requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -292,11 +325,11 @@ dependencies:
         - 9
         version: 0.3.9
   type: :development
-  version_requirements: *id017
+  version_requirements: *id019
 - !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
   prerelease: false
-  requirement: &id018 !ruby/object:Gem::Requirement 
+  requirement: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -306,11 +339,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id018
+  version_requirements: *id020
 - !ruby/object:Gem::Dependency 
   name: ruby-debug
   prerelease: false
-  requirement: &id019 !ruby/object:Gem::Requirement 
+  requirement: &id021 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -322,11 +355,11 @@ dependencies:
         - 3
         version: 0.10.3
   type: :development
-  version_requirements: *id019
+  version_requirements: *id021
 - !ruby/object:Gem::Dependency 
   name: rspec-rails
   prerelease: false
-  requirement: &id020 !ruby/object:Gem::Requirement 
+  requirement: &id022 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -338,11 +371,11 @@ dependencies:
         - 0
         version: 2.5.0
   type: :development
-  version_requirements: *id020
+  version_requirements: *id022
 - !ruby/object:Gem::Dependency 
   name: factory_girl
   prerelease: false
-  requirement: &id021 !ruby/object:Gem::Requirement 
+  requirement: &id023 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -354,11 +387,11 @@ dependencies:
         - 2
         version: 1.3.2
   type: :development
-  version_requirements: *id021
+  version_requirements: *id023
 - !ruby/object:Gem::Dependency 
   name: forgery
   prerelease: false
-  requirement: &id022 !ruby/object:Gem::Requirement 
+  requirement: &id024 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -370,11 +403,11 @@ dependencies:
         - 6
         version: 0.3.6
   type: :development
-  version_requirements: *id022
+  version_requirements: *id024
 - !ruby/object:Gem::Dependency 
   name: ci_reporter
   prerelease: false
-  requirement: &id023 !ruby/object:Gem::Requirement 
+  requirement: &id025 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -386,11 +419,11 @@ dependencies:
         - 4
         version: 1.6.4
   type: :development
-  version_requirements: *id023
+  version_requirements: *id025
 - !ruby/object:Gem::Dependency 
   name: nifty-generators
   prerelease: false
-  requirement: &id024 !ruby/object:Gem::Requirement 
+  requirement: &id026 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -402,7 +435,7 @@ dependencies:
         - 5
         version: 0.4.5
   type: :development
-  version_requirements: *id024
+  version_requirements: *id026
 description: Ruby on Rails engine supporting social networking features and activity streams.
 email: 
 executables: []
@@ -422,7 +455,6 @@ 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
@@ -431,20 +463,25 @@ files:
 - app/controllers/home_controller.rb
 - app/controllers/likes_controller.rb
 - app/controllers/messages_controller.rb
+- app/controllers/notifications_controller.rb
 - app/controllers/omniauth_callbacks_controller.rb
+- app/controllers/permissions_controller.rb
 - app/controllers/posts_controller.rb
 - app/controllers/profiles_controller.rb
-- app/controllers/representations_controller.rb
+- app/controllers/relation/customs_controller.rb
+- app/controllers/spheres_controller.rb
 - app/controllers/subjects_controller.rb
 - app/controllers/tags_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/location_helper.rb
+- app/helpers/notifications_helper.rb
+- app/helpers/permissions_helper.rb
+- app/helpers/profiles_helper.rb
 - app/helpers/subjects_helper.rb
-- app/helpers/ties_helper.rb
+- app/helpers/toolbar_helper.rb
 - app/helpers/users_helper.rb
 - app/models/ability.rb
 - app/models/activity.rb
@@ -453,8 +490,8 @@ files:
 - app/models/activity_verb.rb
 - app/models/actor.rb
 - app/models/authentication.rb
-- app/models/avatar.rb
 - app/models/comment.rb
+- app/models/contact.rb
 - app/models/group.rb
 - app/models/like.rb
 - app/models/permission.rb
@@ -464,7 +501,6 @@ files:
 - app/models/relation/custom.rb
 - app/models/relation/public.rb
 - app/models/relation_permission.rb
-- app/models/representation.rb
 - app/models/sphere.rb
 - app/models/tie.rb
 - app/models/tie_activity.rb
@@ -482,19 +518,22 @@ files:
 - app/views/activity_objects/_activity_object.html.erb
 - app/views/actors/_actor.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/_contact.html.erb
+- app/views/contacts/_edit.html.erb
+- app/views/contacts/_form.html.erb
 - app/views/contacts/_index.html.erb
+- app/views/contacts/_pendings.html.erb
+- app/views/contacts/_suggestions.html.erb
+- app/views/contacts/_suggestions_and_pendings.html.erb
+- app/views/contacts/edit.html.erb
 - app/views/contacts/index.html.erb
 - app/views/contacts/index.js.erb
+- app/views/contacts/new.html.erb
 - app/views/conversations/_conversation.html.erb
 - app/views/conversations/_conversation_full.html.erb
 - app/views/conversations/_conversations.html.erb
@@ -517,8 +556,6 @@ files:
 - 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/_new.html.erb
 - app/views/groups/_sidebar_index.html.erb
 - app/views/groups/_sidebar_show.html.erb
@@ -527,11 +564,11 @@ files:
 - app/views/groups/new.html.erb
 - app/views/groups/show.html.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/_account.html.erb
+- app/views/layouts/_flash.html.erb
 - app/views/layouts/_footer.html.erb
 - app/views/layouts/_header.erb
 - app/views/layouts/_representation.html.erb
@@ -546,39 +583,73 @@ files:
 - app/views/messages/_new.html.erb
 - app/views/messages/new.html.erb
 - app/views/messages/new.js.erb
+- app/views/notification_mailer/new_notification_email.html.erb
+- app/views/notification_mailer/new_notification_email.text.erb
+- app/views/notifications/_index.html.erb
+- app/views/notifications/_notification.html.erb
+- app/views/notifications/_show.html.erb
+- app/views/notifications/activities/_follow_body.html.erb
+- app/views/notifications/activities/_follow_subject.html.erb
+- app/views/notifications/activities/_like_body.html.erb
+- app/views/notifications/activities/_like_object_body.html.erb
+- app/views/notifications/activities/_like_object_subject.html.erb
+- app/views/notifications/activities/_like_subject.html.erb
+- app/views/notifications/activities/_like_subject_body.html.erb
+- app/views/notifications/activities/_like_subject_subject.html.erb
+- app/views/notifications/activities/_make-friend_body.html.erb
+- app/views/notifications/activities/_make-friend_subject.html.erb
+- app/views/notifications/activities/_post_body.html.erb
+- app/views/notifications/activities/_post_subject.html.erb
+- app/views/notifications/activities/_update_body.html.erb
+- app/views/notifications/activities/_update_subject.html.erb
+- app/views/notifications/index.html.erb
+- app/views/notifications/index.js.erb
+- app/views/notifications/show.html.erb
+- app/views/permissions/_index.html.erb
+- app/views/permissions/index.js.erb
 - app/views/posts/_post.html.erb
 - app/views/posts/create.js.erb
 - app/views/posts/destroy.js.erb
+- app/views/profiles/_contact.html.erb
+- app/views/profiles/_experience.html.erb
+- app/views/profiles/_personal.html.erb
 - app/views/profiles/_profile.html.erb
+- app/views/profiles/_tags.html.erb
 - app/views/profiles/edit.html.erb
 - app/views/profiles/show.html.erb
 - app/views/profiles/update.js.erb
+- app/views/relation/customs/_form.html.erb
+- app/views/relation/customs/_index.html.erb
+- app/views/relation/customs/_list.html.erb
+- app/views/relation/customs/create.js.erb
+- app/views/relation/customs/index.js.erb
+- app/views/relation/customs/update.js.erb
+- app/views/spheres/_form.html.erb
+- app/views/spheres/_jquery.erb
+- app/views/spheres/_list.html.erb
+- app/views/spheres/create.js.erb
+- app/views/spheres/index.html.erb
 - app/views/subjects/_contacts.html.erb
 - app/views/subjects/_tabs.html.erb
-- app/views/subjects/_toolbar_home.html.erb
-- app/views/subjects/_toolbar_home_menu.html.erb
-- 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
-- app/views/subjects/_toolbar_profile_menu_tie_options.html.erb
 - app/views/ties/_edit.html.erb
 - app/views/ties/_form.html.erb
-- app/views/ties/_new.html.erb
-- app/views/ties/_pendings.html.erb
-- app/views/ties/_suggestions.html.erb
-- app/views/ties/_tie.html.erb
 - app/views/ties/create.js.erb
 - app/views/ties/edit.html.erb
-- app/views/ties/new.html.erb
 - app/views/ties/suggestion.html.erb
 - app/views/ties/suggestion.js.erb
+- app/views/toolbar/_home.html.erb
+- app/views/toolbar/_home_menu.html.erb
+- app/views/toolbar/_home_menu_options.html.erb
+- app/views/toolbar/_home_menu_options_subjects.html.erb
+- app/views/toolbar/_logo.html.erb
+- app/views/toolbar/_message_menu.html.erb
+- app/views/toolbar/_notifications_menu.html.erb
+- app/views/toolbar/_profile.html.erb
+- app/views/toolbar/_profile_menu.html.erb
+- app/views/toolbar/_profile_menu_basic_options.html.erb
+- app/views/toolbar/_profile_menu_tie_options.html.erb
 - app/views/users/_groups.html.erb
 - app/views/users/_index.html.erb
-- app/views/users/_location.html.erb
 - app/views/users/_sidebar_index.html.erb
 - app/views/users/index.html.erb
 - app/views/users/index.js.erb
@@ -593,6 +664,10 @@ files:
 - lib/generators/social_stream/install_generator.rb
 - lib/generators/social_stream/templates/initializer.rb
 - lib/generators/social_stream/templates/migration.rb
+- lib/generators/social_stream/templates/public/images/HTML5.png
+- lib/generators/social_stream/templates/public/images/HTML5_Semantics.png
+- lib/generators/social_stream/templates/public/images/HTML5_Styling.png
+- lib/generators/social_stream/templates/public/images/Jcrop.gif
 - lib/generators/social_stream/templates/public/images/boxy/boxy-ne.png
 - lib/generators/social_stream/templates/public/images/boxy/boxy-nw.png
 - lib/generators/social_stream/templates/public/images/boxy/boxy-se.png
@@ -631,6 +706,8 @@ files:
 - lib/generators/social_stream/templates/public/images/btn/btn_info.png
 - lib/generators/social_stream/templates/public/images/btn/btn_like.png
 - lib/generators/social_stream/templates/public/images/btn/btn_next.png
+- lib/generators/social_stream/templates/public/images/btn/btn_notification.png
+- lib/generators/social_stream/templates/public/images/btn/btn_notification_delete.png
 - lib/generators/social_stream/templates/public/images/btn/btn_notifications.png
 - lib/generators/social_stream/templates/public/images/btn/btn_outline.png
 - lib/generators/social_stream/templates/public/images/btn/btn_page_link.png
@@ -687,6 +764,7 @@ files:
 - 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/btn/warning.png
+- lib/generators/social_stream/templates/public/images/cancel.png
 - 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/green_sq.png
@@ -704,23 +782,27 @@ files:
 - 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/html5-badge-h-css3-semantics.png
+- lib/generators/social_stream/templates/public/images/icon_checkbox.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
 - lib/generators/social_stream/templates/public/images/logos/actor/group.png
+- lib/generators/social_stream/templates/public/images/logos/actor/remote_subject.png
+- lib/generators/social_stream/templates/public/images/logos/actor/remote_user.png
 - lib/generators/social_stream/templates/public/images/logos/actor/user.png
 - lib/generators/social_stream/templates/public/images/logos/original/group.png
 - lib/generators/social_stream/templates/public/images/logos/original/user.png
 - lib/generators/social_stream/templates/public/images/logos/profile/group.png
 - lib/generators/social_stream/templates/public/images/logos/profile/user.png
+- lib/generators/social_stream/templates/public/images/logos/representation/group.png
+- lib/generators/social_stream/templates/public/images/logos/representation/user.png
 - lib/generators/social_stream/templates/public/images/logos/tie/group.png
 - lib/generators/social_stream/templates/public/images/logos/tie/user.png
+- lib/generators/social_stream/templates/public/images/pbar-ani.gif
 - 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/addContact.js
 - lib/generators/social_stream/templates/public/javascripts/ajax.paginate.js
 - lib/generators/social_stream/templates/public/javascripts/avatars.js
 - lib/generators/social_stream/templates/public/javascripts/ckeditor/.htaccess
@@ -942,28 +1024,36 @@ files:
 - 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
+- lib/generators/social_stream/templates/public/javascripts/jquery.fileupload-ui.js
+- lib/generators/social_stream/templates/public/javascripts/jquery.fileupload.js
+- lib/generators/social_stream/templates/public/javascripts/jquery.form.js
 - lib/generators/social_stream/templates/public/javascripts/jquery.js
 - 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.scrollTo.min.js
+- lib/generators/social_stream/templates/public/javascripts/jquery.ui.mouse.js
+- lib/generators/social_stream/templates/public/javascripts/jquery.ui.slider.js
+- lib/generators/social_stream/templates/public/javascripts/jquery.ui.widget.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.checkbox.js
 - lib/generators/social_stream/templates/public/javascripts/ui.dropdownchecklist.js
 - lib/generators/social_stream/templates/public/stylesheets/default/activities.css
-- lib/generators/social_stream/templates/public/stylesheets/default/addContact.css
 - lib/generators/social_stream/templates/public/stylesheets/default/avatars.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/contacts.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/fcbkcomplete/close.gif
+- lib/generators/social_stream/templates/public/stylesheets/default/images/loading.gif
 - 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
@@ -980,6 +1070,9 @@ files:
 - 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/jquery.fileupload-ui.css
+- lib/generators/social_stream/templates/public/stylesheets/default/jquery.ui.slider.css
+- lib/generators/social_stream/templates/public/stylesheets/default/jquery.ui.slidertheme.css
 - lib/generators/social_stream/templates/public/stylesheets/default/menu.css
 - lib/generators/social_stream/templates/public/stylesheets/default/messages.css
 - lib/generators/social_stream/templates/public/stylesheets/default/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
@@ -997,6 +1090,7 @@ files:
 - 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/public/stylesheets/default/spheres.css
 - lib/generators/social_stream/templates/relations.yml
 - lib/paperclip/social_stream.rb
 - lib/social_stream.rb
@@ -1018,11 +1112,13 @@ files:
 - spec/controllers/groups_controller_spec.rb
 - spec/controllers/home_controller_spec.rb
 - spec/controllers/likes_controller_spec.rb
+- spec/controllers/permissions_controller_spec.rb
 - spec/controllers/posts_controller_spec.rb
 - spec/controllers/profiles_controller_spec.rb
-- spec/controllers/representations_controller_spec.rb
+- spec/controllers/relation_customs_controller_spec.rb
+- spec/controllers/representations_spec.rb
+- spec/controllers/spheres_controller_spec.rb
 - spec/controllers/subjects_controller.rb
-- spec/controllers/ties_controller_spec.rb
 - spec/controllers/users_controller_spec.rb
 - spec/dummy/.gitignore
 - spec/dummy/Rakefile
@@ -1040,6 +1136,7 @@ files:
 - spec/dummy/config/initializers/backtrace_silencers.rb
 - spec/dummy/config/initializers/devise.rb
 - spec/dummy/config/initializers/inflections.rb
+- spec/dummy/config/initializers/mailboxer.rb
 - spec/dummy/config/initializers/mime_types.rb
 - spec/dummy/config/initializers/secret_token.rb
 - spec/dummy/config/initializers/session_store.rb
@@ -1060,14 +1157,18 @@ files:
 - spec/factories/comment.rb
 - spec/factories/group.rb
 - spec/factories/post.rb
+- spec/factories/relation_custom.rb
+- spec/factories/sphere.rb
 - spec/factories/tie.rb
 - spec/factories/user.rb
 - spec/integration/navigation_spec.rb
 - spec/models/activity_spec.rb
 - spec/models/actor_spec.rb
+- spec/models/group_spec.rb
+- spec/models/like_spec.rb
 - spec/models/post_spec.rb
 - spec/models/profile_spec.rb
-- spec/models/representation_spec.rb
+- spec/models/relation_custom_spec.rb
 - spec/models/tie_activity_spec.rb
 - spec/models/tie_spec.rb
 - spec/models/user_spec.rb
@@ -1107,7 +1208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Social networking features and activity streams for Ruby on Rails.