social_stream 0.27.3 → 0.28.0

data/base/app/models/activity.rb

@@ -182,12 +182,14 @@ class Activity < ActiveRecord::Base
 
   # The first activity object of this activity
   def direct_activity_object
-    activity_objects.first
+    @direct_activity_object ||=
+      activity_objects.first
   end
 
   # The first object of this activity
   def direct_object
-    direct_activity_object.try(:object)
+    @direct_object ||=
+      direct_activity_object.try(:object)
   end
 
   # The title for this activity in the stream

data/base/app/models/activity_action.rb

@@ -5,8 +5,6 @@ class ActivityAction < ActiveRecord::Base
   belongs_to :actor
   belongs_to :activity_object
 
-  before_save :change_follower_count
-
   scope :sent_by, lambda{ |actor|
     where(:actor_id => Actor.normalize_id(actor))
   }
@@ -27,8 +25,11 @@ class ActivityAction < ActiveRecord::Base
     authored_or_owned.sent_by(subject)
   }
 
+
   before_create :follow_by_author_and_owner
 
+  after_save :change_follower_count
+
   private
 
   # Updates the follower_count counter in the {ActivityObject}

data/base/app/models/activity_object.rb

@@ -92,6 +92,21 @@ class ActivityObject < ActiveRecord::Base
       merge(ActivityObjectAudience.where(:relation_id => Relation.ids_shared_with(subject)))
   }
 
+  # Obtain the {ActivityAction} between this {ActivityObject}
+  # and the {Actor} identified by actor_id
+  def received_action_by(actor_id)
+    received_actions.
+      find{ |a| a.actor_id == actor_id }
+  end
+
+  # Obtain received_action_by(actor_id) or create it if it does
+  # not exist
+  def received_action_by!(actor_id)
+    received_action_by(actor_id) ||
+      received_actions.build(:actor_id  => actor_id)
+  end
+
+  # Get the first {ActivityAction} that has activated the role flag
   def received_role_action(role)
     received_actions.
       find{ |a| a.__send__ "#{ role }?" }
@@ -106,16 +121,9 @@ class ActivityObject < ActiveRecord::Base
 
       def #{ role }_id=(actor_id)                    # def author_id=(actor_id)
         action =                                     #   action =
-          received_actions.                          #     received_actions.
-            find{ |a| a.actor_id == actor_id }       #       select{ |a| a.actor_id == actor_id }
+          received_action_by!(actor_id)              #     received_action_by!(actor_id)
                                                      #
-        if action                                    #   if action 
-          action.#{ role } = true                    #     action.author = true
-        else                                         #   else
-          received_actions.                          #     received_actions.
-            build :actor_id  => actor_id,            #       build :actor_id => actor_id,
-                  :#{ role } => true                 #             :author   => true
-        end                                          #   end
+        action.#{ role } = true                      #     action.author = true
                                                      #
         actor_id                                     #  actor_id
       end                                            # end
@@ -133,7 +141,6 @@ class ActivityObject < ActiveRecord::Base
       def #{ role }_subject # def author_subject
         #{ role }.subject   #   author.subject
       end                   # end
-
     EOC
 
     class_eval code, __FILE__, __LINE__ - code.lines.count - 2

data/base/app/models/actor.rb

@@ -5,7 +5,7 @@
 # type of a {Tie} is a {Relation}. Each actor can define and customize their relations own
 # {Relation Relations}.
 #
-# Every {Actor} has an Avatar, a {Profile} with personal o group information, contact data, etc.
+# Every {Actor} has an Avatar, a {Profile} with personal or group information, contact data, etc.
 #
 # {Actor Actors} perform {ActivityAction actions} (like, suscribe, etc.) on
 # {ActivityObject activity objects} ({Post posts}, {Comment commments}, pictures, events..)
@@ -81,6 +81,19 @@ class Actor < ActiveRecord::Base
            :source  => :activity_object,
            :conditions => { 'activity_actions.follow' => true }
 
