social_stream 1.1.12 → 2.0.0.beta1

data/base/config/locales/es.yml

@@ -17,11 +17,10 @@ es:
       change: "Cambiar contraseña"
       new: "Nueva contraseña"
       retype: "Repetir nueva contraseña"
-    privacy: "Privacidad"
   activerecord:
     attributes:
       contact:
-        relation_ids: "El tipo de contacto"
+        relation_ids: "Los roles"
       relation/custom:
         name: "Nombre"
       user:
@@ -52,15 +51,18 @@ es:
     one: "Actividad"
     other: "Actividades"
     privacy:
-      myself:
-        contacts:
+      contact:
+        myself:
           group: "Todos los integrantes"
           user: "Tus contactos"
-      outside:
-        contacts:
+        outside:
           group: "Integrantes de %{receiver}"
           user: "Contactos de %{receiver}"
+      relation:
+        one: "%{count} grupo"
+        other: "%{count} grupos"
     sending: "Enviando"
+    share: "Compartir"
     stream:
       atom_title: "Actividades de %{subject}"
       title:
@@ -108,6 +110,8 @@ es:
         one: "%{count} persona más"
         other: "%{count} personas más"
     unfollow: "Dejar de seguir"
+  ajax:
+    error: "Ha habido un error en el servidor remoto"
   browse: "Descubrir"
   button:
     cancel: "Cancelar"
@@ -134,12 +138,12 @@ es:
     confirm_delete: "¿Borrar commentario?"
     name: "comentario"
     one: "un comentario"
-    view_all: "Ver todos los comentarios"
+    other: "comentarios"
+    view_all: "Ver todos los comentarios (%{count})"
     title:
       one: "Comentario"
       other: "Comentarios"
   contact:
-    addressbook: "Libreta de direcciones"
     all_n: "Todos los contactos (%{count})"
     confirm_delete: "¿Borrar contacto?"
     current: "Actuales"
@@ -147,6 +151,7 @@ es:
     edit:
       title: "Editar contacto con %{name}"
       submit: "Editar contacto"
+    empty: "Aún no has añadido a nadie. ¿Qué te parece <a href=\"%{explore}\">explorar</a>?"
     error_count:
       one: "1 error impidió que se guardara este contacto:"
       other: "%{count} errores impidieron que se guardara este contacto"
@@ -158,7 +163,14 @@ es:
     in_common:
       one: "1 contacto en común"
       other: "%{count} contactos en común"
+    n:
+      one: "%{count} contacto"
+      other: "%{count} contactos"
     new:
+      button:
+        zero: "Añadir"
+        one: "%{count} rol"
+        other: "%{count} roles"
       link: "+ Añadir contacto"
       title: "Añadir a %{name} como contacto"
       menu: "Añadir contacto"
@@ -166,9 +178,10 @@ es:
     one: "Contacto"
     other: "Contactos"
     pending:
-      other: "Pendientes"
+      other: "Te añadieron"
       all: "Todos"
       all_n: "Ver todas los contactos pendientes (%{count})"
+    received: "Recibidos"
     relation:
       one: "Tipo de contacto"
       new: "Nuevo tipo"
@@ -176,6 +189,8 @@ es:
       link: "+ Responder contacto"
       title: "Responder contacto con %{name}"
       submit: "Responder contacto"
+    saving: "Guardando..."
+    sent: "Añadidos"
     suggestion:
       one: "Sugerencia"
       other: "Sugerencias"
@@ -183,7 +198,15 @@ es:
     type:
       new: "+ Nuevo tipo"
     unfollow: "Dejar de seguir"
-  copyright: "2011 Copyright - Derechos reservados"
+    view_all: "Ver todos..."
+  copyright: "2013 Copyright - Derechos reservados"
+  counter:
+    like:
+      one: "<span class=\"counter\">%{count}</span> fan"
+      other: "<span class=\"counter\">%{count}</span> fans"
+    view:
+      one: "<span class=\"counter\">%{count}</span> vista"
+      other: "<span class=\"counter\">%{count}</span> vistas"
   delete:
     confirm: "¿Borrar %{element}}?"
   devise:
