social_stream 2.0.4 → 2.1.0

data/oauth2_server/config/locales/en.yml

@@ -21,12 +21,30 @@ en:
   helpers:
     submit:
       site_client:
-        create: "Next"
-        update: "Save"
+        create: Next
+        update: Save
   permission:
+    description:
+      default:
+        brief:
+          manage:
+            contact: Manage authorizations
+            nil: Manage the site
+            relation/custom: Manage roles
+        detailed:
+          manage:
+            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
+            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
     public_info: Read your public information
   relation_admin:
-    name: "Site Client Admin"
+    name: Site Client Admin
   site:
     client:
       added: Added sites

data/oauth2_server/config/locales/es.yml

@@ -10,15 +10,38 @@ es:
         name: Nombre
         secret: Client Secret
         url: URL
+  authorization:
+    form:
+      accept: Accept
+      cancel: Cancel
+    new:
+      title: Authorize %{client}?
+      permission:
+        title: 'The site %{client} will be able to:'
   helpers:
     submit:
       site_client:
-        create: "Siguiente"
-        update: "Guardar"
+        create: Siguiente
+        update: Guardar
   permission:
+    description:
+      default:
+        brief:
+          manage:
+            nil: Gestionar el sitio
+            relation/custom: Gestionar los roles
+            contact: Manage authorizations
+        detailed:
+          manage:
+            nil:
+              positive: PODRÁN actualizar los detalles del sitio
+              negative: NO 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
     public_info: Acceder a tu información pública
   relation_admin:
-    name: "Administrador de Sitio"
+    name: Administrador de Sitio
   site:
     client:
       added: Sitios añadidos
@@ -27,11 +50,3 @@ es:
       new:
         link: Añadir sitio
         title: Registrar nuevo sitio
-  authorization:
-    form:
-      accept: Accept
-      cancel: Cancel
-    new:
-      title: Authorize %{client}?
-      permission:
-        title: 'The site %{client} will be able to:'

data/oauth2_server/config/locales/zh.yml

@@ -20,6 +20,24 @@ zh:
         title: 'The site %{client} will be able to:'
   permission:
     public_info: Read your public information
+    description:
+      default:
+        brief:
+          manage:
+            nil: Manage the site
+            relation/custom: Manage roles
+            contact: Manage authorizations
+        detailed:
+          manage:
+            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
+            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
   site:
     client:
       added: Added sites
@@ -28,3 +46,10 @@ zh:
       new:
         link: Add site
         title: Register new client site
+  helpers:
+    submit:
+      site_client:
+        create: Next
+        update: Save
+  relation_admin:
+    name: Site Client Admin

data/oauth2_server/db/migrate/20130619134332_site_client_admin_to_manager.rb

@@ -0,0 +1,24 @@
+class SiteClientAdminToManager < ActiveRecord::Migration
+
+  class Relation::Admin < Relation; end
+
+  def up
+    admin = Relation::Admin.first
+
+    if admin.present?
+      rt = Tie.record_timestamps
+      Tie.record_timestamps = false
+
+      admin.ties.each do |t|
+        t.relation = Relation::Manager.instance
+        t.save!
+      end
+
+      Tie.record_timestamps = rt
+    end
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end

data/oauth2_server/lib/social_stream-oauth2_server.rb

@@ -1,19 +1 @@
-require 'social_stream-base'
-
-require 'rack/oauth2'
-
-module SocialStream
-  module Oauth2Server
-    module Controllers
-      autoload :Helpers,  'social_stream/oauth2_server/controllers/helpers'
-    end
-
-    module Models
-      autoload :Actor, 'social_stream/oauth2_server/models/actor'
-      autoload :User, 'social_stream/oauth2_server/models/user'
-    end
-    autoload :TokenEndpoint, 'social_stream/oauth2_server/token_endpoint'
-  end
-end
-
-require 'social_stream/oauth2_server/engine'
+require 'social_stream/oauth2_server'

data/oauth2_server/lib/social_stream/oauth2_server.rb

@@ -1,5 +1,33 @@
-# Bundler 1.2 tries to load this file instead of the gem name,
-# so we delegate to it
-#
-# We will probably change this in the future
-require 'social_stream-oauth2_server'
+require 'social_stream-base'
+
+require 'rack/oauth2'
+
+module SocialStream
+  module Oauth2Server
+    module Controllers
+      autoload :Helpers,  'social_stream/oauth2_server/controllers/helpers'
+    end
+
+    module Models
+      autoload :Actor, 'social_stream/oauth2_server/models/actor'
+      autoload :User, 'social_stream/oauth2_server/models/user'
+    end
+
+    autoload :Ability,       'social_stream/oauth2_server/ability'
+    autoload :TokenEndpoint, 'social_stream/oauth2_server/token_endpoint'
+  end
+
+  # 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.available_permissions['site/client'] = [
+    [ 'manage', nil ],
+    [ 'manage', 'relation/custom' ],
+    [ 'manage', 'contact' ]
+  ]
+end
+
+require 'social_stream/oauth2_server/engine'

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

@@ -0,0 +1,23 @@
+module SocialStream
+  module Oauth2Server
+    module Ability
+      def initialize(subject)
+        super
+
+        can :read, Site::Client
+
+        can :create, Site::Client do |c|
+          subject.present? &&
+            c.author_id == subject.actor_id
+        end
+
+        can [:update, :destroy], Site::Client do |c|
+          c.allow? subject, 'manage'
+        end
+
+        can :read, Relation::Manager
+      end
+    end
+  end
+end
+

data/oauth2_server/lib/social_stream/oauth2_server/engine.rb

