social_stream-base 0.5.2 → 0.6.0

data/lib/tasks/db/populate.rake

@@ -26,7 +26,7 @@ namespace :db do
             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)
+            l.save
           end
         end
       end
@@ -76,9 +76,9 @@ namespace :db do
       10.times do
         founder = available_actors[rand(available_actors.size)]
         
-        Group.create :name  => Forgery::Name.company_name,
-                     :email => Forgery::Internet.email_address,
-        :_founder => founder.slug
+        Group.create! :name  => Forgery::Name.company_name,
+                      :email => Forgery::Internet.email_address,
+                      :_founder => founder.slug
       end
       
       set_logos(Group)
@@ -101,8 +101,9 @@ namespace :db do
         
         Forgery::Basic.number(:at_most => actors.size).times do
           actor = actors.delete_at((rand * actors.size).to_i)
-          a.sent_ties.create :receiver => actor,
-                             :relation => relations.random
+          Contact.create! :sender_id => a.id,
+                          :receiver_id => actor.id,
+                          :relation_ids => Array(relations.random.id)
         end
       end
       
@@ -115,13 +116,14 @@ namespace :db do
       posts_start = Time.now
       
       SocialStream::Populate.power_law(Tie.all) do |t|
-        updated = Time.at(rand(Time.now))
+        updated = Time.at(rand(Time.now.to_i))
         
         p = Post.create :text =>
                       "This post should be for #{ t.relation.name } of #{ t.sender.name }.\n#{ Forgery::LoremIpsum.paragraph(:random => true) }",
                         :created_at => Time.at(rand(updated)),
                         :updated_at => updated,
-        :_activity_tie_id => t.id
+                        :_contact_id => t.contact_id,
+                        :_relation_ids => Array(t.relation_id)
         
         p.post_activity.update_attributes(:created_at => p.created_at,
                                           :updated_at => p.updated_at)

data/lib/tasks/resque.rake

@@ -0,0 +1,3 @@
+require "resque/tasks"
+
+task "resque:setup" => :environment

data/social_stream-base.gemspec

@@ -17,37 +17,36 @@ Gem::Specification.new do |s|
   # SQL foreign keys
   s.add_runtime_dependency('foreigner', '~> 0.9.1')
   # Authentication
-  s.add_runtime_dependency('devise', '~> 1.2.rc')
+  s.add_runtime_dependency('devise', '~> 1.3.4')
   # CRUD controllers
   s.add_runtime_dependency('inherited_resources', '~> 1.2.2')
   # Slug generation
   s.add_runtime_dependency('stringex', '~> 1.2.0')
   # Avatar attachments
-  s.add_runtime_dependency('paperclip', '~> 2.3.4')
-  s.add_runtime_dependency('avatars_for_rails', '~> 0.0.9')
+  s.add_runtime_dependency('avatars_for_rails', '~> 0.1.0')
   # jQuery
-  s.add_runtime_dependency('jquery-rails', '~> 0.2.5')
+  s.add_runtime_dependency('jquery-rails', '~> 1.0.9')
   # Authorization
   s.add_runtime_dependency('cancan', '~> 1.6.4')
   # Pagination
-  s.add_runtime_dependency('will_paginate', '~> 3.0.pre2')
+  s.add_runtime_dependency('kaminari', '~> 0.12.4')
   # OAuth client
   s.add_runtime_dependency('omniauth','~> 0.2.6')
   # 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.1.4')
+  s.add_runtime_dependency('mailboxer','~> 0.2.3')
   # Avatar manipulation
   s.add_runtime_dependency('rmagick','~> 2.13.1')
   # Tagging
   s.add_runtime_dependency('acts-as-taggable-on','~> 2.0.6')
   # HTML Forms
   s.add_runtime_dependency('formtastic','~> 1.2.3')
- 
+  #Gem dependencies
+  s.add_runtime_dependency('resque','~> 1.17.1')
+  
   # Freeze Rails to 3.0.7 until Mailboxer bug is fixed
-  s.add_runtime_dependency('rails', '3.0.7')
+  s.add_runtime_dependency('rails', '3.1.0.rc4')
 
   # Development Gem dependencies
   # Integration testing
@@ -59,7 +58,7 @@ Gem::Specification.new do |s|
     s.add_development_dependency('ruby-debug', '~> 0.10.3')
   end
   # Specs