@@ -199,43 +222,61 @@ es:
       forgot: "¿Olvidaste tu contraseña?"
       instructions: "Introduce el correo electrónico y te mandaremos instrucciones para cambiarlo"
       update: "Cambiar contraseña"
+  dropdown:
+    notifications: "Notificaciones"
+    privacy: "Privacidad"
+    settings: "Ajustes"
+  explore:
+    explore:
+      most_followed: "Más seguidos"
+      most_popular: "Más populares"
+    header:
+      explore: "Explorar"
+      participants: "Participantes"
+      resources: "Recursos"
+      timeline: "Linea temporal"
+      tags: "Etiquetas"
+      search: "Buscar"
+    link: "Explora"
+    or: "o Explora"
+    participants:
+      last_active: "Últimos activos"
+      last_registered: "Últimos registrados"
+      most_members: "Más integrantes"
+      registered_since: "desde el %{time}"
+    resources:
+      last_uploaded: "Últimos subidos"
+      most_visited: "Más vistos"
+      uploaded_since: "desde el %{time}"
+    search:
+      placeholder: "buscando..."
+      submit: "Buscar"
+      title: "Búsqueda avanzada"
   follower:
     follower:
       title: "Seguidores"
     following:
       title: "Siguiendo"
-  n:
+    n:
       one: "1 seguidor/a"
       other: "%{count} seguidores"
   forgot_password: "¿Olvidaste tu contraseña?"
   frontpage:
-    collaborate:
-      default: "Colabora"
-      sentence1: "Organice sus proyectos y actividades"
-      sentence2: "Participe en grupos y conferencias"
-      sentence3: "Cree sus propios grupos y conferencias"
-    elements:
-      comments: "Comentarios"
-      conferences: "Conferencias"
-      networks: "Redes sociales"
-      organizers: "Organizadores"
-      participants: "Participantes"
-      groups: "Grupos"
-      tags: "Etiquetas"
-    main_title: "Social Stream es un núcleo para construir webs con características de red social"
-    meet:
-      default: "Encuentra"
-      sentence1: "Descubre grupos y gente interesante"
-      sentence2: "Encuentra la última actividad de tus contactos"
-    register: "¡Regístrate ahora!"
-    share:
-      default: "Comparte"
-      sentence1: "Tus proyectos y actividades"
-      sentence2: "Comentarios, fotos, audio y vídeo"
+    main_title: "Social Stream, el núcleo para construir webs con características de red social distribuída"
+    presentation:
+      modular:
+        header: "Modular"
+        p: "Los <a href=\"https://github.com/ging/social_stream#social-stream-components\">componentes de Social Stream</a> disponibles aportan solo las características que necesitas para tu red social. Simplemente añade las gemas que necesites a tu Gemfile"
+      flexible:
+        header: "Flexible"
+        p: "Personaliza completamente tu red social <a href=\"https://github.com/ging/social_stream/wiki/How-to-change-controllers%2C-models%2C-views%2C-assets-and-locales\">cambiando cualquier componente de Social Stream</a>, <a href=\"https://github.com/ging/social_stream/wiki/How-to-add-new-activity-objects\">añadiendo nuevas actividades</a> o cambiando el CSS con <a href=\"http://sass-lang.com/\">SASS</a>"
+      community:
+        header: "Comunidad"
+        p: "Social Stream disfruta de una comunidad creciente de desarrolladores. No dudes en dejar un mensaje en <a href=\"http://groups.google.com/group/social-stream\">el Google group de Social Stream</a> o <a href=\"http://stackoverflow.com/questions/tagged/social-stream\">StackOverflow</a> si te encuentras con problemas. <a href=\"https://github.com/ging/social_stream/issues/new\">Abre un reporte</a> si encutras algún fallo. ¡Los pull request son muy bienvenidos!"
     stats: "%{users} personas and %{groups} grupos registrados"
   group:
-    one: "Grupo"
-    other: "Grupos"
+    one: "grupo"
+    other: "grupos"
     all: "Todos los grupos"
     all_n: "Todos los grupos (%{count})"
     by: "Por grupos"
@@ -249,6 +290,9 @@ es:
     input: "¿Cuál es el nombre del grupo?"
     last: "Últimos grupos"
     my: "Mis grupos"
