social_stream 0.4.3 → 0.4.4

data/lib/generators/social_stream/templates/migration.rb

@@ -85,8 +85,8 @@ class CreateSocialStream < ActiveRecord::Migration
     
     create_table "permissions", :force => true do |t|
       t.string   "action"
-      t.string   "object"
-      t.string   "function"
+      t.string   "object",   :default => nil
+      t.string   "function", :default => nil
       t.datetime "created_at"
       t.datetime "updated_at"
     end
@@ -137,31 +137,27 @@ class CreateSocialStream < ActiveRecord::Migration
     add_index "relation_permissions", "permission_id"
     
     create_table "relations", :force => true do |t|
-      t.string   "name",       :limit => 45
+      t.string   "type"
+      t.string   "name"
       t.datetime "created_at"
       t.datetime "updated_at"
       t.string   "sender_type"
       t.string   "receiver_type"
-      t.integer  "parent_id"
-      t.integer  "lft"
-      t.integer  "rgt"
+      t.string   "ancestry"
+      t.integer  "sphere_id"
     end
     
-    add_index "relations", "parent_id"
-    
-    create_table "tags", :force => true do |t|
-      t.string   "name",       :limit => 45
+    add_index "relations", "ancestry"
+    add_index "relations", "sphere_id"
+
+    create_table "spheres", :force => true do |t|
+      t.string   "name"
+      t.integer  "actor_id"
       t.datetime "created_at"
       t.datetime "updated_at"
     end
-    
-    create_table "tags_activity_objects", :force => true do |t|
-      t.integer "tag_id"
-      t.integer "activity_object_id"
-    end
-    
-    add_index "tags_activity_objects", "activity_object_id"
-    add_index "tags_activity_objects", "tag_id"
+
+    add_index "spheres", "actor_id"
     
     create_table "tie_activities", :force => true do |t|
       t.integer "tie_id"
@@ -229,9 +225,10 @@ class CreateSocialStream < ActiveRecord::Migration
     add_foreign_key "relation_permissions", "relations", :name => "relation_permissions_on_relation_id"
     add_foreign_key "relation_permissions", "permissions", :name => "relation_permissions_on_permission_id"
     
-    add_foreign_key "tags_activity_objects", "activity_objects", :name => "tags_activity_objects_on_activity_object_id"
-    add_foreign_key "tags_activity_objects", "tags", :name => "tags_activity_objects_on_tag_id"
-    
+    add_foreign_key "relations", "spheres", :name => "relations_on_sphere_id"
+
+    add_foreign_key "spheres", "actors", :name => "spheres_on_actor_id"
+
     add_foreign_key "tie_activities", "ties",       :name => "tie_activities_on_tie_id"
     add_foreign_key "tie_activities", "activities", :name => "tie_activities_on_activity_id"
     
@@ -265,9 +262,10 @@ class CreateSocialStream < ActiveRecord::Migration
     
     remove_foreign_key "relation_permissions", :name => "relation_permissions_on_relation_id"
     remove_foreign_key "relation_permissions", :name => "relation_permissions_on_permission_id"
-    
-    remove_foreign_key "tags_activity_objects", :name => "tags_activity_objects_on_activity_object_id"
-    remove_foreign_key "tags_activity_objects", :name => "tags_activity_objects_on_tag_id"
+
+    remove_foreign_key "relations", :name => "relations_on_sphere_id"
+
+    remove_foreign_key "spheres", :name => "spheres_on_actor_id"
     
     remove_foreign_key "tie_activities", :name => "tie_activities_on_tie_id"
     remove_foreign_key "tie_activities", :name => "tie_activities_on_activity_id"
@@ -292,10 +290,8 @@ class CreateSocialStream < ActiveRecord::Migration
     drop_table :profiles
     drop_table :relation_permissions
     drop_table :relations
-    drop_table :tags
-    drop_table :tags_activity_objects
+    drop_table :spheres
     drop_table :ties
     drop_table :users
-
   end
 end

data/lib/generators/social_stream/templates/public/javascripts/ajax.paginate.js

