social_stream-oauth2_server 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f974cd2ca225c2e81f96ebfe5705847aa8f79db
-  data.tar.gz: 767419bbe1194902609edfdea7d5502968c4882c
+  metadata.gz: dc036d8372a01dfcdd89be772415cfee0ec9c09d
+  data.tar.gz: 797262eb30dea1097c1fc7d42292ff974316b836
 SHA512:
-  metadata.gz: 047a94b500d2e5b14fde61acc72d5978babf0d9fa5c67c6c7cb2a856449cb9686dead638ee8a86ec0911bfd14567bc2e790ef7a623ee7c87e3c464c15ed11ec9
-  data.tar.gz: 57c1b9cf96589fcf8fe39790460e8ac712b65e194af414d69a6b0e2ed24455ee48201e12743b8a26a86b6f2da222180b91ee27a2006726431e880cf0e3100b4b
+  metadata.gz: 2632f575f38a9414b58f23266ddd2a1b95fe02a8bb6069c499969ec98ab924768b8629ce8e11dfe4be1c04057ff6c6f1383fde3abd2f00776e52b545faa52f0c
+  data.tar.gz: 6d25f86424c5ae4c23cd1a041762b5f4e4d2dea0cb140d2faf8ec1dbf5b01f419fe7024c71a293aceb8d080ba1d08983120abff97612848921e2f78c3e2bab03

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

@@ -48,3 +48,6 @@
       input
         &[type="file"]
           line-height: 0px
+
+.next-step
+  @include next-btn

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

@@ -1,5 +1,45 @@
 // menu horizontal
 // ----------------------------------
+@mixin btn-secundary
+  @include ie7-inline-block()
+  padding: 4px 12px
+  margin-bottom: 0
+  font-size: $baseFontSize
+  line-height: $baseLineHeight
+  vertical-align: middle
+  cursor: pointer
+  background-color: $secundary-btnColorbackground
+  border: 1px solid $secundary-btnColorborder 
+  *border: 0
+  color: $auxiliarColor
+  background-image: none
+  @include ie7-restore-left-whitespace()
+  @include box-shadow(inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05))
+  @include transition(background 1s, color, 1s)
+  @include border-radius(7px)
+  a
+    color: $gray
+  
+  &:hover
+    border: 1px solid $secundary-btnColorbackground
+    background-color: $secundary-btnColorborder !important
+    color: $principalColor
+  
+  &:focus 
+    @include tab-focus()
+  
+  &.active
+    border: 1px solid $secundary-btnColorborder
+    background-color: $secundary-btnColorbackground !important
+    color: $principalColor
+
+  &.disabled,
+  &[disabled] 
+    cursor: default
+    @include opacity(85)
+    background-color: $secundary-btnColorbackground
+    color: $gray
+
 
 @mixin principal-box
   @include border-radius(5px)
@@ -7,4 +47,9 @@
   border: 1px solid 
   border-color: rgba(0,0,0, 0.1)
   background-color: $auxiliarColor
-  border-color: rgba(0,0,0, 0.1)
+  border-color: rgba(0,0,0, 0.1)
+
+
+@mixin next-btn
+  @include btn-secundary
+

data/app/controllers/site/clients_controller.rb

@@ -4,7 +4,7 @@ class Site::ClientsController < ApplicationController
 
   before_filter :authenticate_user!
 
-  load_and_authorize_resource
+  load_and_authorize_resource except: :index
 
   def create
     create! do |success, error|
@@ -28,9 +28,28 @@ class Site::ClientsController < ApplicationController
     destroy! { :home }
   end
 
+  def collection
+    get_collection_ivar ||
+      set_collection_ivar(build_collection)
+  end
+    
   protected
 
-  def collection
+  def build_collection
     current_subject.managed_site_clients
   end
+
+  def permitted_params
+    params.permit resource_request_name => resource_permitted_params,
+                  resource_instance_name => resource_permitted_params
+  end
+
+  def resource_permitted_params
+    [
+      :name,
+      :description,
+      :url,
+      :callback_url
+    ]
+  end
 end

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

@@ -14,6 +14,7 @@
             <%= link_to client.url, client.url, target: '_blank' %>
           </div>
         </div>
+        <!--
         <div class="team">
           <div class="users">
             <span>
@@ -28,6 +29,7 @@
             authorized
           </div>   
         </div>