@@ -5,6 +5,12 @@ module SocialStream
         Oauth2Token::AccessToken.valid.find_by_token(req.access_token) || req.invalid_token!
       end
 
+      initializer "social_stream-oauth2_server.ability" do
+        SocialStream::Ability.module_eval do
+          include SocialStream::Oauth2Server::Ability
+        end
+      end
+
       initializer "social_stream-oauth2_server.controller.helpers",
                   after: "social_stream-base.controller.helpers" do
         ActiveSupport.on_load(:action_controller) do

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

@@ -2,8 +2,8 @@ module SocialStream
   module Oauth2Server
     module Models
       module Actor
-        def developer_site_clients
-          Site::Client.administered_by(self)
+        def managed_site_clients
+          Site::Client.managed_by(self)
         end
       end
     end

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Oauth2Server
-    VERSION = "2.0.3".freeze
+    VERSION = "2.1.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.0.4')
+  s.add_runtime_dependency('social_stream-base', '~> 2.1.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

@@ -0,0 +1,112 @@
+require 'spec_helper'
+
+describe Site::ClientsController do
+  include SocialStream::TestHelpers
+  include SocialStream::TestHelpers::Controllers
+
+  render_views
+
+  describe "when Anonymous" do
+    it "should not render new" do
+      get :new
+
+      response.should redirect_to(new_user_session_path)
+    end
+
+    context "faking a new client" do
+      it "should deny creating" do
+        post :create, :client => { :name => "Test" }
+
+        response.should redirect_to(new_user_session_path)
+      end
+    end
+
+    context "an existing client" do
+      before do
+        @current_model = Factory(:"site/client")
+      end
+
+      it_should_behave_like "Deny Updating"
+      it_should_behave_like "Deny Destroying"
+    end
+  end
+
+  describe "when authenticated" do
+    before do
+      @user = Factory(:user)
+
+      sign_in @user
+    end
+
+    it "should render client" do
+      @client = Factory(:"site/client", author: @user.actor )
+      get :show, :id => @client.to_param
+
+      response.should be_success
+    end
+
+    it "should render other group" do
+      get :show, :id => Factory(:"site/client").to_param
+
+      response.should be_success
+    end
+
+    it "should render new" do
+      get :new
+
+      response.should be_success
+    end
+
+    context "a new own client" do
+      it "should allow creating" do
+        count = Site::Client.count
+        post :create, site_client: { name: "Test",
+                                    url: "http://test.com/",
+                                    callback_url: "http://test.com/callback"
+                                   }
+
+        client = assigns(:client)
+
+        client.should be_valid
+        Site::Client.count.should eq(count + 1)
+        client.receivers.should include(@user.actor)
+      end
+    end
+
+    context "a new fake client" do
+      before do
+        user = Factory(:user)
+
+        model_attributes[:author_id] = user.actor_id
+        model_attributes[:user_author_id] = user.actor_id
+      end
+
+      it_should_behave_like "Deny Creating"
+    end
+
+    context "a external client" do
+      before do
+        @current_model = Factory(:"site/client")
+      end
+
+      it_should_behave_like "Deny Updating"
+      it_should_behave_like "Deny Destroying"
+    end
+
+    context "a existing own client" do
+      before do
+        @current_model = Factory(:"site/client", author: @user.actor)
+      end
+
+      it "should update client" do
+        put :update, :id => @current_model.to_param,
+                     "client" => { name: "Update name" }
+
+        response.should redirect_to(@current_model)
+      end
+
+      it_should_behave_like "Allow Destroying"
+    end
+  end
+end
+

data/oauth2_server/spec/factories/site_client.rb

@@ -1,6 +1,6 @@
-Factory.define(:site_client, :class => Site::Client) do |c|
+Factory.define(:"site/client", :class => Site::Client) do |c|
   c.sequence(:name) { |n| "Site client #{ n }" }
   c.url { 'https://test.com' }
   c.callback_url { 'https://test.com/callback' }
-  c.actor { Factory(:user).actor }
+  c.author { Factory(:user).actor }
 end

data/oauth2_server/spec/models/site/client_authorization_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe Site::Client do
+  before do
+    @user = Factory(:user)
+
+    @client = Site::Client.create name: "Test",
+                                  url: "http://test.com",
+                                  callback_url: "http://test.com/callback",
+                                  author: @user
+  end
+
+  it "should allow update to author" do
+    Ability.new(@user).should be_able_to(:update, @client)
+  end
+
+  it "should not allow update to other" do
+    Ability.new(Factory(:user)).should_not be_able_to(:update, @client)
+  end
+end

data/ostatus/lib/social_stream-ostatus.rb

@@ -40,10 +40,6 @@ module SocialStream
       module Object
         autoload :ClassMethods, 'social_stream/ostatus/models/object'
       end
-
-      module Relation
-        autoload :Custom, 'social_stream/ostatus/models/relation/custom'
-      end
     end
     
     module Controllers

data/ostatus/lib/social_stream/ostatus/engine.rb

@@ -16,6 +16,17 @@ module SocialStream
       initializer "social_stream-ostatus.remote_subject_in_social_stream_subjects" do
         SocialStream.subjects << :remote_subject unless SocialStream.subjects.include?(:remote_subject)
       end
+
+      initializer "social_stream-ostatus.custom_relations" do
+        SocialStream.custom_relations['remote_subject'] = {
+          'default' => {
+            'name' => 'default',
+            'permissions' => [
+              [ 'read', 'activity' ]
+            ]
+          }
+        }
+      end
     end
   end
 end