-  s.add_development_dependency('rspec-rails', '~> 2.5.0')
+  s.add_development_dependency('rspec-rails', '~> 2.6.1')
   # Fixtures
   s.add_development_dependency('factory_girl', '~> 1.3.2')
   # Population

data/spec/controllers/comments_controller_spec.rb

@@ -13,27 +13,34 @@ describe CommentsController do
 
     describe "comment from user" do
       before do
-        model_assigned_to @user.sent_ties.received_by(@user).related_by(@user.relation_customs.sort.first).first
+        contact = @user.contact_to!(@user)
+        relation = @user.relation_customs.sort.first
+
+        model_assigned_to contact, relation
       end
 
       it_should_behave_like "Allow Creating"
     end
 
-    describe "comment from friend" do
+    describe "comment to friend" do
       before do
-        f = Factory(:friend, :receiver => @user.actor).sender
+        f = Factory(:friend, :contact => Factory(:contact, :receiver => @user.actor)).sender
+        contact = @user.contact_to!(f)
+        relation = f.relation_custom('friend')
 
-        model_assigned_to Factory(:friend, :sender => @user.actor, :receiver => f)
+        model_assigned_to contact, relation
       end
 
       it_should_behave_like "Allow Creating"
     end
 
-    describe "post from acquaintance" do
+    describe "post to acquaintance" do
       before do
-        a = Factory(:acquaintance, :receiver => @user.actor).sender
+        a = Factory(:acquaintance, :contact => Factory(:contact, :receiver => @user.actor)).sender
+        contact = @user.contact_to!(a)
+        relation = a.relation_custom('acquaintance')
 
-        model_assigned_to Factory(:friend, :sender => @user.actor, :receiver => a)
+        model_assigned_to contact, relation
       end
 
       it_should_behave_like "Deny Creating"

data/spec/controllers/contacts_controller_spec.rb

@@ -4,38 +4,37 @@ describe ContactsController do
 
   render_views
 
-  before do
-    sign_in Factory(:friend).sender_subject
+  before(:all) do
+    @tie = Factory(:friend)
+    @user = @tie.sender_subject
   end
 
-  describe "GET 'index'" do
-    it "should be successful" do
-      get 'index'
-      response.should be_success
-    end
-  end
+  it "should be successful" do
+    sign_in @user
 
-  describe "when authenticated" do
-    before do
-      @user = Factory(:user)
+    get 'index'
+    response.should be_success
+  end
 
-      sign_in @user
-    end
+  it "should render edit" do
+    sign_in @user
 
-    it "should render edit" do
-      get :edit, :id => Factory(:user).actor_id
+    get :edit, :id => @tie.contact_id
 
-      assert_response :success
-    end
+    assert_response :success
+  end
 
-    it "should render update" do
-      contact = Factory(:user)
+  it "should render update" do
+    sign_in @user
 
-      put :update, :id => contact.actor_id,
-                   :contact => { "relation_ids" => [ "gotcha", @user.relations.first.id ] }
+    put :update, :id => @tie.contact_id,
+                 :contact => { "relation_ids" => [ "gotcha", @user.relations.last.id ] }
 
-      response.should redirect_to(contact)
-      @user.sent_ties.received_by(contact).first.relation.should == @user.relations.first
-    end
+    response.should redirect_to(@tie.receiver_subject)
+    @user.reload.
+      sent_ties.
+      merge(Contact.received_by(@tie.receiver)).
+      first.relation.
+      should == @user.relations.last
   end
 end

data/spec/controllers/groups_controller_spec.rb

@@ -60,7 +60,7 @@ describe GroupsController do
     end
 
     it "should render contact group" do
-      @group = Factory(:member, :receiver => @user.actor).sender_subject
+      @group = Factory(:member, :contact => Factory(:group_contact, :receiver => @user.actor)).sender_subject
       get :show, :id => @group.to_param
 
       assert_response :success
@@ -81,7 +81,6 @@ describe GroupsController do
     context "a new own group" do
       before do
         model_attributes[:_founder] = @user.slug
-        model_attributes[:_participants] = [Factory(:user).slug]
       end
 
       it "should allow creating" do
@@ -90,11 +89,39 @@ describe GroupsController do
 
         group = assigns(:group)
 
-        Group.count.should eq(count + 1)
         group.should be_valid
+        Group.count.should eq(count + 1)
         assigns(:current_subject).should eq(group)
         response.should redirect_to(:home)
       end
