social_stream 2.1.1 → 2.2.0

data/oauth2_server/config/locales/en.yml

@@ -33,6 +33,9 @@ en:
             relation/custom: Manage roles
         detailed:
           manage:
+            contact:
+              negative: They WILL NOT BE ABLE to assign roles to users
+              positive: They WILL BE ABLE to assign roles to users
             nil:
               positive: They WILL BE ABLE to update the details of the client site
               negative: They WILL NOT BE ABLE to update the details of the client
@@ -45,11 +48,27 @@ en:
     public_info: Read your public information
   relation_admin:
     name: Site Client Admin
+  relation_manager:
+    name: Manager
   site:
     client:
       added: Added sites
+      button:
+        edit: Edit
+      contact:
+        add: Add
+      destroy:
+        confirm: Are you sure? This operation cannot be reverted!
+        link: Remove the site client and all its data
+        title: Destroy site client
+      go_to_other: See your other site clients
       index:
         title: Client sites
       new:
         link: Add site
         title: Register new client site
+      oauth:
+        credentials: Credentials
+        secret:
+          refresh: refresh
+          refreshed: OAuth2 client secret regenerated

data/oauth2_server/config/locales/es.yml

@@ -15,9 +15,9 @@ es:
       accept: Accept
       cancel: Cancel
     new:
-      title: Authorize %{client}?
       permission:
         title: 'The site %{client} will be able to:'
+      title: Authorize %{client}?
   helpers:
     submit:
       site_client:
@@ -28,25 +28,44 @@ es:
       default:
         brief:
           manage:
+            contact: Manage authorizations
             nil: Gestionar el sitio
             relation/custom: Gestionar los roles
-            contact: Manage authorizations
         detailed:
           manage:
+            contact:
+              negative: NO PODRÁN asignar roles a usuarios
+              positive: PODRÁN asignar roles a usuarios
             nil:
-              positive: PODRÁN actualizar los detalles del sitio
               negative: NO PODRÁN actualizar los detalles del sitio
+              positive: PODRÁN actualizar los detalles del sitio
             relation/custom:
-              positive: PODRÁN crear, actualizar y borrar los roles del sitio
               negative: NO PODRÁN crear, actualizar y borrar los roles del sitio
+              positive: PODRÁN crear, actualizar y borrar los roles del sitio
     public_info: Acceder a tu información pública
   relation_admin:
     name: Administrador de Sitio
+  relation_manager:
+    name: Admin
   site:
     client:
       added: Sitios añadidos
+      button:
+        edit: Editar
+      contact:
+        add: Add
+      destroy:
+        confirm: Are you sure? This operation cannot be reverted!
+        link: Remove the site client and all its data
+        title: Destroy site client
+      go_to_other: Ver tus otros sitios
       index:
         title: Sitios
       new:
         link: Añadir sitio
         title: Registrar nuevo sitio
+      oauth:
+        credentials: Credenciales
+        secret:
+          refresh: regenerar
+          refreshed: Token secreto de OAuth2 regenerado

data/oauth2_server/config/locales/zh.yml

@@ -15,41 +15,60 @@ zh:
       accept: Accept
       cancel: Cancel
     new:
-      title: Authorize %{client}?
       permission:
         title: 'The site %{client} will be able to:'
+      title: Authorize %{client}?
+  helpers:
+    submit:
+      site_client:
+        create: Next
+        update: Save
   permission:
-    public_info: Read your public information
     description:
       default:
         brief:
           manage:
+            contact: Manage authorizations
             nil: Manage the site
             relation/custom: Manage roles
-            contact: Manage authorizations
         detailed:
           manage:
+            contact:
+              negative: They WILL NOT BE ABLE to assign roles to users
+              positive: They WILL BE ABLE to assign roles to users
             nil:
-              positive: They WILL BE ABLE to update the details of the client site
               negative: They WILL NOT BE ABLE to update the details of the client
                 site
+              positive: They WILL BE ABLE to update the details of the client site
             relation/custom:
-              positive: They WILL BE ABLE to create, update and delete the roles of
-                the client site
               negative: They WILL NOT BE ABLE to create, update and delete the roles
                 of the client site
+              positive: They WILL BE ABLE to create, update and delete the roles of
+                the client site
+    public_info: Read your public information
+  relation_admin:
+    name: Site Client Admin
+  relation_manager:
+    name: Manager
   site:
     client:
       added: Added sites
+      button:
+        edit: Edit
+      contact:
+        add: Add
+      destroy:
+        confirm: Are you sure? This operation cannot be reverted!
+        link: Remove the site client and all its data
+        title: Destroy site client
+      go_to_other: See your other site clients
       index:
         title: Client sites
       new:
         link: Add site
         title: Register new client site
