social_stream-base 0.16.0 → 0.16.1

data/app/models/activity.rb

@@ -233,8 +233,8 @@ class Activity < ActiveRecord::Base
 
   # This and related activities
   def same_thread
-    return [self] if ancestry.nil?
-    [Activity.find(ancestry)] + Activity.find_all_by_ancestry(ancestry)
+    return [self] if is_root?
+    [parent] + siblings
   end
 
   # Is subject allowed to perform action on this {Activity}?

data/db/migrate/20120208135718_group_title_and_description_in_activity_object.rb

@@ -8,6 +8,8 @@ class GroupTitleAndDescriptionInActivityObject < ActiveRecord::Migration
       t.text :description
     end
 
+    ActivityObject.reset_column_information
+
     # Fix 'comments' table
     c_ts = Comment.record_timestamps
     Comment.record_timestamps = false

data/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.16.0".freeze
+    VERSION = "0.16.1".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream-base
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.16.1
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2012-02-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &81549840 !ruby/object:Gem::Requirement
+  requirement: &76633680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *81549840
+  version_requirements: *76633680
 - !ruby/object:Gem::Dependency
   name: ancestry
-  requirement: &81549340 !ruby/object:Gem::Requirement
+  requirement: &76633180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *81549340
+  version_requirements: *76633180
 - !ruby/object:Gem::Dependency
   name: foreigner
-  requirement: &81549050 !ruby/object:Gem::Requirement
+  requirement: &76632640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *81549050
+  version_requirements: *76632640
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &81548420 !ruby/object:Gem::Requirement
+  requirement: &76632260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 1.5.3
   type: :runtime
   prerelease: false
-  version_requirements: *81548420
+  version_requirements: *76632260
 - !ruby/object:Gem::Dependency
   name: inherited_resources
-  requirement: &81548060 !ruby/object:Gem::Requirement
+  requirement: &76631820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *81548060
+  version_requirements: *76631820
 - !ruby/object:Gem::Dependency
   name: stringex
-  requirement: &81547700 !ruby/object:Gem::Requirement
+  requirement: &76631280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *81547700
+  version_requirements: *76631280
 - !ruby/object:Gem::Dependency
   name: avatars_for_rails
-  requirement: &81547210 !ruby/object:Gem::Requirement
+  requirement: &76630910 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 0.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *81547210
+  version_requirements: *76630910
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &81546790 !ruby/object:Gem::Requirement
+  requirement: &76630540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: 1.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *81546790
+  version_requirements: *76630540
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &81546460 !ruby/object:Gem::Requirement
+  requirement: &76630270 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +110,10 @@ dependencies:
         version: 1.6.4
   type: :runtime
   prerelease: false
-  version_requirements: *81546460
+  version_requirements: *76630270
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &81546060 !ruby/object:Gem::Requirement
+  requirement: &76630020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -121,10 +121,10 @@ dependencies:
         version: 0.13.0
   type: :runtime
   prerelease: false
-  version_requirements: *81546060
+  version_requirements: *76630020
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &81533900 !ruby/object:Gem::Requirement
+  requirement: &76629770 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,10 +132,10 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *81533900
+  version_requirements: *76629770
 - !ruby/object:Gem::Dependency
   name: omniauth-facebook
-  requirement: &81533670 !ruby/object:Gem::Requirement
+  requirement: &76629530 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -143,10 +143,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *81533670
+  version_requirements: *76629530
 - !ruby/object:Gem::Dependency
   name: omniauth-linkedin
-  requirement: &81533430 !ruby/object:Gem::Requirement
+  requirement: &76629300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -154,10 +154,10 @@ dependencies:
         version: 0.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *81533430
+  version_requirements: *76629300
 - !ruby/object:Gem::Dependency
   name: mailboxer
-  requirement: &81533200 !ruby/object:Gem::Requirement
+  requirement: &76629060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -165,10 +165,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *81533200
+  version_requirements: *76629060
 - !ruby/object:Gem::Dependency
   name: acts-as-taggable-on
-  requirement: &81532970 !ruby/object:Gem::Requirement
+  requirement: &76628820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -176,10 +176,10 @@ dependencies:
         version: 2.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *81532970