+
+      context "with participants" do
+        before do
+          @user_participant = Factory(:user)
+          @group_participant = Factory(:group)
+
+          model_attributes[:_participants] = [@user_participant.actor_id, @group_participant.actor_id]
+        end
+
+        it "should allow creating" do
+          count = Group.count
+          post :create, attributes
+
+          group = assigns(:group)
+
+          group.should be_valid
+          Group.count.should eq(count + 1)
+          assigns(:current_subject).should eq(group)
+
+          participants = group.contact_subjects(:direction => :sent)
+
+          participants.should include(@user_participant)
+          participants.should include(@group_participant)
+
+          group.contact_subjects(:direction => :received)
+          response.should redirect_to(:home)
+        end
+        end
     end
 
     context "a new fake group" do
@@ -117,7 +144,7 @@ describe GroupsController do
 
     context "a existing own group" do
       before do
-        @current_model = Factory(:member, :receiver => @user.actor).sender_subject
+        @current_model = Factory(:member, :contact => Factory(:group_contact, :receiver => @user.actor)).sender_subject
       end
 
       it "should update contact group" do

data/spec/controllers/notifications_controller_spec.rb

@@ -0,0 +1,47 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+
+describe NotificationsController do
+  include SocialStream::TestHelpers
+  render_views
+
+  before do
+    @user = Factory(:user)
+    @actor =  @user.actor
+    sign_in @user
+    @receipt = @user.notify("subject", "body", Factory(:activity))
+  end
+
+  it "should render index" do
+    get :index
+    assert_response :success
+  end
+
+  it "should update read" do
+    put :update, :id => @receipt.notification.to_param, :read => "Read"
+    @receipt.notification.is_unread?(@actor).should==false
+    response.should redirect_to notifications_path
+  end
+
+  it "should update unread" do
+    put :update, :id => @receipt.notification.to_param, :read => "Unread"
+    @receipt.notification.is_unread?(@actor).should==true
+    response.should redirect_to notifications_path
+  end
+
+  it "should update all" do
+    @receipt2 = @user.notify("subject", "body", Factory(:activity))
+    put :update_all
+    @receipt.notification.is_unread?(@actor).should==false
+    @receipt2.notification.is_unread?(@actor).should==false
+    response.should redirect_to notifications_path
+  end
+  
+  it "should send to trash" do
+    delete :destroy, :id => @receipt.notification.to_param
+    @receipt.notification.is_trashed?(@actor).should==true
+    response.should redirect_to notifications_path
+    
+  end
+
+end

data/spec/controllers/posts_controller_spec.rb

@@ -16,9 +16,10 @@ describe PostsController do
     describe "posts to user" do
       describe "with first relation" do
         before do
-          tie = @user.sent_ties.received_by(@user).related_by(@user.relation_customs.sort.first).first
-          model_assigned_to tie
-          @current_model = Factory(:post, :_activity_tie_id => tie)
+          contact = @user.contact_to!(@user)
+          relation = @user.relation_customs.sort.first
+          model_assigned_to @user.contact_to!(@user), relation
+          @current_model = Factory(:post, :_contact_id => contact.id, :_relation_ids => Array(relation.id))
         end
 
         it_should_behave_like "Allow Creating"
@@ -27,9 +28,10 @@ describe PostsController do
 
       describe "with last relation" do
         before do
-          tie = @user.sent_ties.received_by(@user).related_by(@user.relation_customs.sort.last).first
-          model_assigned_to tie
-          @current_model = Factory(:post, :_activity_tie_id => tie)
+          contact = @user.contact_to!(@user)
+          relation = @user.relation_customs.sort.last
+          model_assigned_to @user.contact_to!(@user), relation
+          @current_model = Factory(:post, :_contact_id => contact.id, :_relation_ids => Array(relation.id))
         end
 
         it_should_behave_like "Allow Creating"
@@ -38,22 +40,22 @@ describe PostsController do
 
       describe "with public relation" do
         before do
-          tie = @user.sent_ties.received_by(@user).related_by(@user.relation_public).first
-          model_assigned_to tie
-          @current_model = Factory(:post, :_activity_tie_id => tie)
+          contact = @user.contact_to!(@user)
+          relation = @user.relation_public
+          model_assigned_to @user.contact_to!(@user), relation
+          @current_model = Factory(:post, :_contact_id => contact.id)
         end
 
         it_should_behave_like "Allow Creating"
         it_should_behave_like "Allow Destroying"
       end
