social_stream 2.1.1 → 2.2.0

data/oauth2_server/app/decorators/social_stream/base/relation_decorator.rb

@@ -0,0 +1,2 @@
+# FIXME: dirty hack ahead!
+Relation::Positive << "manager"

data/oauth2_server/app/decorators/social_stream/base/user_decorator.rb

@@ -1,20 +1 @@
-User.class_eval do
-  include SocialStream::Oauth2Server::Models::User
-
-  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
-
-  alias_method_chain :as_json, :client
-end
+User.send :include, SocialStream::Oauth2Server::Models::User

data/oauth2_server/app/models/relation/manager.rb

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

data/oauth2_server/app/models/site/client.rb

@@ -23,8 +23,10 @@ class Site::Client < Site
     end
   end
 
-  def to_param
-    id
+  # Generate a new OAuth secret for this site client
+  def refresh_secret!
+    set_secret
+    save!
   end
 
   private

data/oauth2_server/app/views/site/clients/_destroy.html.erb

@@ -0,0 +1,11 @@
+<div id="destroy_site_client" class="accordion-group">
+  <header class="accordion-heading">
+    <h5>
+      <%= link_to t("site.client.destroy.title"), "javascript:void(0);", class: 'accordion-toggle', "data-toggle" => 'collapse', "data-parent" => "#site_client-accordion", "data-target" => "#destroy_site_client-content" %>
+    </h5>
+  </header>
+  
+  <div class="content collapse" id="destroy_site_client-content">
+    <%= link_to t("site.client.destroy.link"), resource, confirm: t("site.client.destroy.confirm"), method: :delete %>
+  </div>
+</div>

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

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

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

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

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

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

data/oauth2_server/app/views/site/clients/_form.html.erb

@@ -1,4 +1,4 @@
-<%= form_for(@client || Site::Client.new) do |f| %>
+<%= form_for(begin; resource; rescue ActiveRecord::RecordNotFound; end || resource_class.new) do |f| %>
 
   <% if f.object.errors.any? %>
     <div id="error_explanation" class="alert alert-error">
@@ -14,26 +14,26 @@
   <% end %>
 
   <section id="site_client_form">
-    <section class="name">
+    <div class="name">
       <%= f.label :name %>
       <%= f.text_field :name %>
-    </section>
+    </div>
 
-    <section class="description">
+    <div class="description">
       <%= f.label :description %>
       <%= f.text_area :description %>
-    </section>
+    </div>
 
-    <section class="url">
+    <div class="url">
       <%= f.label :url %>
       <%= f.text_area :url %>
-    </section>
+    </div>
 
-    <section class="callback_url">
+    <div class="callback_url">
       <%= f.label :callback_url %>
       <%= f.text_area :callback_url %>
-    </section>
-
-    <%= f.submit %>
+    </div>
   </section>
+  <%= f.submit :class => "next-step" %>
+
 <% end %>

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

@@ -2,19 +2,31 @@
   <ul>
     <% list.each do |client| %>
       <li>
-        <%= image_tag client.logo.url(:small), style: "width: 40px; height: 40px;" %>
+        <%= link_to client do %>
+          <%= image_tag client.logo.url(:small) %>
+        <% end %>
 
-        <div class="name">
-          <%= link_to client.name, client %>
+        <div class="data">
+          <div class="name">
+            <%= link_to client.name, client %>
+          </div>
+          <div class="url">
+            <%= link_to client.url, client.url, target: '_blank' %>
+          </div>
         </div>
-        <div class="url">
-          <%= link_to client.url, client.url, target: '_blank' %>
-        </div>
-        <div class="users">
-          <span>
-            5
-          </span>
-          users
+        <div class="team">
+          <div class="users">
+            <span>
+              5
+            </span>
+            users
+          </div>  
+          <div class="auth">
+            <span>
+              15
+            </span>
+            authorized
+          </div>   
         </div>
         <hr class="soften">
       </li>

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

@@ -2,7 +2,7 @@
 
   <%= render partial: 'toolbar/home' %>
 
-  <section class="edit_site_client" id="edit_<%= dom_id @client %>">
+  <section class="edit_site_client" id="edit_<%= dom_id resource %>">
     <% if params[:step].present? %>
       <%= render partial: "edit_step_#{ params[:step] }" %>
     <% else %>

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

@@ -5,55 +5,24 @@
   <section class="site_clients">
     <header>
       <h3>
-        <%= link_to t('site.client.new.link'), new_site_client_path, class: "new_site_client-modal-link", 'data-toggle' => 'modal'  %>
+        <%= link_to t('site.client.new.link'), polymorphic_path(resource_class.new, action: 'new'), class: "new_site_client-modal-link", 'data-toggle' => 'modal'  %>
         
-        <%= t 'site.client.added' %>
+        Applications
       </h3>
     </header>
     <div class="tabbable"> <!-- Only required for left/right tabs -->
       <ul class="nav nav-tabs">
-        <li class="active"><a href="#tab1" data-toggle="tab">Mine</a></li>
-        <li><a href="#tab2" data-toggle="tab">Others</a></li>
-      </ul>
-      <div class="search-nav hidden-phone">
-        <%= form_tag search_path, method: 'get', class: "navbar-search pull-left" do %>
-          <%= text_field_tag :q, nil, autocomplete: :off, class: 'search-query input-small', placeholder: t('search.name'), "data-min_query" => SocialStream::Search::MIN_QUERY %>
-        <% end %>
-        <%= javascript_tag do %>
-          $(function() {
-            SocialStream.SearchHeader.show();
-          });
-        <% end %>
-        <div class="mat">
-          <%= render partial: 'layouts/loading' %>
-
-          <div class="query_too_short">
-            <%= t 'search.at_least', count: SocialStream::Search::MIN_QUERY %>
-          </div>
-
-          <div class="no_results">
-            <%= t 'search.nothing' %>
-          </div>
-
-          <div class="results">
-          </div>
-        </div>
-      </div>
-
+        <li class="active"><a href="#tab1" data-toggle="tab">Managing</a></li>
+      </ul>  
+    </div>
 