+  version_requirements: *76628820
 - !ruby/object:Gem::Dependency
   name: formtastic
-  requirement: &81532740 !ruby/object:Gem::Requirement
+  requirement: &76628580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -187,10 +187,10 @@ dependencies:
         version: 1.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *81532740
+  version_requirements: *76628580
 - !ruby/object:Gem::Dependency
   name: simple-navigation
-  requirement: &81532510 !ruby/object:Gem::Requirement
+  requirement: &76614470 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -198,10 +198,10 @@ dependencies:
         version: 3.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *81532510
+  version_requirements: *76614470
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &81532250 !ruby/object:Gem::Requirement
+  requirement: &76614240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -209,10 +209,10 @@ dependencies:
         version: 1.19.0
   type: :runtime
   prerelease: false
-  version_requirements: *81532250
+  version_requirements: *76614240
 - !ruby/object:Gem::Dependency
   name: modernizr-rails
-  requirement: &81531970 !ruby/object:Gem::Requirement
+  requirement: &76614000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -220,10 +220,10 @@ dependencies:
         version: 2.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *81531970
+  version_requirements: *76614000
 - !ruby/object:Gem::Dependency
   name: thinking-sphinx
-  requirement: &81531650 !ruby/object:Gem::Requirement
+  requirement: &76613760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -231,10 +231,10 @@ dependencies:
         version: 2.0.8
   type: :runtime
   prerelease: false
-  version_requirements: *81531650
+  version_requirements: *76613760
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &81531240 !ruby/object:Gem::Requirement
+  requirement: &76613510 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -242,10 +242,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *81531240
+  version_requirements: *76613510
 - !ruby/object:Gem::Dependency
   name: rails_autolink
-  requirement: &81530810 !ruby/object:Gem::Requirement
+  requirement: &76613270 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -253,10 +253,10 @@ dependencies:
         version: 1.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *81530810
+  version_requirements: *76613270
 - !ruby/object:Gem::Dependency
   name: social_cheesecake
-  requirement: &81530350 !ruby/object:Gem::Requirement
+  requirement: &76613030 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -264,10 +264,10 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *81530350
+  version_requirements: *76613030
 - !ruby/object:Gem::Dependency
   name: i18n-js
-  requirement: &81530080 !ruby/object:Gem::Requirement
+  requirement: &76612780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -275,10 +275,10 @@ dependencies:
         version: 2.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *81530080
+  version_requirements: *76612780
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &81529620 !ruby/object:Gem::Requirement
+  requirement: &76612540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -286,10 +286,10 @@ dependencies:
         version: 0.3.9
   type: :development
   prerelease: false
-  version_requirements: *81529620
+  version_requirements: *76612540
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &81529180 !ruby/object:Gem::Requirement
+  requirement: &76612350 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -297,10 +297,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *81529180
+  version_requirements: *76612350
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &81528760 !ruby/object:Gem::Requirement
+  requirement: &76612100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -308,10 +308,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *81528760
+  version_requirements: *76612100
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &81528370 !ruby/object:Gem::Requirement
+  requirement: &76611850 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -319,10 +319,10 @@ dependencies:
         version: 2.6.1
   type: :development
   prerelease: false
-  version_requirements: *81528370
+  version_requirements: *76611850
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &81527960 !ruby/object:Gem::Requirement
+  requirement: &76611600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -330,10 +330,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *81527960
+  version_requirements: *76611600
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &81527710 !ruby/object:Gem::Requirement
+  requirement: &76611370 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -341,10 +341,10 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *81527710
+  version_requirements: *76611370
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &81527480 !ruby/object:Gem::Requirement
+  requirement: &76611140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -352,10 +352,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *81527480
+  version_requirements: *76611140
 - !ruby/object:Gem::Dependency
   name: nifty-generators
-  requirement: &81527220 !ruby/object:Gem::Requirement
+  requirement: &76610910 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -363,7 +363,7 @@ dependencies:
         version: 0.4.5
   type: :development
   prerelease: false
-  version_requirements: *81527220
+  version_requirements: *76610910
 description: ! 'Social Stream is a Ruby on Rails engine providing your application
   with social networking features and activity streams.