+        -->
         <hr class="soften">
       </li>
     <% end %>

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

@@ -12,17 +12,24 @@
     </header>
     <div class="tabbable"> <!-- Only required for left/right tabs -->
       <ul class="nav nav-tabs">
-        <li class="active"><a href="#tab1" data-toggle="tab">Managing</a></li>
+        <li class="active"><a href="#tab1" data-toggle="tab"><%= t 'site.client.managing' %></a></li>
       </ul>  
     </div>
 
-
     <div class="tab-content">
       <div class="tab-pane active" id="tab1">
         <%= render partial: 'list',
                    object: collection %>
       </div>
     </div>
+
+    <div class="tab-content">
+      <div class="tab-pane" id="tab2">
+        <%= render partial: 'list',
+                   object: collection %>
+      </div>
+    </div>
+
     <%= render partial: 'new.modal' %>
   </section>
 </section>

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

@@ -11,7 +11,7 @@
         <% end %>
       </h4>
 
-      <%= image_tag('logos/app-default.png', class: "logo-app pull-right") %>
+      <%= image_tag(resource.logo.url(:medium), class: "logo-app pull-right") %>
 
     </header>
 
@@ -85,31 +85,30 @@
   <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">Users</a></li>
     </ul>
     
-    <%= 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/add_button',
+                   locals: {
+                     sender: resource,
+                     type: [ :user, :group ]
+                   }
+        %>
+
         <%= render partial: 'contacts/contact',
                    collection: resource.sent_contacts.first(12) %>
       </div>
-
-      <div class="tab-pane" id="registered">
-      </div>
     </div>
   </div>
 

data/config/locales/en.yml

@@ -64,11 +64,12 @@ en:
       go_to_other: See your other site clients
       index:
         title: Client sites
+      managing: Managing
       new:
         link: Add site
         title: Register new client site
       oauth:
-        credentials: Credentials
+        credentials: OAuth2 Credentials
         secret:
           refresh: refresh
           refreshed: OAuth2 client secret regenerated

data/config/locales/es.yml

@@ -65,7 +65,7 @@ es:
         link: Añadir sitio
         title: Registrar nuevo sitio
       oauth:
-        credentials: Credenciales
+        credentials: Credenciales OAuth2
         secret:
           refresh: regenerar
           refreshed: Token secreto de OAuth2 regenerado

data/lib/social_stream/oauth2_server/controllers/helpers.rb

@@ -10,15 +10,13 @@ module SocialStream
         end
 
         def current_subject
-          super ||
-            @current_subject ||=
-              current_from_oauth_token(:client)
+          @current_subject ||=
+            current_from_oauth_token(:client) || super
         end
 
         def current_user
-          super ||
-            @current_user ||=
-              current_from_oauth_token(:user)
+          @current_user ||=
+            current_from_oauth_token(:user) || super
         end
 
         def current_from_oauth_token(type)

data/lib/social_stream/oauth2_server/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Oauth2Server
-    VERSION = "2.2.0".freeze
+    VERSION = "2.2.1".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.2.0')
+  s.add_runtime_dependency('social_stream-base', '~> 2.2.1')
   s.add_runtime_dependency('rack-oauth2', '~> 1.0.0')
 
   s.add_development_dependency('rspec-rails', '~> 2.8.0')

data/spec/controllers/dummy_controller_spec.rb

@@ -20,11 +20,18 @@ describe DummyController do
       token.stub(:user).and_return(user)
     end
 
-    it "should have user as current_subject" do
+    it "should have user as current_user" do
+      get :index
+
+      assigns(:current_user).should be_present
+      assigns(:current_user).should eq(user)
+    end
+
+    it "should have client as current_subject" do
       get :index
 
       assigns(:current_subject).should be_present
-      assigns(:current_subject).should eq(user)
+      assigns(:current_subject).should eq(client)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream-oauth2_server
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Antonio Tapiador
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-01 00:00:00.000000000 Z
+date: 2013-08-13 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.2.0
+        version: 2.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.1
 - !ruby/object:Gem::Dependency
   name: rack-oauth2
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ files:
 - Gemfile
 - README.rdoc
 - Rakefile
-- app/assets/images/logos/app-default.png
+- app/assets/images/logos/medium/site.png
 - app/assets/images/logos/small/site.png
 - app/assets/images/step_1.png
 - app/assets/images/step_2.png