social_stream 2.2.1 → 2.2.2

data/base/social_stream-base.gemspec

@@ -9,6 +9,7 @@ Gem::Specification.new do |s|
   s.authors = [ "GING - DIT - UPM" ]
   s.homepage = "http://social-stream.dit.upm.es/"
   s.files = `git ls-files`.split("\n")
+  s.license = 'MIT'
 
   # Runtime gem dependencies
   #
@@ -31,7 +32,7 @@ Gem::Specification.new do |s|
   # Slug generation
   s.add_runtime_dependency('stringex', '~> 1.5.1')
   # Avatar attachments
-  s.add_runtime_dependency('avatars_for_rails', '~> 1.1.1')
+  s.add_runtime_dependency('avatars_for_rails', '~> 1.1.4')
   # jQuery
   s.add_runtime_dependency('jquery-rails', '>= 3.0.0')
   # jQuery UI

data/config/locales/en.yml

@@ -1,3 +1,4 @@
+---
 en:
   post:
-    input: "Share your thougths, links, videos and more, here!"
+    input: Share your thougths, links, videos and more, here!

data/config/locales/es.yml

@@ -1,3 +1,4 @@
+---
 es:
   post:
-    input: "Comparte tus ideas, enlaces, videos y más, aquí"
+    input: Comparte tus ideas, enlaces, videos y más, aquí

data/documents/app/controllers/documents_controller.rb

@@ -11,13 +11,30 @@ class DocumentsController < ApplicationController
         render collection if request.xhr?
       }
 
-      format.json { render :json => collection }
+      format.json { render :json => collection.to_json(helper: self) }
     end
   end
-  
+
+  def show
+    respond_to do |format|
+      format.html {render :action => :show}
+      format.json {render :json => resource.to_json(helper: self) }
+      format.any {
+        path = resource.file.path(params[:style] || params[:format])
+
+        head(:not_found) and return unless File.exist?(path)
+
+        send_file path,
+                 :filename => resource.file_file_name,
+                 :disposition => "inline",
+                 :type => request.format
+      }
+    end
+  end
+
   def create
     super do |format|
-      format.json { render :json => resource }
+      format.json { render :json => resource.to_json(helper: self) }
       format.js
       format.all {
         if resource.new_record?
@@ -43,20 +60,13 @@ class DocumentsController < ApplicationController
     end
   end
 
-  def show
-    respond_to do |format|
-      format.html {render :action => :show}
-      format.json {render :json => resource }
-      format.any {
-        path = resource.file.path(params[:style] || params[:format])
-
-        head(:not_found) and return unless File.exist?(path)
-
-        send_file path,
-                 :filename => resource.file_file_name,
-                 :disposition => "inline",
-                 :type => request.format
+  def destroy
+    super do |format|
+      format.html {
+        redirect_to :home
       }
+
+      format.js
     end
   end
 

data/documents/app/models/document.rb

@@ -62,12 +62,13 @@ class Document < ActiveRecord::Base
   end
 
  # JSON, generic version for most documents
-  def as_json(options = nil)
-    {:id => id,
+  def as_json(options)
+    {
+     :id => id,
      :title => title,
      :description => description,
      :author => author.name,
-     :src => file.to_s
+     :src => URI.join(options[:helper].root_url, file.url).to_s 
     }
   end
   

data/documents/app/models/video.rb

@@ -16,15 +16,17 @@ class Video < Document
                       
  # JSON, special edition for video files
   def as_json(options = nil)
-    {:id => id,
-     :title => title,
-     :description => description,
-     :author => author.name,
-     :poster => file(:poster).to_s,
-     :sources => [ { :type => Mime::WEBM.to_s,  :src => file(:webm).to_s },
-                   { :type => Mime::MP4.to_s,   :src => file(:mp4).to_s },
-                   { :type => Mime::FLV.to_s, :src => file(:flv).to_s }
-                 ]
+    {
+      :id => id,
+      :title => title,
+      :description => description,
+      :author => author.name,
+      :poster => URI.join(options[:helper].root_url, file.url(:poster)).to_s,
+      :sources => [
+        { type: Mime::WEBM.to_s, src: URI.join(options[:helper].root_url, file.url(:webm)).to_s },
+        { type: Mime::MP4.to_s,  src: URI.join(options[:helper].root_url, file.url(:mp4)).to_s },
+        { type: Mime::FLV.to_s,  src: URI.join(options[:helper].root_url, file.url(:flv)).to_s }
+      ]
     }
   end
   

data/documents/app/views/audios/_audio_show.html.erb

@@ -5,7 +5,7 @@
         <%= t('audio.processing')%>
       </div>
     <% else %>
-      <%= render partial: 'player',
+      <%= render partial: 'audios/player',
                  object: audio,
                  as: :audio %>
     <% end %>

data/documents/app/views/videos/_video_show.html.erb

@@ -4,7 +4,7 @@
       <%= t('video.processing')%>
     </div>
   <% else %>
-    <%= render partial: 'player', 
+    <%= render partial: 'videos/player', 
                object: video,
                as: :video %>
   <% end %>

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

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

data/documents/social_stream-documents.gemspec

@@ -10,9 +10,10 @@ Gem::Specification.new do |s|
   s.email = "social-stream@dit.upm.es"
   s.homepage = "http://github.com/ging/social_stream-documents"
   s.files = `git ls-files`.split("\n")
+  s.license = 'MIT'
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 2.2.0')
+  s.add_runtime_dependency('social_stream-base', '~> 2.2.2')
 
   s.add_runtime_dependency('paperclip','~> 3.5.1')
   s.add_runtime_dependency('paperclip-ffmpeg', '~> 0.11.0')

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

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

data/events/social_stream-events.gemspec

@@ -10,9 +10,10 @@ Gem::Specification.new do |s|
   s.email = "social-stream@dit.upm.es"
   s.homepage = "http://github.com/ging/social_stream-events"
   s.files = `git ls-files`.split("\n")
+  s.license = 'MIT'
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 2.2.0')
+  s.add_runtime_dependency('social_stream-base', '~> 2.2.2')
   s.add_runtime_dependency('rails-scheduler', '~> 0.1.2')
 
   # Development Gem dependencies

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "2.2.1".freeze
+  VERSION = "2.2.2".freeze
 end

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

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

data/linkser/social_stream-linkser.gemspec

@@ -10,9 +10,10 @@ Gem::Specification.new do |s|
   s.email = "ecasanovac@gmail.com"
   s.homepage = "http://github.com/ging/social_stream-linkser"
   s.files = `git ls-files`.split("\n")
+  s.license = 'MIT'
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 2.2.0')
+  s.add_runtime_dependency('social_stream-base', '~> 2.2.2')
   s.add_runtime_dependency('linkser', '~> 0.0.12')
   # Development Gem dependencies
   s.add_development_dependency('sqlite3-ruby')

data/oauth2_server/app/models/site/client.rb

@@ -1,6 +1,22 @@
 class Site::Client < Site
   validates_presence_of :url, :callback_url, :secret
 
+  has_many :oauth2_tokens,
+           foreign_key: 'site_id',
+           dependent: :destroy
+
+  has_many :authorization_codes,
+           foreign_key: 'site_id',
+           class_name: 'Oauth2Token::AuthorizationCode'
+
+  has_many :access_tokens,
+           foreign_key: 'site_id',
+           class_name: 'Oauth2Token::AccessToken'
+
+  has_many :refresh_tokens,
+           foreign_key: 'site_id',
+           class_name: 'Oauth2Token::RefreshToken'
+
   before_validation :set_secret,
                     on: :create
 

data/oauth2_server/app/views/site/clients/_edit.html.erb

@@ -7,6 +7,12 @@
              locals: { subject: resource } %>
 </section>
 
+<section class="logo">
+<%= render partial: 'avatars/form',
+           object: resource.actor,
+           as: :avatarable %>
+</section>
+
 <section class="delete">
   <%= render partial: 'destroy' %>
 </section>

data/oauth2_server/app/views/site/clients/_edit_step_2.html.erb

@@ -4,7 +4,7 @@
   <h4>Set the application's logo</h4>
 
   <%= render partial: 'avatars/form',
-             object: resource,
+             object: resource.actor,
              as: :avatarable %>
 
   <%= link_to "Next", polymorphic_path(resource, action: 'edit', step: 3), class: "next-step" %>

data/oauth2_server/app/views/site/clients/_edit_step_3.html.erb

@@ -6,7 +6,6 @@
   <section class="site_client_roles">
     <%= render partial: 'relation/customs/index',
                locals: { subject: resource } %>
+    <%= link_to 'Finish', resource, class: "next-step" %>
   </section>
-
-  <%= link_to 'Finish', resource, class: "next-step" %>
 </section>

data/oauth2_server/app/views/site/clients/_form.html.erb

@@ -33,7 +33,7 @@
       <%= f.label :callback_url %>
       <%= f.text_area :callback_url %>
     </div>
+    <%= f.submit :class => "next-step" %>
   </section>
-  <%= f.submit :class => "next-step" %>
 
 <% end %>

data/oauth2_server/config/locales/en.yml

@@ -66,7 +66,7 @@ en:
         title: Client sites
       managing: Managing
       new:
-        link: Add site
+        link: Register site
         title: Register new client site
       oauth:
         credentials: OAuth2 Credentials

data/oauth2_server/config/locales/es.yml

@@ -61,8 +61,9 @@ es:
       go_to_other: Ver tus otros sitios
       index:
         title: Sitios
+      managing: Managing
       new:
-        link: Añadir sitio
+        link: Registrar sitio
         title: Registrar nuevo sitio
       oauth:
         credentials: Credenciales OAuth2

data/oauth2_server/config/locales/zh.yml

@@ -64,6 +64,7 @@ zh:
       go_to_other: See your other site clients
       index:
         title: Client sites
+      managing: Managing
       new:
         link: Add site
         title: Register new client site

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Oauth2Server
-    VERSION = "2.2.1".freeze
+    VERSION = "2.2.2".freeze
   end
 end

data/oauth2_server/social_stream-oauth2_server.gemspec

@@ -10,9 +10,10 @@ Gem::Specification.new do |s|
   s.email = "social-stream@dit.upm.es"
   s.homepage = "http://github.com/ging/social_stream-oauth2_server"
   s.files = `git ls-files`.split("\n")
+  s.license = 'MIT'
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 2.2.1')
+  s.add_runtime_dependency('social_stream-base', '~> 2.2.2')
   s.add_runtime_dependency('rack-oauth2', '~> 1.0.0')
 
   s.add_development_dependency('rspec-rails', '~> 2.8.0')

data/ostatus/app/controllers/remote_subjects_controller.rb

@@ -1,6 +1,6 @@
 class RemoteSubjectsController < ApplicationController
   def index
-    raise ActiveRecord::NotFound if params[:q].blank?
+    raise ActiveRecord::RecordNotFound if params[:q].blank?
 
     @remote_subject =
       RemoteSubject.find_or_create_by_webfinger_uri!(params[:q])

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Ostatus
-    VERSION = "2.2.0".freeze
+    VERSION = "2.2.1".freeze
   end
 end

data/ostatus/social_stream-ostatus.gemspec

@@ -10,9 +10,10 @@ Gem::Specification.new do |s|
   s.email = "social-stream@dit.upm.es"
   s.homepage = "http://social-stream.dit.upm.es"
   s.files = `git ls-files`.split("\n")
+  s.license = 'MIT'
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 2.2.0')
+  s.add_runtime_dependency('social_stream-base', '~> 2.2.2')
   s.add_runtime_dependency('proudhon','>= 0.3.6')
   s.add_runtime_dependency('nokogiri','> 1.4.4')
   

data/places/social_stream-places.gemspec

@@ -10,6 +10,7 @@ Gem::Specification.new do |s|
   s.email = "holacarol@gmail.com"
   s.homepage = "http://github.com/ging/social_stream-places"
   s.files = `git ls-files`.split("\n")
+  s.license = 'MIT'
 
   # Gem dependencies
   s.add_runtime_dependency('social_stream-base', '~> 2.0.0')

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Presence
-    VERSION = "2.2.0"
+    VERSION = "2.2.1"
   end
 end

data/presence/social_stream-presence.gemspec

@@ -10,6 +10,7 @@ Gem::Specification.new do |s|
   s.homepage    = "https://github.com/ging/social_stream/wiki/Getting-Started-With-Social-Stream-Presence"
   s.summary = "Presence capabilities for Social Stream, the core for building social network websites."
   s.description = "Social Stream Presence provides everything you need for including presence, instant messaging and video chat services in your social network website, including a complete chat fully integrated with Social Stream."
+  s.license = 'MIT'
 
   s.rubyforge_project = "social_stream-presence"
 
@@ -19,7 +20,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 2.2.0')
+  s.add_runtime_dependency('social_stream-base', '~> 2.2.2')
   
   s.add_runtime_dependency "xmpp4r"
 

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.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.1')
+  s.add_runtime_dependency('social_stream-base', '~> 2.2.2')
+  s.add_runtime_dependency('social_stream-documents', '~> 2.2.1')
+  s.add_runtime_dependency('social_stream-events', '~> 2.2.1')
+  s.add_runtime_dependency('social_stream-linkser', '~> 2.2.1')
+  s.add_runtime_dependency('social_stream-presence', '~> 2.2.1')
+  s.add_runtime_dependency('social_stream-ostatus', '~> 2.2.1')
+  s.add_runtime_dependency('social_stream-oauth2_server', '~> 2.2.2')
  
   # Development Gem dependencies
   #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: social_stream
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - GING - DIT - UPM
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-13 00:00:00.000000000 Z
+date: 2013-09-25 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.2.1
+        version: 2.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.2.2
 - !ruby/object:Gem::Dependency
   name: social_stream-documents
   requirement: !ruby/object:Gem::Requirement
     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-events
   requirement: !ruby/object:Gem::Requirement
     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-linkser
   requirement: !ruby/object:Gem::Requirement
     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-presence
   requirement: !ruby/object:Gem::Requirement
     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-ostatus
   requirement: !ruby/object:Gem::Requirement
     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-oauth2_server
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.2.2
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -488,6 +488,7 @@ files:
 - base/app/controllers/tags_controller.rb
 - base/app/controllers/ties_controller.rb
 - base/app/controllers/users_controller.rb
+- base/app/decorators/avatars_controller_decorator.rb
 - base/app/helpers/activities_helper.rb
 - base/app/helpers/activity_actions_helper.rb
 - base/app/helpers/contacts_helper.rb
@@ -534,6 +535,8 @@ files:
 - base/app/models/site/current.rb
 - base/app/models/tie.rb
 - base/app/models/user.rb
+- base/app/overrides/avatars/_crop/add_actor_id.rb
+- base/app/overrides/avatars/_form/add_actor_id.rb
 - base/app/views/activities/_actions.html.erb
 - base/app/views/activities/_activity.html.erb
 - base/app/views/activities/_audience.html.erb
@@ -639,7 +642,6 @@ files:
 - base/app/views/groups/show.html.erb
 - base/app/views/groups/show.js.erb
 - base/app/views/home/index.html.erb
-- base/app/views/home/index.js.erb
 - base/app/views/invitation_mailer/send_invitation.html.erb
 - base/app/views/invitation_mailer/send_invitation.text.erb
 - base/app/views/invitations/_new.html.erb
@@ -771,7 +773,11 @@ files:
 - base/app/views/users/show.js.erb
 - base/app/views/users/show.xml.builder
 - base/config/locales/de.yml
+- base/config/locales/devise.de.yml
 - base/config/locales/devise.es.yml
+- base/config/locales/devise.fr.yml
+- base/config/locales/devise.hu.yml
+- base/config/locales/devise.nl.yml
 - base/config/locales/en.yml
 - base/config/locales/es.yml
 - base/config/locales/fr.yml
@@ -844,6 +850,7 @@ files:
 - base/lib/social_stream/base/thinking-sphinx.rb
 - base/lib/social_stream/base/version.rb
 - base/lib/social_stream/controllers/authorship.rb
+- base/lib/social_stream/controllers/avatars.rb
 - base/lib/social_stream/controllers/cancan_devise_integration.rb
 - base/lib/social_stream/controllers/helpers.rb
 - base/lib/social_stream/controllers/i18n_integration.rb
@@ -872,6 +879,7 @@ files:
 - base/lib/social_stream/views/location.rb
 - base/lib/tasks/attachments.rake
 - base/lib/tasks/db/populate.rake
+- base/lib/tasks/i18n.rake
 - base/lib/tasks/workers.rake
 - base/lib/thinking-sphinx/social_stream.rb
 - base/social_stream-base.gemspec
@@ -1231,7 +1239,6 @@ files:
 - lib/social_stream/release/global/version_file.rb
 - lib/social_stream/release/kernel.rb
 - lib/social_stream/version.rb
-- lib/tasks/i18n.rake
 - lib/tasks/migrations.rake
 - linkser/.gitignore
 - linkser/.rspec