social_stream 0.12.14 → 0.13.0

data/base/app/controllers/groups_controller.rb

@@ -51,7 +51,8 @@ class GroupsController < InheritedResources::Base
   private
 
   def set_founder
-    params[:group]               ||= {}
-    params[:group][:_contact_id] ||= current_subject.ego_contact.id
+    params[:group]                  ||= {}
+    params[:group][:author_id]      ||= current_subject.try(:actor_id)
+    params[:group][:user_author_id] ||= current_user.try(:actor_id)
   end
 end

data/base/app/controllers/posts_controller.rb

@@ -1,11 +1,3 @@
-class PostsController < InheritedResources::Base
-  load_and_authorize_resource
-
-  respond_to :html, :xml, :js
-
-  def destroy
-    @post_activity = resource.post_activity
-
-    destroy!
-  end
+class PostsController < ApplicationController
+  include SocialStream::Controllers::Objects
 end

data/base/app/helpers/activities_helper.rb

@@ -31,6 +31,7 @@ module ActivitiesHelper
   def new_post(receiver)
     return Post.new unless user_signed_in?
 
-    Post.new :_contact_id => current_subject.contact_to!(receiver).id
+    Post.new :author_id => Actor.normalize_id(current_subject),
+             :owner_id  => Actor.normalize_id(receiver)
   end
 end

data/base/app/models/activity_object.rb

@@ -14,9 +14,22 @@ class ActivityObject < ActiveRecord::Base
 
   acts_as_taggable
   
+  # Author can be any type of Actor: User, Group, etc.
+  belongs_to :author,
+             :class_name => "Actor"
+  # Owner is the wall's subject this object is posted to
+  belongs_to :owner,
+             :class_name => "Actor"
+
+  # UserAuthor is the real user behind the Author
+  belongs_to :user_author,
+             :class_name => "Actor"
+
   has_many :activity_object_activities, :dependent => :destroy
   has_many :activities, :through => :activity_object_activities
 
+  validates_presence_of :object_type
+
   # The object of this activity object
   def object
     subtype_instance.is_a?(Actor) ?
@@ -24,6 +37,21 @@ class ActivityObject < ActiveRecord::Base
       subtype_instance
   end
 
+  # The {SocialStream::Models::Subject subject} author
+  def author_subject
+    author.subject
+  end
+
+  # The {SocialStream::Models::Subject subject} owner
+  def owner_subject
+    owner.subject
+  end
+
+  # The {SocialStream::Models::Subject subject} user actor
+  def user_author_subject
+    user_author.subject
+  end
+
   # The activity in which this activity_object was created
   def post_activity
     activities.includes(:activity_verb).where('activity_verbs.name' => 'post').first

data/base/app/models/actor.rb

@@ -58,6 +58,16 @@ class Actor < ActiveRecord::Base
   has_many :relations,
            :dependent => :destroy
 