-
     end
 
     describe "post to friend" do
       before do
-        friend = Factory(:friend, :receiver => @user.actor).sender
+        friend = Factory(:friend, :contact => Factory(:contact, :receiver => @user.actor)).sender
 
-        model_assigned_to friend.activity_ties_for(@user).first
+        model_assigned_to @user.contact_to!(friend), friend.relation_custom('friend')
       end
 
       it_should_behave_like "Allow Creating"
@@ -61,9 +63,9 @@ describe PostsController do
 
     describe "post to acquaintance" do
       before do
-        ac = Factory(:acquaintance, :receiver => @user.actor).sender
+        ac = Factory(:acquaintance, :contact => Factory(:contact, :receiver => @user.actor)).sender
 
-        model_assigned_to Factory(:friend, :sender => @user.actor, :receiver => ac)
+        model_assigned_to @user.contact_to!(ac), ac.relation_custom('acquaintance')
       end
 
       it_should_behave_like "Deny Creating"
@@ -71,14 +73,16 @@ describe PostsController do
 
     describe "posts represented group" do
       before do
-        @group = Factory(:member, :receiver_id => @user.actor_id).sender_subject
+        @group = Factory(:member, :contact => Factory(:group_contact, :receiver => @user.actor)).sender_subject
       end
 
       describe "with public relation" do
         before do
-          tie = @group.activity_ties_for(@user).first
-          model_assigned_to tie
-          @current_model = Factory(:post, :_activity_tie_id => tie)
+          contact = @user.contact_to!(@group)
+          relation = @group.relation_public
+
+          model_assigned_to contact, relation
+          @current_model = Factory(:post, :_contact_id => contact.id, :_relation_ids => Array(relation.id))
         end
 
         it_should_behave_like "Allow Creating"
@@ -92,9 +96,10 @@ describe PostsController do
 
         describe "with first relation" do
           before do
-            tie = @group.sent_ties.received_by(@group).related_by(@group.relation_customs.sort.first).first
-            model_assigned_to tie
-            @current_model = Factory(:post, :_activity_tie_id => tie)
+            contact = @group.contact_to!(@group)
+            relation = @group.relation_customs.sort.first
+            model_assigned_to contact, relation
+            @current_model = Factory(:post, :_contact_id => contact.id, :_relation_ids => Array(relation.id))
           end
 
           it_should_behave_like "Allow Creating"
@@ -103,9 +108,10 @@ describe PostsController do
 
         describe "with last relation" do
           before do
-            tie = @group.sent_ties.received_by(@group).related_by(@group.relation_customs.sort.last).first
-            model_assigned_to tie
-            @current_model = Factory(:post, :_activity_tie_id => tie)
+            contact = @group.contact_to!(@group)
+            relation = @group.relation_customs.sort.last
+            model_assigned_to contact, relation
+            @current_model = Factory(:post, :_contact_id => contact.id, :_relation_ids => Array(relation.id))
           end
 
           it_should_behave_like "Allow Creating"
@@ -114,9 +120,10 @@ describe PostsController do
 
         describe "with public relation" do
           before do
-            tie = @group.sent_ties.received_by(@group).related_by(@group.relation_public).first
-            model_assigned_to tie
-            @current_model = Factory(:post, :_activity_tie_id => tie)
+            contact = @group.contact_to!(@group)
+            relation = @group.relation_public
+            model_assigned_to contact, relation
+            @current_model = Factory(:post, :_contact_id => contact.id, :_relation_ids => Array(relation.id))
           end
 
           it_should_behave_like "Allow Creating"

data/spec/controllers/representations_spec.rb

@@ -24,7 +24,7 @@ describe HomeController do
 
       context "to represent own group" do
         before do
-          @group = Factory(:member, :receiver => @user.actor).sender_subject
+          @group = Factory(:member, :contact => Factory(:group_contact, :receiver => @user.actor)).sender_subject
         end
 
         it "should redirect_to root" do
@@ -37,7 +37,7 @@ describe HomeController do
 
       context "representing own group" do
         before do
-          @group = Factory(:member, :receiver => @user.actor).sender_subject
+          @group = Factory(:member, :contact => Factory(:group_contact, :receiver => @user.actor)).sender_subject
           represent @group
         end
 

data/spec/controllers/spheres_controller_spec.rb

