social_stream-base 0.6.3 → 0.6.5

data/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.6.3".freeze
+    VERSION = "0.6.5".freeze
   end
 end

data/lib/social_stream/migration_finder.rb

@@ -0,0 +1,19 @@
+module SocialStream
+  # Searches for migrations in a gem and requires them.
+  # Example:
+  #
+  #   MigrationFinder.new 'acts-as-taggable-on',
+  #                       ["generators", "acts_as_taggable_on", "migration", "templates", "active_record", "migration"]
+  #   ActsAsTaggableOnMigration.up
+class MigrationFinder
+    def initialize gem, path
+      finder = Gem::GemPathSearcher.new
+      taggable_spec = finder.find(gem)
+      taggable_migration = finder.matching_files(taggable_spec,
+                                                 File.join(*path)).first
+
+      require taggable_migration
+    end
+end
+
+end

data/lib/social_stream/toolbar_config.rb

@@ -0,0 +1,113 @@
+module SocialStream
+  module ToolbarConfig
+    #Prints the default home toolbar menu
+  def default_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"}}}
+
+    #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.mine'),
+        :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_pictures,: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 })}]
+    }
+
+    render_items items
+  end
+
+  #Prints the default profile toolbar menu
+  def default_profile_toolbar_menu(subject = current_subject)
+    items = Array.new
+    #Information button
+    items << {:key => :subject_info,
+      :name => image_tag("btn/btn_edit.png")+t('menu.information'),
+      :url => [subject, :profile]
+    }
+
+    if subject!=current_subject
+      #Like button
+      items << {:key => :like_button,
+        :name => link_like_params(subject)[0],
+        :url => link_like_params(subject)[1],
+        :options => {:link => link_like_params(subject)[2]}}
+        
+      if user_signed_in?
+        #Relation button
+        items << {:key => :subject_relation,
+          :name => image_tag("btn/btn_friend.png") + contact_status(subject),
+          :url => edit_contact_path(current_subject.contact_to!(subject))
+        }
+        #Send message button
+        items << {:key => :send_message,
+          :name => image_tag("btn/btn_send.png")+t('message.send'),
+          :url => new_message_path(:receiver => subject.slug)
+        }
+      end
+    end
+    #Documents if present
+    if SocialStream.activity_forms.include? :document
+      if subject == current_subject
+        resources_label = t('resource.mine')
+      else
+        resources_label = t('resource.title')        
+      end
+      items << {:key => :resources,
+        :name => image_tag("btn/btn_resource.png",:class =>"menu_icon")+resources_label,
+        :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_pictures,: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
+    render_items items
+  end
+  end
+end

data/lib/social_stream-base.rb

@@ -40,6 +40,7 @@ module SocialStream
   autoload :Populate,  'social_stream/populate'
   autoload :Relations, 'social_stream/relations'
   autoload :TestHelpers, 'social_stream/test_helpers'
+  autoload :ToolbarConfig, 'social_stream/toolbar_config'
 
   module Controllers
     autoload :Helpers, 'social_stream/controllers/helpers'

data/lib/tasks/db/populate.rake

@@ -118,7 +118,7 @@ namespace :db do
         
         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)),
+                        :created_at => Time.at(rand(updated.to_i)),
                         :updated_at => updated,
                         :_contact_id => t.contact_id,
                         :_relation_ids => Array(t.relation_id)

data/social_stream-base.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |s|
   # OAuth provider
   s.add_runtime_dependency('oauth-plugin','~> 0.4.0.pre1')	
   # Messages
-  s.add_runtime_dependency('mailboxer','~> 0.2.4')
+  s.add_runtime_dependency('mailboxer','~> 0.3.2')
   # Avatar manipulation
   s.add_runtime_dependency('rmagick','~> 2.13.1')
   # Tagging
@@ -56,7 +56,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency('sqlite3-ruby')
   # Debugging
   if RUBY_VERSION < '1.9'
-    s.add_development_dependency('ruby-debug', '~> 0.10.3')
+    s.add_development_dependency('ruby-debug')
+  else
+    s.add_development_dependency('ruby-debug19')
   end
   # Specs
   s.add_development_dependency('rspec-rails', '~> 2.6.1')