-  helpers:
-    submit:
-      site_client:
-        create: Next
-        update: Save
-  relation_admin:
-    name: Site Client Admin
+      oauth:
+        credentials: Credentials
+        secret:
+          refresh: refresh
+          refreshed: OAuth2 client secret regenerated

data/oauth2_server/config/routes.rb

@@ -5,6 +5,8 @@ Rails.application.routes.draw do
   resources :authorizations, only: :create
 
   namespace "site" do
-    resources :clients
+    resources :clients do
+      post :update_secret, on: :member
+    end
   end
 end

data/oauth2_server/lib/social_stream/oauth2_server.rb

@@ -17,11 +17,14 @@ module SocialStream
     autoload :TokenEndpoint, 'social_stream/oauth2_server/token_endpoint'
   end
 
+  # Include site/client in routes
+  SocialStream.routed_subjects << :"site/client"
+
   # Define default custom relations for Site::Client
   SocialStream.custom_relations['site/client'] = {}
 
   # Relations that appear in the Site::Client list
-  SocialStream.list_relations['site/client'] = [ :manager ]
+  SocialStream.system_relations['site/client'] = [ :manager ]
 
   SocialStream.available_permissions['site/client'] = [
     [ 'manage', nil ],

data/oauth2_server/lib/social_stream/oauth2_server/ability.rb

@@ -11,7 +11,7 @@ module SocialStream
             c.author_id == subject.actor_id
         end
 
-        can [:update, :destroy], Site::Client do |c|
+        can [:update, :update_secret, :destroy], Site::Client do |c|
           c.allow? subject, 'manage'
         end
 

data/oauth2_server/lib/social_stream/oauth2_server/models/user.rb

@@ -16,6 +16,8 @@ module SocialStream
 
           has_many :refresh_tokens,
                    class_name: 'Oauth2Token::RefreshToken'
+
+          alias_method_chain :as_json, :client
         end
 
         # Is {#client} authorized by this {User}
@@ -29,6 +31,22 @@ module SocialStream
             contact_to!(client).relation_ids += [ Relation::Auth.instance.id ]
           end
         end
+
+        # Include application role information in the json
+        def as_json_with_client options = {}
+          hash = as_json_without_client options
+
+          if options[:client] && !options[:client].is_a?(User)
+            hash['roles'] = options[:client].contact_to!(self).relations.map{ |r|
+              { 
+                id: r.id,
+                name: r.name
+              }
+            }
+          end
+
+          hash
+        end
       end
     end
   end

data/oauth2_server/lib/social_stream/oauth2_server/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Oauth2Server
-    VERSION = "2.1.1".freeze
+    VERSION = "2.2.0".freeze
   end
 end

data/oauth2_server/social_stream-oauth2_server.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', '~> 2.1.0')
+  s.add_runtime_dependency('social_stream-base', '~> 2.2.0')
   s.add_runtime_dependency('rack-oauth2', '~> 1.0.0')
 
   s.add_development_dependency('rspec-rails', '~> 2.8.0')

data/oauth2_server/spec/controllers/site_clients_controller_authorization_spec.rb

@@ -38,6 +38,13 @@ describe Site::ClientsController do
       sign_in @user
     end
 
+    it "should render index" do
+      @client = Factory(:"site/client", author: @user.actor )
+      get :index
+
+      response.should be_success
+    end
+
     it "should render client" do
       @client = Factory(:"site/client", author: @user.actor )
       get :show, :id => @client.to_param

data/ostatus/Rakefile

@@ -3,12 +3,7 @@ require 'bundler/gem_tasks'
 
 require 'rdoc/task'
 
-require 'rspec/core'
-require 'rspec/core/rake_task'
-
-RSpec::Core::RakeTask.new(:spec)
-
-task :default => :spec
+task :default => :rdoc
 
 Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'

data/ostatus/config/locales/zh.yml

@@ -4,32 +4,32 @@ zh:
     verb:
       follow:
         RemoteSubject:
-          title: '%{subject} added %{contact} as contact.'
           message: '%{name} added you as contact.'
           notification:
-            subject: '%{name} added you as contact.'
             body: '%{name} added you as contact.'
+            subject: '%{name} added you as contact.'
+          title: '%{subject} added %{contact} as contact.'
       like:
         RemoteSubject:
-          title: '%{subject} is a fan of %{contact}.'
           message: '%{name} is now your fan.'
           notification:
-            subject: '%{name} is now your fan.'
             body: '%{name} is now your fan.'
+            subject: '%{name} is now your fan.'
+          title: '%{subject} is a fan of %{contact}.'
       make-friend:
         RemoteSubject:
-          title: '%{subject} and %{contact} are now connected.'
           message: '%{name} also added you as contact.'
           notification:
-            subject: '%{name} also added you as contact.'
             body: '%{name} also added you as contact.'
+            subject: '%{name} also added you as contact.'
+          title: '%{subject} and %{contact} are now connected.'
       post:
         RemoteSubject:
           notification:
-            subject: '%{name} has posted something(%{direct_object}) in your wall'
             body: '%{name} has posted something(%{direct_object}) in your wall'
+            subject: '%{name} has posted something(%{direct_object}) in your wall'
       update:
         RemoteSubject:
           notification:
-            subject: '%{name} has updated %{direct_object} in your wall'
             body: '%{name} has updated something(%{direct_object}) in your wall'
+            subject: '%{name} has updated %{direct_object} in your wall'

data/ostatus/lib/social_stream-ostatus.rb

@@ -45,6 +45,9 @@ module SocialStream
     module Controllers
       autoload :DebugRequests, 'social_stream/ostatus/controllers/debug_requests'
     end
+
+    # Include route_subject in routes
+    SocialStream.routed_subjects << :remote_subject
   end
 end
 

data/ostatus/lib/social_stream/ostatus/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Ostatus
-    VERSION = "2.1.0".freeze
+    VERSION = "2.2.0".freeze
   end
 end

data/ostatus/social_stream-ostatus.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', '~> 2.1.0')
+  s.add_runtime_dependency('social_stream-base', '~> 2.2.0')
   s.add_runtime_dependency('proudhon','>= 0.3.6')
   s.add_runtime_dependency('nokogiri','> 1.4.4')
   

data/places/config/locales/es.yml

@@ -1,85 +1,85 @@
 ---
 es:
+  activity:
+    like_construction:
+      like_and: ' y '
+      like_final:
+        one: ' le gusta esto'
+        other: ' les gusta esto'
+        you: le gusta esto
+      like_friends:
+        one: A %{friends} contacto
+        other: A %{friends} contactos
+      like_others:
+        one: '%{people} otro'
+        other: '%{people} otros'
+      like_people:
+        one: a %{people} persona
+        other: a %{people} personas
+    verb:
+      like:
+        Place:
+          like: También me gusta
+          title: A %{subject} le gusta %{activity_object}.
+          unlike: Ya no me gusta
   place:
     actions:
       delete: Borrar
       details: Detalles
       edit: Editar
+    address:
+      country: País
+      locality: Ciudad
+      postalcode: Código postal
+      region: Región
+      street: Dirección
     all: Todos los lugares
+    comments:
+      all: Ver todos los comentarios
+      contacts: Ver sólo los comentarios de mis contactos
     confirm_delete: ¿Borrar lugar?
+    details:
+      info: Info
     form:
       title: Lugar
     info:
+      author: Author
       date:
         created_at: Creado el
         updated_at: Actualizado el
-      file:
-        title: Cargar
-      title:
-        title: Título
-      author: Author
       description:
         description: Description
         update: Update description
+      file:
+        title: Cargar
       size: Size
       tags: Tags
+      title:
+        title: Título
+    like:
+      me: que me gustan
+      other: que gustan a %{contact}
     mine: Mis lugares
     name: lugar
     name_title: Nombre del lugar
+    not_mine: Lugares
     one: un lugar
+    other: lugares
     phone_title: Teléfono
     photo:
       button: Subir
       update: Subir foto
-    url_title: Website
-    address:
-      street: Dirección
-      locality: Ciudad
-      region: Región
-      postalcode: Código postal
-      country: País
-    not_mine: Lugares
-    other: lugares
-    simple_all: Todos
-    title: Lugares
-    like:
-      me: que me gustan
-      other: que gustan a %{contact}
     search:
       name: Busca tus lugares favoritos
-      no_match: ¿No encuentras el lugar?
       new: + Añade un lugar nuevo
-    comments:
-      contacts: Ver sólo los comentarios de mis contactos
-      all: Ver todos los comentarios
-    view:
-      list: Lista
-      map: Mapa
+      no_match: ¿No encuentras el lugar?
+    simple_all: Todos
     tabs:
-      mine: Mis lugares
       friends: De amigos
+      mine: Mis lugares
       recommended: Recomendados
-    details:
-      info: Info
-  activity:
-    verb:
-      like:
-        Place:
-          title: A %{subject} le gusta %{activity_object}.
-          like: También me gusta
-          unlike: Ya no me gusta
-    like_construction:
-      like_friends:
-        one: A %{friends} contacto
-        other: A %{friends} contactos
-      like_and: ' y '
-      like_people:
-        one: a %{people} persona
-        other: a %{people} personas
-      like_others:
-        one: '%{people} otro'
-        other: '%{people} otros'
-      like_final:
-        one: ' le gusta esto'
-        other: ' les gusta esto'
-        you: le gusta esto
+    title: Lugares
+    url_title: Website
+    view:
+      list: Lista
+      map: Mapa