+    n:
+      one: "%{count} grupo"
+      other: "%{count} groupos"
     new:
       action: "Nuevo grupo"
       name: "Nombre"
@@ -262,6 +306,7 @@ es:
     title:
       one: "Grupo"
       other: "Grupos"
+    view_all: "Ver todos..."
   help: "Ayuda"
   helpers:
     submit:
@@ -282,6 +327,8 @@ es:
     toolbar: "Invitar"
     success: "Se han enviado tus invitaciones"
     text: "Escribe tu mensaje"
+  layout:
+    more: "Ver más (%{count})"
   like:
     n:
       one: "1 fan"
@@ -342,7 +389,7 @@ es:
     like:
       group: "A %{sender} le gusta el %{thing} %{whose}." 
       user: "A %{sender} le gusta tu %{thing}."
-    look: "Echa un vistazo al muro de %{sender}"
+    look: "Echa un vistazo al perfil de %{sender}"
     makefriend:
       group: "%{sender} también añadió a %{who} como contacto."
       user: "%{sender} también te añadió como contacto."
@@ -370,9 +417,10 @@ es:
     confirm_delete: "¿Borrar texto?"
     form:
       title: "Texto"
-    input: "¿Qué quieres compartir?"
+    input: "Comparte tus ideas..."
     name: "publicación"
     one: "una publicación"
+    other: "publicaciones"
     title:
       one: "Texto"
       other: "Textos"
@@ -470,7 +518,8 @@ es:
               positive: "PODRÁN leer las publicaciones que aparezcan en tu muro, salvo las que compartas solo con ciertas personas"
               negative: "NO PODRÁN leer las publicaciones que aparezcan en tu muro, salvo las que marques como públicas"
     of_relation:
-      choose: "2. Permisos para <strong>%{name}</strong>"
+      choose: "Permisos para <strong>%{name}</strong>"
+    postit: "Gestiona los permisos de tus contactos y crea nuevos roles"
   privacy:
     intro: "Los contactos en <strong>%{relation}</strong>:"
     rule:
@@ -478,21 +527,31 @@ es:
       title: "Reglas de privacidad"
       saved: "Reglas de privacidad guardadas"
   relation_custom:
-    choose: "1. Elegir tipo de relación"
-    confirm_delete: "¿Borrar este tipo de relación?"
+    confirm_delete: "¿Borrar este rol?"
     delete: "Borrar"
     edit: "Cambiar nombre"
-    new: "+ Nuevo tipo"
-    title: "Privacidad y contexto"
+    list:
+      title: 'Roles'
+    new: "+ Nuevo rol"
+    title: "Privacidad"
   relation_public:
     name: "Público"
+  repository:
+    filter: "filtrar"
+    title: "Repositorio"
+    order:
+      by: "Ordenar por"
+      last_modified: "Última modificación"
+      most_popular: "Popularidad"
   representation:
     notice: "Tu sesión ha cambiado. Ahora actúas en nombre de %{subject}. Para regresar a tu sessión, utiliza el menú de arriba a la derecha"
     switch: "Cambiar sessión"
   required: "(*) Estos campos son obligatorios"
   search:
     all_subject_results: "Ver todos %{subject} (%{count})"
-    at_least: "Escribe al menos 2 letras"
+    at_least:
+      one: "Escribe al menos %{count} letra"
+      other: "Escribe al menos %{count} letras"
     global: 
       name: "Búsqueda global"
       first_result:
@@ -555,8 +614,8 @@ es:
     all: "Todos los usuarios"
     all_n: "Todos los usuarios (%{count})"
     by: "Por usuarios"
-    one: "Usuario"
-    other: "Usuarios"
+    one: "usuario"
+    other: "usuarios"
     title:
       one: "Usuario"
       other: "Usuarios"

data/base/config/routes.rb

@@ -3,12 +3,13 @@ Rails.application.routes.draw do
   
   match 'home' => 'home#index', :as => :home
   match 'home' => 'home#index', :as => :user_root # devise after_sign_in_path_for
