social_stream 2.2.0 → 2.2.1

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

data/social_stream.gemspec

@@ -11,13 +11,13 @@ Gem::Specification.new do |s|
   s.license = 'MIT'
 
   # 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('social_stream-documents', '~> 2.2.0')
   s.add_runtime_dependency('social_stream-events', '~> 2.2.0')
   s.add_runtime_dependency('social_stream-linkser', '~> 2.2.0')
   s.add_runtime_dependency('social_stream-presence', '~> 2.2.0')
   s.add_runtime_dependency('social_stream-ostatus', '~> 2.2.0')
-  s.add_runtime_dependency('social_stream-oauth2_server', '~> 2.2.0')
+  s.add_runtime_dependency('social_stream-oauth2_server', '~> 2.2.1')
  
   # Development Gem dependencies
   #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: social_stream
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - GING - DIT - UPM
 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
@@ -16,14 +16,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: social_stream-documents
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,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: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -858,6 +858,7 @@ files:
 - base/lib/social_stream/models/subject.rb
 - base/lib/social_stream/models/subtype.rb
 - base/lib/social_stream/models/supertype.rb
+- base/lib/social_stream/population.rb
 - base/lib/social_stream/population/activity_object.rb
 - base/lib/social_stream/population/actor.rb
 - base/lib/social_stream/population/power_law.rb
@@ -1302,7 +1303,7 @@ files:
 - oauth2_server/Gemfile
 - oauth2_server/README.rdoc
 - oauth2_server/Rakefile
-- oauth2_server/app/assets/images/logos/app-default.png
+- oauth2_server/app/assets/images/logos/medium/site.png
 - oauth2_server/app/assets/images/logos/small/site.png
 - oauth2_server/app/assets/images/step_1.png
 - oauth2_server/app/assets/images/step_2.png