social_stream-base 0.5.2 → 0.6.0

data/config/routes.rb

@@ -1,4 +1,7 @@
 Rails.application.routes.draw do
+  #Background tasks
+  mount Resque::Server, :at => "/resque"
+  
   root :to => "frontpage#index"
   
   match 'home' => 'home#index', :as => :home
@@ -43,11 +46,17 @@ Rails.application.routes.draw do
   
   resource :representation
   
-    #resources :avatars
+  resources :settings do
+    collection do
+      put 'update_all'
+    end
+  end
 
   resources :messages
 
   resources :conversations
+
+  resources :invitations
   
   resources :notifications do
     collection do

data/{lib/generators/social_stream/base/templates/migration.rb → db/migrate/20110610112023_create_social_stream.rb}

@@ -1,12 +1,14 @@
 class CreateSocialStream < ActiveRecord::Migration
   def self.up
     create_table "activities", :force => true do |t|
+      t.integer  "contact_id"
       t.integer  "activity_verb_id"
       t.datetime "created_at"
       t.datetime "updated_at"
       t.string   "ancestry"
     end
     
+    add_index "activities", "contact_id"
     add_index "activities", "activity_verb_id"
     
     create_table "activity_object_activities", :force => true do |t|
@@ -38,6 +40,7 @@ class CreateSocialStream < ActiveRecord::Migration
       t.string   "email",     :default => "", :null => false
       t.string   "slug"
       t.string   "subject_type"
+      t.boolean  "notify_by_email", :default => true
       t.datetime "created_at"
       t.datetime "updated_at"
       t.integer  "activity_object_id"
@@ -47,6 +50,14 @@ class CreateSocialStream < ActiveRecord::Migration
     add_index "actors", "activity_object_id"
     add_index "actors", "email"
     add_index "actors", "slug", :unique => true
+     
+    create_table "audiences", :force => true do |t|
+      t.integer "relation_id"
+      t.integer "activity_id"
+    end
+    
+    add_index "audiences", "relation_id"
+    add_index "audiences", "activity_id"
     
     create_table :authentications, :force => true do |t|
       t.integer :user_id
@@ -67,15 +78,28 @@ class CreateSocialStream < ActiveRecord::Migration
     end
     
     add_index "avatars", "actor_id"
-   
+
     create_table "comments", :force => true do |t|
       t.integer  "activity_object_id"
       t.text     "text"
-      t.datetime "updated_at"
       t.datetime "created_at"
+      t.datetime "updated_at"
     end
     
     add_index "comments", "activity_object_id"
+
+    create_table "contacts", :force => true do |t|
+      t.integer  "sender_id"
+      t.integer  "receiver_id"
+      t.datetime "created_at"
+      t.datetime "updated_at"
+      t.integer  "inverse_id"
+      t.integer  "ties_count"
+    end
+
+    add_index "contacts", "receiver_id"
+    add_index "contacts", "sender_id"
+    add_index "contacts", "inverse_id"
     
     create_table "groups", :force => true do |t|
       t.integer  "actor_id"
@@ -139,6 +163,7 @@ class CreateSocialStream < ActiveRecord::Migration
     add_index "relation_permissions", "permission_id"
     
     create_table "relations", :force => true do |t|
+      t.integer  "actor_id"
       t.string   "type"
       t.string   "name"
       t.datetime "created_at"
@@ -149,6 +174,7 @@ class CreateSocialStream < ActiveRecord::Migration
       t.integer  "sphere_id"
     end
     
+    add_index "relations", "actor_id"
     add_index "relations", "ancestry"
     add_index "relations", "sphere_id"
 
@@ -160,29 +186,16 @@ class CreateSocialStream < ActiveRecord::Migration
     end
 
     add_index "spheres", "actor_id"
-    
-    create_table "tie_activities", :force => true do |t|
-      t.integer "tie_id"
-      t.integer "activity_id"
-      t.boolean "read"
-      t.boolean "original", :default => true
-    end
-    
-    add_index "tie_activities", "tie_id"
-    add_index "tie_activities", "activity_id"
-    
+   
     create_table "ties", :force => true do |t|
-      t.integer  "sender_id"
-      t.integer  "receiver_id"
+      t.integer  "contact_id"
       t.integer  "relation_id"
       t.datetime "created_at"
       t.datetime "updated_at"
-      t.boolean  "intended", :default => true
     end
     
-    add_index "ties", "receiver_id"
+    add_index "ties", "contact_id"
     add_index "ties", "relation_id"
-    add_index "ties", "sender_id"
     
     create_table "users", :force => true do |t|
       t.string :encrypted_password, :null => false, :default => "", :limit => 128
