social_stream 0.12.13 → 0.12.14

data/base/app/helpers/settings_helper.rb

@@ -0,0 +1,9 @@
+module SettingsHelper
+  include SocialStream::Views::Settings
+
+  def render_settings
+    settings_items.inject(ActiveSupport::SafeBuffer.new) do |result, item|
+      result + item[:html]
+    end
+  end
+end

data/base/app/views/settings/_index.html.erb

@@ -4,18 +4,5 @@
 <h2><%= t('settings.for')%> <%= current_subject.name %></h2>
 <div class="space_center">
 </div>
-<% if current_subject==current_user %>
-<%= render :partial => "devise/registrations/edit_user", :locals => { :resource => current_user, :resource_name => :user }%>
-<% end %>
-<%= render :partial => "notifications" %>
-<% if current_subject.respond_to? :authentication_token%>
-<%= render :partial => "api_key" %>
-<% end %>
-<% if current_subject==current_user %>
-  <%= render :partial => "devise/registrations/delete_account", :locals => { :resource => current_user, :resource_name => :user }%>
-<% else %>
-  <%= render :partial => 'destroy' %>
-<% end %>
-<% if defined?(SocialStream::Presence) and SocialStream::Presence.enable %>
-  <%= render :partial => 'chat/settings' %>
-<% end %>
+
+<%= render_settings %>

data/base/config/locales/en.yml

@@ -190,7 +190,7 @@ en:
     destroy:
       one: "Destroy group"
       explanation: "All the activities, information and contacts of this group will be destroyed!"
-      go_ahead: "Yes, I am sure. Go ahead"
+      go_ahead: "Yes, I am sure. Destroy all!"
       last_confirm: "This is your last chance. Are you really sure?"
     form:
       title: "Group"

data/base/config/locales/es.yml

@@ -190,7 +190,7 @@ es:
     destroy:
       one: "Destruir grupo"
       explanation: "¡Todas las actividades, información y contactos de este grupo serán destruídos!"
-      go_ahead: "Sí, estoy seguro/a. ¡Adelante!"
+      go_ahead: "Sí, estoy seguro/a. ¡Destruirlo todo!"
       last_confirm: "Es tu última oportunidad. ¿Realmente estás seguro/a?"
     form:
       title: "Grupo"

data/base/lib/social_stream-base.rb

@@ -61,6 +61,13 @@ module SocialStream
     autoload :Object,    'social_stream/models/object'
   end
 
+  module Views
+    module Settings
+      autoload :Base,     'social_stream/views/settings/base'
+      autoload :ItemList, 'social_stream/views/settings/item_list'
+    end
+  end
+
   module TestHelpers
     autoload :Controllers, 'social_stream/test_helpers/controllers'
   end
@@ -129,8 +136,4 @@ module SocialStream
   end
 end
 
-module Mailboxer
-  autoload :NotificationDecoder,   'mailboxer/notification_decoder'
-end
-
-require 'social_stream/base'
+require 'social_stream/base/engine'

data/base/lib/social_stream/ability.rb

@@ -1,99 +1,7 @@
+require 'social_stream/ability/base'
+
 module SocialStream
   class Ability