data/spec/controllers/contacts_controller_spec.rb

@@ -63,7 +63,7 @@ describe ContactsController do
     contact = @user.contact_to!(group)
     # Initialize inverse contact
     contact.inverse!
-    relations = [ @user.relation_custom('friend'), @user.relation_custom('partner') ]
+    relations = [ @user.relation_custom('friend'), @user.relation_custom('colleague') ]
     
 
     put :update, :id => contact.id,

data/spec/controllers/permissions_controller_spec.rb

@@ -14,8 +14,7 @@ describe PermissionsController do
 
     context "with an existing relation" do
       before do
-        @sphere = Factory(:sphere, :actor_id => @user.actor_id)
-        @relation = Factory(:relation_custom, :sphere_id => @sphere.id)
+        @relation = Factory(:relation_custom, :actor_id => @user.actor_id)
       end
 
       it "should render index" do

data/spec/controllers/posts_controller_spec.rb

@@ -76,10 +76,10 @@ describe PostsController do
         @group = Factory(:member, :contact => Factory(:group_contact, :receiver => @user.actor)).sender_subject
       end
 
-      describe "with public relation" do
+      describe "with member relation" do
         before do
           contact = @user.contact_to!(@group)
-          relation = @group.relation_public
+          relation = @group.relation_custom('member')
 
           model_assigned_to contact, relation
           @current_model = Factory(:post, :_contact_id => contact.id, :_relation_ids => Array(relation.id))

data/spec/controllers/relation_customs_controller_spec.rb

@@ -1,103 +1,112 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Relation::CustomsController do
-  include SocialStream::TestHelpers::Controllers
-
   render_views
 
-  describe "when authenticated" do
-    before do
-      @user = Factory(:user)
+  describe "when Anonymous" do
+    context "faking a new relation" do
+      it "should not create" do
+        post :create, :custom => Factory.attributes_for(:relation_custom)
 
-      sign_in @user
+        response.should redirect_to(:new_user_session)
+      end
     end
 
-    context "with an existing sphere" do
+    context "an existing relation" do
       before do
-        @sphere = Factory(:sphere, :actor_id => @user.actor_id)
+        @relation = Factory(:relation_custom)
       end
 
-      it "should render index" do
-        get :index, :sphere_id => @sphere.id, :format => "js"
+      it "should not update" do
+        put :update, :id => @relation.to_param, :custom => { :name => 'Testing' }
 
-        response.should be_success
+        assigns(:custom).should be_blank
+        response.should redirect_to(:new_user_session)
       end
 
-      context "a new relation" do
-        it "should be created" do
-          count = Relation::Custom.count
+      it "should not destroy" do
+        count = Relation.count
+        begin
+          delete :destroy, :id => @relation.to_param
+        rescue CanCan::AccessDenied
+        end
 
-          post :create, :custom => { :name => "Test create", :sphere_id => @sphere.id }, :format => 'js'
+        relation = assigns(:custom)
 
-          relation = assigns(:custom)
+        Relation.count.should eq(count)
+      end
 
-          Relation::Custom.count.should eq(count + 1)
-          relation.should be_valid
-          response.should be_success
-        end
+    end
+  end
 
-      end
 
-      context "a existing own relation" do
-        before do
-          @relation = Factory(:relation_custom, :sphere_id => @sphere.id)
-          @relation.reload
-        end
+  describe "when authenticated" do
+    before do
+      @user = Factory(:user)
+
+      sign_in @user
+    end
 
-        it "should allow updating" do
-          attrs = { :name => "Updating own" }
+    it "should render index" do
+      get :index
 
-          put :update, :id => @relation.to_param, :relation_custom => attrs, :format => 'js'
+      response.should be_success
+    end
 
-          relation = assigns(:custom)
+    context "a new own relation" do
+      it "should be created" do
+        count = Relation::Custom.count
 
-#          relation.should_receive(:update_attributes).with(attrs)
-          relation.should be_valid
-          response.should be_success
-        end
+        post :create, :custom => { :name => "Test create", :actor_id => @user.actor_id }, :format => 'js'
+
+        relation = assigns(:custom)
 