-      <div class="tab-content">
-        <div class="tab-pane active" id="tab1">
-          <%= render partial: 'list',
-               object: @clients %>
-        </div>
 
-        <div class="tab-pane" id="tab2">
-        </div>
+    <div class="tab-content">
+      <div class="tab-pane active" id="tab1">
+        <%= render partial: 'list',
+                   object: collection %>
       </div>
     </div>
-
     <%= render partial: 'new.modal' %>
-
-    <hr class="soften">
   </section>
 </section>

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

@@ -1,14 +1,15 @@
 <section id="site_client">
   <%= render partial: 'toolbar/home' %>
 
-  <section class="site_client" id="<%= dom_id @client %>">
+  <section class="site_client" id="<%= dom_id resource %>">
     <header>  
-      <h1>
-        <%= @client.name %>
-        <a class="go-more" href="#">
-          ir a tus demás aplicaciones
-        </a>
-      </h1>
+      <h4>
+        <%= resource.name %>
+
+        <% if can?(:update, resource) %>
+          <%= link_to t('site.client.button.edit'), polymorphic_path(resource, action: 'edit'), class: "edit" %>
+        <% end %>
+      </h4>
 
       <%= image_tag('logos/app-default.png', class: "logo-app pull-right") %>
 
@@ -20,53 +21,63 @@
           <%= Site::Client.human_attribute_name :description %>
         </h4>
         <div class="result">
-          <%= @client.description%>
+          <%= resource.description%>
         </div>
 
         <h4>
           <%= Site::Client.human_attribute_name :url %>
         </h4>
         <div class="result">
-          <%= link_to @client.url, @client.url%>
+          <%= link_to resource.url, resource.url%>
         </div>
 
-        <% if can? :update, @client %>
+        <% if can? :update, resource %>
           <h4>
             <%= Site::Client.human_attribute_name :callback_url %>
           </h4>
           <div class="result">
-            <%= @client.callback_url %>
+            <%= resource.callback_url %>
           </div>
         <% end %>
       </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>   
+      <% if can? :update_secret, resource %>
+        <div class="accordion" id="accordion2">
+          <div class="accordion-group">
+            <div class="accordion-heading">
+              <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion2" href="#collapseOne">
+                <%= t 'site.client.oauth.credentials' %>
+              </a>
+            </div>
+            <div id="collapseOne" class="accordion-body collapse">
+              <div class="accordion-inner">
+                <div class="content settings_content collapse in">
+                  <div class="result">
+                    <div class="client-id">
+                      <h6>
+                        <%= Site::Client.human_attribute_name :id %>
+                      </h6>
+                      <p>
+                        <%= resource.id %>
+                      </p>
+                    </div>
+                    <div class="client-secret">
+                      <h6>
+                        <%= Site::Client.human_attribute_name :secret %>
+                        <%= form_tag update_secret_site_client_path(resource, format: :json), class: "site-client-secret" do %>
+                          <%= submit_tag t('site.client.oauth.secret.refresh'), class: 'pull-right' %>
+                        <% end %>
+                      </h6>
+                      <p>
+                        <span class="site-client-secret"><%= resource.secret %></span>
+                      </p>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
       <% end %>
     </div>
   </section>
@@ -74,48 +85,35 @@
   <div class="tabbable"> <!-- Only required for left/right tabs -->
     <ul class="nav nav-tabs">
       <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>
+      <li><a href="#registered" data-toggle="tab">Users</a></li>
     </ul>
-    <div class="search-nav hidden-phone">
-      <%= form_tag search_path, method: 'get', class: "navbar-search pull-left" do %>
-        <%= text_field_tag :q, nil, autocomplete: :off, class: 'search-query input-small', placeholder: t('search.name'), "data-min_query" => SocialStream::Search::MIN_QUERY %>
-      <% end %>
-      <%= javascript_tag do %>
-        $(function() {
-          SocialStream.SearchHeader.show();
-        });
-      <% end %>
-
-      <div class="mat">
-        <%= render partial: 'layouts/loading' %>
-
-        <div class="query_too_short">
-          <%= t 'search.at_least', count: SocialStream::Search::MIN_QUERY %>
-        </div>
-
-        <div class="no_results">
-          <%= t 'search.nothing' %>
-        </div>
-
-        <div class="results">
-        </div>
-      </div>
+    
+    <%= render partial: 'contacts/add_button',
+               locals: {
+                 sender: resource,
+                 type: [ :user, :group ]
+               }
+    %>
+
+    <div class="btn-group" data-toggle="buttons">
+      <button type="radio" name="options" id="option1">user</button>
+      <button type="radio" name="options" id="option2"">organization</button>
     </div>
 
+     <%= text_field_tag "contact-filter", "", placeholder: "filter", autocomplete: "off" %>
 
     <div class="tab-content">
       <div class="tab-pane active" id="authorized">
         <%= render partial: 'contacts/contact',
-                   collection: @client.sent_contacts.first(12) %>
+                   collection: resource.sent_contacts.first(12) %>
       </div>
 
       <div class="tab-pane" id="registered">
       </div>
-
-      <div class="tab-pane" id="stats">
-      </div>
     </div>
   </div>
 
+  <%= javascript_tag do %>
+    SocialStream.SiteClient.show();
+  <% end %>
 </section>