-
+  match 'explore(/:section)' => 'explore#index', :as => :explore
   match 'search' => 'search#index', :as => :search
 
   # Social Stream subjects configured in config/initializers/social_stream.rb
   SocialStream.subjects.each do |actor|
     resources actor.to_s.pluralize do
+      resources :contacts
       resource :like
       resource :profile
       resources :activities
@@ -21,9 +22,21 @@ Rails.application.routes.draw do
           get 'search', :on => :collection
         end
       end
+
+      # Repository models are configured in config/initializers/social_stream.rb
+      if SocialStream.repository_models.present?
+        resource :repository do
+          get 'search', on: :collection
+        end
+      end
     end
   end
 
+  # Get information about current_subject
+  match 'user'    => 'users#current', format: :json
+
+  match 'profile' => 'profiles#show'
+
   # Social Stream objects configured in config/initializers/social_stream.rb
   #
   # /posts
@@ -35,13 +48,21 @@ Rails.application.routes.draw do
 
   resources :comments
 
-  constraints SocialStream::Routing::Constraints::Custom.new do
-    resources :contacts do
-      collection do
-        get 'pending'
-      end
+  # Repository models are configured in config/initializers/social_stream.rb
+  if SocialStream.repository_models.present?
+    resource :repository do
+      get 'search', on: :collection
     end
+  end
 
+  resources :contacts do
+    collection do
+      get 'suggestion'
+      get 'pending'
+    end
+  end
+
+  constraints SocialStream::Routing::Constraints::Custom.new do
     namespace "relation" do
       resources :customs
     end
@@ -53,12 +74,6 @@ Rails.application.routes.draw do
     match 'followings' => 'followers#index', :as => :followings, :defaults => { :direction => 'sent' }
     match 'followers' => 'followers#index', :as => :followers, :defaults => { :direction => 'received' }
     resources :followers
-
-    resources :contacts do
-      collection do
-        get 'pending'
-      end
-    end
   end
 
   resources :activity_actions
@@ -87,11 +102,10 @@ Rails.application.routes.draw do
     resource :like
   end
 
+  get 'home/activities' => 'activities#index', as: :home_activities, defaults: { section: 'home' }
+
   get 'audience/index', :as => :audience
   
-  match 'cheesecake' => 'cheesecake#index', :as => :cheesecake  
-  match 'update_cheesecake' => 'cheesecake#update', :as => :update_cheesecake  
-  
   match 'ties' => 'ties#index', :as => :ties
   
   match 'tags' => 'tags#index', :as => 'tags'
@@ -103,7 +117,6 @@ Rails.application.routes.draw do
   match 'api/me/home/' => 'api#activity_atom_feed', :format => 'atom', :as => :api_my_home
 
   match 'api/me/contacts' => 'contacts#index', :format => 'json', :as => :api_contacts
-  match 'api/subjects/:s/contacts' => 'contacts#index', :format => 'json', :as => :api_subject_contacts
   ##/API##
  
   #Background tasks

data/base/db/migrate/20120326083509_create_social_stream.rb

@@ -1,15 +1,19 @@
 class CreateSocialStream < ActiveRecord::Migration
   def change
     create_table "activities", :force => true do |t|
-      t.integer  "activity_verb_id"
-      t.datetime "created_at"
-      t.datetime "updated_at"
-      t.string   "ancestry"
-      t.integer  "channel_id"
+      t.integer    "activity_verb_id"
+      t.datetime   "created_at"
+      t.datetime   "updated_at"
+      t.string     "ancestry"
+      t.integer    "author_id"
+      t.integer    "user_author_id"
+      t.integer    "owner_id"
     end
 
     add_index "activities", ["activity_verb_id"], :name => "index_activities_on_activity_verb_id"
-    add_index "activities", ["channel_id"], :name => "index_activities_on_channel_id"
+    add_index "activities", ["author_id"], :name => "index_activities_on_author_id"
+    add_index "activities", ["user_author_id"], :name => "index_activities_on_user_author_id"
+    add_index "activities", ["owner_id"], :name => "index_activities_on_owner_id"
 
     create_table :activity_actions do |t|
       t.references :actor
@@ -43,6 +47,15 @@ class CreateSocialStream < ActiveRecord::Migration
       t.string   "object_type",    :limit => 45
       t.integer  "like_count",     :default => 0
       t.integer  "follower_count", :default => 0
