social_stream 2.1.1 → 2.2.0

data/documents/lib/social_stream/documents/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Documents
-    VERSION = "2.1.0".freeze
+    VERSION = "2.2.0".freeze
   end
 end

data/documents/social_stream-documents.gemspec

@@ -12,9 +12,9 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 2.1.0')
+  s.add_runtime_dependency('social_stream-base', '~> 2.2.0')
 
-  s.add_runtime_dependency('paperclip','~> 3.3.0')
-  s.add_runtime_dependency('paperclip-ffmpeg', '~> 0.9.0')
-  s.add_runtime_dependency('delayed_paperclip','>= 2.4.5.2')
+  s.add_runtime_dependency('paperclip','~> 3.5.1')
+  s.add_runtime_dependency('paperclip-ffmpeg', '~> 0.11.0')
+  s.add_runtime_dependency('delayed_paperclip','>= 2.6.1')
 end

data/events/Rakefile

@@ -3,12 +3,7 @@ require 'bundler/gem_tasks'
 
 require 'rdoc/task'
 
-require 'rspec/core'
-require 'rspec/core/rake_task'
-
-RSpec::Core::RakeTask.new(:spec)
-
-task :default => :spec
+task :default => :rdoc
 
 Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'

data/events/config/locales/es.yml

@@ -3,9 +3,9 @@ es:
   activerecord:
     attributes:
       event:
-        title: Título
-        room: Espacio
         frequency: Repetición
+        room: Espacio
+        title: Título
       room:
         name: Nombre
     errors:
@@ -51,7 +51,7 @@ es:
     confirm_delete: ¿Borrar espacio?
     delete: Borrar
     settings:
-      title: Espacios
       description: Salas disponibles para la realización de eventos
+      title: Espacios
     watermark:
       name: Nuevo espacio

data/events/config/locales/zh.yml

@@ -3,9 +3,9 @@ zh:
   activerecord:
     attributes:
       event:
-        title: Title
-        room: Room
         frequency: Frequency
+        room: Room
+        title: Title
       room:
         name: Name
     errors:
@@ -51,7 +51,7 @@ zh:
     confirm_delete: Delete room?
     delete: Delete
     settings:
-      title: Rooms
       description: Rooms available for event celebration
+      title: Rooms
     watermark:
       name: New room

data/events/lib/social_stream/events/models/actor.rb

@@ -5,7 +5,8 @@ module SocialStream
         extend ActiveSupport::Concern
 
         included do
-          has_many :rooms
+          has_many :rooms,
+                   dependent: :destroy
         end
 
         def events

data/events/lib/social_stream/events/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Events
-    VERSION = "2.1.0".freeze
+    VERSION = "2.2.0".freeze
   end
 end

data/events/social_stream-events.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.1.0')
+  s.add_runtime_dependency('social_stream-base', '~> 2.2.0')
   s.add_runtime_dependency('rails-scheduler', '~> 0.1.2')
 
   # Development Gem dependencies

data/lib/generators/social_stream/install_generator.rb

@@ -5,4 +5,5 @@ class SocialStream::InstallGenerator < Rails::Generators::Base #:nodoc:
   hook_for :linkser
   hook_for :chat
   hook_for :federation
+  hook_for :oauth2_server
 end

data/lib/social_stream.rb

@@ -18,6 +18,7 @@ module SocialStream
     config.app_generators.linkser    'social_stream:linkser'
     config.app_generators.chat       'social_stream:presence'
     config.app_generators.federation 'social_stream:ostatus'
+    config.app_generators.oauth2_server 'social_stream:oauth2_server'
   end
 end
 

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "2.1.1".freeze
+  VERSION = "2.2.0".freeze
 end

data/lib/tasks/i18n.rake

@@ -9,7 +9,6 @@ namespace :i18n do
         en_hash = h.dup
 
         each_key do |self_key|
-#          require 'debugger'; debugger
           en_val = en_hash.delete(self_key)
 
           case en_val
@@ -30,21 +29,42 @@ namespace :i18n do
           end
         end
 
+        # Merge missing keys
         merge! en_hash
+
+        # Order alphabetically
+        replace sort_by{ |k, v| k }.inject({}){ |h, a| h[a.first] = a.last; h }
       end
     end
 
     SocialStream::ALL_COMPONENTS.each do |c|
       path = "#{ c }/config/locales/"
+
       files = Dir[path + '*'].select{ |f| f =~ /\/\w+\.yml$/ }
+
       en = files.find{ |f| f =~ /\/en.yml$/ }
       files.delete(en)