-        it "should allow destroying" do
-          pending "Delete relations"
+        Relation::Custom.count.should eq(count + 1)
+        relation.should be_valid
+        response.should be_success
+      end
+    end
 
-          count = Relation::Custom.count
+    context "a new fake relation" do
+      it "should not be created" do
+        count = Relation.count
+	begin
+          post :create, :custom => Factory.attributes_for(:relation_custom)
 
-          delete :destroy, :id => @relation.to_param, :format => :js
+          assert false
+        rescue CanCan::AccessDenied
+          assigns(:custom).should be_new_record
 
-          Relation::Custom.count.should eq(count - 1)
+          Relation.count.should eq(count)
         end
       end
-
     end
 
-    context "with a fake sphere" do
+    context "a existing own relation" do
       before do
-        @sphere = Factory(:sphere)
+        @relation = Factory(:relation_custom, :actor => @user.actor)
       end
 
-      it "should not render index" do
-	begin
-          get :index, :sphere_id => @sphere.id, :format => "js"
+      it "should allow updating" do
+        attrs = { :name => "Updating own" }
 
-	  # Should not get here
-          assert false
-        rescue CanCan::AccessDenied
-          assigns(:customs).should be_blank
-        end
+        put :update, :id => @relation.to_param, :relation_custom => attrs, :format => 'js'
+
+        relation = assigns(:custom)
+
+#          relation.should_receive(:update_attributes).with(attrs)
+        relation.should be_valid
+        response.should be_success
       end
 
-      context "a new relation" do
-        it "should belong to user" do
-          count = Relation::Custom.count
+      it "should allow destroying" do
+        pending "Delete relations"
 
-          begin
-            post :create, :relation_custom => { :name => "Test create", :sphere_id => @sphere.id }, :format => 'js'
+        count = Relation::Custom.count
 
-            assert false
-          rescue CanCan::AccessDenied
+        delete :destroy, :id => @relation.to_param, :format => :js
 
-            Relation::Custom.count.should eq(count)
-          end
-        end
+        Relation::Custom.count.should eq(count - 1)
       end
     end
 
@@ -126,8 +135,6 @@ describe Relation::CustomsController do
         end
       end
     end
-
-
   end
 end
 

data/spec/dummy/config/database.yml

@@ -18,6 +18,13 @@ test:
   pool: 5
   timeout: 5000
 
+test_mysql:
+  adapter: mysql
+  database: social_stream_test
+  username: root
+  password:
+  sockect: /var/run/mysqld/mysqld.sock
+
 test_pg:
   adapter: postgresql
   encoding: unicode

data/spec/dummy/config/relations.yml

@@ -11,35 +11,29 @@ user:
   friend:
     name: friend
     permissions:
-      - [ follow ]                            # follow the activities of the friend
-      - [ create,  activity, same_level ]     # let the friend create activities
-      - [ read,    activity, same_and_lower_levels ] # friend can read activities from the other friends and below
-    sphere: personal
+      - [ follow ]
+      - [ create,  activity ]
+      - [ read,    activity ]
   acquaintance:
     name: acquaintance
-    parent: friend # friend relation is stronger than acquaintance
     permissions:
-      - [ read,    activity, same_and_lower_levels ]
-    sphere: personal
-  partner:
-    name: partner
+      - [ read,    activity ]
+  colleague:
+    name: colleague
     permissions:
-      - [ read, activity, same_and_lower_levels ]
-    sphere: work
+      - [ follow ]
+      - [ create,  activity ]
+      - [ read, activity ]
 
 group:
   member:
     name: member
     permissions:
-      - [ represent ]                         # let the member act as the group
-      - [ create,  activity, same_and_lower_levels ] # let them member create activities
-      - [ read,    activity, same_and_lower_levels ] # read activities from other members
-      - [ read,    tie,      same_and_lower_levels ]
-    sphere: organization
+      - [ represent ]
+      - [ create,  activity ]
+      - [ read,    activity ]
+      - [ read,    tie ]
   partner:
     name: partner
-    parent: member # member is stronger than partner
     permissions:
-      - [ read,    activity, same_and_lower_levels ]
-    sphere: external_relations
-
+      - [ read,    activity ]