+  has_many :authored_objects,
+           :class_name => "ActivityObject",
+           :foreign_key => :author_id,
+           :dependent => :destroy
+
+  has_many :owned_objects,
+           :class_name => "ActivityObject",
+           :foreign_key => :owner_id,
+           :dependent => :destroy
+
   scope :alphabetic, order('actors.name')
 
   scope :letter, lambda { |param|

data/base/app/models/group.rb

@@ -33,13 +33,17 @@ class Group < ActiveRecord::Base
 
   # Creates the ties from the founder to the group
   def create_ties_from_founder
-    _contact.sender.sent_contacts.create! :receiver_id  => actor_id,
-                                          :relation_ids => _relation_ids
+    author.sent_contacts.create! :receiver_id  => actor_id,
+                                 :relation_ids => _relation_ids
+
+    if represented_author?
+      # TODO: create tie with future representation relation
+    end
   end
   
   # Creates the ties from the group to the participants
   def create_ties_to_participants
-    ([ _contact.sender_id, _contact.receiver_id ] | Array.wrap(@_participants)).uniq.each do |a|
+    ([ author_id, user_author_id ].uniq | Array.wrap(@_participants)).uniq.each do |a|
       sent_contacts.create! :receiver_id => a,
                             :relation_ids => Array(relation_customs.sort.first.id)
     end

data/base/app/models/user.rb

@@ -3,12 +3,17 @@ require 'devise/orm/active_record'
 class User < ActiveRecord::Base
   include SocialStream::Models::Subject
 
-  has_many :authentications, :dependent => :destroy
   devise *SocialStream.devise_modules
 
+  has_many :authentications, :dependent => :destroy
+
+  has_many :user_authored_objects,
+           :class_name => "ActivityObject",
+           :foreign_key => :user_author_id
+
   # Setup accessible (or protected) attributes for your model
   attr_accessible :name, :email, :password, :password_confirmation, :remember_me, :profile_attributes
-  
+
   validates_presence_of :email
 
   validates_format_of :email, :with => Devise.email_regexp, :allow_blank => true

data/base/app/views/activities/_new.html.erb

@@ -1,4 +1,3 @@
-
 <% if can? :create, new_post(receiver) %>
 <div id="activities_header" class="content_size">
   <% SocialStream.activity_forms.each do |element| %>

data/base/app/views/activity_objects/_activity_object.html.erb

@@ -1,7 +1,7 @@
-<% unless activity_object.object.is_a? Actor or activity_object.object.respond_to? :actor %>
-  <%= render activity_object.object %>
-<% else %>
+<% if activity_object.object.is_a?(Actor) || activity_object.object.class.ancestors.include?(SocialStream::Models::Subject) %>
   <div class="block">
     <%= model_with_details activity_object.object %>
   </div>
+<% else %>
+  <%= render activity_object.object %>
 <% end %>

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

@@ -9,9 +9,8 @@
         <%= current_subject.name %>
       </div>
       <%= form_for Comment.new(:text => t('comment.input'),
-                              :_contact_id =>
-                                current_subject.contact_to!(activity.receiver).id,
-                              :_activity_parent_id => activity.id
+                               :owner_id => Actor.normalize_id(activity.receiver),
+                               :_activity_parent_id => activity.id
                   ),
                 :html => { :class => "new_comment", :id => "new_comment"+dom_id(activity)  },
                 :remote => true do |f| %>

data/base/app/views/groups/_new.html.erb

@@ -19,9 +19,6 @@
 <div class="space_center"></div>
 
 <%= form_for @group do |f| %>
-	<% f.object._contact_id ||= current_subject.ego_contact.id %>
-	<%= f.hidden_field :_contact_id %>
-
 	<% if @group.errors.any? %>
 		<div id="notice">
 			<h2><%= pluralize(@group.errors.count, "error") %> prohibited this group from being saved:</h2>

data/base/app/views/notifications/activities/_like.text.erb

@@ -20,4 +20,4 @@
 <% end %>
 
 <%= raw t('notification.look', 
-          :sender => truncate_name(activity.sender.name)) %>: <%=polymorphic_url(activity.sender.subject)%>
+          :sender => truncate_name(activity.sender.name)) %>: <%=polymorphic_url(activity.sender.subject)%>

data/base/app/views/objects/_new_activity.html.erb

@@ -1,8 +1,8 @@
-<% object._contact_id = current_subject.contact_to!(receiver).id %>
+<% object.owner_id = Actor.normalize_id(receiver) %>
 <% remote = true if remote.nil? %>
 
 <%= form_for object, :remote => remote  do |f| %>
-  <%= f.hidden_field :_contact_id %>
+  <%= f.hidden_field :owner_id %>
 
   <%= render :partial => object.class.to_s.tableize+'/new_activity_fields' , :locals => {:f => f} %>	
 <% end %>

data/base/app/views/objects/_show.html.erb

@@ -1,3 +1,3 @@
-<% toolbar :profile => object._owner %>
+<% toolbar :profile => object.owner_subject %>
 
 <%= render object.post_activity %>

data/base/db/migrate/20111124100618_object_actors.rb