@@ -23,7 +23,13 @@ describe SpheresController do
         @current_model = Factory(:sphere)
       end
 
-      it_should_behave_like "Deny Updating"
+      it "should not update" do
+        put :update, updating_attributes
+
+        assigns(:sphere).should be_blank
+        response.should redirect_to(:new_user_session)
+      end
+
       it_should_behave_like "Deny Destroying"
     end
   end
@@ -54,15 +60,17 @@ describe SpheresController do
         model_attributes[:actor_id] = Factory(:user).actor_id
       end
 
-      it "should belong to user" do
+      it "should not be created" do
         count = Sphere.count
-        post :create, attributes
+	begin
+          post :create, attributes
 
-        resource = assigns(:sphere)
+          assert false
+        rescue CanCan::AccessDenied
+          assigns(:sphere).should be_new_record
 
-        Sphere.count.should eq(count + 1)
-        resource.should be_valid
-        resource.actor.should eq(@user.actor)
+          Sphere.count.should eq(count)
+        end
       end
     end
 

data/spec/controllers/users_controller_spec.rb

@@ -46,17 +46,21 @@ describe UsersController do
       assert_response :success
     end
 
-    it "should render self page" do
+    it "should render other's page" do
       get :show, :id => Factory(:user).to_param
 
       assert_response :success
     end
 
-    it "should render edit page" do
-      pending "Account section"
-      get :edit, :id => @user.to_param
+    it "should render other's page with activity" do
+      tie = Factory(:friend, :receiver => @user.actor)
+      friend = tie.sender
+      Factory(:post, :_contact_id  => tie.contact_id,
+                     :_relation_ids => Array(tie.relation_id))
 
-      assert_response :success
+      get :show, :id => friend.to_param
+
+      response.should be_success
     end
 
     it "should not render other's edit" do

data/spec/dummy/.gitignore

@@ -2,3 +2,4 @@ log/*log
 db/*.sqlite3
 db/*.sqlite3-journal
 public/images/tmp/
+tmp/*

data/spec/dummy/config/application.rb

@@ -1,13 +1,12 @@
 require File.expand_path('../boot', __FILE__)
 
-require "active_model/railtie"
-require "active_record/railtie"
-require "action_controller/railtie"
-require "action_view/railtie"
-require "action_mailer/railtie"
+require 'rails/all'
 
-Bundler.require
-require "social_stream-base"
+# If you have a Gemfile, require the gems listed there, including any gems
+# you've limited to :test, :development, or :production.
+Bundler.require(:default, Rails.env) if defined?(Bundler)
+
+require 'social_stream-base'
 
 module Dummy
   class Application < Rails::Application
@@ -33,13 +32,13 @@ module Dummy
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
 
-    # JavaScript files you want as :defaults (application.js is always included).
-    # config.action_view.javascript_expansions[:defaults] = %w(jquery rails)
-
     # Configure the default encoding used in templates for Ruby 1.9.
     config.encoding = "utf-8"
 
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
+
+    # Enable the asset pipeline
+    config.assets.enabled = true
   end
 end

data/spec/dummy/config/database.yml

@@ -1,5 +1,8 @@
 # SQLite version 3.x
-#   gem install sqlite3-ruby (not necessary on OS X Leopard)
+#   gem install sqlite3
+#
+#   Ensure the SQLite 3 gem is defined in your Gemfile
+#   gem 'sqlite3'
 development:
   adapter: sqlite3
   database: db/development.sqlite3

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

@@ -1,9 +1,9 @@
 Dummy::Application.configure do
-  # Settings specified here will take precedence over those in config/environment.rb
+  # Settings specified here will take precedence over those in config/application.rb
 
   # In the development environment your application's code is reloaded on
   # every request.  This slows down response time but is perfect for development
-  # since you don't have to restart the webserver when you make code changes.
+  # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
 
   # Log error messages when you accidentally call methods on nil.
@@ -11,7 +11,6 @@ Dummy::Application.configure do
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
-  config.action_view.debug_rjs             = true
   config.action_controller.perform_caching = false
 
   # Don't care if the mailer can't send
@@ -22,5 +21,10 @@ Dummy::Application.configure do
 
   # Only use best-standards-support built into browsers
   config.action_dispatch.best_standards_support = :builtin
-end
 
+  # Do not compress assets
+  config.assets.compress = false
+
+  # Email configuration
+  config.action_mailer.default_url_options = { :host => 'localhost:3000' }
+end