+  has_many :authored_activities,
+           :class_name  => "Activity",
+           :foreign_key => :author_id,
+           :dependent   => :destroy
+  has_many :user_authored_activities,
+           :class_name  => "Activity",
+           :foreign_key => :user_author_id,
+           :dependent   => :destroy
+  has_many :owned_activities,
+           :class_name  => "Activity",
+           :foreign_key => :owner_id,
+           :dependent   => :destroy
+
   scope :alphabetic, order('actors.name')
 
   scope :letter, lambda { |param|

data/base/app/models/comment.rb

@@ -4,6 +4,9 @@ class Comment < ActiveRecord::Base
   alias_attribute :text, :description
   validates_presence_of :text
 
+  after_create :increment_comment_count
+  before_destroy :decrement_comment_count
+
   define_index do
     activity_object_index
   end
@@ -15,4 +18,25 @@ class Comment < ActiveRecord::Base
   def title
     description.truncate(30, :separator =>' ')
   end
+
+  private
+
+  # after_create callback 
+  # 
+  # Increment comment counter in parent's activity_object with a comment
+  def increment_comment_count 
+    return if self.post_activity.parent.blank?
+ 
+    self.post_activity.parent.direct_activity_object.increment!(:comment_count) 
+  end 
+ 
+  # before_destroy callback 
+  # 
+  # Decrement comment counter in parent's activity_object when comment is destroyed 
+  def decrement_comment_count 
+    return if self.post_activity.blank? || self.post_activity.parent.blank?
+ 
+    self.post_activity.parent.direct_activity_object.decrement!(:comment_count) 
+  end 
+
 end

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

@@ -1,3 +1,5 @@
 <div class="activity_comments" id="comments_<%= dom_id(activity) %>">
-  <%= render activity.comments %>
+  <% if activity.direct_activity_object.blank? || activity.direct_activity_object.comment_count > 0 %>
+    <%= render activity.comments %>
+  <% end %>
 </div>

data/base/db/migrate/20120621135650_add_comment_count_to_activity_object.rb

@@ -0,0 +1,24 @@
+class AddCommentCountToActivityObject < ActiveRecord::Migration
+  def up
+    add_column :activity_objects, :comment_count, :integer, :default => 0
+
+    ActivityObject.record_timestamps = false
+    ActivityObject.reset_column_information
+
+    ActivityObject.all.each do |ao|
+      parent_activity = ao.activities.first
+
+      # Actors have not parent activities
+      next if parent_activity.blank?
+
+      ao.update_attribute(:comment_count, Activity.includes(:activity_objects).where('activity_objects.object_type' => "Comment").where(:ancestry => [parent_activity.id]).size)
+    end
+
+    ActivityObject.record_timestamps = true
+    ActivityObject.reset_column_information
+  end
+
+  def down
+    remove_column :activity_objects, :comment_count
+  end
+end

data/base/db/migrate/20120627115244_fix_activity_object_follower_count.rb

@@ -0,0 +1,17 @@
+# Reset follower_count for all the ActivityObjects that are not Actors
+# See: https://github.com/ging/social_stream/issues/274
+class FixActivityObjectFollowerCount < ActiveRecord::Migration
+  def up
+    ActivityObject.record_timestamps = false
+
+    ActivityObject.where("object_type != ?", "Actor").all.each do |ao|
+      ao.update_attribute :follower_count, ao.received_actions.where(:follow => true).count
+    end
+
+    ActivityObject.record_timestamps = true
+    ActivityObject.reset_column_information
+  end
+
+  def down
+  end
+end

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.21.2".freeze
+    VERSION = "0.22.0".freeze
   end
 end

data/base/social_stream-base.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
   # jQuery
   s.add_runtime_dependency('jquery-rails', '>= 1.0.9')
   # Authorization
-  s.add_runtime_dependency('cancan', '~> 1.6.4')
+  s.add_runtime_dependency('cancan', '1.6.7')
   # Pagination
   s.add_runtime_dependency('kaminari', '~> 0.13.0')
   # OAuth client

data/base/spec/integration/activity.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe Activity do
+  before(:all) do
+    @activity = Factory(:activity)
+  end
+
+  it "should be destroyed along with its author" do
+    author = @activity.author
+
+    author.destroy
+
+    Activity.find_by_id(@activity.id).should be_nil
+  end
+end

data/base/spec/models/activity_action_spec.rb

@@ -31,6 +31,10 @@ describe ActivityAction do
       it "should not be duplicated" do
         @post.received_actions.count.should == 2
       end
+
+      it "should initialize follower count" do
+        @post.reload.follower_count.should == 2
+      end
     end
 
     describe "where posting to self" do
@@ -41,6 +45,10 @@ describe ActivityAction do
       it "should not be duplicated" do
         @post.received_actions.count.should == 1
       end
+
+      it "should initialize follower count" do
+        @post.reload.follower_count.should == 1
+      end
     end
 
     describe "where building the post" do

data/documents/lib/social_stream/documents/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Documents
-    VERSION = "0.15.1".freeze
+    VERSION = "0.16.0".freeze
   end
 end

data/documents/social_stream-documents.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.21.1')
+  s.add_runtime_dependency('social_stream-base', '~> 0.22.0')
   s.add_runtime_dependency('paperclip-ffmpeg', '~> 0.7.0')
   s.add_runtime_dependency('paperclip','= 2.4.5')
   s.add_runtime_dependency('delayed_paperclip','2.4.5.1')

data/events/app/assets/stylesheets/events.css.scss

@@ -97,7 +97,8 @@ div.event_date {
 
 .event_details .follow_sentence {
 	float: left;
-	padding: 20px 10px;
+	padding: 10px 10px;
+	width: 175px;
 }
 
 .event_sidebar .event_frequency {

data/events/lib/social_stream/events/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Events
-    VERSION = "0.13.2".freeze
+    VERSION = "0.14.0".freeze
   end
 end

data/events/social_stream-events.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.21.2')
+  s.add_runtime_dependency('social_stream-base', '~> 0.22.0')
   s.add_runtime_dependency('rails-scheduler', '~> 0.0.8')
 
   # Development Gem dependencies

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "0.27.3".freeze
+  VERSION = "0.28.0".freeze
 end

data/linkser/lib/social_stream/linkser/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Linkser
-    VERSION = "0.12.0".freeze
+    VERSION = "0.13.0".freeze
   end
 end

data/linkser/social_stream-linkser.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.21.0')
+  s.add_runtime_dependency('social_stream-base', '~> 0.22.0')
   s.add_runtime_dependency('linkser', '~> 0.0.12')
   # Development Gem dependencies
   s.add_development_dependency('sqlite3-ruby')

data/presence/lib/social_stream/presence/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Presence
-    VERSION = "0.14.0"
+    VERSION = "0.15.0"
   end
 end

data/presence/social_stream-presence.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.21.0')
+  s.add_runtime_dependency('social_stream-base', '~> 0.22.0')
   
   s.add_runtime_dependency "xmpp4r"
 

data/social_stream.gemspec

@@ -11,11 +11,11 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.21.2')
-  s.add_runtime_dependency('social_stream-documents', '~> 0.15.1')
-  s.add_runtime_dependency('social_stream-events', '~> 0.13.2')
-  s.add_runtime_dependency('social_stream-linkser', '~> 0.12.0')
-  s.add_runtime_dependency('social_stream-presence', '~> 0.14.0')
+  s.add_runtime_dependency('social_stream-base', '~> 0.22.0')
+  s.add_runtime_dependency('social_stream-documents', '~> 0.16.0')
+  s.add_runtime_dependency('social_stream-events', '~> 0.14.0')
+  s.add_runtime_dependency('social_stream-linkser', '~> 0.13.0')
+  s.add_runtime_dependency('social_stream-presence', '~> 0.15.0')
  
   # Development Gem dependencies
   #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream
 version: !ruby/object:Gem::Version
-  version: 0.27.3
+  version: 0.28.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-15 00:00:00.000000000 Z
+date: 2012-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: social_stream-base
@@ -19,7 +19,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.21.2
+        version: 0.22.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,7 +27,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.21.2
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: social_stream-documents
   requirement: !ruby/object:Gem::Requirement
@@ -35,7 +35,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: 0.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: social_stream-events
   requirement: !ruby/object:Gem::Requirement
@@ -51,7 +51,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.13.2
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -59,7 +59,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.13.2
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: social_stream-linkser
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +67,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -75,7 +75,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: social_stream-presence
   requirement: !ruby/object:Gem::Requirement
@@ -83,7 +83,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -91,7 +91,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.15.0
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -743,6 +743,8 @@ files:
 - base/db/migrate/20120411132550_add_visit_count_to_activity_object.rb
 - base/db/migrate/20120411151413_relation_public_permissions.rb
 - base/db/migrate/20120526171311_remove_activity_channels.rb
+- base/db/migrate/20120621135650_add_comment_count_to_activity_object.rb
+- base/db/migrate/20120627115244_fix_activity_object_follower_count.rb
 - base/lib/acts_as_taggable_on/acts_as_taggable_on/dirty.rb
 - base/lib/acts_as_taggable_on/social_stream.rb
 - base/lib/generators/social_stream/base/install_generator.rb
@@ -879,6 +881,7 @@ files:
 - base/spec/factories/relation_custom.rb
 - base/spec/factories/tie.rb
 - base/spec/factories/user.rb
+- base/spec/integration/activity.rb
 - base/spec/integration/navigation_spec.rb
 - base/spec/integration/resque_access_spec.rb
 - base/spec/models/activity_action_spec.rb