social_stream 0.12.9 → 0.12.10

data/base/app/models/actor.rb

@@ -206,7 +206,7 @@ class Actor < ActiveRecord::Base
     subject_types   = Array(options[:type] || self.class.subtypes)
     subject_classes = subject_types.map{ |s| s.to_s.classify }
     
-    as = Actor.select("DISTINCT actors.*").
+    as = Actor.group(:id).
                where('actors.subject_type' => subject_classes)
 
     if options[:load_subjects].nil? || options[:load_subjects]

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.9.31".freeze
+    VERSION = "0.9.32".freeze
   end
 end

data/base/spec/models/user_spec.rb

@@ -29,6 +29,22 @@ describe User do
       it "should represent" do
         @user.represented.should include(@group)
       end
+
+      context "and a second group" do
+        before do
+          @second_group =
+            Factory(:member,
+                    :contact => Factory(:group_contact,
+                                        :receiver => @user.actor)
+                   ).sender_subject
+          Factory(:friend, :contact => @user.contact_to!(@second_group))
+        end
+
+        it "should represent both groups" do
+          @user.represented.should include(@group)
+          @user.represented.should include(@second_group)
+        end
+      end
     end
   end
 

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "0.12.9".freeze
+  VERSION = "0.12.10".freeze
 end

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

@@ -1,5 +1,5 @@
 module Socialstream
   module Presence
-    VERSION = "0.0.21"
+    VERSION = "0.1.0"
   end
 end

data/social_stream.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.9.31')
+  s.add_runtime_dependency('social_stream-base', '~> 0.9.32')
   s.add_runtime_dependency('social_stream-documents', '~> 0.4.5')
   s.add_runtime_dependency('social_stream-events', '~> 0.0.20')
  

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 59
   prerelease: 
   segments: 
   - 0
   - 12
-  - 9
-  version: 0.12.9
+  - 10
+  version: 0.12.10
 platform: ruby
 authors: 
 - GING - DIT - UPM
@@ -27,12 +27,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 123
         segments: 
         - 0
         - 9
-        - 31
-        version: 0.9.31
+        - 32
+        version: 0.9.32
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency