social_stream 2.0.3 → 2.0.4

data/oauth2_server/config/locales/es.yml

@@ -10,8 +10,15 @@ es:
         name: Nombre
         secret: Client Secret
         url: URL
+  helpers:
+    submit:
+      site_client:
+        create: "Siguiente"
+        update: "Guardar"
   permission:
     public_info: Acceder a tu información pública
+  relation_admin:
+    name: "Administrador de Sitio"
   site:
     client:
       added: Sitios añadidos

data/oauth2_server/lib/social_stream/oauth2_server/token_endpoint.rb

@@ -9,30 +9,31 @@ module SocialStream
 
       def authenticator
         Rack::OAuth2::Server::Token.new do |req, res|
-        client = Site::Client.find(req.client_id) || req.invalid_client!
-        client.secret == req.client_secret || req.invalid_client!
+          client = Site::Client.find(req.client_id) || req.invalid_client!
+          client.secret == req.client_secret || req.invalid_client!
 
-        case req.grant_type
-        when :authorization_code
-          code = Oauth2Token::AuthorizationCode.valid.find_by_token(req.code)
-          req.invalid_grant! if code.blank? || code.redirect_uri != req.redirect_uri
+          case req.grant_type
+          when :authorization_code
+            code = Oauth2Token::AuthorizationCode.valid.find_by_token(req.code)
+            req.invalid_grant! if code.blank? || code.redirect_uri != req.redirect_uri
 
-          res.access_token = code.access_token.to_bearer_token(:with_refresh_token)
-        when :password
-          # TODO
-          account = Account.find_by_username_and_password(req.username, req.password) || req.invalid_grant!
-          res.access_token = account.access_tokens.create(:client => client).to_bearer_token(:with_refresh_token)
-        when :client_credentials
-          # NOTE: client is already authenticated here.
-          res.access_token = client.access_tokens.create!.to_bearer_token
-        when :refresh_token
-          refresh_token = client.refresh_tokens.valid.find_by_token(req.refresh_token)
-          req.invalid_grant! unless refresh_token
-          res.access_token = refresh_token.access_tokens.create!.to_bearer_token
-        else
-          # NOTE: extended assertion grant_types are not supported yet.
-          req.unsupported_grant_type!
-        end
+            res.access_token = code.access_token.to_bearer_token(:with_refresh_token)
+          when :password
+            user = User.find_for_authentication(email: req.username) || req.invalid_grant!
+            user.valid_password?(req.password) || req.invalid_grant!
+
+            res.access_token = user.access_tokens.create(:client => client).to_bearer_token(:with_refresh_token)
+          when :client_credentials
+            # NOTE: client is already authenticated here.
+            res.access_token = client.access_tokens.create!.to_bearer_token
+          when :refresh_token
+            refresh_token = client.refresh_tokens.valid.find_by_token(req.refresh_token)
+            req.invalid_grant! unless refresh_token
+            res.access_token = refresh_token.access_tokens.create!.to_bearer_token
+          else
+            # NOTE: extended assertion grant_types are not supported yet.
+            req.unsupported_grant_type!
+          end
         end
       end
     end

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

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

data/presence/app/assets/stylesheets/social_stream/presence/_wrapper-chatBox.css.sass

@@ -8,6 +8,7 @@
   right: 1px
   position: fixed
   z-index: 10000
+  width: 15.85714% !important
 
 .ui-chatbox-titlebar,
 .ui-widget-content

data/presence/lib/social_stream/presence/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Presence
-    VERSION = "2.0.1"
+    VERSION = "2.0.2"
   end
 end

data/presence/social_stream-presence.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 2.0.2')
+  s.add_runtime_dependency('social_stream-base', '~> 2.0.4')
   
   s.add_runtime_dependency "xmpp4r"
 

data/social_stream.gemspec

@@ -10,13 +10,13 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 2.0.3')
-  s.add_runtime_dependency('social_stream-documents', '~> 2.0.3')
-  s.add_runtime_dependency('social_stream-events', '~> 2.0.1')
+  s.add_runtime_dependency('social_stream-base', '~> 2.0.4')
+  s.add_runtime_dependency('social_stream-documents', '~> 2.0.4')
+  s.add_runtime_dependency('social_stream-events', '~> 2.0.2')
   s.add_runtime_dependency('social_stream-linkser', '~> 2.0.0')
-  s.add_runtime_dependency('social_stream-presence', '~> 2.0.1')
+  s.add_runtime_dependency('social_stream-presence', '~> 2.0.2')
   s.add_runtime_dependency('social_stream-ostatus', '~> 2.0.0')
-  s.add_runtime_dependency('social_stream-oauth2_server', '~> 2.0.2')
+  s.add_runtime_dependency('social_stream-oauth2_server', '~> 2.0.3')
  
   # Development Gem dependencies
   #

data/spec/dummy/config/initializers/devise.rb

@@ -46,7 +46,7 @@ Devise.setup do |config|
   # config.params_authenticatable = true
 
   # Tell if authentication through HTTP Basic Auth is enabled. False by default.
-  # config.http_authenticatable = false
+  config.http_authenticatable = true
 
   # If http headers should be returned for AJAX requests. True by default.
   # config.http_authenticatable_on_xhr = true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: social_stream
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - GING - DIT - UPM
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-03 00:00:00.000000000 Z
+date: 2013-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: social_stream-base
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: 2.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: 2.0.4
 - !ruby/object:Gem::Dependency
   name: social_stream-documents
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: 2.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: 2.0.4
 - !ruby/object:Gem::Dependency
   name: social_stream-events
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: social_stream-linkser
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: social_stream-ostatus
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 2.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 2.0.3
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -711,6 +711,7 @@ files:
 - base/app/views/profiles/update.js.erb
 - base/app/views/relation/customs/_custom.html.erb
 - base/app/views/relation/customs/_form.html.erb
+- base/app/views/relation/customs/_index.html.erb
 - base/app/views/relation/customs/_list.html.erb
 - base/app/views/relation/customs/create.js.erb
 - base/app/views/relation/customs/destroy.js.erb
@@ -909,7 +910,9 @@ files:
 - base/spec/support/mock.rb
 - base/spec/views/profiles_spec.rb
 - base/spec/views/settings_spec.rb
+- base/vendor/assets/javascripts/bootstrap-modal.js
 - base/vendor/assets/javascripts/bootstrap-multiselect.js
+- base/vendor/assets/javascripts/bootstrap-scroll-modal.js
 - base/vendor/assets/javascripts/colorfont.js
 - base/vendor/assets/javascripts/d3.geom.js
 - base/vendor/assets/javascripts/d3.js
@@ -929,6 +932,7 @@ files:
 - base/vendor/assets/javascripts/jquery.validate.old.js
 - base/vendor/assets/javascripts/jquery.watermark.js
 - base/vendor/assets/javascripts/superfish.js
+- base/vendor/assets/stylesheets/bootstrap-scroll-modal.css
 - base/vendor/assets/stylesheets/carousel.css
 - base/vendor/assets/stylesheets/chosen-sprite.png
 - base/vendor/assets/stylesheets/chosen.css
@@ -956,11 +960,6 @@ files:
 - bin/social_stream_heroku
 - config/locales/en.yml
 - config/locales/es.yml
-- contacts/_contacts.css.sass
-- contacts/layouts/_contacts.css.sass
-- contacts/responsive/_responsive-1200px-min.css.sass
-- contacts/responsive/_responsive-767px-max.css.sass
-- contacts/responsive/_responsive-768px-979px.css.sass
 - documents/.gitignore
 - documents/.rspec
 - documents/Gemfile
@@ -1277,6 +1276,8 @@ files:
 - oauth2_server/Rakefile
 - oauth2_server/app/assets/images/logos/app-default.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
 - oauth2_server/app/assets/javascripts/social_stream-oauth2_server.js
 - oauth2_server/app/assets/javascripts/social_stream/site_client.js
 - oauth2_server/app/assets/stylesheets/social_stream-oauth2_server.css.sass
@@ -1291,6 +1292,7 @@ files:
 - oauth2_server/app/assets/stylesheets/social_stream/oauth2_server/create/responsive/_responsive-1200px-min.css.sass
 - oauth2_server/app/assets/stylesheets/social_stream/oauth2_server/create/responsive/_responsive-767px-max.css.sass
 - oauth2_server/app/assets/stylesheets/social_stream/oauth2_server/create/responsive/_responsive-768px-979px.css.sass
+- oauth2_server/app/assets/stylesheets/social_stream/oauth2_server/mixins/_mixins.css.sass
 - oauth2_server/app/assets/stylesheets/social_stream/oauth2_server/show/_show-oauth2server.css.sass
 - oauth2_server/app/assets/stylesheets/social_stream/oauth2_server/show/layout/_show-oauth2server.css.sass
 - oauth2_server/app/assets/stylesheets/social_stream/oauth2_server/show/responsive/_responsive-1200px-min.css.sass
@@ -1300,6 +1302,7 @@ files:
 - oauth2_server/app/controllers/site/clients_controller.rb
 - oauth2_server/app/decorators/social_stream/base/actor_decorator.rb
 - oauth2_server/app/decorators/social_stream/base/user_decorator.rb
+- oauth2_server/app/decorators/social_stream/base/users_controller_decorator.rb
 - oauth2_server/app/helpers/site_client_helper.rb
 - oauth2_server/app/models/oauth2_token.rb
 - oauth2_server/app/models/oauth2_token/access_token.rb
@@ -1313,8 +1316,12 @@ files:
 - oauth2_server/app/views/authorizations/error.html.erb
 - oauth2_server/app/views/authorizations/new.html.erb
 - oauth2_server/app/views/site/clients/_form.html.erb
+- oauth2_server/app/views/site/clients/_form_step1.html.erb
+- oauth2_server/app/views/site/clients/_form_step2.html.erb
+- oauth2_server/app/views/site/clients/_list.html.erb
 - oauth2_server/app/views/site/clients/_new.modal.html.erb
 - oauth2_server/app/views/site/clients/_presentation.html.erb
