social_stream 2.0.4 → 2.1.0

data/ostatus/lib/social_stream/ostatus/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Ostatus
-    VERSION = "2.0.0".freeze
+    VERSION = "2.1.0".freeze
   end
 end

data/ostatus/social_stream-ostatus.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.0')
+  s.add_runtime_dependency('social_stream-base', '~> 2.1.0')
   s.add_runtime_dependency('proudhon','>= 0.3.6')
   s.add_runtime_dependency('nokogiri','> 1.4.4')
   

data/places/config/locales/en.yml

@@ -42,7 +42,6 @@ en:
       postalcode: Postalcode
       country: Country
     not_mine: Places
-    one: a place
     simple_all: All
     title: Places
     like:

data/places/config/locales/es.yml

@@ -26,7 +26,7 @@ es:
     mine: Mis lugares
     name: lugar
     name_title: Nombre del lugar
-    one:
+    one: un lugar
     phone_title: Teléfono
     photo:
       button: Subir
@@ -39,7 +39,6 @@ es:
       postalcode: Código postal
       country: País
     not_mine: Lugares
-    one: un lugar
     other: lugares
     simple_all: Todos
     title: Lugares

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Presence
-    VERSION = "2.0.2"
+    VERSION = "2.1.0"
   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.4')
+  s.add_runtime_dependency('social_stream-base', '~> 2.1.0')
   
   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.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.2')
-  s.add_runtime_dependency('social_stream-ostatus', '~> 2.0.0')
-  s.add_runtime_dependency('social_stream-oauth2_server', '~> 2.0.3')
+  s.add_runtime_dependency('social_stream-base', '~> 2.1.0')
+  s.add_runtime_dependency('social_stream-documents', '~> 2.1.0')
+  s.add_runtime_dependency('social_stream-events', '~> 2.1.0')
+  s.add_runtime_dependency('social_stream-linkser', '~> 2.1.0')
+  s.add_runtime_dependency('social_stream-presence', '~> 2.1.0')
+  s.add_runtime_dependency('social_stream-ostatus', '~> 2.1.0')
+  s.add_runtime_dependency('social_stream-oauth2_server', '~> 2.1.0')
  
   # Development Gem dependencies
   #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: social_stream
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.1.0
 platform: ruby
 authors:
 - GING - DIT - UPM
 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
@@ -16,98 +16,98 @@ 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: social_stream-documents
   requirement: !ruby/object:Gem::Requirement
     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: social_stream-events
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: social_stream-linkser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: social_stream-presence
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: social_stream-ostatus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: social_stream-oauth2_server
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -493,7 +493,6 @@ files:
 - base/app/helpers/layouts_helper.rb
 - base/app/helpers/location_helper.rb
 - base/app/helpers/notifications_helper.rb
-- base/app/helpers/permissions_helper.rb
 - base/app/helpers/posts_helper.rb
 - base/app/helpers/profiles_helper.rb
 - base/app/helpers/search_helper.rb
@@ -566,9 +565,9 @@ files:
 - base/app/views/comments/_search_result.html.erb
 - base/app/views/comments/create.js.erb
 - base/app/views/comments/destroy.js.erb
+- base/app/views/contacts/_button.html.erb
 - base/app/views/contacts/_contact.html.erb
 - base/app/views/contacts/_form.html.erb
-- base/app/views/contacts/_link_custom.html.erb
 - base/app/views/contacts/_link_follow.html.erb
 - base/app/views/contacts/_pendings.html.erb
 - base/app/views/contacts/_suggestions.html.erb
@@ -691,6 +690,7 @@ files:
 - base/app/views/objects/_show.html.erb
 - base/app/views/objects/_timeline_description.html.erb
 - base/app/views/permissions/_index.html.erb
+- base/app/views/permissions/_list.html.erb
 - base/app/views/permissions/index.js.erb
 - base/app/views/posts/_post.html.erb
 - base/app/views/posts/_quick_search_result.html.erb