@@ -205,19 +218,25 @@ class CreateSocialStream < ActiveRecord::Migration
     # add_index :users, :confirmation_token, :unique => true
     # add_index :users, :unlock_token,       :unique => true
     
+    add_foreign_key "activities", "contacts", :name => "index_activities_on_contact_id"
     add_foreign_key "activities", "activity_verbs", :name => "index_activities_on_activity_verb_id"
     
     add_foreign_key "activity_object_activities", "activities", :name => "index_activity_object_activities_on_activity_id"
     add_foreign_key "activity_object_activities", "activity_objects", :name => "activity_object_activities_on_activity_object_id"
     
     add_foreign_key "actors", "activity_objects", :name => "actors_on_activity_object_id"
+ 
+    add_foreign_key "audiences", "relations",  :name => "audiences_on_relation_id"
+    add_foreign_key "audiences", "activities", :name => "audiences_on_activity_id"
     
     add_foreign_key "authentications", "users", :name => "authentications_on_user_id"
 
     add_foreign_key "avatars", "actors", :name => "avatars_on_actor_id"
     
     add_foreign_key "comments", "activity_objects", :name => "comments_on_activity_object_id"
-    
+    add_foreign_key "contacts", "actors", :name => "contacts_on_receiver_id", :column => "receiver_id"
+    add_foreign_key "contacts", "actors", :name => "contacts_on_sender_id",   :column => "sender_id"
+   
     add_foreign_key "groups", "actors", :name => "groups_on_actor_id"
     
     add_foreign_key "posts", "activity_objects", :name => "posts_on_activity_object_id"
@@ -227,16 +246,13 @@ 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 "relations", "actors",  :name => "relations_on_actor_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"
-    
-    add_foreign_key "ties", "actors", :name => "ties_on_receiver_id", :column => "receiver_id"
-    add_foreign_key "ties", "actors", :name => "ties_on_relation_id", :column => "sender_id"
-    add_foreign_key "ties", "relations", :name => "ties_on_sender_id"
+   
+    add_foreign_key "ties", "contacts",  :name => "ties_on_contact_id"
+    add_foreign_key "ties", "relations", :name => "ties_on_relation_id"
     
     add_foreign_key "users", "actors", :name => "users_on_actor_id"
   end
@@ -249,12 +265,18 @@ class CreateSocialStream < ActiveRecord::Migration
     remove_foreign_key "activity_object_activities", :name => "activity_object_activities_on_activity_object_id"
     
     remove_foreign_key "actors", :name => "actors_on_activity_object_id"
+     
+    remove_foreign_key "audiences", :name => "audiences_on_relation_id"
+    remove_foreign_key "audiences", :name => "audiences_on_activity_id"
     
     remove_foreign_key "authentications", :name => "authentications_on_user_id"
 
     remove_foreign_key "avatars", :name => "avatars_on_actor_id"
     
     remove_foreign_key "comments", :name => "comments_on_activity_object_id"
+
+    remove_foreign_key "contacts", :name => "contacts_on_receiver_id", :column => "receiver_id"
+    remove_foreign_key "contacts", :name => "contacts_on_sender_id", :column => "sender_id"
     
     remove_foreign_key "groups", :name => "groups_on_actor_id"
        
@@ -265,16 +287,13 @@ 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 "relations", :name => "relations_on_actor_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"
-    
-    remove_foreign_key "ties", :name => "ties_on_receiver_id", :column => "receiver_id"
-    remove_foreign_key "ties", :name => "ties_on_relation_id", :column => "sender_id"
-    remove_foreign_key "ties", :name => "ties_on_sender_id"
+   
+    remove_foreign_key "ties", :name => "ties_on_contact_id"
+    remove_foreign_key "ties", :name => "ties_on_relation_id"
     
     remove_foreign_key "users", :name => "users_on_actor_id"
     
@@ -286,6 +305,7 @@ class CreateSocialStream < ActiveRecord::Migration
     drop_table :authentications
     drop_table :avatars
     drop_table :comments
+    drop_table :contacts
     drop_table :groups
     drop_table :permissions
     drop_table :posts

data/lib/acts_as_taggable_on/acts_as_taggable_on/dirty.rb