-    include CanCan::Ability
-
-    # Create a new ability for this user, who is currently representing subject
-    def initialize(subject)
-      
-      #Download alias action
-      alias_action :download, :to => :show
-      
-      # Activity Objects
-      (SocialStream.objects - [ :actor, :comment ]).map{ |obj|
-        obj.to_s.classify.constantize
-      }.each do |klass|
-        can :create, klass do |k| # can :create, Post do |post|
-          k.build_post_activity.allow?(subject, 'create')
-        end
-
-        can :read, klass do |k| # can :read, Post do |post|
-          k.post_activity.allow?(subject, 'read')
-        end
-
-        can :update, klass do |k| # can :update, Post do |post|
-          k.post_activity.allow?(subject, 'update')
-        end
-
-        can :destroy, klass do |k| # can :destroy, Post do |post|
-          k.post_activity.allow?(subject, 'destroy')
-        end
-      end
-
-      can :create, Comment do |c|
-        c._activity_parent.allow?(subject, 'read')
-      end
-
-      can :read, Comment do |c|
-        c.post_activity.allow?(subject, 'read')
-      end
-
-      can :update, Comment do |c|
-        c.post_activity.allow?(subject, 'update')
-      end
-
-      can :destroy, Comment do |c|
-        c.post_activity.allow?(subject, 'destroy')
-      end
-
-      # Activities
-      can :create, Activity do |a|
-        a.allow?(subject, 'create')
-      end
-
-      can :read, Activity do |a|
-        a.allow?(subject, 'read')
-      end
-
-      can :update, Activity do |a|
-        a.allow?(subject, 'update')
-      end
-
-      can :destroy, Activity do |a|
-        a.allow?(subject, 'destroy')
-      end
-
-      # Users
-      can :read, User
-
-      can :update, User do |u|
-        u.represented_by?(subject)
-      end
-
-      # Groups
-      can :read, Group
-
-      can :create, Group do |g|
-        subject.present? &&
-          g._contact.sender_id == Actor.normalize_id(subject)
-      end
-
-      can :update, Group do |g|
-        g.represented_by?(subject)
-      end
-
-      can :destroy, Group do |g|
-        g.represented_by?(subject)
-      end
-
-      can :read, Profile
-
-      # Profile
-      can :update, Profile do |p|
-        p.subject.represented_by?(subject)
-      end
-
-      # Privacy
-      can [:create, :read, :update, :destroy], Relation::Custom, :actor_id => subject.try(:actor_id)
-    end
+    include SocialStream::Ability::Base
   end
 end

data/base/lib/social_stream/ability/base.rb

@@ -0,0 +1,101 @@
+module SocialStream
+  class Ability
+    module Base
+      include CanCan::Ability
+
+      # Create a new ability for this user, who is currently representing subject
+      def initialize(subject)
+        
+        #Download alias action
+        alias_action :download, :to => :show
+        
+        # Activity Objects
+        (SocialStream.objects - [ :actor, :comment ]).map{ |obj|
+          obj.to_s.classify.constantize
+        }.each do |klass|
+          can :create, klass do |k| # can :create, Post do |post|
+            k.build_post_activity.allow?(subject, 'create')
+          end
+
+          can :read, klass do |k| # can :read, Post do |post|
+            k.post_activity.allow?(subject, 'read')
+          end
+
+          can :update, klass do |k| # can :update, Post do |post|
+            k.post_activity.allow?(subject, 'update')
+          end
+
+          can :destroy, klass do |k| # can :destroy, Post do |post|
+            k.post_activity.allow?(subject, 'destroy')
+          end
+        end
+
+        can :create, Comment do |c|
+          c._activity_parent.allow?(subject, 'read')
+        end
+
+        can :read, Comment do |c|
+          c.post_activity.allow?(subject, 'read')
+        end
+
+        can :update, Comment do |c|
+          c.post_activity.allow?(subject, 'update')
+        end
+
+        can :destroy, Comment do |c|
+          c.post_activity.allow?(subject, 'destroy')
+        end
+
+        # Activities
+        can :create, Activity do |a|
+          a.allow?(subject, 'create')
+        end
+
+        can :read, Activity do |a|
+          a.allow?(subject, 'read')
+        end
+
+        can :update, Activity do |a|
+          a.allow?(subject, 'update')
+        end
+
+        can :destroy, Activity do |a|
+          a.allow?(subject, 'destroy')
+        end
+
+        # Users
+        can :read, User
+
+        can :update, User do |u|
+          u.represented_by?(subject)
+        end
+
+        # Groups
+        can :read, Group
+
+        can :create, Group do |g|
+          subject.present? &&
+            g._contact.sender_id == Actor.normalize_id(subject)
+        end
+
+        can :update, Group do |g|
+          g.represented_by?(subject)
+        end
+
+        can :destroy, Group do |g|
+          g.represented_by?(subject)
+        end
+
+        can :read, Profile
+
+        # Profile
+        can :update, Profile do |p|
+          p.subject.represented_by?(subject)
+        end
+
+        # Privacy
+        can [:create, :read, :update, :destroy], Relation::Custom, :actor_id => subject.try(:actor_id)
+      end
+    end
+  end
+end