@@ -717,6 +717,7 @@ files:
 - base/app/views/relation/customs/destroy.js.erb
 - base/app/views/relation/customs/index.html.erb
 - base/app/views/relation/customs/update.js.erb
+- base/app/views/relations/_relation.html.erb
 - base/app/views/repositories/_filter.html.erb
 - base/app/views/repositories/show.html.erb
 - base/app/views/search/_extended_search.html.erb
@@ -775,7 +776,6 @@ files:
 - base/lib/acts_as_taggable_on/social_stream.rb
 - base/lib/generators/social_stream/base/install_generator.rb
 - base/lib/generators/social_stream/base/templates/initializer.rb
-- base/lib/generators/social_stream/base/templates/relations.yml
 - base/lib/generators/social_stream/base/templates/social_stream.css.sass
 - base/lib/generators/social_stream/base/templates/sphinx.yml
 - base/lib/i18n-js/social_stream-base.rb
@@ -984,6 +984,7 @@ files:
 - documents/app/assets/stylesheets/social_stream/documents/documents/layout/_documents.css.sass
 - documents/app/assets/stylesheets/social_stream/documents/explore/_explore-documents.css.sass
 - documents/app/assets/stylesheets/social_stream/documents/explore/layout/_explore-documents.css.sass
+- documents/app/assets/stylesheets/social_stream/documents/mixins/_mixins.css.sass
 - documents/app/assets/stylesheets/social_stream/documents/responsive/_responsive-1200px-min.css.sass
 - documents/app/assets/stylesheets/social_stream/documents/responsive/_responsive-767px-max.css.sass
 - documents/app/assets/stylesheets/social_stream/documents/responsive/_responsive-768px-979px.css.sass
@@ -1292,7 +1293,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/mixins/_mixin.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
@@ -1308,16 +1309,18 @@ files:
 - oauth2_server/app/models/oauth2_token/access_token.rb
 - oauth2_server/app/models/oauth2_token/authorization_code.rb
 - oauth2_server/app/models/oauth2_token/refresh_token.rb
-- oauth2_server/app/models/relation/admin.rb
 - oauth2_server/app/models/relation/auth.rb
+- oauth2_server/app/models/relation/manager.rb
 - oauth2_server/app/models/site/client.rb
 - oauth2_server/app/overrides/frontpage/_presentation/client_site_presentation.html.erb.deface
 - oauth2_server/app/overrides/layouts/_header_dropdown_menu/applications_entry.html.erb.deface
 - oauth2_server/app/views/authorizations/error.html.erb
 - oauth2_server/app/views/authorizations/new.html.erb
+- oauth2_server/app/views/site/clients/_avatar.html.erb
+- oauth2_server/app/views/site/clients/_edit.html.erb
+- oauth2_server/app/views/site/clients/_edit_step_2.html.erb
+- oauth2_server/app/views/site/clients/_edit_step_3.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
@@ -1330,10 +1333,12 @@ files:
 - oauth2_server/config/locales/zh.yml
 - oauth2_server/config/routes.rb
 - oauth2_server/db/migrate/20130115102300_create_social_stream_oauth2_server.rb
+- oauth2_server/db/migrate/20130619134332_site_client_admin_to_manager.rb
 - oauth2_server/lib/generators/social_stream/oauth2_server/install_generator.rb
 - oauth2_server/lib/social_stream-oauth2_server.rb
 - oauth2_server/lib/social_stream/migrations/oauth2_server.rb
 - oauth2_server/lib/social_stream/oauth2_server.rb
+- oauth2_server/lib/social_stream/oauth2_server/ability.rb
 - oauth2_server/lib/social_stream/oauth2_server/controllers/helpers.rb
 - oauth2_server/lib/social_stream/oauth2_server/engine.rb
 - oauth2_server/lib/social_stream/oauth2_server/models/actor.rb