+
       en_h = Psych.load_file(en)
 
       files.each do |f|
         h = Psych.load_file(f)
 
-        h.first.last.sync en_h.first.last
+        # Leave language_name at the begining of the hash
+        if c == "base"
+          orig_h = h.first.last
+          orig_en_h = en_h.first.last.dup
+
+          language_name = orig_h.delete('language_name')
+          language_name_en = orig_en_h.delete('language_name')
+          language_name ||= language_name_en 
+
+          orig_h.sync orig_en_h
+
+          h.first.last.replace({ 'language_name' => language_name }.merge!(orig_h))
+        else
+          h.first.last.sync en_h.first.last
+        end
 
         Psych.dump h, File.open(f, 'w')
       end

data/linkser/Rakefile

@@ -3,12 +3,7 @@ require 'bundler/gem_tasks'
 
 require 'rdoc/task'
 
-require 'rspec/core'
-require 'rspec/core/rake_task'
-
-RSpec::Core::RakeTask.new(:spec)
-
-task :default => :spec
+task :default => :rdoc
 
 Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'

data/linkser/config/locales/de.yml

@@ -0,0 +1,17 @@
+---
+de:
+  link:
+    by: by %{author}
+    confirm_delete: Link löschen?
+    errors:
+      loading: Fehler beim Laden
+      only_webs: Nur Webseiten werden unterstützt
+    form:
+      title: Link
+    input: Gib die Web Addresse ein
+    name: Link
+    one: Ein Link
+    other: links
+    title: Links
+  linkser:
+    title: Linkser

data/linkser/config/locales/es.yml

@@ -1,7 +1,5 @@
 ---
 es:
-  linkser:
-    title: Linkser
   link:
     by: por %{author}
     confirm_delete: ¿Borrar enlace?
@@ -15,3 +13,5 @@ es:
     one: un enlace
     other: enlaces
     title: Enlaces
+  linkser:
+    title: Linkser

data/linkser/config/locales/fr.yml

@@ -0,0 +1,17 @@
+---
+fr:
+  link:
+    by: by %{author}
+    confirm_delete: Supprimer le lien ?
+    errors:
+      loading: Erreur de chargement
+      only_webs: Seules les pages Web sont prises en charge
+    form:
+      title: Lien
+    input: Saisir l'adresse Web
+    name: lien
+    one: un lien
+    other: links
+    title: Liens
+  linkser:
+    title: Linkser

data/linkser/config/locales/hu.yml

@@ -0,0 +1,17 @@
+---
+hu:
+  link:
+    by: by %{author}
+    confirm_delete: Törlöd a linket?
+    errors:
+      loading: Töltési hiba
+      only_webs: Csak a weboldalak támogatottak
+    form:
+      title: Link
+    input: Írd be a web címet
+    name: link
+    one: egy link
+    other: links
+    title: Linkek
+  linkser:
+    title: Hivatkozás megosztása

data/linkser/config/locales/nl.yml

@@ -0,0 +1,17 @@
+---
+nl:
+  link:
+    by: by %{author}
+    confirm_delete: Link verwijderen?
+    errors:
+      loading: Fout bij het laden
+      only_webs: Alleen webpagina’s worden ondersteund
+    form:
+      title: Link
+    input: Het webadres schrijven
+    name: link
+    one: een link
+    other: links
+    title: Links
+  linkser:
+    title: Linkser

data/linkser/config/locales/zh.yml

@@ -1,7 +1,5 @@
 ---
 zh:
-  linkser:
-    title: Linkser
   link:
     by: by %{author}
     confirm_delete: Delete link?
@@ -15,3 +13,5 @@ zh:
     one: a link
     other: links
     title: Links
+  linkser:
+    title: Linkser

data/linkser/lib/social_stream/linkser/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Linkser
-    VERSION = "2.1.0".freeze
+    VERSION = "2.2.0".freeze
   end
 end

data/linkser/social_stream-linkser.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.1.0')
+  s.add_runtime_dependency('social_stream-base', '~> 2.2.0')
   s.add_runtime_dependency('linkser', '~> 0.0.12')
   # Development Gem dependencies
   s.add_development_dependency('sqlite3-ruby')

data/oauth2_server/Rakefile

@@ -3,12 +3,7 @@ require 'bundler/gem_tasks'
 
 require 'rdoc/task'
 
-require 'rspec/core'
-require 'rspec/core/rake_task'
-
-RSpec::Core::RakeTask.new(:spec)
-
-task :default => :spec
+task :default => :rdoc
 
 Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'

