social_stream-base 0.6.1 → 0.6.2

data/app/assets/javascripts/menu.js

@@ -1,6 +1,6 @@
 function initMenu() {
-	$('.menu ul').hide();
-	$('.menu li a').click( function() {
+	$('.toolbar_menu ul li ul').hide();
+	$('.toolbar_menu li a').click( function() {
 		$(this).next().slideToggle('normal');
 	}
 	);

data/app/assets/stylesheets/menu.css

@@ -1,14 +1,13 @@
 /**************MENU***********/
-ul.menu {list-style-type:none;  margin: 0;  padding: 0;  width: 15em; border-bottom: thin solid #D4E4EA; }
-ul.menu ul {list-style-type:none;  margin: 0;  padding: 0;  width: 15em;  }
-ul.menu a {  display: block;  text-decoration: none; }
-ul.menu li {  border-top: thin solid #D4E4EA; padding-left:0px;  }
-ul.menu li a, ul.menu ul.menu li a {  background: #fff;  color: #2A3890;  padding: 0.3em; padding:5px 0px 5px 0px; }
-ul.menu li a:hover, ul.menu ul.menu li a:hover {  background: #DEEFF8;  color: #2A3890;  text-decoration:none; }
-ul.menu li ul li a, ul.menu ul.menu li ul li a {  background: #fff; border-left: 5px #2A3890 solid;
+.toolbar_menu {list-style-type:none;  margin: 0;  padding: 0;  width: 15em; border-bottom: thin solid #D4E4EA; }
+.toolbar_menu ul {list-style-type:none;  margin: 0;  padding: 0;  width: 15em;  }
+.toolbar_menu a {  display: block;  text-decoration: none; }
+.toolbar_menu li {  border-top: thin solid #D4E4EA; padding-left:0px;  }
+.toolbar_menu li a, ul.menu ul.menu li a {  background: #fff;  color: #2A3890;  padding: 0.3em; padding:5px 0px 5px 0px; }
+.toolbar_menu li a:hover, ul.menu ul.menu li a:hover {  background: #DEEFF8;  color: #2A3890;  text-decoration:none; }
+.toolbar_menu li ul li a, ul.menu ul.menu li ul li a {  background: #fff; border-left: 5px #2A3890 solid;
   color: #2A3890;  padding-left: 10px;}
-ul.menu li ul li a:hover {  background: #DEEFF8;  border-left: 5px #2A3890 solid;  padding-left: 15px;}
-
+.toolbar_menu li ul li a:hover {  background: #DEEFF8;  border-left: 5px #2A3890 solid;  padding-left: 15px;}
 
 /*
 div.panel {    border: 1px #2A3890 solid;    padding: 5px;    margin-top: 0px;}

data/app/controllers/groups_controller.rb

@@ -1,4 +1,8 @@
 class GroupsController < InheritedResources::Base
+  # Set group founder to current_subject
+  # Must do before authorization
+  before_filter :set_founder, :only => :new
+
   load_and_authorize_resource
 
   respond_to :html, :js
@@ -32,4 +36,13 @@ class GroupsController < InheritedResources::Base
   def resource
     @group ||= end_of_association_chain.find_by_slug!(params[:id])
   end
+
+  private
+
+  def set_founder
+    return unless user_signed_in?
+
+    params[:group]            ||= {}
+    params[:group][:_founder] ||= current_subject.slug
+  end
 end

data/app/controllers/invitations_controller.rb

@@ -1,20 +1,34 @@
 class InvitationsController < ApplicationController
-  
-  def new 
-    
+  def new
+
   end
-  
+
   def create
-    
+
     if params[:mails].present?
-      receivers = params[:mails].split(",")
-      receivers.each do |receiver|
-        InvitationMailer.send_invitation(receiver, current_subject, params[:message]).deliver
+      receivers = params[:mails].split(/, */)
+      if are_valid_emails?(receivers)
+        receivers.each do |receiver|
+          InvitationMailer.send_invitation(receiver, current_subject, params[:message]).deliver
+        end
+        redirect_to new_invitation_path, :flash => { :success => t('invitation.success')}
+        return
       end
-      redirect_to new_invitation_path, :flash => { :success => t('invitation.success')}
-    else
-      redirect_to new_invitation_path, :flash => { :error => t('invitation.error')}
     end
-    
+    redirect_to new_invitation_path, :flash => { :error => t('invitation.error')}
+
   end
+
+  private
+
+  def are_valid_emails?(emails)
+    email_regex= /^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?$/
+    emails.each do |email|
+      if !(email_regex.match(email))
+        return false
+      end
+    end
+    return true
+  end
+
 end

data/app/helpers/activities_helper.rb

@@ -1,20 +1,28 @@
 module ActivitiesHelper
-  
   # Link to 'like' or 'unlike' depending on the like status of the activity to current_subject
-  # 
+  #
   # @param [Object]
   # @return [String]
   def link_like(object)
+    params = link_like_params(object)
+    link_to params[0],params[1],params[2]
+  end
+
+  def link_like_params(object)
+    params = Array.new
     if !user_signed_in?
-      link_to image_tag("btn/nolike.png", :class => "menu_icon")+ 
-                t('activity.like'),new_user_session_path
+      params << image_tag("btn/nolike.png", :class => "menu_icon")+t('activity.like')
+      params << new_user_session_path
+      params << {:class => "verb_like",:id => "like_" + dom_id(object)}
     else
       if (object.liked_by?(current_subject))
-        link_to image_tag("btn/like.png", :class => "menu_icon")+ 
-                t('activity.unlike'), [object, :like], :method => :delete, :remote => true
+        params << image_tag("btn/like.png", :class => "menu_icon")+t('activity.unlike')
+        params << [object, :like]
+        params << {:class => "verb_like",:id => "like_" + dom_id(object),:method => :delete, :remote => true}
       else
-        link_to image_tag("btn/nolike.png", :class => "menu_icon")+ 
-                t('activity.like'), [object, :like], :method => :post, :remote => true
+        params << image_tag("btn/nolike.png", :class => "menu_icon")+t('activity.like')
+        params << [object, :like]
+        params << {:class => "verb_like",:id => "like_" + dom_id(object),:method => :post, :remote => true}
       end
     end
   end
@@ -24,6 +32,6 @@ module ActivitiesHelper
     return Activity.new unless user_signed_in?
 
     Activity.new :contact_id => current_subject.contact_to!(receiver).id,
-                 :relation_ids => current_subject.activity_relations(receiver, :from => :receiver).map(&:id)
+    :relation_ids => current_subject.activity_relations(receiver, :from => :receiver).map(&:id)
   end
 end

data/app/helpers/toolbar_helper.rb

@@ -85,21 +85,82 @@ module ToolbarHelper
   end
 
   def default_toolbar_menu
-    items = [{:key => :notifications,
-        :name => image_tag("btn/btn_notification.png", :class => "menu_icon")+t('notification.other')+' ('+ current_subject.mailbox.notifications.not_trashed.unread.count.to_s+')',
-        :url => notifications_path}]
+    home_menu
+  end
+
+  def home_toolbar_menu
+    items = Array.new
+    #Notifications
+    items << {:key => :notifications,
+      :name => image_tag("btn/btn_notification.png")+t('notification.other')+' ('+ current_subject.mailbox.notifications.not_trashed.unread.count.to_s+')',
+      :url => notifications_path,
+      :options => {:link => {:id => "notifications_menu"}}}
 
-    items << {:key => :dummy1, :name => "Dummy 1", :url => "#", :items => [
-        {:key => :dummy1_1, :name => "Dummy 1.1", :url => "#"},
-        {:key => :dummy1_2, :name => "Dummy 1.2", :url => "#"}
+    #Messages
+    items << {:key => :messages,
+      :name => image_tag("btn/new.png")+t('message.other')+' (' + current_subject.mailbox.inbox(:unread => true).count.to_s + ')',
+      :url => "#",
+      :options => {:link => {:id => "messages_menu"}},
+      :items => [
+        {:key => :message_new, :name => image_tag("btn/message_new.png")+ t('message.new'), :url => new_message_path},
+        {:key => :message_inbox, :name => image_tag("btn/message_inbox.png")+t('message.inbox')+' (' + current_subject.mailbox.inbox(:unread => true).count.to_s + ')',
+          :url => conversations_path, :options => {:link =>{:remote=> true}}},
+        {:key => :message_sentbox, :name => image_tag("btn/message_sentbox.png")+t('message.sentbox'), :url => conversations_path(:box => :sentbox), :remote=> true},
+        {:key => :message_trash, :name => image_tag("btn/message_trash.png")+t('message.trash'), :url => conversations_path(:box => :trash)}
       ]}
 
+    #Documents if present
+    if SocialStream.activity_forms.include? :document
+      items << {:key => :resources,
+        :name => image_tag("btn/btn_resource.png",:class =>"menu_icon")+t('resource.title'),
+        :url => "#",
+        :options => {:link => {:id => "resources_menu"}},
+        :items => [
+          {:key => :resources_documents,:name => image_tag("btn/btn_documents.png")+t('document.title'),:url => documents_path},
+          {:key => :resources_pictores,:name => image_tag("btn/btn_gallery.png")+t('picture.title'),:url => pictures_path},
+          {:key => :resources_videos,:name => image_tag("btn/btn_video.png")+t('video.title'),:url => videos_path},
+          {:key => :resources_audios,:name => image_tag("btn/btn_audio.png")+t('audio.title'),:url => audios_path}
+        ]}
+    end
+
+    #Contacts
+    relation_items = [{:key => :invitations, :name => image_tag("btn/btn_invitation.png")+t('invitation.other'), :url => new_invitation_path}]
+    current_subject.relation_customs.sort.each do |r|
+      relation_items << {:key => r.name + "_menu",
+        :name => image_tag("btn/btn_friend.png") + r.name,
+        :url => contacts_path(:relation => r.id)}
+    end
+    items << {:key => :contacts,
+      :name => image_tag("btn/btn_friend.png")+t('contact.other'),
+      :url => "#",
+      :options => {:link => {:id => "contacts_menu"}},
+      :items => relation_items}
+
+    #Subjects
+    items << {:key => :groups,
+      :name => image_tag("btn/btn_group.png")+t('group.other'),
+      :url => "#",
+      :options => {:link => {:id => "groups_menu"}},
+      :items => [{:key => :new_group ,:name => image_tag("btn/btn_group.png")+t('group.new.action'),:url => new_group_path('group' => { '_founder' => current_subject.slug })}]
+    }
+
+    return render_items items
+  end
+
+  def profile_toolbar_menu(subject=current_subject)
+    items = Array.new
+
+    if subject!=current_subject
+      items << {:key => :like_button,
+        :name => link_like_params(subject)[0],
+        :url => link_like_params(subject)[1],
+        :options => {:link => link_like_params(subject)[2]}}
+    end
     return render_items items
   end
 
   def render_items(items)
     menu = render_navigation :items => items
-    menu = menu.gsub(/\<ul\>/,'<ul class="menu">')
     return raw menu
   end
 end

data/app/mailers/invitation_mailer.rb

@@ -1,5 +1,7 @@
 class InvitationMailer < ActionMailer::Base
   
+  
+  
   def send_invitation(receiver, sender, message)
     @sender= sender
     @message= message  

data/app/models/actor.rb

@@ -353,7 +353,11 @@ class Actor < ActiveRecord::Base
   end
 
   # Is this {Actor} allowed to create a comment on activity?
+  #
+  # We are allowing comments from everyone signed in by now
   def can_comment?(activity)
+    return true
+
     comment_relations(activity).any?
   end
 

data/app/models/comment.rb

@@ -2,4 +2,9 @@ class Comment < ActiveRecord::Base
   include SocialStream::Models::Object
 
   validates_presence_of :text
+
+  def _activity_parent_id=(id)
+    self._relation_ids = Activity.find(id).relation_ids
+    @_activity_parent_id = id
+  end
 end

data/app/models/contact.rb

@@ -126,11 +126,11 @@ class Contact < ActiveRecord::Base
       end
     end
   end
- 
+
   # Send a message to the contact receiver
   def send_message
     if message.present?
-      sender.send_message(receiver, message, I18n.t("activity.verb.#{ contact_verb }.#{ receiver.subject_type }.message", :name => sender.name))
+      sender.send_message(receiver, message, I18n.t("activity.verb.#{ verb }.#{ receiver.subject_type }.message", :name => sender.name))
     end
   end
 

data/app/views/comments/_new.html.erb

@@ -7,9 +7,6 @@
               ),
           :html => { :class => "new_comment", :id => "new_comment"+dom_id(activity)  },
           :remote => true do |f| %>
-   <% current_subject.comment_relations(activity).each do |r| %>
-     <%= f.hidden_field "_relation_ids][", :id => "comment__relation_ids_#{ r.id }", :value => r.id %>
-   <% end %>
    <%= f.hidden_field :_activity_parent_id %>
 
    <%= f.text_field :text,   :class =>"input_new_comments" , :id => "comment_text_"+dom_id(activity) %>

data/app/views/home/index.html.erb

@@ -11,8 +11,9 @@
 <div class="space_center">
 </div>
 
-<div id="media_wall">
-</div>
+<% if SocialStream.activity_forms.include? :document %>
+	<%= render :partial => '/documents/mediawall' %>
+<% end %>
 
 <% if current_subject.respond_to?(:recent_groups) %>
 <div id="my_groups">

data/app/views/invitation_mailer/send_invitation.text.erb

@@ -1,4 +1,4 @@
-<%= @sender.name %> has invited you to <%= link_to( t('socialstream'), new_user_registration_path)%>
+<%= @sender.name %> has invited you to <%= t('socialstream')%>: <%= new_user_registration_path%>
 "<%= @message%>"
 
 <%= t('frontpage.main_title') %>

data/app/views/invitations/_new.html.erb

@@ -4,13 +4,11 @@
   });
 <% end %>
 
-<br class="clearfloat" />
-<div class="space_center"></div>
 <div class="space_center"></div>
 
 <h2><%=t('invitation.other')%></h2>
 
-<%= form_tag invitations_path, :method=> :post, :class => "invitation_form"  do %>
+<%= form_tag invitations_path, :method=> :post, :class => "invitation_form", :remote => true  do %>
   <div class="block">   
     <h3 class= "form_row"><%=t('invitation.join')%></h3>
     <div class="form_row form_label ">

data/app/views/invitations/new.js.erb

@@ -0,0 +1,4 @@
+$("#flash").empty();
+$("#flash").append("<%= escape_javascript(render :partial => "layouts/flash", :locals => {:flash => flash})%>");
+$("#content").empty();
+$("#content").append("<%= escape_javascript(render(:partial => 'new'))%>");

data/app/views/toolbar/_home.html.erb

@@ -1,9 +1,20 @@
-<%= render :partial => 'toolbar/logo', :locals => { :subject => current_subject, } %>
+<% content_for :headers do %>
+<%= stylesheet_link_tag "menu", :media => "screen, projection" %>
+<%= javascript_include_tag 'menu' %>
+<% end %>
+
+<%= render :partial => 'toolbar/logo', :locals => {:subject => current_subject} %>
 
 <div class="block space_center">
 </div>
 
-<%= render :partial => 'toolbar/home_menu' %>
+<div id="menu_lateral" class="toolbar_menu">
+    Testing SimpleNavigation
+    <br>
+    Please comment any bug
+    <hr>
+    <%= yield(:toolbar_menu).empty? ? home_toolbar_menu : yield(:toolbar_menu)%>
+</div>
 
 <div class="block space_center">
 </div>

data/app/views/toolbar/_profile.html.erb

@@ -1,13 +1,34 @@
+<% content_for :headers do %>
+  <%= stylesheet_link_tag "menu", :media => "screen, projection" %>
+  <%= javascript_include_tag 'menu' %>
+<% end %>
+
 <%= render :partial => 'toolbar/logo', :locals => { :subject => subject } %>
 
-<div class="block space_center"></div>
+<div class="block space_center">
+</div>
 
-<%= render :partial => 'toolbar/profile_menu', :locals => { :subject => subject } %>
+<div id="menu_lateral" class="toolbar_menu">
+  <ul>
+    <% unless subject == current_subject %>
+      <%= render :partial => "toolbar/profile_menu_tie_options", :locals => { :subject => subject } %>
+    <% end %>
 
-<div class="block space_center"></div>
+    <%= render :partial => "toolbar/profile_menu_basic_options", :locals => { :subject => subject } %>
+  </ul>
+  <hr>
+  Testing SimpleNavigation
+  <br>
+  Please move along
+  <hr>
+  <%= yield(:toolbar_menu).empty? ? profile_toolbar_menu(subject) : yield(:toolbar_menu) %>
+</div>
 
+<div class="block space_center">
+</div>
 
 <%= render :partial => 'subjects/contacts', :locals => { :subject => subject } %>
 
-<div class="block space_center"></div>
-<div class="block space_center"></div>
+<div class="block space_center">
+</div>
+

data/db/migrate/20110705103202_empty_ties_count.rb

@@ -0,0 +1,13 @@
+class EmptyTiesCount < ActiveRecord::Migration
+  def up
+    change_column :contacts, :ties_count, :integer, :default => 0
+
+    Contact.record_timestamps = false
+    Contact.all.each do |c|
+      c.update_attribute(:ties_count, 0) if c.ties_count.nil?
+    end
+  end
+
+  def down
+  end
+end

data/lib/generators/social_stream/base/templates/initializer.rb

@@ -16,6 +16,8 @@ SocialStream.setup do |config|
   #
   # config.objects = [ :post, :comment ]
   
-  # Form modules to be loaded 
-  # config.activity_forms = [ :document, :other_module, :foo, :bar ]
+  # Form for activity objects to be loaded 
+  # You can write your own activity objects
+  #
+  # config.activity_forms = [ :post, :document, :foo, :bar ]
 end

data/lib/social_stream/ability.rb

@@ -9,7 +9,7 @@ module SocialStream
       alias_action :download, :to => :show
       
       # Activity Objects
-      (SocialStream.objects - [ :actor ]).map{ |obj|
+      (SocialStream.objects - [ :actor, :comment ]).map{ |obj|
         obj.to_s.classify.constantize
       }.each do |klass|
         can :create, klass do |k| # can :create, Post do |post|
@@ -29,6 +29,22 @@ module SocialStream
         end
       end
 
+      can :create, Comment do |c|
+        c._activity_parent.allow?(subject, 'read')
+      end
+
+      can :read, Comment do |c|
+        c.post_activity.allow?(subject, 'read')
+      end
+
+      can :update, Comment do |c|
+        c.post_activity.allow?(subject, 'update')
+      end
+
+      can :destroy, Comment do |c|
+        c.post_activity.allow?(subject, 'destroy')
+      end
+
       # Activities
       can :create, Activity do |a|
         a.allow?(subject, 'create')

data/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.6.1".freeze
+    VERSION = "0.6.2".freeze
   end
 end

data/lib/social_stream/models/object.rb

@@ -61,6 +61,10 @@ module SocialStream
           @_contact ||= Contact.find(_contact_id)
         end
 
+        def _activity_parent
+          @_activity_parent ||= Activity.find(_activity_parent_id)
+        end
+
         private
 
         def create_post_activity

data/spec/controllers/comments_controller_spec.rb

@@ -13,10 +13,11 @@ describe CommentsController do
 
     describe "comment from user" do
       before do
+        activity = Factory(:self_activity, :contact => Factory(:self_contact, :sender => @user.actor))
         contact = @user.contact_to!(@user)
-        relation = @user.relation_customs.sort.first
 
-        model_assigned_to contact, relation
+        model_attributes[:_contact_id] = contact.id
+        model_attributes[:_activity_parent_id] = activity.id
       end
 
       it_should_behave_like "Allow Creating"
@@ -25,10 +26,11 @@ describe CommentsController do
     describe "comment to friend" do
       before do
         f = Factory(:friend, :contact => Factory(:contact, :receiver => @user.actor)).sender
+        activity = Factory(:self_activity, :contact => f.contact_to!(f))
         contact = @user.contact_to!(f)
-        relation = f.relation_custom('friend')
 
-        model_assigned_to contact, relation
+        model_attributes[:_contact_id] = contact.id
+        model_attributes[:_activity_parent_id] = activity.id
       end
 
       it_should_behave_like "Allow Creating"
@@ -37,10 +39,11 @@ describe CommentsController do
     describe "post to acquaintance" do
       before do
         a = Factory(:acquaintance, :contact => Factory(:contact, :receiver => @user.actor)).sender
+        activity = Factory(:self_activity, :contact => a.contact_to!(a))
         contact = @user.contact_to!(a)
-        relation = a.relation_custom('acquaintance')
 
-        model_assigned_to contact, relation
+        model_attributes[:_contact_id] = contact.id
+        model_attributes[:_activity_parent_id] = activity.id
       end
 
       it_should_behave_like "Deny Creating"

data/spec/controllers/contacts_controller_spec.rb

@@ -56,4 +56,26 @@ describe ContactsController do
       should == @user.relations.last
   end
 
+  it "should create contact with several relations" do
+    sign_in @user
+
+    group = Factory(:group)
+    contact = @user.contact_to!(group)
+    # Initialize inverse contact
+    contact.inverse!
+    relations = [ @user.relation_custom('friend'), @user.relation_custom('partner') ]
+    
+
+    put :update, :id => contact.id,
+                 :contact => { :relation_ids => [ "gotcha", relations.map(&:id) ].flatten,
+                               :message => "Testing" }
+
+    response.should redirect_to(contact.receiver_subject)
+
+    contact.reload.
+      ties.
+      map(&:relation).
+      map(&:id).sort.
+      should == relations.map(&:id).sort
+  end
 end

data/spec/controllers/groups_controller_spec.rb

@@ -74,7 +74,7 @@ describe GroupsController do
     end
 
     it "should render new" do
-      get :new, 'group' => { '_founder' => @user.to_param }
+      get :new
 
       assert_response :success
     end

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

@@ -16,6 +16,8 @@ SocialStream.setup do |config|
   #
   # config.objects = [ :post, :comment ]
   
-  # Form modules to be loaded 
-  # config.activity_forms = [ :document, :other_module, :foo, :bar ]
+  # Form for activity objects to be loaded 
+  # You can write your own activity objects
+  #
+  # config.activity_forms = [ :post, :document, :foo, :bar ]
 end

data/spec/models/contact_spec.rb

@@ -12,5 +12,16 @@ describe Contact do
     end
   end
 
+  context "with message" do
+    before do
+      @sent = Factory(:contact, :message => 'Hello')
+      @received = @sent.inverse!
+    end
+
+    it "should send to the receiver" do
+      @sent.message.should == 'Hello'
+      @sent.sender_subject.should eq(@received.receiver_subject)
+    end
+  end
 
 end

data/spec/spec_helper.rb

@@ -18,12 +18,12 @@ Capybara.default_selector = :css
 # FIXME orm
 ActiveRecord::Migration.verbose = false
 
-# Run any available migration
-ActiveRecord::Migrator.migrate File.expand_path("../dummy/db/migrate/", __FILE__)
-
 # Load support files
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
+# Run any available migration
+ActiveRecord::Migrator.migrate File.expand_path("../dummy/db/migrate/", __FILE__)
+
 # Load Factories
 require 'factory_girl'
 Dir["#{File.dirname(__FILE__)}/factories/*.rb"].each {|f| require f}

data/spec/support/db.rb

@@ -6,7 +6,7 @@ rescue
   puts "WARNING: ActsAsTaggableOnMigration failed to rollback" 
 end
 
-%w(SocialStream Mailboxer).each do |m|
+%w(Mailboxer).each do |m|
   begin
     "Create#{ m }".constantize.down
   rescue
@@ -15,7 +15,6 @@ end
 end
 
 CreateMailboxer.up
-CreateSocialStream.up
 ActsAsTaggableOnMigration.up
 
 require File.expand_path("../../dummy/db/seeds", __FILE__)

data/spec/support/migrations.rb

@@ -9,10 +9,6 @@ class MigrationFinder
   end
 end
 
-# Social Stream Base
-MigrationFinder.new 'social_stream-base',
-                    ['..', 'db', 'migrate', '20110610112023_create_social_stream']
-
 # acts-as-taggable-on
 MigrationFinder.new 'acts-as-taggable-on',
                    ["generators", "acts_as_taggable_on", "migration", "templates", "active_record", "migration"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream-base
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 6
-  - 1
-  version: 0.6.1
+  - 2
+  version: 0.6.2
 platform: ruby
 authors: 
 - GING - DIT - UPM
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-04 00:00:00 +02:00
+date: 2011-07-06 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -989,6 +989,7 @@ files:
 - app/views/invitation_mailer/send_invitation.text.erb
 - app/views/invitations/_new.html.erb
 - app/views/invitations/new.html.erb
+- app/views/invitations/new.js.erb
 - app/views/layouts/_account.html.erb
 - app/views/layouts/_flash.html.erb
 - app/views/layouts/_footer.html.erb
@@ -1062,15 +1063,8 @@ files:
 - app/views/subjects/_contacts.html.erb
 - app/views/subjects/_tabs.html.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/_invitations_menu.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_options.html.erb
 - app/views/toolbar/_profile_menu_tie_options.html.erb
@@ -1087,6 +1081,7 @@ files:
 - config/locales/en.yml
 - config/routes.rb
 - db/migrate/20110610112023_create_social_stream.rb
+- db/migrate/20110705103202_empty_ties_count.rb
 - lib/acts_as_taggable_on/acts_as_taggable_on/dirty.rb
 - lib/acts_as_taggable_on/social_stream.rb
 - lib/generators/social_stream/base/install_generator.rb
@@ -1149,7 +1144,6 @@ files:
 - spec/dummy/config/navigation.rb
 - spec/dummy/config/relations.yml
 - spec/dummy/config/routes.rb
-- spec/dummy/db/migrate/.gitkeep
 - spec/dummy/db/schema.rb
 - spec/dummy/db/seeds.rb
 - spec/dummy/public/404.html

data/app/views/toolbar/_home_menu.html.erb

@@ -1,13 +0,0 @@
-<% content_for :headers do %>
-  <%= stylesheet_link_tag "menu", :media => "screen, projection" %>
-  <%= javascript_include_tag 'menu' %>
-<% end %>
-
-<div id="menu_lateral">
-  <%= render :partial => "toolbar/home_menu_options" %>
-  <hr>
-  Testing SimpleNavigation<br>Please move along
-  <hr>
-  <%= yield(:toolbar_menu).empty? ? default_toolbar_menu : yield(:toolbar_menu)%>
-</div>
-

data/app/views/toolbar/_home_menu_options.html.erb

@@ -1,41 +0,0 @@
-<ul class="menu">
-
-<%= menu_options[:notifications] || capture do %>
-  <%= render :partial =>'toolbar/notifications_menu'%>
-<% end %>
-
-
-<%= menu_options[:messages] || capture do %>
-  <%= render :partial =>'toolbar/message_menu'%>
-<% end %>
-
-<%= menu_options[:contacts] || capture do %>
-  <li>
-    <%= link_to( image_tag("btn/btn_friend.png", :class => "menu_icon")+t('contact.other'), '#', :id => "contacts_menu") %>
-    <ul>
-      <%= menu_options[:invitations] || capture do %>
-        <%= render :partial =>'toolbar/invitations_menu'%>
-      <% end %>
-    <% current_subject.relation_customs.sort.each do |r| %>
-      <li>
-      <%= link_to image_tag("btn/btn_friend.png", :class => "menu_icon") + r.name , contacts_path(:relation => r.id) %>
-      </li>
-    <% end %>
-    </ul>
-  </li>
-<% end %>
-
-<%= menu_options[:subjects] || capture do %>
-  <%= render :partial => 'toolbar/home_menu_options_subjects' %>
-<% end %>
-
-<% if SocialStream.activity_forms.include? :document %>
-    <%= menu_options[:uploads] || capture do %>
-      <%= render :partial =>'toolbar/uploads_menu'%>
-    <% end %>
-<% end %>
-
-
-
-</ul>
-

data/app/views/toolbar/_home_menu_options_subjects.html.erb

@@ -1,12 +0,0 @@
-<%= menu_options[:groups] || capture do %>
-  <li>
-    <%= link_to( image_tag("btn/btn_group.png", :class => "menu_icon")+t('group.other'), '#', :id => "groups_menu") %>
-    <ul>
-      <li>
-      <%= link_to( image_tag("btn/btn_group.png", :class => "menu_icon")+t('group.new.action'), new_group_path('group' => { '_founder' => current_subject.slug })) %>
-      </li>
-    </ul>
-  </li>
-
-<% end %>
-

data/app/views/toolbar/_invitations_menu.html.erb

@@ -1,3 +0,0 @@
-<li>
-  <%= link_to( image_tag("btn/btn_invitation.png", :class => "menu_icon")+t('invitation.other'), new_invitation_path) %>
-</li>

data/app/views/toolbar/_message_menu.html.erb

@@ -1,17 +0,0 @@
-<li>
-  <%= link_to( image_tag("btn/new.png", :class => "menu_icon")+t('message.other')+" (" + current_subject.mailbox.inbox(:unread => true).count.to_s + ")", '#', :id => "messages_menu") %>
-  <ul>
-    <li>
-      <%= link_to( image_tag("btn/message_new.png", :class => "menu_icon")+ t('message.new'), new_message_path) %>
-    </li>
-    <li>
-      <%= link_to( image_tag("btn/message_inbox.png", :class => "menu_icon")+t('message.inbox')+" (" + current_subject.mailbox.inbox(:unread => true).count.to_s + ")", conversations_path, :remote => true) %>
-    </li>
-    <li>
-      <%= link_to( image_tag("btn/message_sentbox.png", :class => "menu_icon")+t('message.sentbox'), conversations_path(:box => :sentbox), :remote => true) %>
-    </li>
-    <li>
-      <%= link_to( image_tag("btn/message_trash.png", :class => "menu_icon")+t('message.trash'), conversations_path(:box => :trash), :remote => true) %>
-    </li>
-  </ul>
-</li>

data/app/views/toolbar/_notifications_menu.html.erb

@@ -1,3 +0,0 @@
-<li>
-  <%= link_to( image_tag("btn/btn_notification.png", :class => "menu_icon")+t('notification.other')+' ('+ current_subject.mailbox.notifications.not_trashed.unread.count.to_s+')', notifications_path)  %>
-</li>

data/app/views/toolbar/_profile_menu.html.erb

@@ -1,15 +0,0 @@
-<% content_for :headers do %>
-  <%= stylesheet_link_tag "menu", :media => "screen, projection" %>
-  <%= javascript_include_tag 'menu' %>
-<% end %>
-
-<div id="menu_lateral">
-  <ul class="menu">
-    <% unless subject == current_subject %>
-      <%= render :partial => "toolbar/profile_menu_tie_options", :locals => { :subject => subject } %>
-    <% end %>
-
-    <%= render :partial => "toolbar/profile_menu_basic_options", :locals => { :subject => subject } %>
-  </ul>
-</div>
-<div class="space_center"></div>