data/base/lib/social_stream/{base.rb → base/engine.rb}

@@ -31,6 +31,12 @@ module SocialStream
         end
       end
 
+      initializer "social_stream-base.views.settings" do
+        SocialStream::Views::Settings.module_eval do
+          include SocialStream::Views::Settings::Base
+        end
+      end
+
       initializer "social_stream-base.avatars_for_rails" do
         AvatarsForRails.setup do |config|
           config.avatarable_model = :actor

data/base/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.9.35".freeze
+    VERSION = "0.9.36".freeze
   end
 end

data/base/lib/social_stream/views/settings/base.rb

@@ -0,0 +1,43 @@
+module SocialStream
+  module Views
+    module Settings
+      module Base
+        def settings_items
+          SocialStream::Views::Settings::ItemList.new.tap do |items|
+            if current_subject  == current_user
+              items << {
+                :key  => 'user.edit',
+                :html => render(:partial => "devise/registrations/edit_user",
+                                :locals => {
+                                             :resource => current_user,
+                                             :resource_name => :user
+                                           })
+              }
+            end
+
+            items << {
+              :key  => 'notifications',
+              :html => render(:partial => "notifications")
+            }
+
+            if current_subject.respond_to? :authentication_token
+              items << {
+                :key  => 'api_key',
+                :html => render(:partial => "api_key")
+              }
+            end
+
+            items << {
+              :key  => 'destroy',
+              :html => 
+                current_subject == current_user ?
+                  render(:partial => "devise/registrations/delete_account",
+                                     :locals => { :resource => current_user, :resource_name => :user }) :
+                  render(:partial => 'destroy')
+            }
+          end
+        end
+      end
+    end
+  end
+end

data/base/lib/social_stream/views/settings/item_list.rb

@@ -0,0 +1,13 @@
+module SocialStream
+  module Views
+    module Settings
+      class ItemList < Array
+        def insert_before key, obj
+          position = index{ |i| i[:key] == 'notifications' } + 1
+
+          insert position, obj
+        end
+      end
+    end
+  end
+end

data/documents/config/locales/en.yml

@@ -31,10 +31,10 @@ en:
     mine: "My files"
     msg: "Uploaded a file:"
     name: "file"
-    not_mine: "Documents"
+    not_mine: "Files"
     one: "a file"
     simple_all: "All"  
-    title: "Documents"
+    title: "Files"
   picture:
     confirm_delete: "Delete picture?"
     title: "Pictures"

data/documents/config/locales/es.yml

@@ -31,10 +31,10 @@ es:
     mine: "Mis ficheros"
     msg: "Subió un fichero:"
     name: "fichero"
-    not_mine: "Documentos"
+    not_mine: "Ficheros"
     one: "un fichero"
     simple_all: "Todos"
-    title: "Documentos"
+    title: "Ficheros"
   picture:
     confirm_delete: "¿Borrar imagen?"
     title: "Imágenes"

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Documents
-    VERSION = "0.4.7".freeze
+    VERSION = "0.4.8".freeze
   end
 end

data/documents/social_stream-documents.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', '~> 0.9.35')
+  s.add_runtime_dependency('social_stream-base', '~> 0.9.36')
   s.add_runtime_dependency('paperclip-ffmpeg', '~> 0.7.0')
   s.add_runtime_dependency('paperclip','2.3.11')
   s.add_runtime_dependency('delayed_paperclip','>= 0.7.2')

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "0.12.13".freeze
+  VERSION = "0.12.14".freeze
 end

data/presence/app/views/chat/_settings.html.erb

@@ -1,5 +1,3 @@
-<% if current_user and current_subject and current_user==current_subject %>
-	
 <div class="block" id="chat_settings">
     <div class="header">
         <div class="header_text">
@@ -34,5 +32,3 @@
         <% end %>
     </div>
 </div>
-	
-<% end %>

data/presence/lib/social_stream-presence.rb

@@ -1,6 +1,12 @@
 require 'social_stream-base'
 
 module SocialStream
+  module Views
+    module Settings
+      autoload :Presence, 'social_stream/views/settings/presence'
+    end
+  end
+
   module Presence   
 
     autoload :XmppServerOrder, 'social_stream/presence/xmpp_server_order'
