social_stream 0.13.2 → 0.13.3

data/base/app/controllers/groups_controller.rb

@@ -3,7 +3,7 @@ class GroupsController < InheritedResources::Base
 
   # Set group founder to current_subject
   # Must do before authorization
-  before_filter :set_founder, :only => :new
+  before_filter :set_founder, :only => [ :new, :create ]
 
   load_and_authorize_resource
 

data/base/app/models/actor.rb

@@ -162,6 +162,8 @@ class Actor < ActiveRecord::Base
       receivers = group.contact_actors(:direction => :sent, :relations => relation)
       emails = Array.new
       receivers.each do |receiver|
+        next unless Actor.normalize(receiver).subject_type.eql?("User")
+
         receiver_emails = receiver.mailboxer_email(object)
         case receiver_emails
         when String

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.10.2".freeze
+    VERSION = "0.10.3".freeze
   end
 end

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

@@ -11,15 +11,21 @@ module SocialStream
         load_and_authorize_resource :except => :index
 
         respond_to :html, :js
-      end
 
-      module InstanceMethods
+        # destroy method must be before the one provided by inherited_resources
+        include SocialStream::Controllers::Objects::UpperInstanceMethods
+      end
 
+      # Methods that should be included after the included block
+      module UpperInstanceMethods
         def destroy
           @post_activity = resource.post_activity
 
           destroy!
         end
+      end
+
+      module InstanceMethods
 
         protected
 

data/base/spec/controllers/groups_controller_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 describe GroupsController do
+  include SocialStream::TestHelpers
   include SocialStream::TestHelpers::Controllers
 
   render_views
@@ -76,14 +77,9 @@ describe GroupsController do
     end
 
     context "a new own group" do
-      before do
-        model_attributes[:author_id] = @user.actor_id
-        model_attributes[:user_author_id] = @user.actor_id
-      end
-
       it "should allow creating" do
         count = Group.count
-        post :create, attributes
+        post :create, :group => { :name => "Test" }
 
         group = assigns(:group)
 
@@ -97,13 +93,13 @@ describe GroupsController do
         before do
           @user_participant = Factory(:user)
           @group_participant = Factory(:group)
-
-          model_attributes[:_participants] = [@user_participant.actor_id, @group_participant.actor_id]
         end
 
         it "should allow creating" do
           count = Group.count
-          post :create, attributes
+          post :create,
+               :group => { :name => "Test group",
+                           :_participants => [ @user_participant.actor_id, @group_participant.actor_id ] }
 
           group = assigns(:group)
 
@@ -119,7 +115,7 @@ describe GroupsController do
           group.contact_subjects(:direction => :received)
           response.should redirect_to(:home)
         end
-        end
+      end
     end
 
     context "a new fake group" do
@@ -158,6 +154,25 @@ describe GroupsController do
       # it_should_behave_like "Allow Updating"
       it_should_behave_like "Allow Destroying"
     end
+
+    context "representing a group" do
+      before do
+        @group = Factory(:member, :contact => Factory(:group_contact, :receiver => @user.actor)).sender_subject
+        represent(@group)
+      end
+
+      it "should allow creating" do
+        count = Group.count
+        post :create, :group => { :name => "Test" }
+
+        group = assigns(:group)
+
+        group.should be_valid
+        Group.count.should eq(count + 1)
+        assigns(:current_subject).should eq(group)
+        response.should redirect_to(:home)
+      end
+    end
   end
 end
 

data/base/spec/controllers/posts_controller_spec.rb

@@ -26,6 +26,15 @@ describe PostsController do
 
         it_should_behave_like "Allow Creating"
         it_should_behave_like "Allow Destroying"
+
+        it "should destroy with js" do
+          count = model_count
+          delete :destroy, :id => @current_model.to_param, :format => :js
+
+          resource = assigns(model_sym)
+
+          model_count.should eq(count - 1)
+        end
       end
 
       describe "with last relation" do

data/documents/app/models/document.rb

@@ -11,7 +11,7 @@ class Document < ActiveRecord::Base
   validates_presence_of :title
   
   before_validation(:on => :create) do
-    set_title_and_description
+    set_title
   end
   
   define_index do
@@ -71,7 +71,7 @@ class Document < ActiveRecord::Base
   
   protected
   
-  def set_title_and_description
+  def set_title
     self.title = self.file_file_name
   end
     

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "0.13.2".freeze
+  VERSION = "0.13.3".freeze
 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.10.2')
+  s.add_runtime_dependency('social_stream-base', '~> 0.10.3')
   s.add_runtime_dependency('social_stream-documents', '~> 0.5.0')
   s.add_runtime_dependency('social_stream-events', '~> 0.1.0')
  

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream
 version: !ruby/object:Gem::Version 
-  hash: 47
+  hash: 45
   prerelease: 
   segments: 
   - 0
   - 13
-  - 2
-  version: 0.13.2
+  - 3
+  version: 0.13.3
 platform: ruby
 authors: 
 - GING - DIT - UPM
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-01 00:00:00 +01:00
+date: 2011-12-02 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,12 +27,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 51
+        hash: 49
         segments: 
         - 0
         - 10
-        - 2
-        version: 0.10.2
+        - 3
+        version: 0.10.3
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency