social_stream-base 0.9.32 → 0.9.33

data/app/models/actor.rb

@@ -206,7 +206,9 @@ class Actor < ActiveRecord::Base
     subject_types   = Array(options[:type] || self.class.subtypes)
     subject_classes = subject_types.map{ |s| s.to_s.classify }
     
-    as = Actor.group(:id).
+    as = Actor.select('actors.*').
+               # PostgreSQL requires that all the columns must be included in the GROUP BY
+               group((Actor.columns.map(&:name).map{ |c| "actors.#{ c }" } + [ "contacts.created_at" ]).join(", ")).
                where('actors.subject_type' => subject_classes)
 
     if options[:load_subjects].nil? || options[:load_subjects]

data/lib/social_stream/base/version.rb

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

data/spec/controllers/home_controller_spec.rb

@@ -14,7 +14,8 @@ describe HomeController do
 
   describe "when authenticated" do
     before do
-      sign_in Factory(:user)
+      @user = Factory(:user)
+      sign_in @user
     end
 
     it "should render" do
@@ -24,6 +25,20 @@ describe HomeController do
       response.body.should =~ /activities_share_btn/
     end
 
+    context "with a group" do
+      before do
+        Factory(:friend,
+                :contact => Factory(:g2g_contact, :sender => @user.actor))
+      end
+
+      it "should render" do
+        get :index
+
+        response.should be_success
+        response.body.should =~ /activities_share_btn/
+      end
+    end
+
     describe "when representing" do
       before do
         @represented = represent(Factory(:group))

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream-base
 version: !ruby/object:Gem::Version 
-  hash: 123
+  hash: 121
   prerelease: 
   segments: 
   - 0
   - 9
-  - 32
-  version: 0.9.32
+  - 33
+  version: 0.9.33
 platform: ruby
 authors: 
 - GING - DIT - UPM