@@ -9,6 +15,7 @@ module SocialStream
       autoload :BuddyManager, 'social_stream/presence/models/buddy_manager'
     end
 
+
     mattr_accessor :domain
     mattr_accessor :bosh_service
     mattr_accessor :auth_method
@@ -37,4 +44,4 @@ module SocialStream
   end
 end
 
-require 'social_stream/presence/engine'
+require 'social_stream/presence/engine'

data/presence/lib/social_stream/presence/engine.rb

@@ -6,6 +6,12 @@ module SocialStream
           include SocialStream::Presence::Models::BuddyManager
         end
       end
+
+      initializer "social_stream-presence.views.settings" do
+        SocialStream::Views::Settings.module_eval do
+          include SocialStream::Views::Settings::Presence
+        end
+      end
     end
   end
 end

data/presence/lib/social_stream/views/settings/presence.rb

@@ -0,0 +1,20 @@
+module SocialStream
+  module Views
+    module Settings
+      module Presence
+        def settings_items
+          super.tap do |items|
+            if SocialStream::Presence.enable
+              if current_subject == current_user
+                items.insert_before 'notifications', {
+                  :key  => 'chat',
+                  :html => render(:partial => "chat/settings")
+                }
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/social_stream.gemspec

@@ -11,8 +11,8 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.9.35')
-  s.add_runtime_dependency('social_stream-documents', '~> 0.4.7')
+  s.add_runtime_dependency('social_stream-base', '~> 0.9.36')
+  s.add_runtime_dependency('social_stream-documents', '~> 0.4.8')
   s.add_runtime_dependency('social_stream-events', '~> 0.0.20')
  
   # Development Gem dependencies

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 51
   prerelease: 
   segments: 
   - 0
   - 12
-  - 13
-  version: 0.12.13
+  - 14
+  version: 0.12.14
 platform: ruby
 authors: 
 - GING - DIT - UPM
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-20 00:00:00 +01:00
+date: 2011-11-21 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,12 +27,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 125
+        hash: 115
         segments: 
         - 0
         - 9
-        - 35
-        version: 0.9.35
+        - 36
+        version: 0.9.36
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -43,12 +43,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 31
         segments: 
         - 0
         - 4
-        - 7
-        version: 0.4.7
+        - 8
+        version: 0.4.8
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -440,6 +440,7 @@ files:
 - base/app/helpers/permissions_helper.rb
 - base/app/helpers/profiles_helper.rb
 - base/app/helpers/search_helper.rb
+- base/app/helpers/settings_helper.rb
 - base/app/helpers/subjects_helper.rb
 - base/app/helpers/toolbar_helper.rb
 - base/app/helpers/users_helper.rb
@@ -670,7 +671,8 @@ files:
 - base/lib/paperclip/social_stream.rb
 - base/lib/social_stream-base.rb
 - base/lib/social_stream/ability.rb
-- base/lib/social_stream/base.rb
+- base/lib/social_stream/ability/base.rb
+- base/lib/social_stream/base/engine.rb
 - base/lib/social_stream/base/version.rb
 - base/lib/social_stream/controllers/cancan_devise_integration.rb
 - base/lib/social_stream/controllers/helpers.rb
@@ -684,6 +686,8 @@ files:
 - base/lib/social_stream/test_helpers.rb
 - base/lib/social_stream/test_helpers/controllers.rb
 - base/lib/social_stream/toolbar_config/base.rb
+- base/lib/social_stream/views/settings/base.rb
+- base/lib/social_stream/views/settings/item_list.rb
 - base/lib/tasks/db/populate.rake
 - base/lib/tasks/workers.rake
 - base/social_stream-base.gemspec
@@ -1188,6 +1192,7 @@ files:
 - presence/lib/social_stream/presence/models/buddy_manager.rb
 - presence/lib/social_stream/presence/version.rb
 - presence/lib/social_stream/presence/xmpp_server_order.rb
+- presence/lib/social_stream/views/settings/presence.rb
 - presence/lib/tasks/presence/synchronize.rake
 - presence/social_stream-presence.gemspec
 - presence/spec/demo/.gitignore