@@ -0,0 +1,50 @@
+class ObjectActors < ActiveRecord::Migration
+  def up
+    change_table :activity_objects do |t|
+      t.integer :author_id
+      t.integer :owner_id
+      t.integer :user_author_id
+    end
+
+    add_index "activity_objects", "author_id"
+    add_index "activity_objects", "owner_id"
+    add_index "activity_objects", "user_author_id"
+
+    add_foreign_key "activity_objects", "actors", :name => "index_activity_objects_on_author_id", :column => :author_id
+    add_foreign_key "activity_objects", "actors", :name => "index_activity_objects_on_owner_id", :column => :owner_id
+    add_foreign_key "activity_objects", "actors", :name => "index_activity_objects_on_user_author_id", :column => :user_author_id
+
+    ActivityObject.record_timestamps = false
+
+    ActivityObject.all.each do |a|
+      if a.object_type == "Actor"
+        next if a.object.is_a? User
+
+        author = user_author = a.object.sent_ties.order(:created_at).first.receiver
+
+        until user_author.subject_type == "User"
+          user_author = user_author.sent_ties.order(:created_at).first.receiver
+        end
+
+        a.author = author
+        a.user_author = user_author
+      else
+        a.author = a.post_activity.sender
+        a.owner  = a.post_activity.receiver
+        a.user_author = (a.author.is_a?(User) ? a.author : a.author.sent_ties.order(:created_at).first.receiver)
+      end
+
+      a.save!
+    end
+  end
+
+  def down
+    remove_foreign_key "activity_objects", :name => "index_activity_objects_on_author_id"
+    remove_foreign_key "activity_objects", :name => "index_activity_objects_on_owner_id"
+    remove_foreign_key "activity_objects", :name => "index_activity_objects_on_user_author_id"
+
+    remove_column :activity_objects, :author_id
+    remove_column :activity_objects, :owner_id
+    remove_column :activity_objects, :user_author_id
+  end
+end

data/base/lib/social_stream-base.rb

@@ -51,8 +51,9 @@ module SocialStream
   autoload :TestHelpers, 'social_stream/test_helpers'
 
   module Controllers
-    autoload :Helpers, 'social_stream/controllers/helpers'
     autoload :CancanDeviseIntegration, 'social_stream/controllers/cancan_devise_integration'
+    autoload :Helpers, 'social_stream/controllers/helpers'
+    autoload :Objects, 'social_stream/controllers/objects'
   end
 
   module Models

data/base/lib/social_stream/ability/base.rb

@@ -75,7 +75,7 @@ module SocialStream
 
         can :create, Group do |g|
           subject.present? &&
-            g._contact.sender_id == Actor.normalize_id(subject)
+            g.author_id == Actor.normalize_id(subject)
         end
 
         can :update, Group do |g|

data/base/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.9.36".freeze
+    VERSION = "0.10.0".freeze
   end
 end

data/base/lib/social_stream/controllers/objects.rb

@@ -0,0 +1,33 @@
+module SocialStream
+  module Controllers
+    module Objects
+      extend ActiveSupport::Concern
+
+      included do
+        inherit_resources
+
+        before_filter :set_author_ids, :only => [ :new, :create, :update ]
+
+        load_and_authorize_resource :except => :index
+
+        respond_to :html, :js
+      end
+
+      module InstanceMethods
+
+        def destroy
+          @post_activity = resource.post_activity
+
+          destroy!
+        end
+
+        protected
+
+        def set_author_ids
+          resource_params.first[:author_id] = current_subject.try(:actor_id)
+          resource_params.first[:user_author_id] = current_user.try(:actor_id)
+        end
+      end
+    end
+  end
+end

data/base/lib/social_stream/models/object.rb

@@ -7,23 +7,20 @@ module SocialStream
       extend ActiveSupport::Concern
 
       included do
-        attr_accessor :_contact_id
         attr_writer   :_relation_ids
         attr_accessor :_activity_parent_id
 
-        belongs_to :activity_object, :dependent => :destroy, :autosave => true
-        has_many   :activity_object_activities, :through => :activity_object
+        belongs_to :activity_object,
+                   :validate  => true,
+                   :autosave => true,
+                   :dependent => :destroy
 