data/oauth2_server/app/assets/javascripts/social_stream/site_client.js

@@ -1,4 +1,5 @@
 //= require social_stream/callback
+//= require social_stream/flash
 
 SocialStream.SiteClient = (function(SS, $, undefined) {
   var callback = new SS.Callback();
@@ -7,8 +8,34 @@ SocialStream.SiteClient = (function(SS, $, undefined) {
     $('.new_site_client-modal-link').attr('href', '#new_site_client-modal');
   };
 
+  var initRefreshButton = function() {
+    $('form.site-client-secret').submit(sendSecretRefresh);
+  };
+
+  var sendSecretRefresh = function(e) {
+    var form = $(e.target);
+
+    e.preventDefault();
+
+    $.ajax({
+      url: form.attr('action'),
+      method: form.attr('method'),
+      dataType: 'json',
+      success: function(data) {
+        SS.Flash.success(I18n.t('site.client.oauth.secret.refreshed'));
+
+        $('span.site-client-secret').html(data.secret).effect('highlight', {}, 3000);
+      },
+      error: function(jqXHR, textStatus) {
+        SS.Flash.error(textStatus);
+      }
+    });
+  };
+
   callback.register('index', initNewModal);
 
+  callback.register('show', initRefreshButton);
+
   return callback.extend({
   });
 

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

@@ -48,8 +48,3 @@
       input
         &[type="file"]
           line-height: 0px
-
-
-.site_clients_list
-  ul 
-    li

data/oauth2_server/app/assets/stylesheets/social_stream/oauth2_server/create/layout/_create-oauth2server.css.sass

@@ -29,9 +29,7 @@
   .description
     textarea
       height: 60px
-  input
-    &[type="submit"]
-      @include btn-primary
-      @include border-radius (5px)
-
+.next-step
+  @include btn-secundary
+  float: right
 

data/oauth2_server/app/assets/stylesheets/social_stream/oauth2_server/show/layout/_show-oauth2server.css.sass

@@ -37,12 +37,14 @@
     padding: 0 2.5%
     margin-bottom: 30px
     display: inline-block
-    h1
-      @include clearfix
-      margin-bottom: 4px
-      margin-left: -2.5%
-      a
-        font-size: 13px
+    header
+      margin-top: -37px
+      h4
+        @include clearfix
+        margin-bottom: 4px
+        margin-left: -2.5%
+        a
+          font-size: 13px
     .soften
       margin-bottom: 0px
     .content

data/oauth2_server/app/controllers/site/clients_controller.rb

@@ -1,60 +1,36 @@
 class Site::ClientsController < ApplicationController
-  before_filter :authenticate_user!
+  include SocialStream::Controllers::Subjects
+  include SocialStream::Controllers::Authorship
 
-  before_filter :set_author_ids, only: [ :new, :create, :update ]
+  before_filter :authenticate_user!
 
   load_and_authorize_resource
 
-  def index
-    @clients = current_subject.managed_site_clients
-  end
-
   def create
-    @client = Site::Client.new params[:site_client]
-
-    if @client.save
-      respond_to do |format|
-        format.html { 
-          redirect_to edit_site_client_path(@client, step: 2)
-        }
-      end
-    else
-      respond_to do |format|
-        format.html { render :new }
-      end
+    create! do |success, error|
+      success.html { 
+        redirect_to polymorphic_path(resource, action: :edit, step: 2)
+      }
+      error.html { render :new }
     end
   end
 
-  def edit
-    @client = Site::Client.find params[:id]
-  end
+  # Refresh the site client token
+  def update_secret
+    resource.refresh_secret!
 
-  def update
-    @client = Site::Client.find params[:id]
-
-    if @client.update_attributes params[:client]
-      respond_to do |format|
-        format.html { redirect_to @client }
-      end
-    else
-      respond_to do |format|
-        format.html { render :edit }
-      end
+    respond_to do |format|
+      format.json { render json: { secret: resource.secret } }
     end
   end
 
   def destroy
-    @client.destroy
-
-    redirect_to home_path
+    destroy! { :home }
   end
 
-  private
+  protected
 
-  def set_author_ids
-    params[:site_client] ||= HashWithIndifferentAccess.new
-    params[:site_client][:author_id]      = current_subject.actor_id
-    params[:site_client][:user_author_id] = current_user.actor_id
-    params[:site_client][:owner_id]       = current_subject.actor_id
+  def collection
+    current_subject.managed_site_clients
   end
 end