social_stream 0.12.11 → 0.12.12

data/base/app/assets/stylesheets/activities.css.scss

@@ -34,7 +34,7 @@
 .activity {	text-align:left;	display: block;	vertical-align: top;	padding: 10px 0px 5px 0px;
 	display: inline-block;	color: $sentence-color; font-size: 13px;  color: $main-color;border-bottom:1px solid #E9E9E9;}
 .actor_logo {	width: 38px;	padding: 8px 0px 5px 5px;	display: inline-block;	vertical-align: top;}
-.activity_content {	padding: 0px;	display: inline-block;	color: $sentence-color;	width: 89%;}
+.activity_content {	padding: 0px;	display: inline-block;	color: $sentence-color;	width: 89%; word-wrap: break-word; }
 .actor_name {font-size: 13px;}
 .actor_name a{font-weight: bold;}
 .post a {	color: $main-color;}

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

@@ -77,7 +77,7 @@ button, input[type=submit]{margin: 10px 0 10px 0px;padding: 3px 20px 3px 20px;co
 .block .center{ text-align:center;}
 .block .close {  float:right;  vertical-align:top;}
 .block .content{ padding: 5px 4px 5px 4px; }
-.block .header{vertical-align: middle;	background: #DEEFF8;
+.block .header{vertical-align: middle;	background: $secondary-color;
 	padding-left: 10px;	display: block;  height:20px; font-weight:bold;}
 .block .header_icon{ margin-top: 2px;  width:14px;  height:14px; }
 .block .header_icon_right {	float: right;	padding-right: 5px;	padding-top: 3px;}

data/base/app/assets/stylesheets/home.css.scss

@@ -3,6 +3,7 @@
 /******** MAIN Structure home *********/
 #center_body {
 	width: 560px;
+	max-width: 560px;
 	border-right: thin solid $separation-color;
 	border-bottom: thin solid $separation-color;
   border-left: thin solid $separation-color;

data/base/config/locales/es.yml

@@ -326,7 +326,7 @@ es:
     age: "Edad"
     must_be_signed_id: "Debes identificarte"
     group:
-      about: "Sobre nosotros"
+      about: "Sobre nosotros/as"
       birthday: "Aniversario"
       experience: "Temas que se trabajan"
       info: "Información sobre el grupo"

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

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

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

@@ -8,11 +8,20 @@ module SocialStream
 
         private
 
-        # Redirect to login if the user is trying to access a protected resource
-        # and she is not authenticated
+        # Catch some authorization errors:
+        #
+        # * Redirect to home when the user changes the session and the resource
+        #   is not accesible with the new representation
+        #
+        # * Redirect to login if the user is trying to access a protected resource
+        #   and she is not authenticated
         def rescue_from_access_denied(exception)
           if user_signed_in?
-            raise exception
+            if params[:s].present? && controller_name != 'home'
+              redirect_to :home
+            else
+              raise exception
+            end
           else
             redirect_to new_user_session_path
           end

data/base/spec/controllers/posts_controller_spec.rb

@@ -131,6 +131,7 @@ describe PostsController do
         end
       end
     end
+
   end
 
   context "creating post in group's wall" do
@@ -163,5 +164,25 @@ describe PostsController do
       response.should be_success
     end
   end
+
+  describe "to friend on representation change" do
+    before do
+      @post = Factory(:post)
+
+      @user = @post.post_activity.sender_subject
+
+      @group = Factory(:member, :contact => Factory(:g2g_contact, :receiver => @user.actor)).sender_subject
+
+      Factory(:friend, :contact => Factory(:g2g_contact, :sender => @user.actor))
+
+      sign_in @user
+    end
+
+    it "should redirect show to home" do
+      get :show, :id => @post.to_param, :s => @group.slug
+
+      response.should redirect_to(:home)
+    end
+  end
 end
 

data/documents/app/views/documents/_document_global_search.html.erb

@@ -1,2 +1,2 @@
 <%= render :partial => 'documents/document_with_details',
-           :locals => {:document => video} %>
+           :locals => {:document => document} %>

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Documents
-    VERSION = "0.4.5".freeze
+    VERSION = "0.4.6".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.9.31')
+  s.add_runtime_dependency('social_stream-base', '~> 0.9.34')
   s.add_runtime_dependency('paperclip-ffmpeg', '~> 0.7.0')
   s.add_runtime_dependency('paperclip','2.3.11')
   s.add_runtime_dependency('delayed_paperclip','>= 0.7.2')

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "0.12.11".freeze
+  VERSION = "0.12.12".freeze
 end

data/social_stream.gemspec

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 55
   prerelease: 
   segments: 
   - 0
   - 12
-  - 11
-  version: 0.12.11
+  - 12
+  version: 0.12.12
 platform: ruby
 authors: 
 - GING - DIT - UPM
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-17 00:00:00 +01:00
+date: 2011-11-18 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,12 +27,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 121
+        hash: 127
         segments: 
         - 0
         - 9
-        - 33
-        version: 0.9.33
+        - 34
+        version: 0.9.34
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -43,12 +43,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 3
         segments: 
         - 0
         - 4
-        - 5
-        version: 0.4.5
+        - 6
+        version: 0.4.6
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency