social_stream-oauth2_server 2.0.3 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5874569601b0facde73388ee10a32044bc0bc6e
-  data.tar.gz: 96810fac87271a300f61ea2aa58fc68ef6577286
+  metadata.gz: 1a60e2888e5625188bfc0189ef45f33a371219f7
+  data.tar.gz: 618771f1116c05f0658c38f082f101801b31ad9b
 SHA512:
-  metadata.gz: 9e81ba78877af6bb87b7a09ae819ad3788898e5aac3431a3ccf05938384cc0614d458e1e97c5369d6d07ac4358e4a320eac0439fc4caf7c4f8383c06de1632e5
-  data.tar.gz: 1219933a3ca94f0de905540b9b075cf2c009491250bd04875dd8fc89848b499055dd40ce54e67736fbb9099cb0a7f2675c797e2603bd2e2b8a8f2912498708b3
+  metadata.gz: 02c4fcb5e161d6dd4cd900b8819b58b5de16870d9d11197dfe6c74267699f6526e479fb8c2b79f229506caac19a6fc21c8e52c267dea23b491aa17cf6bce453a
+  data.tar.gz: 3f6933a27f7fdaccb410f999e70b0a69d5e23c6cb3fe37e6f989834a5321d1cbc4e1acbab88a4f8e519ba68800a859458506eaa3757c3ff36bcb5ed99f864cc1

data/app/assets/stylesheets/social_stream-oauth2_server.css.sass

@@ -1,4 +1,4 @@
-@import "social_stream/oauth2_server/mixins/mixins/"
+@import "social_stream/oauth2_server/mixins/mixin"
 
 @import "social_stream/oauth2_server/applications/applications-oauth2server"
 @import "social_stream/oauth2_server/applications/layout/applications-oauth2server"

data/app/assets/stylesheets/social_stream/oauth2_server/applications/_applications-oauth2server.css.sass

@@ -4,7 +4,7 @@
       @include colorfont-big-size
       float: left
     a
-      @include btn-primary
+      @include btn-secundary
       @include border-radius(5px)
       margin: 12px 0
     .soften

data/app/assets/stylesheets/social_stream/oauth2_server/applications/layout/_applications-oauth2server.css.sass

@@ -49,3 +49,7 @@
         &[type="file"]
           line-height: 0px
 
+
+.site_clients_list
+  ul 
+    li

data/app/assets/stylesheets/social_stream/oauth2_server/create/_create-oauth2server.css.sass

@@ -1,10 +1,6 @@
-#content
-  .box
-    @include border-radius (5px)
-    background-color: whitesmoke
-    .image
-      @include border-radius (5px)
-      background-color: $white
+form.new_site_client
+  @include principal-box
+
 
 
 

data/app/assets/stylesheets/social_stream/oauth2_server/mixins/_mixin.css.sass

@@ -0,0 +1,10 @@
+// menu horizontal
+// ----------------------------------
+
+@mixin principal-box
+  @include border-radius(5px)
+  @include box-shadow (1px 1px 15px 0px rgba(50, 50, 50, 0.1))
+  border: 1px solid 
+  border-color: rgba(0,0,0, 0.1)
+  background-color: $auxiliarColor
+  border-color: rgba(0,0,0, 0.1)

data/app/assets/stylesheets/social_stream/oauth2_server/show/layout/_show-oauth2server.css.sass

@@ -34,8 +34,8 @@
   margin-left: 2.85%
   .site_client
     width: 95% 
-    padding-left: 2.5%
-    padding-right: 2.5%
+    padding: 0 2.5%
+    margin-bottom: 30px
     display: inline-block
     h1
       @include clearfix
@@ -56,6 +56,9 @@
         margin-top: -50px
         h4
           margin-bottom: 0px
+          font-size: 18px
+          color: $principalColor
+          font-family: $serifFontFamily 
         .name,
         .url,
         .users
@@ -69,21 +72,27 @@
           margin-left: 20px
           padding-top: 5px
           border-top: 1px solid #C1C1C1
+          color: #929292
+          font-size: 17px
       .btn-group
         @include btn-primary
         @include border-radius(5px)
         @include btn-add
+        float: right
         .dropdown-menu
           width: 300px
           margin-left: -196px
+          padding: 10px 14px
+          color: $gray
           li
-            word-break: break-all
-            overflow-y: hidden
-            overflow-x: scroll
             h6
               border-bottom: 1px solid #CCC
               a
-                color: principalColor
+                color: $principalColor !important
+          li.client-secret
+            p
+              word-break: break-all
+              overflow-x: scroll
 
 
      

data/app/controllers/site/clients_controller.rb

@@ -1,18 +1,12 @@
 class Site::ClientsController < ApplicationController
   before_filter :authenticate_user!
 
-  before_filter :set_author_ids, only: [ :create, :update ]
+  before_filter :set_author_ids, only: [ :new, :create, :update ]
 
-  def index
-    @developer_clients = current_subject.developer_site_clients
-  end
-
-  def show
-    @client = Site::Client.find params[:id]
-  end
+  load_and_authorize_resource
 
-  def new
-    @client = Site::Client.new
+  def index
+    @clients = current_subject.managed_site_clients
   end
 
   def create
@@ -20,7 +14,9 @@ class Site::ClientsController < ApplicationController
 
     if @client.save
       respond_to do |format|
-        format.html { redirect_to @client }
+        format.html { 
+          redirect_to edit_site_client_path(@client, step: 2)
+        }
       end
     else
       respond_to do |format|
@@ -47,9 +43,16 @@ class Site::ClientsController < ApplicationController
     end
   end
 
+  def destroy
+    @client.destroy
+
+    redirect_to home_path
+  end
+
   private
 
   def set_author_ids
+    params[:site_client] ||= HashWithIndifferentAccess.new
     params[:site_client][:author_id]      = current_subject.actor_id
     params[:site_client][:user_author_id] = current_user.actor_id
     params[:site_client][:owner_id]       = current_subject.actor_id

data/app/models/relation/manager.rb

@@ -0,0 +1,19 @@
+# Owner of client sites
+class Relation::Manager < Relation::Single
+  PERMISSIONS =
+    [
+      [ 'manage', nil ],
+      [ 'manage', 'relation/custom' ],
+      [ 'manage', 'contact' ]
+    ]
+
+  class << self
+    def create_activity?
+      false
+    end
+  end
+
+  def available_permissions
+    Permission.instances PERMISSIONS
+  end
+end

data/app/models/site/client.rb

@@ -4,12 +4,13 @@ class Site::Client < Site
   before_validation :set_secret,
                     on: :create
 
-  after_create :set_admin
+  after_create :set_manager
 
-  scope :administered_by, lambda { |actor|
-    joins(actor: :sent_ties).
+  scope :managed_by, lambda { |actor|
+    select("DISTINCT sites.*").
+      joins(actor: :sent_permissions).
       merge(Contact.received_by(actor)).
-      merge(Tie.related_by(Relation::Admin.instance))
+      merge(Permission.where(action: 'manage', object: nil))
   }
 
   %w{ url callback_url secret }.each do |m|
@@ -32,7 +33,10 @@ class Site::Client < Site
     self.secret = SecureRandom.hex(64)
   end
 
-  def set_admin
-    contact_to!(author).relation_ids = [ Relation::Admin.instance.id ]
+  def set_manager
+    c = sent_contacts.create! receiver_id: author.id,
+                              user_author: author
+
+    c.relation_ids = [ ::Relation::Manager.instance.id ]
   end
 end

data/app/views/site/clients/_avatar.html.erb

@@ -0,0 +1,15 @@
+<section class="avatar">
+  <% if can? :update, @profile %>
+    <header>
+      <%= render partial: 'edit_icon' %>
+      <h4>
+        <%= t('avatar.profile_change') %>
+      </h4>
+    </header>
+    <div class="update">
+      <%= render partial: 'avatars/form',
+                 object: @profile.actor,
+                 as: :avatarable %>
+    </div>
+  <% end %>
+</section>

data/app/views/site/clients/_edit.html.erb

@@ -0,0 +1,6 @@
+<%= render partial: 'form' %>
+
+<section class="site_client_roles">
+  <%= render partial: 'relation/customs/index',
+             locals: { subject: @client } %>
+</section>

data/app/views/site/clients/_edit_step_2.html.erb

@@ -0,0 +1,11 @@
+<%= image_tag 'step_2.png' %>
+
+<section class="new_app">
+<h1>Set the application's logo</h1>
+
+<%= render partial: 'avatars/form',
+           object: @client,
+           as: :avatarable %>
+
+<%= link_to "Next", edit_site_client_path(@client, step: 3) %>
+</section>

data/app/views/site/clients/_edit_step_3.html.erb

@@ -0,0 +1,10 @@
+<%= image_tag 'step_3.png' %>
+
+<h1>Manage roles and permissions</h1>
+
+<section class="site_client_roles">
+  <%= render partial: 'relation/customs/index',
+             locals: { subject: @client } %>
+</section>
+
+<%= link_to 'Finish', @client %>

data/app/views/site/clients/_list.html.erb

@@ -1,24 +1,27 @@
 <section class="site_clients_list">
-  <% list.each do |client| %>
+  <ul>
+    <% list.each do |client| %>
+      <li>
+        <%= image_tag client.logo.url(:small), style: "width: 40px; height: 40px;" %>
 
-    <%= image_tag client.logo.url(:small), style: "width: 40px; height: 40px;" %>
-
-    <div class="name">
-      <%= link_to client.name, client %>
-    </div>
-    <div class="url">
-      <%= link_to client.url, client.url, target: '_blank' %>
-    </div>
-    <div class="users">
-      <span>
-        5
-      </span>
-      users
-    </div>
-  <hr class="soften">
-  <% end %>
+        <div class="name">
+          <%= link_to client.name, client %>
+        </div>
+        <div class="url">
+          <%= link_to client.url, client.url, target: '_blank' %>
+        </div>
+        <div class="users">
+          <span>
+            5
+          </span>
+          users
+        </div>
+        <hr class="soften">
+      </li>
+    <% end %>
 
   <%= javascript_tag do %>
     SocialStream.SiteClient.index();
   <% end %>
+  </ul>
 </section>

data/app/views/site/clients/edit.html.erb

@@ -3,12 +3,11 @@
   <%= render partial: 'toolbar/home' %>
 
   <section class="edit_site_client" id="edit_<%= dom_id @client %>">
-    <%= render partial: 'form' %>
-    
-    <section class="site_client_roles">
-      <%= render partial: 'relation/customs/index',
-                 locals: { list: @client.relations } %>
-    </section>
+    <% if params[:step].present? %>
+      <%= render partial: "edit_step_#{ params[:step] }" %>
+    <% else %>
+      <%= render partial: 'edit' %>
+    <% end %>
   </section>
 </section>
 

data/app/views/site/clients/index.html.erb

@@ -44,7 +44,7 @@
       <div class="tab-content">
         <div class="tab-pane active" id="tab1">
           <%= render partial: 'list',
-               object: @developer_clients %>
+               object: @clients %>
         </div>
 
         <div class="tab-pane" id="tab2">

data/app/views/site/clients/new.html.erb

@@ -2,9 +2,11 @@
   <%= render partial: 'toolbar/home' %>
 
   <section class="new_site_client">
+    <%= image_tag 'step_1.png' %>
 
-
-    <%= render partial: 'form_step1' %>
+    <article class="new_app">
+      <%= render partial: 'form' %>
+    </article>
   </section>
 </section>
 

data/app/views/site/clients/show.html.erb

@@ -20,7 +20,7 @@
           <%= Site::Client.human_attribute_name :description %>
         </h4>
         <div class="result">
-          <%= link_to @client.description, @client.description%>
+          <%= @client.description%>
         </div>
 
         <h4>
@@ -30,45 +30,52 @@
           <%= link_to @client.url, @client.url%>
         </div>
 
-        <h4>
-          <%= Site::Client.human_attribute_name :callback_url %>
-        </h4>
-        <div class="result">
-          <%= @client.callback_url %>
-        </div>
+        <% if can? :update, @client %>
+          <h4>
+            <%= Site::Client.human_attribute_name :callback_url %>
+          </h4>
+          <div class="result">
+            <%= @client.callback_url %>
+          </div>
+        <% end %>
       </div>
         
-      <div class="btn-group">
-        <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-          Credentials
-          <span class="caret"></span>
-        </a>
-        <ul class="dropdown-menu">
-          <li>
-            <h6>
-            <%= Site::Client.human_attribute_name :id %>
-            <a href="#" class="pull-right">refresh</a>
-            </h6>
-            <%= @client.id %>
-          </li>
-
-          <li>
-            <h6>
-              <%= Site::Client.human_attribute_name :secret %>
-              <a href="#" class="pull-right">refresh</a>
-            </h6>
-            <%= @client.secret %>
-          </li>
-        </ul>  
-      </div>   
+      <% if can? :update, @client %>
+        <div class="btn-group">
+          <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+            Credentials
+            <span class="caret"></span>
+          </a>
+          <ul class="dropdown-menu">
+            <li>
+              <h6>
+              <%= Site::Client.human_attribute_name :id %>
+              </h6>
+              <p>
+                <%= @client.id %>
+              </p>
+            </li>
+
+            <li class="client-secret">
+              <h6>
+                <%= Site::Client.human_attribute_name :secret %>
+                <a href="#" class="pull-right">refresh</a>
+              </h6>
+              <p>
+                <%= @client.secret %>
+              </p>
+            </li>
+          </ul>  
+        </div>   
+      <% end %>
     </div>
   </section>
 
   <div class="tabbable"> <!-- Only required for left/right tabs -->
     <ul class="nav nav-tabs">
-      <li class="active"><a href="#tab1" data-toggle="tab">Users</a></li>
-      <li><a href="#tab2" data-toggle="tab">Organizations</a></li>
-      <li><a href="#tab3" data-toggle="tab">Stats</a></li>
+      <li class="active"><a href="#authorized" data-toggle="tab">Authorized</a></li>
+      <li><a href="#registered" data-toggle="tab">Registered</a></li>
+      <li><a href="#stats" data-toggle="tab">Stats</a></li>
     </ul>
     <div class="search-nav hidden-phone">
       <%= form_tag search_path, method: 'get', class: "navbar-search pull-left" do %>
@@ -79,6 +86,7 @@
           SocialStream.SearchHeader.show();
         });
       <% end %>
+
       <div class="mat">
         <%= render partial: 'layouts/loading' %>
 
@@ -97,18 +105,17 @@
 
 
     <div class="tab-content">
-      <div class="tab-pane active" id="tab1">
-        <ul class="nav nav-pills">
-          <li class="active">
-            <a href="#">added</a>
-          </li>
-          <li><a href="#">registered</a></li>
-        </ul>
+      <div class="tab-pane active" id="authorized">
+        <%= render partial: 'contacts/contact',
+                   collection: @client.sent_contacts.first(12) %>
+      </div>
+
+      <div class="tab-pane" id="registered">
       </div>
 
-      <div class="tab-pane" id="tab2">
+      <div class="tab-pane" id="stats">
       </div>
     </div>
   </div>
 
-</section>
+</section>

data/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/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/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/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/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/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/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/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/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/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/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/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/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/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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream-oauth2_server
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.1.0
 platform: ruby
 authors:
 - Antonio Tapiador
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-18 00:00:00.000000000 Z
+date: 2013-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: social_stream-base
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.4
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.4
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: rack-oauth2
   requirement: !ruby/object:Gem::Requirement
@@ -84,7 +84,7 @@ files:
 - app/assets/stylesheets/social_stream/oauth2_server/create/responsive/_responsive-1200px-min.css.sass
 - app/assets/stylesheets/social_stream/oauth2_server/create/responsive/_responsive-767px-max.css.sass
 - app/assets/stylesheets/social_stream/oauth2_server/create/responsive/_responsive-768px-979px.css.sass
-- app/assets/stylesheets/social_stream/oauth2_server/mixins/_mixins.css.sass
+- app/assets/stylesheets/social_stream/oauth2_server/mixins/_mixin.css.sass
 - app/assets/stylesheets/social_stream/oauth2_server/show/_show-oauth2server.css.sass
 - app/assets/stylesheets/social_stream/oauth2_server/show/layout/_show-oauth2server.css.sass
 - app/assets/stylesheets/social_stream/oauth2_server/show/responsive/_responsive-1200px-min.css.sass
@@ -100,16 +100,18 @@ files:
 - app/models/oauth2_token/access_token.rb
 - app/models/oauth2_token/authorization_code.rb
 - app/models/oauth2_token/refresh_token.rb
-- app/models/relation/admin.rb
 - app/models/relation/auth.rb
+- app/models/relation/manager.rb
 - app/models/site/client.rb
 - app/overrides/frontpage/_presentation/client_site_presentation.html.erb.deface
 - app/overrides/layouts/_header_dropdown_menu/applications_entry.html.erb.deface
 - app/views/authorizations/error.html.erb
 - app/views/authorizations/new.html.erb
+- app/views/site/clients/_avatar.html.erb
+- app/views/site/clients/_edit.html.erb
+- app/views/site/clients/_edit_step_2.html.erb
+- app/views/site/clients/_edit_step_3.html.erb
 - app/views/site/clients/_form.html.erb
-- app/views/site/clients/_form_step1.html.erb
-- app/views/site/clients/_form_step2.html.erb
 - app/views/site/clients/_list.html.erb
 - app/views/site/clients/_new.modal.html.erb
 - app/views/site/clients/_presentation.html.erb
@@ -122,10 +124,12 @@ files:
 - config/locales/zh.yml
 - config/routes.rb
 - db/migrate/20130115102300_create_social_stream_oauth2_server.rb
+- db/migrate/20130619134332_site_client_admin_to_manager.rb
 - lib/generators/social_stream/oauth2_server/install_generator.rb
 - lib/social_stream-oauth2_server.rb
 - lib/social_stream/migrations/oauth2_server.rb
 - lib/social_stream/oauth2_server.rb
+- lib/social_stream/oauth2_server/ability.rb
 - lib/social_stream/oauth2_server/controllers/helpers.rb
 - lib/social_stream/oauth2_server/engine.rb
 - lib/social_stream/oauth2_server/models/actor.rb
@@ -136,8 +140,10 @@ files:
 - social_stream-oauth2_server.gemspec
 - spec/controllers/authorizations_controller_spec.rb
 - spec/controllers/dummy_controller_spec.rb
+- spec/controllers/site_clients_controller_authorization_spec.rb
 - spec/factories/site_client.rb
 - spec/models/relation/auth_spec.rb
+- spec/models/site/client_authorization_spec.rb
 - spec/models/site/client_spec.rb
 homepage: http://github.com/ging/social_stream-oauth2_server
 licenses: []

data/app/assets/stylesheets/social_stream/oauth2_server/mixins/_mixins.css.sass

@@ -1,5 +0,0 @@
-@mixin principal-box
-  @include border-radius(5px)
-  @include box-shadow (1px 1px 15px 0px rgba(50, 50, 50, 0.1))
-  border: 1px solid 
-  border-color: rgba(0,0,0, 0.1)

data/app/models/relation/admin.rb

@@ -1,9 +0,0 @@
-# Administer client sites
-class Relation::Admin < Relation::Single
-  class << self
-    def create_activity?
-      false
-    end
-  end
-end
-

data/app/views/site/clients/_form_step1.html.erb

@@ -1,7 +0,0 @@
-<%= image_tag 'step_1.png' %>
-
-<article class="new_app">
-  <%= render partial: 'form' %>
-</article>
-
-

data/app/views/site/clients/_form_step2.html.erb

@@ -1,20 +0,0 @@
-<img src="/assets/step_2.png">
-<article class="permissions">
-  <h4>
-    <%= raw t('permission.of_relation.choose', :name => h(@relation.name)) %>
-  </h4>
-
-  <%= form_for @relation, url: polymorphic_path(@relation, section: 'permissions'), remote: true do |f| %>
-    <%= hidden_field_tag 'relation_custom[permission_ids][]', "" %>
-
-    <ul>
-      <% default_permissions.each do |p| %>
-        <li>
-        <%= check_box_tag 'relation_custom[permission_ids][]', p.id, @relation.permission_ids.include?(p.id), id: "checkbox_relation_#{ @relation.id }_permission_#{ p.id }" %>
-        <%= label_tag "checkbox_relation_#{ @relation.id }_permission_#{ p.id }", p.description(:brief, subject: current_subject), title: p.description(:detailed, subject: current_subject, state: (@relation.permission_ids.include?(p.id) ? 'positive' : 'negative'), relation: @relation.name) %>
-        </li>
-      <% end %>
-    </ul>
-  <% end %>
-  <%= f.submit :next %>
-</article>