@@ -0,0 +1,37 @@
+module ActsAsTaggableOn::Taggable
+  module Dirty
+    def self.included(base)
+      base.extend ActsAsTaggableOn::Taggable::Dirty::ClassMethods
+      
+      base.initialize_acts_as_taggable_on_dirty
+    end
+    
+    module ClassMethods
+      def initialize_acts_as_taggable_on_dirty
+        tag_types.map(&:to_s).each do |tags_type|
+          tag_type         = tags_type.to_s.singularize
+          context_tags     = tags_type.to_sym
+          
+          class_eval %(
+            def #{tag_type}_list_changed?
+              changed_attributes.include?("#{tag_type}_list")
+            end
+            
+            def #{tag_type}_list_was
+              changed_attributes.include?("#{tag_type}_list") ? changed_attributes["#{tag_type}_list"] : __send__("#{tag_type}_list")
+            end
+            
+            def #{tag_type}_list_change
+              [changed_attributes['#{tag_type}_list'], __send__('#{tag_type}_list')] if changed_attributes.include?("#{tag_type}_list")               
+            end
+            
+            def #{tag_type}_list_changes
+              [changed_attributes['#{tag_type}_list'], __send__('#{tag_type}_list')] if changed_attributes.include?("#{tag_type}_list")               
+            end
+          )
+          
+        end
+      end
+    end
+  end
+end

data/lib/acts_as_taggable_on/social_stream.rb

@@ -0,0 +1,58 @@
+require "acts_as_taggable_on/acts_as_taggable_on/dirty"
+
+module ActsAsTaggableOn::Taggable
+  def acts_as_taggable_on(*tag_types)
+    tag_types = tag_types.to_a.flatten.compact.map(&:to_sym)
+
+    if taggable?
+      write_inheritable_attribute(:tag_types, (self.tag_types + tag_types).uniq)
+    else
+      write_inheritable_attribute(:tag_types, tag_types)
+      class_inheritable_reader(:tag_types)
+
+      class_eval do
+        has_many :taggings, :as => :taggable, :dependent => :destroy, :include => :tag, :class_name => "ActsAsTaggableOn::Tagging"
+        has_many :base_tags, :through => :taggings, :source => :tag, :class_name => "ActsAsTaggableOn::Tag"
+
+        def self.taggable?
+          true
+        end
+
+        include ActsAsTaggableOn::Taggable::Core
+        include ActsAsTaggableOn::Taggable::Collection
+        include ActsAsTaggableOn::Taggable::Cache
+        include ActsAsTaggableOn::Taggable::Ownership
+        include ActsAsTaggableOn::Taggable::Related
+        include ActsAsTaggableOn::Taggable::Dirty
+      end
+    end
+  end
+end
+
+
+module ActsAsTaggableOn::Taggable::Core::InstanceMethods
+  def set_tag_list_on(context, new_list)
+    add_custom_context(context)
+
+    variable_name = "@#{context.to_s.singularize}_list"
+    process_dirty_object(context, new_list)        
+
+    instance_variable_set(variable_name, ActsAsTaggableOn::TagList.from(new_list))
+  end
+
+  def process_dirty_object(context,new_list)
+    value = new_list.is_a?(Array) ? new_list.join(', ') : new_list
+    attr = "#{context.to_s.singularize}_list"
+
+    if changed_attributes.include?(attr)
+      # The attribute already has an unsaved change.
+      old = changed_attributes[attr]
+      changed_attributes.delete(attr) if (old.to_s == value.to_s)
+    else
+      old = tag_list_on(context).to_s
+      changed_attributes[attr] = old if (old.to_s != value.to_s)
+    end
+  end
+end
+
+

data/lib/generators/social_stream/base/install_generator.rb

@@ -5,7 +5,7 @@ class SocialStream::Base::InstallGenerator < Rails::Generators::Base #:nodoc:
   hook_for :authentication
   hook_for :messages
 
-  source_root File.expand_path('../templates', __FILE__)
+  source_root File.expand_path(File.join('..', 'templates'), __FILE__)
 
   def devise_initializer_config
     inject_into_file "config/initializers/devise.rb",
@@ -29,29 +29,20 @@ class SocialStream::Base::InstallGenerator < Rails::Generators::Base #:nodoc:
     copy_file 'relations.yml', 'config/relations.yml'
   end
 
-  def copy_public
-    directory "public"
-  end
-
   def remove_public_index
     remove_file 'public/index.html'
   end
 
   def create_application_layout