-        delegate :post_activity,
-                 :like_count,
-                 :tag_list, :tag_list=,
-                 :tagged_with, :tag_counts,
-                 :to => :activity_object!
+        has_many   :activity_object_activities, :through => :activity_object
 
-        before_create :create_activity_object_with_type
+#        before_create :create_activity_object_with_type
 
         unless self == Actor
-          validates_presence_of :_contact_id, :on => :create
+          validates_presence_of :author_id, :owner_id, :user_author_id
 
           after_create :create_post_activity
           after_update :create_update_activity
@@ -35,6 +32,27 @@ module SocialStream
           activity_object || build_activity_object(:object_type => self.class.to_s)
         end
 
+        # Delegate missing methods to {ActivityObject}, if they exist there
+        def method_missing(method, *args, &block)
+          super
+        rescue NameError => object_error 
+          # These methods must be raised to avoid loops (the :activity_object association calls here again)
+          exceptions = [ :_activity_object_id ]
+          raise object_error if exceptions.include?(method)
+
+          activity_object!.__send__ method, *args, &block
+        end
+
+        # {ActivityObject} handles some methods
+        def respond_to? *args
+          super || activity_object!.respond_to?(*args)
+        end
+
+        # Was the author represented with this {SocialStream::Models::Object object} was created?
+        def represented_author?
+          author_id == user_author_id
+        end
+
         # All the activities with this object
         def activities
           Activity.
@@ -42,13 +60,6 @@ module SocialStream
             where("#{ self.class.quoted_table_name }.id" => self.id)
         end
 
-        # The activity in which this object was posted
-        #
-        # FIXME: Currently it only supports direct objects
-        def post_activity
-          (activities.includes(:activity_verb) & ActivityVerb.verb_name('post')).first
-        end
-
         # Build the post activity when this object is not saved
         def build_post_activity
           Activity.new :contact_id   => _contact_id,
@@ -65,7 +76,11 @@ module SocialStream
         end
 
         def _contact
-          @_contact ||= Contact.find(_contact_id)
+          @_contact ||= author && owner && author.contact_to!(owner)
+        end
+
+        def _contact_id
+          _contact.try(:id)
         end
 
         def _relation_ids
@@ -90,16 +105,6 @@ module SocialStream
           @_activity_parent ||= Activity.find(_activity_parent_id)
         end
 
-        # The {SocialStream::Models::Subject subject} that posted this object
-        def _author
-          post_activity.contact.sender_subject
-        end
-
-        # The owner of the wall where {#_author} posted this object
-        def _owner
-          post_activity.contact.receiver_subject
-        end
-
         private
 
         def create_post_activity

data/base/lib/social_stream/test_helpers/controllers.rb

@@ -33,7 +33,9 @@ module SocialStream
       end
 
       def model_assigned_to contact, relation_ids
-        model_attributes[:_contact_id] = contact.id
+        model_attributes[:author_id] = contact.sender.id
+        model_attributes[:owner_id]  = contact.receiver.id
+        model_attributes[:user_author_id] = contact.sender.id
         model_attributes[:_relation_ids] = Array(relation_ids).map(&:id)
       end
 

data/base/lib/tasks/db/populate.rake

@@ -91,7 +91,8 @@ namespace :db do
 
         Group.create! :name  => Forgery::Name.company_name,
                       :email => Forgery::Internet.email_address,
-                      :_contact_id => founder.ego_contact.id
+                      :author_id => founder.id,
+                      :user_author_id => founder.id
       end
 
       set_tags(Group)
@@ -128,11 +129,17 @@ namespace :db do
       SocialStream::Populate.power_law(Tie.all) do |t|
         updated = Time.at(rand(Time.now.to_i))
 
+        author = t.sender
+        owner  = t.receiver
+        user_author = ( t.sender.subject_type == "User" ? t.sender : t.sender.user_author )
+
         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.to_i)),
                         :updated_at => updated,
-                        :_contact_id => t.contact_id,
+                        :author_id  => author.id,
+                        :owner_id   => owner.id,
+                        :user_author_id => user_author.id,
                         :_relation_ids => Array(t.relation_id)
 
         p.post_activity.update_attributes(:created_at => p.created_at,