@@ -1344,8 +1349,10 @@ files:
 - oauth2_server/social_stream-oauth2_server.gemspec
 - oauth2_server/spec/controllers/authorizations_controller_spec.rb
 - oauth2_server/spec/controllers/dummy_controller_spec.rb
+- oauth2_server/spec/controllers/site_clients_controller_authorization_spec.rb
 - oauth2_server/spec/factories/site_client.rb
 - oauth2_server/spec/models/relation/auth_spec.rb
+- oauth2_server/spec/models/site/client_authorization_spec.rb
 - oauth2_server/spec/models/site/client_spec.rb
 - ostatus/Gemfile
 - ostatus/MIT-LICENSE
@@ -1364,7 +1371,6 @@ files:
 - ostatus/app/decorators/social_stream/base/actor_decorator.rb
 - ostatus/app/decorators/social_stream/base/audience_decorator.rb
 - ostatus/app/decorators/social_stream/base/contact_decorator.rb
-- ostatus/app/decorators/social_stream/base/relation/custom_decorator.rb
 - ostatus/app/decorators/social_stream/base/tie_decorator.rb
 - ostatus/app/models/actor_key.rb
 - ostatus/app/models/remote_subject.rb
@@ -1386,7 +1392,6 @@ files:
 - ostatus/lib/social_stream/ostatus/models/audience.rb
 - ostatus/lib/social_stream/ostatus/models/contact.rb
 - ostatus/lib/social_stream/ostatus/models/object.rb
-- ostatus/lib/social_stream/ostatus/models/relation/custom.rb
 - ostatus/lib/social_stream/ostatus/models/tie.rb
 - ostatus/lib/social_stream/ostatus/version.rb
 - ostatus/social_stream-ostatus.gemspec
@@ -1642,7 +1647,6 @@ files:
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/navigation.rb
-- spec/dummy/config/relations.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config/sphinx.yml
 - spec/dummy/db/migrate/.gitkeep

data/base/app/helpers/permissions_helper.rb

@@ -1,21 +0,0 @@
-module PermissionsHelper
-  DEFAULT_PERMISSIONS =
-    [
-      [ "read",    "activity" ],
-      [ "create",  "activity" ],
-      [ "follow", nil ],
-      [ "represent", nil ],
-      [ "notify", nil ]
-    ]
-
-  def default_permissions
-    @default_permissions ||=
-      DEFAULT_PERMISSIONS.map{ |p|
-        Permission.find_or_create_by_action_and_object *p
-      }
-  end
-
-  def disable_permission_edit? perm
-    (perm.action == 'represent') and (@relation.ties.size > 0) and perm.relations.include?(@relation) and (perm.relations.where(:actor_id => @relation.actor_id).find_all{|r| r.ties.size > 0}.size <= 1)
-  end
-end

data/base/lib/generators/social_stream/base/templates/relations.yml

@@ -1,39 +0,0 @@
-# Default relations for Social Stream
-#
-# Define the default relations and permissions offered by your application
-# Though subjects (user, groups, etc.) can customize their own relations,
-# these are the defaults to start up with
-#
-# Detailed information on permissions is available at:
-# http://rdoc.info/gems/social_stream-base/Permission
-#
-user:
-  friend:
-    name: friend
-    permissions:
-      - [ follow ]
-      - [ create,  activity ]
-      - [ read,    activity ]
-  acquaintance:
-    name: acquaintance
-    permissions:
-      - [ read,    activity ]
-  colleague:
-    name: colleague
-    permissions:
-      - [ follow ]
-      - [ create,  activity ]
-      - [ read, activity ]
-
-group:
-  member:
-    name: member
-    permissions:
-      - [ represent ]
-      - [ create,  activity ]
-      - [ read,    activity ]
-      - [ read,    tie ]
-  partner:
-    name: partner
-    permissions:
-      - [ read,    activity ]

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