+- oauth2_server/app/views/site/clients/edit.html.erb
 - oauth2_server/app/views/site/clients/index.html.erb
 - oauth2_server/app/views/site/clients/new.html.erb
 - oauth2_server/app/views/site/clients/show.html.erb

data/contacts/_contacts.css.sass

@@ -1,64 +0,0 @@
-#contacts
-  .contacts
-    .new_group-modal-link
-      @include btn-primary
-      @include border-radius(5px)
-    .add
-      @include btn-add
-
-
-    .tab-content
-      .add-goup
-        float: right
-      .contact-list
-        .contact
-          .x
-            font-size: 12px
-            color: $black
-
-
-#contact-form
-  .name_text_area
-    font-size: 16px
-
-
-
-
-/////////////////////////////////////// PRIVACITY - roles
-///////////// 
-
-
-#relation_customs
-  h2
-    @include colorfont-big-size
-
-#relation_customs,
-  .relation_list
-    border-right: 1px solid #c4c4c4
-
-
-#new_relation
-  .new_relation_custom
-    .btn
-
-    
-
-#permissions
-  h4
-    text-align: left
-
-.postit
-  font-size: 16px
-  font-family: "Giveyouglory"
-  background-image: url(nota.png)
-  
-
-.rotate
-  @include rotate(-3deg)
-
-
-.privacity-rules
-  border-top: 1px solid $grayLighter
-  p
-    word-wrap: break-word
-

data/contacts/layouts/_contacts.css.sass

@@ -1,177 +0,0 @@
-input#group_name
-  margin-left: 0px
-  width: 93% !important 
-
-#contacts
-  @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
-
-  .contacts
-    @include grid-core-span(10, $fluidGridColumnWidth, $fluidGridGutterWidth)
-    float: left
-    margin-left: 2%
-    .btn-group
-      max-width: 400px
-      .btn
-        .caret
-          margin-left: 6px
-
-    .contact-filter
-      margin-left: 0px
-      width: 22% !important 
-      float: left
-      margin-botom: 0 !important
-    .new_group-modal-link
-      float: right
-
-    .tab-content
-      .contact-list
-        clear: both
-        min-height: 500px
-        padding-bottom: 50px
-
-        .contact
-          width: 240px
-          float: left
-          margin-left: 19px
-          min-height: 76px
-          margin-bottom: 14px
-
-        .avatar
-          float: left
-          margin-left: 0px
-          width: 50px
-          display: inline
-          margin-top: 10px
-          img
-            width: 45px 
-            vertical-align: top
-
-        .data
-          float: left
-          margin-left: 0px
-          width: 175px
-          display: inline-block
-          margin-top: 11px
-        .info
-          @include ellipsis
-          z-index: 1
-          padding-left: 2%
-      
-        .add
-          z-index: 1
-          float: left
-          .edit_contact
-            margin-bottom: 0px
-          .dropdown-toggle
-            margin-left: 0 
-            widht: 100%
-        .x
-          display: inline-block
-          float: right
-          margin-top: -40px
-
-        
-
-#contact-form
-  ul
-    @include makeColumnoMargin(3, 0)
-    input
-      &[type="check"]
-        display: inline
-    label
-      display: inline-block
-      margin-left: 10px
-
-  .new_contact_text_area
-    @include makeColumn(6, 0)
-    @include clearfix
-    height: 200px 
-  input
-    &[type="submit"]
-      float: right
-      margin-right: 74px
-
-
-
-/////////////////////////////////////// PRIVACITY - roles
-///////////// 
-
-
-
-.relation_customs
-  width: 80%
-  float: left
-  margin-left: 2.5%
-.relation_list
-  @include makeColumn(3, 0)
-  padding-right: 5px
-  input
-    margin-right: 10px
-  label
-    display: inline-block
-
-  .actions
-    display: inline-block
-    float: right
-    margin-right: 10px
-
-  .edit_name
-    margin-top: -22px
-    .edit_relation_custom
-      margin-bottom: 0px
-      #relation_custom_name
-        width: 69% !important
-        margin-left: 23px
-        margin-top: -3px
-      .icon_tool16-ok
-        margin-top: -3px
-
-  .btn
-    margin-left: 32px
-
-#relation_custom_name
-  width: 215px
-  height: auto
-  margin: 3px 0 0 0
-
-
-
-#new_relation
-  a 
-    float: right
-    margin-right: 10px
-  .new_relation_custom
-    .btn
-      @include btn-secundary 
-      float: right
-      margin: 7px 0px 0 0
-    
-
-#new_relation_input_block
-  .btn
-    margin-left: 32px
-
-
-#permissions
-  @include makeColumn(4, 0)
-  h4
-    text-align: left
-  li
-    margin-left: -17px
-    input
-      display: inline
-    label
-      display: inline-block
-
-.postit
-  padding: 100px 0 0 30px
-  width: 250px
-  height: 157px
-  margin-bottom: 12px
-  
-
-.privacity-rules
-  p
-    padding-left: 10px
-  .btn
-    float: right