+      t.integer  "visit_count",    :default => 0
+      t.integer  "comment_count",  :default => 0
+    end
+
+    create_table :activity_object_audiences do |t|
+      t.references :activity_object
+      t.references :relation
+
+      t.timestamps
     end
 
     create_table :activity_object_properties do |t|
@@ -106,18 +119,6 @@ class CreateSocialStream < ActiveRecord::Migration
 
     add_index "avatars", ["actor_id"], :name => "index_avatars_on_actor_id"
 
-    create_table "channels", :force => true do |t|
-      t.integer  "author_id"
-      t.integer  "owner_id"
-      t.integer  "user_author_id"
-      t.datetime "created_at",     :null => false
-      t.datetime "updated_at",     :null => false
-    end
-
-    add_index "channels", ["author_id"], :name => "index_channels_on_author_id"
-    add_index "channels", ["owner_id"], :name => "index_channels_on_owner_id"
-    add_index "channels", ["user_author_id"], :name => "index_channels_on_user_author_id"
-
     create_table "comments", :force => true do |t|
       t.integer  "activity_object_id"
       t.datetime "created_at"
@@ -210,6 +211,12 @@ class CreateSocialStream < ActiveRecord::Migration
     add_index "relations", ["actor_id"], :name => "index_relations_on_actor_id"
     add_index "relations", ["ancestry"], :name => "index_relations_on_ancestry"
 
+    create_table :sites do |t|
+      t.text    :config
+
+      t.timestamps
+    end
+
     create_table "ties", :force => true do |t|
       t.integer  "contact_id"
       t.integer  "relation_id"
@@ -242,7 +249,9 @@ class CreateSocialStream < ActiveRecord::Migration
     add_index "users", ["reset_password_token"], :name => "index_users_on_reset_password_token", :unique => true
 
     add_foreign_key "activities", "activity_verbs", :name => "index_activities_on_activity_verb_id"
-    add_foreign_key "activities", "channels", :name => "index_activities_on_channel_id"
+    add_foreign_key "activities", "actors", :column => :author_id, :name => "index_activities_on_author_id"
+    add_foreign_key "activities", "actors", :column => :user_author_id, :name => "index_activities_on_user_author_id"
+    add_foreign_key "activities", "actors", :column => :owner_id, :name => "index_activities_on_owner_id"
 
     add_foreign_key "activity_actions", "actors", :name => "index_activity_actions_on_actor_id"
     add_foreign_key "activity_actions", "activity_objects", :name => "index_activity_actions_on_activity_object_id"
@@ -250,6 +259,9 @@ class CreateSocialStream < ActiveRecord::Migration
     add_foreign_key "activity_object_activities", "activities", :name => "index_activity_object_activities_on_activity_id"
     add_foreign_key "activity_object_activities", "activity_objects", :name => "activity_object_activities_on_activity_object_id"
 
+    add_foreign_key :activity_object_audiences, :activity_objects, :name => 'activity_object_audiences_on_activity_object_id'
+    add_foreign_key :activity_object_audiences, :relations, :name => 'activity_object_audiences_on_relation_id'
+
     add_foreign_key "activity_object_properties", "activity_objects", :name => "index_activity_object_properties_on_activity_object_id", :column => :activity_object_id
     add_foreign_key "activity_object_properties", "activity_objects", :name => "index_activity_object_properties_on_property_id", :column => :property_id
 
@@ -262,10 +274,6 @@ class CreateSocialStream < ActiveRecord::Migration
 
     add_foreign_key "avatars", "actors", :name => "avatars_on_actor_id"
 
-    add_foreign_key "channels", "actors", :name => "index_channels_on_author_id", :column => "author_id"
-    add_foreign_key "channels", "actors", :name => "index_channels_on_owner_id", :column => "owner_id"
-    add_foreign_key "channels", "actors", :name => "index_channels_on_user_author_id", :column => "user_author_id"
-
     add_foreign_key "comments", "activity_objects", :name => "comments_on_activity_object_id"
 
     add_foreign_key "contacts", "actors", :name => "contacts_on_receiver_id", :column => "receiver_id"