@@ -20,34 +20,27 @@ $(function(){
 
     $('.pagination a').live('click',function(){
         $('#list_users_ajax').html("<div id='ajax_loader_icon'><img src='../images/loader.gif'></div>");
-        $.setFragment({ "page" : $.queryString(this.href).page });
+        $.setFragment({ "page" : $.queryString(this.href).page});
+        $.setFragment({ "letter" : $.queryString(this.href).letter});
+        $.setFragment({ "search" : $.queryString(this.href).search});
+	    $.setFragment({ "tag" : $.queryString(this.href).tag});
+
         $.getScript(this.href);
         return false;
     });
 
     $('.user_letter_link').live('click',function(){
         $('#list_users_ajax').html("<div id='ajax_loader_icon'><img src='../images/loader.gif'></div>");
-        $.setFragment({ "page" : $.queryString(this.href).page });
-        $.setFragment({ "letter" : $.queryString(this.href).letter });
+        $.setFragment({ "letter" : $.queryString(this.href).letter});
         $.getScript(this.href);
         return false;
     });
 
-    $.fragmentChange(true);
-    $(document).bind("fragmentChange.page", function() {
-        $.getScript($.queryString(document.location.href, { "page" : $.fragment().page,
-                                                            "letter": $.fragment().letter}));
-    });
-    $(document).bind("fragmentChange.letter", function() {
-        $.getScript($.queryString(document.location.href, { "page" : $.fragment().page,
-                                                            "letter": $.fragment().letter}));
-    });
-
-    if ($.fragment().page) {
-        $(document).trigger("fragmentChange.page");
-    }
-    if ($.fragment().letter) {
-        $(document).trigger("fragmentChange.letter");
-    }
+	$('#wordcloud a').live('click', function(){
+		$('#list_users_ajax').html("<div id='ajax_loader_icon'><img src='../images/loader.gif'></div>");
+        $.setFragment({ "tag" : $.queryString(this.href).tag});
+        $.getScript(this.href);
+        return false;
+	});
 
 });

data/lib/generators/social_stream/templates/public/javascripts/jquery.validate.js