-    copy_file File.join(File.dirname(__FILE__), '../../../../',
+    copy_file File.join(File.dirname(__FILE__),
+                        '..', '..', '..', '..',
                         'app/views/layouts/application.html.erb'),
               'app/views/layouts/application.html.erb'
   end
 
-  # TODO: hook_for :orm
-  require 'rails/generators/active_record'
-
-  def self.next_migration_number(dirname)
-    ActiveRecord::Generators::Base.next_migration_number(dirname)
-  end
-
   def create_migration_file
-    migration_template 'migration.rb', 'db/migrate/create_social_stream.rb'
+    require 'rake'
+    Rails.application.load_tasks
+    Rake::Task['social_stream_base_engine:install:migrations'].invoke
   end
-    
 end

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

@@ -6,12 +6,16 @@ SocialStream.setup do |config|
 
   # Include devise modules in User. See devise documentation for details.
   # Others available are:
-  # :token_authenticatable, :confirmable, :lockable, :timeoutable, :validatable
-  # config.devise_modules :database_authenticatable, :registerable,
-  #                       :recoverable, :rememberable, :trackable, :omniauthable
+  # :confirmable, :lockable, :timeoutable, :validatable
+  # config.devise_modules = :database_authenticatable, :registerable,
+  #                         :recoverable, :rememberable, :trackable,
+  #                         :omniauthable, :token_authenticatable
   
   # Type of activities managed by actors
   # Remember you must add an "activity_object_id" foreign key column to your migration!
   #
   # config.objects = [ :post, :comment ]
+  
+  # Form modules to be loaded 
+  # config.activity_forms = [ :document, :other_module, :foo, :bar ]
 end

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

@@ -12,21 +12,19 @@ user:
     name: friend
     permissions:
       - [ follow ]                            # follow the activities of the friend
-      - [ create,  activity ]                 # let the friend create activities
-      - [ read,    activity, weak_star_ties ] # friend can read activities from the other friends and below
-      - [ update,  activity ]                 # update her activities
-      - [ destroy, activity ]                 # delete her activities
+      - [ 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
   acquaintance:
     name: acquaintance
     parent: friend # friend relation is stronger than acquaintance
     permissions:
-      - [ read,    activity, weak_star_ties ]
+      - [ read,    activity, same_and_lower_levels ]
     sphere: personal
   partner:
     name: partner
     permissions:
-      - [ read, activity, weak_star_ties ]
+      - [ read, activity, same_and_lower_levels ]
     sphere: work
 
 group:
@@ -34,16 +32,14 @@ group:
     name: member
     permissions:
       - [ represent ]                         # let the member act as the group
-      - [ create,  activity ]                 # let them member create activities
-      - [ read,    activity, weak_star_ties ] # read activities from other members
-      - [ update,  activity ]                 # update her activities
-      - [ destroy, activity ]                 # delete her activities
-      - [ read,    tie,      weak_star_ties ]
+      - [ 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
   partner:
     name: partner
     parent: member # member is stronger than partner
     permissions:
-      - [ read,    activity, weak_star_ties ]
+      - [ read,    activity, same_and_lower_levels ]
     sphere: external_relations
 

data/lib/social_stream/ability.rb

@@ -4,45 +4,46 @@ module SocialStream
 
     # Create a new ability for this user, who is currently representing subject
     def initialize(subject)
-
+      
+      #Download alias action
+      alias_action :download, :to => :show
+      
       # Activity Objects
       (SocialStream.objects - [ :actor ]).map{ |obj|
         obj.to_s.classify.constantize
       }.each do |klass|
         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')
+          k.build_post_activity.allow?(subject, 'create')
         end
 
         can :read, klass do |k| # can :read, Post do |post|
-          k.post_activity.tie.allow?(subject, 'read', 'activity')
+          k.post_activity.allow?(subject, 'read')
         end
 
         can :update, klass do |k| # can :update, Post do |post|
-          k.post_activity.tie.allow?(subject, 'update', 'activity')
+          k.post_activity.allow?(subject, 'update')
         end
 
         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')
+          k.post_activity.allow?(subject, 'destroy')
         end
       end
 
       # Activities
       can :create, Activity do |a|
-        a.tie.allow?(subject, 'create', 'activity')
+        a.allow?(subject, 'create')
       end
 
       can :read, Activity do |a|
-        a.tie.allow?(subject, 'read', 'activity')
+        a.allow?(subject, 'read')
       end
 
       can :update, Activity do |a|
-        a.tie.allow?(subject, 'update', 'activity')
+        a.allow?(subject, 'update')
       end
 
       can :destroy, Activity do |a|
-        a.tie.allow?(subject, 'destroy', 'activity')
+        a.allow?(subject, 'destroy')
       end
 
       # Users

data/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.5.2".freeze
+    VERSION = "0.6.0".freeze
   end
 end

data/lib/social_stream/base.rb

@@ -12,18 +12,6 @@ module SocialStream
         %w( actor activity_object ).each do |supertype|
           supertype.classify.constantize.load_subtype_features
         end
-
-        # https://rails.lighthouseapp.com/projects/8994/tickets/1905-apphelpers-within-plugin-not-being-mixed-in
-        ApplicationController.helper ActivitiesHelper
-        ApplicationController.helper SubjectsHelper
-        ApplicationController.helper LocationHelper
-        ApplicationController.helper ToolbarHelper
-        ApplicationController.helper ProfilesHelper
-        ApplicationController.helper PermissionsHelper
-        ApplicationController.helper NotificationsHelper
-        ApplicationController.helper ContactsHelper
-      
-        ActsAsTaggableOn::TagsHelper
       end
 
       initializer "social_stream-base.inflections" do
@@ -50,7 +38,7 @@ module SocialStream
           config.avatarable_styles = { :representation => "20x20>",
                                        :contact        => "30x30>",
                                        :actor          => '35x35>',
-                                       :profile        => '94x94'}
+                                       :profile        => '119x119'}
         end
       end
     end

data/lib/social_stream/models/object.rb

@@ -7,7 +7,7 @@ module SocialStream
       extend ActiveSupport::Concern
 
       included do
-        attr_accessor :_activity_tie_id
+        attr_accessor :_contact_id, :_relation_ids
         attr_accessor :_activity_parent_id
 
         belongs_to :activity_object, :dependent => :destroy, :autosave => true
@@ -17,14 +17,13 @@ module SocialStream
                  :like_count,
                  :to => :activity_object
 
-        alias_method_chain :create_activity_object, :type
-        before_create :create_activity_object
+        before_create :create_activity_object_with_type
 
         unless self == Actor
-          before_create :create_post_activity
-          before_update :create_update_activity
+          validates_presence_of :_contact_id, :on => :create
 
-          validates_presence_of :_activity_tie
+          after_create :create_post_activity
+          after_update :create_update_activity
         end
       end
 
@@ -43,13 +42,23 @@ module SocialStream
           (activities.includes(:activity_verb) & ActivityVerb.verb_name('post')).first
         end
 
-        # Create corresponding ActivityObject including this class type
-        def create_activity_object_with_type(attributes = {}) #:nodoc:
-          create_activity_object_without_type attributes.update(:object_type => self.class.to_s)
+        # Build the post activity when this object is not saved
+        def build_post_activity
+          Activity.new :contact_id   => _contact_id,
+                       :relation_ids => Array(_relation_ids)
         end
 
-        def _activity_tie
-          @_activity_tie ||= Tie.find(_activity_tie_id)
+	# before_create callback
+	#
+        # Build corresponding ActivityObject including this class type
+        def create_activity_object_with_type #:nodoc:
+          o = create_activity_object! :object_type => self.class.to_s
+	  # WEIRD: Rails 3.1.0.rc3 does not assign activity_object_id
+	  self.activity_object_id = o.id
+        end
+
+        def _contact
+          @_contact ||= Contact.find(_contact_id)
         end
 
         private
@@ -59,13 +68,16 @@ module SocialStream
         end
 
         def create_update_activity
+          return if _contact_id.blank?
+          
           create_activity "update"
         end
 
         def create_activity(verb)
-          a = Activity.new :verb      => verb,
-                           :_tie      => _activity_tie,
-                           :parent_id => _activity_parent_id
+          a = Activity.new :verb         => verb,
+                           :contact      => _contact,
+                           :relation_ids => _relation_ids,
+                           :parent_id    => _activity_parent_id
 
           a.activity_objects << activity_object
 

data/lib/social_stream/test_helpers/controllers.rb

@@ -32,8 +32,9 @@ module SocialStream
         model_class.count
       end
 
-      def model_assigned_to tie
-        model_attributes[:_activity_tie_id] = tie.id
+      def model_assigned_to contact, relation_ids
+        model_attributes[:_contact_id] = contact.id
+        model_attributes[:_relation_ids] = Array(relation_ids).map(&:id)
       end
 
       shared_examples_for "Allow Creating" do

data/lib/social_stream-base.rb

@@ -21,15 +21,16 @@ require 'paperclip'
 require 'paperclip/social_stream'
 require 'avatars_for_rails'
 # Pagination
-require 'will_paginate'
+require 'kaminari'
 # Oauth
 require 'omniauth/oauth'
-# CSS themes
-require 'rails_css_themes'
 #Tags
 require 'acts-as-taggable-on'
+require 'acts_as_taggable_on/social_stream'
 # HTML forms
 require 'formtastic'
+#Background tasks
+require 'resque/server'
 
 # Provides your Rails application with social network and activity stream support
 module SocialStream
@@ -62,6 +63,9 @@ module SocialStream
   mattr_writer :objects
   @@objects = [ :post, :comment ]
 
+  mattr_accessor :activity_forms
+  @@activity_forms = [:post]
+  
   class << self
     def setup
       yield self