social_stream-base 0.10.5 → 0.10.6

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

@@ -94,7 +94,9 @@
 	color: $main-color;
 	padding: 5px 5px 5px 5px;
 	width:549px;
-	height:40px;
+	min-height:40px;
+	max-height:60px;
+	overflow: hidden;
 	border-bottom:1px solid $text-over-main;
 }
 .conversations .conversation .content_left {
@@ -131,7 +133,7 @@
 .conversations .conversation .notification {
 	float:left;
 	width:5px;
-	height:100%;
+	height: 45px;
 	margin: 0px 5px 0px 0px;
 }
 .conversations .unread .notification {

data/app/models/activity_object.rb

@@ -56,4 +56,9 @@ class ActivityObject < ActiveRecord::Base
   def post_activity
     activities.includes(:activity_verb).where('activity_verbs.name' => 'post').first
   end
+
+  # Does this {ActivityObject} has {Actor}?
+  def acts_as_actor?
+    object_type == "Actor"
+  end
 end

data/app/views/activity_objects/_activity_object.html.erb

@@ -1,4 +1,4 @@
-<% if activity_object.object.is_a?(Actor) || activity_object.object.class.ancestors.include?(SocialStream::Models::Subject) %>
+<% if activity_object.acts_as_actor? %>
   <div class="block">
     <%= model_with_details activity_object.object %>
   </div>

data/app/views/groups/_show.html.erb

@@ -1,10 +1,12 @@
 <% content_for :title do %>
-  <%= @group.name%>
+  <%= @group.name+" | "+t('site.name') %>
 <% end %>
 
-<% if @group.profile.description? %>
-  <% content_for :description do %>
+<% content_for :description do %>
+  <% if @group.profile.description? %>
     <%= @group.profile.description%>
+  <% else %>
+    <%= @group.name+" "+t('profile.is_on') + " "+ t('site.name') %>
   <% end %>
 <% end %>
 

data/app/views/notifications/activities/_like.html.erb

@@ -1,4 +1,4 @@
-<% if activity.direct_object.is_a? Actor or activity.direct_object.respond_to? :actor %>
+<% if activity.direct_object.acts_as_actor? %>
   <div class="subject">
     <%= raw t('notification.fan', 
           :sender => link_to(truncate_name(activity.sender.name), polymorphic_url(activity.sender.subject)),

data/app/views/notifications/activities/_like.text.erb

@@ -1,4 +1,4 @@
-<% if activity.direct_object.is_a? Actor or activity.direct_object.respond_to? :actor %>
+<% if activity.direct_object.acts_as_actor? %>
   <%= raw t('notification.fan', 
         :sender => truncate_name(activity.sender.name),
         :whose => t('notification.whose.'+ activity.receiver.subject.class.to_s.underscore,

data/app/views/posts/_post_global_search.html.erb

@@ -1,4 +1,4 @@
-<% author = post.post_activity.sender_subject %>
+<% author = post.author_subject %>
 <div class="model_with_details">
   <div class="logo">
     <%= link_to (image_tag(author.logo.url , :size => "50x50", :alt => author.name )), author  %>
@@ -15,4 +15,4 @@
       <br>
     </div>
   </div>
-</div>
+</div>

data/app/views/users/_show.html.erb

@@ -1,10 +1,13 @@
 <% content_for :title do %>
-  <%= @user.name%>
+  <%= @user.name+" | "+t('site.name') %>
 <% end %>
 
-<% if @user.profile.description? %>
-  <% content_for :description do %>
+
+<% content_for :description do %>
+  <% if @user.profile.description? %>
     <%= @user.profile.description%>
+  <% else %>
+    <%= @user.name+" "+t('profile.is_on') + " "+ t('site.name') %>
   <% end %>
 <% end %>
 

data/config/locales/en.yml

@@ -318,12 +318,14 @@ en:
     input: "What are you doing?"
     name: "post"
     one: "a post"
-    title: "Posts"  
+    title: "Posts"
   preposition:
     and: "and"
+    on: "on"
   profile:
     one: "Profile"
     age: "Age"
+    is_on: "is on"
     must_be_signed_id: "You must be signed in"
     group:
       about: "About us"

data/config/locales/es.yml

@@ -324,6 +324,7 @@ es:
   profile:
     one: "Perfil"
     age: "Edad"
+    is_on: "esta en"
     must_be_signed_id: "Debes identificarte"
     group:
       about: "Sobre nosotros/as"

data/lib/generators/social_stream/base/templates/relations.yml

@@ -37,16 +37,3 @@ group:
     name: partner
     permissions:
       - [ read,    activity ]
-
-event:
-  member:
-    name: member
-    permissions:
-      - [ represent ]
-      - [ create,  activity ]
-      - [ read,    activity ]
-      - [ read,    tie ]
-  partner:
-    name: partner
-    permissions:
-      - [ read,    activity ]

data/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.10.5".freeze
+    VERSION = "0.10.6".freeze
   end
 end

data/social_stream-base.gemspec

@@ -35,8 +35,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('kaminari', '~> 0.12.4')
   # OAuth client
   s.add_runtime_dependency('omniauth','~> 0.2.6')
-  # OAuth provider
-  s.add_runtime_dependency('oauth-plugin','~> 0.4.0.pre1')	
   # Messages
   s.add_runtime_dependency('mailboxer','~> 0.5.4')
   # Tagging

data/spec/dummy/config/relations.yml

@@ -37,16 +37,3 @@ group:
     name: partner
     permissions:
       - [ read,    activity ]
-
-event:
-  member:
-    name: member
-    permissions:
-      - [ represent ]
-      - [ create,  activity ]
-      - [ read,    activity ]
-      - [ read,    tie ]
-  partner:
-    name: partner
-    permissions:
-      - [ read,    activity ]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream-base
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 59
   prerelease: 
   segments: 
   - 0
   - 10
-  - 5
-  version: 0.10.5
+  - 6
+  version: 0.10.6
 platform: ruby
 authors: 
 - GING - DIT - UPM
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-05 00:00:00 +01:00
+date: 2011-12-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -195,28 +195,10 @@ dependencies:
         version: 0.2.6
   type: :runtime
   version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: oauth-plugin
-  prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: -223651605
-        segments: 
-        - 0
-        - 4
-        - 0
-        - pre
-        - 1
-        version: 0.4.0.pre1
-  type: :runtime
-  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: mailboxer
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -228,11 +210,11 @@ dependencies:
         - 4
         version: 0.5.4
   type: :runtime
-  version_requirements: *id013
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: acts-as-taggable-on
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -244,11 +226,11 @@ dependencies:
         - 6
         version: 2.0.6
   type: :runtime
-  version_requirements: *id014
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   name: formtastic
   prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -260,11 +242,11 @@ dependencies:
         - 3
         version: 1.2.3
   type: :runtime
-  version_requirements: *id015
+  version_requirements: *id014
 - !ruby/object:Gem::Dependency 
   name: simple-navigation
   prerelease: false
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -274,11 +256,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id016
+  version_requirements: *id015
 - !ruby/object:Gem::Dependency 
   name: resque
   prerelease: false
-  requirement: &id017 !ruby/object:Gem::Requirement 
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -290,11 +272,11 @@ dependencies:
         - 1
         version: 1.17.1
   type: :runtime
-  version_requirements: *id017
+  version_requirements: *id016
 - !ruby/object:Gem::Dependency 
   name: modernizr-rails
   prerelease: false
-  requirement: &id018 !ruby/object:Gem::Requirement 
+  requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -306,11 +288,11 @@ dependencies:
         - 6
         version: 2.0.6
   type: :runtime
-  version_requirements: *id018
+  version_requirements: *id017
 - !ruby/object:Gem::Dependency 
   name: thinking-sphinx
   prerelease: false
-  requirement: &id019 !ruby/object:Gem::Requirement 
+  requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -322,11 +304,11 @@ dependencies:
         - 8
         version: 2.0.8
   type: :runtime
-  version_requirements: *id019
+  version_requirements: *id018
 - !ruby/object:Gem::Dependency 
   name: sass-rails
   prerelease: false
-  requirement: &id020 !ruby/object:Gem::Requirement 
+  requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -338,11 +320,11 @@ dependencies:
         - 0
         version: 3.1.0
   type: :runtime
-  version_requirements: *id020
+  version_requirements: *id019
 - !ruby/object:Gem::Dependency 
   name: rails_autolink
   prerelease: false
-  requirement: &id021 !ruby/object:Gem::Requirement 
+  requirement: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -354,11 +336,11 @@ dependencies:
         - 4
         version: 1.0.4
   type: :runtime
-  version_requirements: *id021
+  version_requirements: *id020
 - !ruby/object:Gem::Dependency 
   name: capybara
   prerelease: false
-  requirement: &id022 !ruby/object:Gem::Requirement 
+  requirement: &id021 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -370,11 +352,11 @@ dependencies:
         - 9
         version: 0.3.9
   type: :development
-  version_requirements: *id022
+  version_requirements: *id021
 - !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
   prerelease: false
-  requirement: &id023 !ruby/object:Gem::Requirement 
+  requirement: &id022 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -384,11 +366,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id023
+  version_requirements: *id022
 - !ruby/object:Gem::Dependency 
   name: ruby-debug
   prerelease: false
-  requirement: &id024 !ruby/object:Gem::Requirement 
+  requirement: &id023 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -398,11 +380,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id024
+  version_requirements: *id023
 - !ruby/object:Gem::Dependency 
   name: rspec-rails
   prerelease: false
-  requirement: &id025 !ruby/object:Gem::Requirement 
+  requirement: &id024 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -414,11 +396,11 @@ dependencies:
         - 1
         version: 2.6.1
   type: :development
-  version_requirements: *id025
+  version_requirements: *id024
 - !ruby/object:Gem::Dependency 
   name: factory_girl
   prerelease: false
-  requirement: &id026 !ruby/object:Gem::Requirement 
+  requirement: &id025 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -430,11 +412,11 @@ dependencies:
         - 2
         version: 1.3.2
   type: :development
-  version_requirements: *id026
+  version_requirements: *id025
 - !ruby/object:Gem::Dependency 
   name: forgery
   prerelease: false
-  requirement: &id027 !ruby/object:Gem::Requirement 
+  requirement: &id026 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -446,11 +428,11 @@ dependencies:
         - 2
         version: 0.4.2
   type: :development
-  version_requirements: *id027
+  version_requirements: *id026
 - !ruby/object:Gem::Dependency 
   name: ci_reporter
   prerelease: false
-  requirement: &id028 !ruby/object:Gem::Requirement 
+  requirement: &id027 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -462,11 +444,11 @@ dependencies:
         - 4
         version: 1.6.4
   type: :development
-  version_requirements: *id028
+  version_requirements: *id027
 - !ruby/object:Gem::Dependency 
   name: nifty-generators
   prerelease: false
-  requirement: &id029 !ruby/object:Gem::Requirement 
+  requirement: &id028 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -478,7 +460,7 @@ dependencies:
         - 5
         version: 0.4.5
   type: :development
-  version_requirements: *id029
+  version_requirements: *id028
 description: |-
   Social Stream is a Ruby on Rails engine providing your application with social networking features and activity streams.
   
@@ -547,6 +529,7 @@ files:
 - app/assets/images/btn/btn_page_link.png
 - app/assets/images/btn/btn_partner.png
 - app/assets/images/btn/btn_photo.png
+- app/assets/images/btn/btn_play.png
 - app/assets/images/btn/btn_printer.png
 - app/assets/images/btn/btn_profile.png
 - app/assets/images/btn/btn_rank.png