@@ -194,7 +194,7 @@ $.extend($.validator, {
     messages: {},
     groups: {},
     rules: {},
-    errorClass: "error",
+    errorClass: "validation_error",
     errorElement: "label",
     focusInvalid: true,
     errorContainer: $( [] ),

data/lib/generators/social_stream/templates/public/javascripts/main.js

@@ -1,18 +1,28 @@
 // initialise plugins
 jQuery(function(){
-jQuery('ul.sf-menu').superfish({
-        delay:       1000,                            // one second delay on mouseout
-        animation:   {height:'show'},  // fade-in and slide-down animation
-        speed:       'fast',                          // faster animation speed
-        autoArrows:  false,
-        dropShadows: false                            // disable drop shadows
-});
-
+  
+   
+    jQuery('ul.sf-menu').superfish({
+        delay: 2000, // one second delay on mouseout
+        animation: {
+            height: 'show'
+        }, // fade-in and slide-down animation
+        speed: 'fast', // faster animation speed
+        autoArrows: false,
+        dropShadows: false // disable drop shadows
+    });
+    
+    
 });
 
 
 
-$(document).ready(function() {
-$('#tabright> ul').tabs({ fx: { height: 'toggle', opacity: 'toggle' } });
+$(document).ready(function(){
+    $('#tabright> ul').tabs({
+        fx: {
+             height: 'toggle',
+            opacity: 'toggle'
+        }
+    });
 });
 

data/lib/generators/social_stream/templates/public/stylesheets/default/base.css

@@ -22,10 +22,27 @@ margin-top: auto; margin-bottom:auto;}
 
 
  /*********** Notices SECTION *********************/
-.error, .notice, .success {padding:.8em;margin-bottom:1em;}
-.notice {color:#1F4A75; font-weight:bold; font-size:1.3em; display:block; text-align:center;}
-.error{color:red;}
-.success {color: #088A08}
+.notice, .success, .alert, .error, .validation {
+    border: 1px solid;
+    margin: 10px 0px;
+    padding:15px 10px 15px 50px;
+    background-repeat: no-repeat;
+    background-position: 10px center;
+    width: 440px;
+    margin-left: auto;
+    margin-right: auto;
+    font-weight: bold;
+}
+.notice ul, .success ul, .alert ul, .error ul, .validation ul{
+  margin-left:50px;
+  
+}
+label.validation_error{color: #D8000C;background-color: #FFBABA;border: 1px solid;
+                       display: block;padding-left:5px;padding-right:5px;width:90%;}
+.notice {color: #00529B;background-color: #BDE5F8;background-image: url('/images/btn/info.png');}
+.success {color: #4F8A10;background-color: #DFF2BF;background-image:url('/images/btn/success.png');}
+.alert {color: #9F6000;background-color: #FEEFB3;background-image: url('/images/btn/warning.png');}
+.error {color: #D8000C;background-color: #FFBABA;background-image: url('/images/btn/error.png');}
 
 /************Forms SECTION **************/
 input.other_blue{	background:#497FC1;	border:0px;	cursor:pointer;  font-size:1.0em;  line-height:135%;

data/lib/generators/social_stream/templates/public/stylesheets/default/header.css

@@ -42,9 +42,15 @@ li.btn_menu_browse{background: transparent url("/images/btn/btn_browse.png") no-
 #menu_account ul{	list-style: none;	margin: 0px;	float:left;}
 #menu_account ul li{	line-height:20px;	padding:5px 0px 5px 20px; vertical-align:top;}
 
-#account{display:inline-block;vertical-align: top; height:22px;}
+#menu_pipe{	vertical-align: top; height:23px; }
+#menu_pipe span {	float:right;	padding-right: 5px;	vertical-align: top;	padding-top: 5px;}
+#menu_pipe ul{	list-style: none;	margin: 0px;	float:left;}
+#menu_pipe ul li{	line-height:20px;	padding:5px 0px 5px 0px; vertical-align:top;}
 
 
+#account, #representation_li,#current_user_info, #representations_menu {display:inline-block;vertical-align: top; height:22px; color:#FFF;}
+#representation_li{margin-left:10px;display:none;}
+
 li.btn_menu_exit{background: transparent url("/images/btn/btn_exit.png") no-repeat left center;}
 li.btn_menu_representation{}
 #menu_home ul li.pipe,#menu_account ul li.pipe{padding:0px 3px 0px 3px; margin:0px;}
@@ -119,9 +125,8 @@ ul.sf-menu li li li.sfHover ul {
 	/*margin-bottom:	1em;   */
 }
 .sf-menu a {
-	padding: 		.55em 1em;
+	padding: 		.40em 1em .70em 2em;
 	text-decoration:none;
-  padding-left:2em;
 }
 .sf-menu a, .sf-menu a:visited  { /* visited pseudo selector so IE6 applies text colour*/
 	color:			#fff;

data/lib/generators/social_stream/templates/relations.yml

@@ -12,20 +12,17 @@ user:
     name: friend
     permissions:
       - [ follow ]                       # follow the activities of the friend
-      - [ create,  activity, tie ]       # let the friend create activities to the same tie
+      - [ create,  activity ]            # let the friend create activities
       - [ read,    activity, star_ties ] # friend can read activities from the other friends
-      - [ update,  activity, tie ]       # update activities to the same tie
-      - [ destroy, activity, tie ]       # destroy activities to the same tie
+      - [ update,  activity ]            # update her activities
+      - [ destroy, activity ]            # destroy her activities
+    sphere: personal
   acquaintance:
     name: acquaintance
     parent: friend # friend relation is stronger than acquaintance
     permissions:
       - [ read,    activity, star_ties ]
-  public:
-    name: public
-    parent: acquaintance # acquaintance is stronger than public
-    permissions:
-      - [ read,    activity, star_ties ]
+    sphere: personal
 
 group:
   member:
@@ -37,13 +34,10 @@ group:
       - [ update,  activity, weak_star_ties ] # update and destroy activities to members,
       - [ destroy, activity, weak_star_ties ] # acquaintance and public
       - [ read,    tie,      weak_star_ties ]
+    sphere: organization
   partner:
     name: partner
     parent: member # member is stronger than partner
     permissions:
       - [ read,    activity, star_ties ]
-  public:
-    name: public
-    parent: partner # partner is stronger than public
-    permissions:
-      - [ read,    activity, star_ties ]
+    sphere: organization

data/lib/social_stream/ability.rb

@@ -2,62 +2,81 @@ module SocialStream
   class Ability
     include CanCan::Ability
 
-    def initialize(user)
+    def initialize(subject)
+
       # Activity Objects
       (SocialStream.objects - [ :actor ]).map{ |obj|
         obj.to_s.classify.constantize
       }.each do |klass|
-        can :create, klass do |k|
-          k._activity_tie.allows?(user, 'create', 'activity')
+        can :create, klass do |k| # can :create, Post do |post|
+          k._activity_tie.sender_id == subject.actor_id &&
+            k._activity_tie.receiver.allow?(subject, 'create', 'activity')
         end
 
-        can :read, klass do |k|
-          k._activity_tie.allows?(user, 'read', 'activity')
+        can :read, klass do |k| # can :read, Post do |post|
+          k.post_activity.tie.allow?(subject, 'read', 'activity')
         end
 
-        can :update, klass do |k|
-          k._activity_tie.allows?(user, 'update', 'activity')
+        can :update, klass do |k| # can :update, Post do |post|
+          k.post_activity.tie.allow?(subject, 'update', 'activity')
         end
 
-        can :destroy, klass do |k|
-          k._activity_tie.allows?(user, 'destroy', 'activity')
+        can :destroy, klass do |k| # can :destroy, Post do |post|
+          k.post_activity.tie.sender_id == Actor.normalize_id(subject) ||
+            k.post_activity.tie.allow?(subject, 'destroy', 'activity')
         end
       end
 
       # Activities
       can :create, Activity do |a|
-        a.tie.allows?(user, 'create', 'activity')
+        a.tie.allow?(subject, 'create', 'activity')
       end
 
       can :read, Activity do |a|
-        a.tie.allows?(user, 'read', 'activity')
+        a.tie.allow?(subject, 'read', 'activity')
       end
 
       can :update, Activity do |a|
-        a.tie.allows?(user, 'update', 'activity')
+        a.tie.allow?(subject, 'update', 'activity')
       end
 
       can :destroy, Activity do |a|
-        a.tie.allows?(user, 'destroy', 'activity')
+        a.tie.allow?(subject, 'destroy', 'activity')
+      end
+
+      # Users
+      can :read, User
+
+      can :update, User do |u|
+        u.represented_by?(subject)
       end
 
       # Groups
       can :read, Group
 
       can :create, Group do |g|
-        user.present? &&
-          ( g._founder == user.slug ||
-            Actor.find_by_slug!(g._founder).sent_ties.received_by(user).with_permissions('represent', nil).any? )
+        subject.present? &&
+          g._founder == subject.slug
       end
 
       can :update, Group do |g|
-        user.present? &&
-          g.sent_ties.received_by(user).with_permissions('represent', nil).any?
+        g.represented_by?(subject)
       end
 
       can :destroy, Group do |g|
-        user.present? &&
-          g.sent_ties.received_by(user).with_permissions('represent', nil).any?
+        g.represented_by?(subject)
+      end
+
+      can :read, Profile
+
+      # Profile
+      can :update, Profile do |p|
+        p.subject.represented_by?(subject)
+      end
+
+      # Representation
+      can :create, Representation do |r|
+        r.subject.represented_by?(subject)
       end
     end
   end

data/lib/social_stream/controllers/helpers.rb

@@ -44,6 +44,12 @@ module SocialStream
           @current_subject = instance
         end
 
+        # Override Cancan#current_ability method to use {#current_subject}
+        def current_ability
+          @current_ability ||=
+            Ability.new(current_subject)
+        end
+
         private
 
         # Get represented subject from session

data/lib/social_stream/models/object.rb

@@ -10,7 +10,7 @@ module SocialStream
         attr_accessor :_activity_tie_id
         attr_accessor :_activity_parent_id
 
-        belongs_to :activity_object, :dependent => :destroy
+        belongs_to :activity_object, :dependent => :destroy, :autosave => true
         has_many   :activity_object_activities, :through => :activity_object
 
         delegate :post_activity, :to => :activity_object
@@ -61,9 +61,13 @@ module SocialStream
         end
 
         def create_activity(verb)
-          activity_object.activities.create! :verb      => verb,
-                                             :_tie      => _activity_tie,
-                                             :parent_id => _activity_parent_id
+          a = Activity.new :verb      => verb,
+                           :_tie      => _activity_tie,
+                           :parent_id => _activity_parent_id
+
+          a.activity_objects << activity_object
+
+          a.save!
         end
       end
     end

data/lib/social_stream/models/subject.rb

@@ -43,6 +43,12 @@ module SocialStream
         scope :search, lambda{ |param|
           joins(:actor).merge(Actor.search(param))
         }
+        
+        scope :tagged_with, lambda { |param|
+          if param.present?
+            joins(:actor => :activity_object).merge(ActivityObject.tagged_with(param))
+          end
+        }
 
         scope :distinct_initials, joins(:actor).merge(Actor.distinct_initials)
 

data/lib/social_stream/rails.rb

@@ -4,9 +4,7 @@ require 'foreigner'
 require 'jquery-rails'
 # Permalinks:
 require 'stringex'
-# Hierarchical relationships in Relation:
-require 'nested_set'
-# Hierarchical relationships in Activity:
+# Hierarchical relationships in Activity and Relation:
 require 'ancestry'
 # Messages
 require 'mailboxer'
@@ -27,11 +25,14 @@ require 'will_paginate'
 require 'omniauth/oauth'
 # CSS themes
 require 'rails_css_themes'
+#Tags
+require 'acts-as-taggable-on'
 
 module SocialStream
   class Engine < ::Rails::Engine #:nodoc:
     config.app_generators.authentication :devise
     config.app_generators.messages :mailboxer
+    config.app_generators.taggings :acts_as_taggable_on
 
     config.to_prepare do
       %w( actor activity_object ).each do |supertype|
@@ -43,6 +44,8 @@ module SocialStream
       ApplicationController.helper SubjectsHelper
       ApplicationController.helper TiesHelper
       ApplicationController.helper LocationHelper
+      
+      ActsAsTaggableOn::TagsHelper
     end
 
     initializer "social_stream.inflections" do

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "0.4.3".freeze
+  VERSION = "0.4.4".freeze
 end

data/lib/tasks/db/populate.rake

@@ -34,6 +34,15 @@ namespace :db do
         end
       end
       
+      def set_tags(klass)
+        klass.all.each do |el|
+          el.tag_list = Forgery::LoremIpsum.words(1,:random => true)+", "+
+                        Forgery::LoremIpsum.words(1,:random => true)+", "+
+                        Forgery::LoremIpsum.words(1,:random => true)
+          el.save!
+        end
+      end
+      
       puts 'User population'
       users_start = Time.now
       
@@ -66,7 +75,7 @@ namespace :db do
       
       # = Groups
       available_actors = Actor.all
-      
+
       10.times do
         founder = available_actors[rand(available_actors.size)]
         
@@ -76,6 +85,7 @@ namespace :db do
       end
       
       set_logos(Group)
+      set_tags(Group)
       
       groups_end = Time.now 
       puts '   -> ' +  (groups_end - groups_start).round(4).to_s + 's'

data/social_stream.gemspec

@@ -12,10 +12,8 @@ Gem::Specification.new do |s|
 
   # Gem dependencies
   #
-  # Activity hierarchies
-  s.add_runtime_dependency('atd-ancestry', '1.3.0')
-  # Relation hierarchies
-  s.add_runtime_dependency('nested_set', '~> 1.5.3')
+  # Activity and Relation hierarchies
+  s.add_runtime_dependency('ancestry', '~> 1.2.3')
   # SQL foreign keys
   s.add_runtime_dependency('foreigner', '~> 0.9.1')
   # Authentication
@@ -29,7 +27,7 @@ Gem::Specification.new do |s|
   # jQuery
   s.add_runtime_dependency('jquery-rails', '~> 0.2.5')
   # Authorization
-  s.add_runtime_dependency('cancan', '~> 1.6.2')
+  s.add_runtime_dependency('cancan', '~> 1.6.4')
   # Pagination
   s.add_runtime_dependency('will_paginate', '~> 3.0.pre2')
   # OAuth client
@@ -39,13 +37,14 @@ Gem::Specification.new do |s|
   # Theme support
   s.add_runtime_dependency('rails_css_themes','~> 1.0.0')	
   # Messages
-  s.add_runtime_dependency('mailboxer','~> 0.0.14')
+  s.add_runtime_dependency('mailboxer','~> 0.0.16')
   # Avatar manipulation
   s.add_runtime_dependency('rmagick','~> 2.13.1')
-
+  # Tagging
+  s.add_runtime_dependency('acts-as-taggable-on','~> 2.0.6')
 
   # Development Gem dependencies
-  s.add_development_dependency('rails', '~> 3.0.6')
+  s.add_development_dependency('rails', '~> 3.0.7')
   # Integration testing
   s.add_development_dependency('capybara', '~> 0.3.9')
   # Testing database

data/spec/controllers/comments_controller_spec.rb

@@ -21,7 +21,9 @@ describe CommentsController do
 
     describe "comment from friend" do
       before do
-        model_assigned_to Factory(:friend, :receiver => @user.actor)
+        f = Factory(:friend, :receiver => @user.actor).sender
+
+        model_assigned_to Factory(:friend, :sender => @user.actor, :receiver => f)
       end
 
       it_should_behave_like "Allow Creating"
@@ -29,7 +31,9 @@ describe CommentsController do
 
     describe "post from acquaintance" do
       before do
-        model_assigned_to Factory(:acquaintance, :receiver => @user.actor)
+        a = Factory(:acquaintance, :receiver => @user.actor).sender
+
+        model_assigned_to Factory(:friend, :sender => @user.actor, :receiver => a)
       end
 
       it_should_behave_like "Deny Creating"