social_stream 0.13.3 → 0.14.0

data/base/app/assets/javascripts/activities.js.erb

@@ -32,14 +32,12 @@ $(function() {
     });      
     
   $('#securities .search-choice a').click(function(){
-    console.log($('#security').children("option:selected").size());
     if($('#security').children("option:selected").size()==0){
       $('#securities input').css('width', default_security_width)
     }
   });      
   });
   $('#securities input').blur(function(){
-    console.log($('#security').children("option:selected").size());
     if($('#security').children("option:selected").size()==0){
       $('#securities input').css('width', default_security_width)
     }

data/base/app/views/objects/_new_activity.html.erb

@@ -4,5 +4,5 @@
 <%= form_for object, :remote => remote  do |f| %>
   <%= f.hidden_field :owner_id %>
 
-  <%= render :partial => object.class.to_s.tableize+'/new_activity_fields' , :locals => {:f => f} %>	
+  <%= render :partial => object.class.to_s.tableize+'/new_activity_fields' , :locals => {:f => f, :receiver => receiver} %>	
 <% end %>

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.10.3".freeze
+    VERSION = "0.10.4".freeze
   end
 end

data/lib/generators/social_stream/install_generator.rb

@@ -2,4 +2,5 @@ class SocialStream::InstallGenerator < Rails::Generators::Base #:nodoc:
   hook_for :base
   hook_for :documents
   hook_for :events
+  hook_for :linkser
 end

data/lib/social_stream.rb

@@ -1,11 +1,13 @@
 require 'social_stream-base'
 require 'social_stream-documents'
 require 'social_stream-events'
+require 'social_stream-linkser'
 
 module SocialStream
   class Engine < ::Rails::Engine #:nodoc:
     config.app_generators.base      'social_stream:base'
     config.app_generators.documents 'social_stream:documents'
     config.app_generators.events    'social_stream:events'
+    config.app_generators.linkser   'social_stream:linkser'
   end
 end

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "0.13.3".freeze
+  VERSION = "0.14.0".freeze
 end

data/linkser/app/assets/stylesheets/linkser.css.scss

@@ -1 +1,41 @@
 @import "colors";
+
+#link_preview {
+  width: 510px;
+  height: 120px;
+  border: 1px solid $auxiliar-color;
+  margin: 5px auto;
+}
+
+#link_preview img.loading{
+  margin: auto;
+  margin-top: 40px;
+}
+.link {
+  position: relative;
+  padding: 10px;
+}
+.link .thumbnail, .link .thumbnail img{
+  float: left;
+  max-height: 100px;
+  max-width: 120px;
+  margin-right:10px;
+}
+.link .info{
+  float: left;
+  width: 360px;
+  text-align: left;
+}
+.activity_objects .link .info{
+  width: 320px;
+}
+.link .info .title{
+  font-weight: bold;
+  margin-bottom: 3px;
+}
+.link .info .url{
+  text-decoration: underline;
+  margin-bottom: 5px;
+}
+.link .info .description{
+}

data/linkser/app/controllers/links_controller.rb

@@ -0,0 +1,3 @@
+class LinksController < ApplicationController
+  include SocialStream::Controllers::Objects
+end

data/linkser/app/controllers/linkser_controller.rb

@@ -0,0 +1,22 @@
+class LinkserController < ApplicationController
+  def index
+    if params[:url].present?
+      url = params[:url]
+      o = Linkser.parse url, {:max_images => 1}
+      if o.is_a? Linkser::Objects::HTML
+        link = Link.new
+        link.title = o.title if o.title
+        link.description = o.description if o.description
+        link.url = o.last_url
+        if o.ogp and o.ogp.image
+          link.image = o.ogp.image
+        elsif o.images and o.images.first
+          link.image = o.images.first.url
+        end
+        render :partial => "links/link_preview", :locals => {:link => link}
+        return
+      end
+    end    
+        render :text => I18n.t("link.errors.only_web")
+  end
+end

data/linkser/app/models/link.rb

@@ -0,0 +1,34 @@
+class Link < ActiveRecord::Base
+  include SocialStream::Models::Object
+
+  validates_presence_of :url
+
+  attr_accessor :loaded
+
+  before_create :check_loaded
+
+  define_index do
+    indexes title
+    indexes description
+    indexes url
+
+    has created_at
+  end
+
+  def check_loaded
+    if !self.loaded.eql?"true" and self.title.nil? and self.description.nil? and self.image.nil?
+      o = Linkser.parse self.url, {:max_images => 1}
+      if o.is_a? Linkser::Objects::HTML
+        self.title = o.title if o.title
+        self.description = o.description if o.description
+        self.url = o.last_url
+        if o.ogp and o.ogp.image
+          self.image = o.ogp.image
+        elsif o.images and o.images.first
+          self.image = o.images.first.url
+        end
+      end
+    end
+  end
+
+end

data/linkser/app/views/links/_link.html.erb

@@ -0,0 +1,24 @@
+<%= div_for link, :class => 'content_size' do %>
+  <% if link.image %>
+    <div class="thumbnail">
+      <%= link_to image_tag(link.image),link.url %>
+    </div>
+  <% end %>
+  <div class="info">
+    <% if link.title %>
+      <div class="title">
+        <%= link.title %>
+      </div>
+    <% end %>
+    <div class="url">
+      <%= auto_link(link.url) %>
+    </div>
+    <% if link.description %>
+      <div class="description">
+        <%= auto_link(link.description) %>
+      </div>
+    <% end %>
+  </div>
+<% end %>
+
+<br class="clearfloat">

data/linkser/app/views/links/_link_preview.html.erb

@@ -0,0 +1,25 @@
+<%= div_for link, :class => 'content_size' do %>
+  <% if link.image %>
+    <div class="thumbnail">
+      <%= image_tag(link.image)%>
+      <%= hidden_field_tag "link[image]", link.image %>
+    </div>
+  <% end %>
+  <div class="info">
+    <% if link.title %>
+      <div class="title">
+        <%= link.title %>
+        <%= hidden_field_tag "link[title]", link.title %>
+      </div>
+    <% end %>
+    <div class="url">
+      <%= auto_link(link.url) %>
+    </div>
+    <% if link.description %>
+      <div class="description">
+        <%= auto_link(link.description) %>
+        <%= hidden_field_tag "link[description]", link.description %>
+      </div>
+    <% end %>
+  </div>
+<% end %>

data/linkser/app/views/links/_link_with_details.html.erb

@@ -0,0 +1,4 @@
+<%= div_for link, :class => 'content_size' do %>
+  <%= simple_format link.title %>
+<% end %>
+

data/linkser/app/views/links/create.js.erb

@@ -0,0 +1,15 @@
+//Display the new post
+$("#wall").prepend("<%= escape_javascript(render @link.post_activity) %>");
+
+setActivityPrivacyTooltips("<%= escape_javascript dom_id(@link.post_activity) %>");
+
+unblock_all_forms();
+
+$("#link_preview").hide();
+$("#link_preview").html("");          
+$("#link_loaded").val(false);
+$("#link_preview").html("");
+$("#link_url").val("");
+
+
+

data/linkser/app/views/links/destroy.js.erb

@@ -0,0 +1 @@
+<%=render(:partial => 'objects/destroy') %>

data/linkser/app/views/links/show.html.erb

@@ -0,0 +1,10 @@
+<% content_for :javascript do %>
+    var message_hash = window.location.hash.match(/^.*activity_(\d+).*$/);
+    if (message_hash && message_hash > 0){
+      $.scrollTo('#activity_' + message_hash[1] ,1500,{axis:'y'});
+    }
+<% end %>
+
+<%= render :partial => 'objects/show',
+           :locals  => { :object => @link } %>
+

data/linkser/app/views/posts/_new_activity_fields.erb

@@ -0,0 +1,53 @@
+<%= f.text_field :text, :id => "input_activities", :size => 85 %>
+<%= hidden_field_tag "link[owner_id]", Actor.normalize_id(receiver) %>
+<%= hidden_field_tag "link[url]" %>
+<%= hidden_field_tag "link[loaded]", false %>
+<div id="link_preview" style="display:none;"></div>
+
+<%= javascript_tag do %>
+  $(function() {
+    $.preloadImages ("assets/loading.gif");
+    $("#input_activities").Watermark("<%= I18n.t('post.input') %>","#666");
+    
+    var urlDetect = function(){
+      this.currentValue = $("#input_activities").val();
+      if(this.lastValue==null) this.lastValue = "";
+      
+      var regexp = /(http|ftp|https):\/\/[\w-]+(\.[\w-]+)+([\w.,@?^=%&amp;:\/~+#-]*[\w@?^=%&amp;\/~+#-])?/
+      if(regexp.test($("#input_activities").val())){
+        $("#link_url").val($("#input_activities").val());              
+        $("#link_loaded").val(false);
+        $("#new_post").attr("action","<%= links_path %>");
+        if(this.currentValue!=this.lastValue){
+          $("#link_preview").html("<%= escape_javascript(image_tag('loading.gif', :class => :loading)) %>");          
+          this.lastValue = this.currentValue;
+          var url = this.currentValue;
+          var urlDetect = this;
+          $.ajax({
+            type : "GET",
+            url : "<%= linkser_parse_url %>?url=" + url,
+            success : function(html) {      
+              console.log("Peticion guay a " + url);
+              if ($("#input_activities").val()==url){ //Only show if input value is still the same
+                $("#link_preview").html(html);                
+                $("#link_loaded").val(true);
+              }          
+            },
+            error: function (xhr, ajaxOptions, thrownError){ 
+              $("#link_preview").html("<span class=\"loading\"><%= escape_javascript(t("link.errors.loading"))%> " + url + "</span>");
+            }         
+          });
+        }
+        $("#link_preview").show();
+      }else{
+        $("#new_post").attr("action","<%= posts_path %>");
+        $("#link_preview").hide();
+        $("#link_preview").html("");
+        $("#link_url").val(""); 
+      }
+    }      
+    $("#input_activities").change(urlDetect).keyup(urlDetect);
+    
+  });
+  
+<% end %>

data/linkser/config/locales/en.yml

@@ -1,3 +1,14 @@
 en:
   linkser:
     title: "Linkser"
+  link:
+    confirm_delete: "Delete link?"
+    errors:
+      loading: "Error loading"
+      only_webs: "Only webpages are supported"
+    form:
+      title: "Link"
+    input: "Write the web address"
+    name: "link"
+    one: "a link"
+    title: "Links"  

data/linkser/config/locales/es.yml

@@ -1,3 +1,14 @@
 es:
   linkser:
-    title: "Linkser"
+    title: "Linkser"
+  link:
+    confirm_delete: "¿Borrar enlace?"
+    errors:
+      loading: "Error cargando"
+      only_webs: "Solo puedes compartir págnas web"
+    form:
+      title: "Enlace"
+    input: "Escribe una dirección"
+    name: "enlace"
+    one: "una enlace"
+    title: "Enlaces"

data/linkser/config/routes.rb

@@ -1,3 +1,3 @@
-Rails.application.routes.draw do
-  
+Rails.application.routes.draw do  
+  match 'linkser_parse' => 'linkser#index', :as => :linkser_parse  
 end

data/linkser/db/migrate/20111129100618_create_social_stream_linkser.rb

@@ -0,0 +1,21 @@
+class CreateSocialStreamLinkser < ActiveRecord::Migration
+  def self.up
+    create_table "links", :force => true do |t|
+      t.integer  "activity_object_id"
+      t.datetime "created_at"
+      t.datetime "updated_at"
+      t.string   "url"
+      t.string   "callback_url"
+      t.string   "title"
+      t.string   "image"
+      t.text     "description"
+    end
+
+    add_index "links", "activity_object_id"
+  end
+
+  def self.down
+    remove_foreign_key "links", :name => "links_on_activity_object_id"
+    drop_table :links
+  end
+end

data/linkser/lib/social_stream-linkser.rb

@@ -1,7 +1,14 @@
 require 'social_stream-base'
+require 'linkser'
 
 module SocialStream
   module Linkser
+    # Add :link to SocialStream.objects and SocialStream.activity_forms by default
+    # It can be configured by users at application's config/initializers/social_stream.rb
+    #%w(objects activity_forms).each do |m|
+    %w(objects).each do |m|
+      SocialStream.__send__(m).push(:link) unless SocialStream.__send__(m).include?(:link)
+    end
     
   end
 end

data/linkser/social_stream-linkser.gemspec

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.9.31')
-  s.add_runtime_dependency('linkser', '~> 0.0.4')
+  s.add_runtime_dependency('social_stream-base', '~> 0.10.1')
+  s.add_runtime_dependency('linkser', '~> 0.0.6')
   # Development Gem dependencies
   s.add_development_dependency('sqlite3-ruby')
   if RUBY_VERSION < '1.9'

data/presence/app/views/xmpp/active_users.html.erb

@@ -11,7 +11,7 @@
 <p>&nbsp;</p>
 <ul>
   <%@users.each do |user| %>
-    <li><b><%=user.name%></b></li>
+    <li><b><%=user.name%></b> (<%=user.status%>) </li>
   <%end%>
  </ul>
 <p>&nbsp;</p>

data/presence/config/routes.rb

@@ -1,13 +1,13 @@
 Rails.application.routes.draw do
   #match "/active_users" => "Xmpp#active_users"
   
-  match '/xmpp/resetConnection' => "Xmpp#resetConnection"
   match '/xmpp/setConnection' => "Xmpp#setConnection"
   match '/xmpp/unsetConnection' => "Xmpp#unsetConecction"
-  match '/xmpp/synchronizePresence' => "Xmpp#synchronizePresence"
   match '/xmpp/setPresence' => "Xmpp#setPresence"
   match '/xmpp/unsetPresence' => "Xmpp#unsetPresence"
-  match '/chatWindow'=> "Xmpp#chatWindow"
+  match '/xmpp/resetConnection' => "Xmpp#resetConnection"
+  match '/xmpp/synchronizePresence' => "Xmpp#synchronizePresence"
   match '/xmpp/updateSettings'=> "Xmpp#updateSettings"
+  match '/chatWindow'=> "Xmpp#chatWindow"
    
 end

data/presence/ejabberd/conf/ssconfig_example.cfg

@@ -1,38 +1,32 @@
-#Social Stream Presence: ejabberd config
+#Social Stream Presence: Ejabberd configuration file
 
 #Ejabberd node server domain
-server_domain=domain.example.com
+server_domain=xmppdomain.example.com
 
 #Scripts Path
 scripts_path=/my_scripts_path
 
-#Source path: uncomment to compile ejabberd social stream module
-#source_path=/.../ejabberd_source/src
-
 #It is also necessary to modify the file: /etc/ejabberd/ejabberd.cfg
 #%%{auth_method, external}.
 #%%{extauth_program, "scripts_path/authentication_script"}.
 
-#API REST
-auth_api=http://localhost/users/sign_in
-auth_by_cookie_api=http://localhost/api/me
-cookie_name=_rails_server_cookie
-set_connection_api=http://localhost/xmpp/setConnection
-unset_connection_api=http://localhost/xmpp/unsetConnection
-reset_connection_api=http://localhost/xmpp/resetConnection
-synchronize_presence_api=http://localhost/xmpp/synchronizePresence
-set_presence_api=http://localhost/xmpp/setPresence
-unset_presence_api=http://localhost/xmpp/unsetPresence
+#Source path: uncomment to compile ejabberd social stream module
+#source_path=/.../ejabberd_source/src
+
 
-#Social Stream Login
-ss_login=social_stream-presence
+#Web Domain for REST API
+web_domain=ssdomain.example.com
+
+#Rails Web Server Cookie name
+#Check this line in your app/config/initializers/session_store.rb: Global::Application.config.session_store :cookie_store, :key => '_rails_server_cookie'
+cookie_name=_rails_server_cookie
 
-#Social Stream PASSWORD
-ss_password=password
 
 #Ejabberd Server Password
 ejabberd_password=password
 
+
 #Emanagement configuration
-users_require_sudo=user1,user2,...
+ejabberd_server_user=ejabberd
+users_require_sudo=all
 verbose=false

data/presence/ejabberd/ejabberd_scripts/authentication_script

@@ -31,11 +31,9 @@ def getOption(option)
   return "Undefined"
 end
 
-$accessUrl = getOption("auth_api=")
-$accessByCookieUrl = getOption("auth_by_cookie_api=")
+$accessByPasswordUrl = "http://" + getOption("web_domain=") + "/users/sign_in"
+$accessByCookieUrl = "http://" + getOption("web_domain=") + "/api/me"
 $cookie_name = getOption("cookie_name=")
-$sslogin = getOption("ss_login=")
-$sspass = getOption("ss_password=")
 
 
 def auth(username, password)
@@ -48,17 +46,9 @@ def auth(username, password)
   #  return true
   #end
 
-  #Social Stream password
-  if username == $sslogin 
-    if password == $sspass
-      return true
-    else
-      return false
-    end
-  end
 
   begin
-    response = RestClient.post $accessUrl, :user => { :email => username , :password => password }
+    response = RestClient.post $accessByPasswordUrl, :user => { :email => username , :password => password }
 
     if response.code == 201
       return true

data/presence/ejabberd/ejabberd_scripts/development_scripts/show_config.sh

@@ -17,17 +17,21 @@ end
 puts ""
 puts "############### Ejabberd Configuration ###############"
 puts "Config file for Social Stream Presence: /etc/ejabberd/ssconfig.cfg"
+puts "Xmpp Server domain: #{getOption("server_domain=")}"
 puts "Scripts Path: #{getOption("scripts_path=")}"
 puts "mod_sspresence Path: #{getOption("source_path=")}"
-puts "Server domain: #{getOption("server_domain=")}"
-puts "API REST URLs"
-puts "Authentication: #{getOption("auth_api=")}"
-puts "onRegisterConnection: #{getOption("set_connection_api=")}"
-puts "onRemoveConnection: #{getOption("unset_connection_api=")}"
-puts "onPresence: #{getOption("set_presence_api=")}"
-puts "onUnsetPresence: #{getOption("unset_presence_api=")}"
-puts "ResetConnection: #{getOption("reset_connection_api=")}"
-puts "SynchronizePresence: #{getOption("synchronize_presence_api=")}"
+puts "Web Domain for REST API: #{getOption("web_domain=")}"
+puts "##############################"
+puts "REST API"
+puts "Authentication by password: http://#{getOption("web_domain=")}/users/sign_in"
+puts "Authentication by cookie: http://#{getOption("web_domain=")}/api/me"
+puts "onRegisterConnection: http://#{getOption("web_domain=")}/xmpp/setConnection"
+puts "onRemoveConnection: http://#{getOption("web_domain=")}/xmpp/unsetConnection"
+puts "onPresence: http://#{getOption("web_domain=")}/xmpp/setPresence"
+puts "onUnsetPresence: http://#{getOption("web_domain=")}/xmpp/unsetPresence"
+puts "ResetConnection: http://#{getOption("web_domain=")}/xmpp/resetConnection"
+puts "SynchronizePresence: http://#{getOption("web_domain=")}/xmpp/synchronizePresence"
+puts "##############################"
 puts "Social Stream Presence logs in var/log/ejabberd/"
 puts "######################################################"
 puts ""

data/presence/ejabberd/ejabberd_scripts/emanagement

@@ -31,6 +31,8 @@ end
 #Configuration variables
 $domain = getOption("server_domain=")
 $verbose = (getOption("verbose=")=="true")
+$ejabberd_user = getOption("ejabberd_server_user=")
+$checkEjabberdctlQuotedString = false
 
 
 PARAMS_FOR_COMMANDS = {
@@ -41,9 +43,7 @@ PARAMS_FOR_COMMANDS = {
 	'getRoster' => 1,
 	'removeRoster' => 1,
 	'removeAllRosters' => 0,
-	'getBuddysFromRoster' => 1,
 	'getAllUsersWithRoster' => 0,
-	'getAllRosters' => 0,
 	'printAllRosters' => 0,
 	'printAllBidirecctionalBuddys' => 0,
 	'checkUser' => 1,
@@ -54,7 +54,9 @@ PARAMS_FOR_COMMANDS = {
 	'sendMessageToUser' => 3,
 	'getUserResource' => 1,
 	'isEjabberdNodeStarted' => 0,
+	'broadcast' => 2,
 	'checkEjabberdctlQuotedString' => 0,
+        'getConnectedUsers' => 0,
 	'help' => 0,
 }
 
@@ -66,9 +68,7 @@ SYNTAX_FOR_COMMANDS = {
 	'getRoster' => 'getRoster username',
 	'removeRoster' => 'removeRoster username',
 	'removeAllRosters' => 'removeAllRosters',
-	'getBuddysFromRoster' => 'getBuddysFromRoster roster',
 	'getAllUsersWithRoster' => 'getAllUsersWithRoster',
-	'getAllRosters' => 'getAllRosters',
 	'printAllRosters' => 'printAllRosters',
 	'printAllBidirecctionalBuddys' => 'printAllBidirecctionalBuddys',
 	'checkUser' => 'checkUser user',
@@ -79,7 +79,9 @@ SYNTAX_FOR_COMMANDS = {
 	'sendMessageToUser' => 'sendMessageToUser from_name to_name msg',
 	'getUserResource' => 'getUserResource username',
 	'isEjabberdNodeStarted' => 'isEjabberdNodeStarted',
+	'broadcast' => 'broadcast users msg (users values: "all" or slugs array)',
 	'checkEjabberdctlQuotedString' => 'checkEjabberdctlQuotedString',
+        'getConnectedUsers' => 'getConnectedUsers',
 	'help' => 'help',
 }
 
@@ -285,13 +287,6 @@ end
 
 #Manage stanzas Utilities
 
-def sendStanzaUserMessage(username,msg)
-	resource = getUserResource(username);
-	stanza = "\\<\\'message\\'\\>\\<\\'body\\'\\>\\'" + msg + "\\'\\<\\'/body\\'\\>\\<\\'/message\\'\\>"
-	executeCommand("ejabberdctl send_stanza_c2s " + username + " " + $domain + " " + resource + " " + stanza)
-	return "Done"
-end
-
 def setPresence(username)
 	sendPresenceStanzaWithType(username,username,"available")
 end
@@ -305,12 +300,14 @@ def sendPresence(username,show)
 end
 
 def sendPresenceWithShow(from_name,to_name,show)
-	puts from_name
+	#puts from_name
 	resource = getUserResource(from_name);
-	puts resource
+	#puts resource
 	from_sid = from_name + "@" + $domain;
 	to_sid = to_name + "@" + $domain;   
-	pres_stanza = "\\<\\'presence from=\\'\\\"\\'" + from_sid + "\\'\\\"\\' to=\\'\\\"\\'" + to_sid + "\\'\\\"\\>\\<\\'show\\'\\>\\'" + show + "\\'\\<\\'/show\\'\\>\\<\\'/presence\\'\\>" 
+	pres_stanza = "\\<" + buildQuotedString("presence from=") + "\\\"" + buildQuotedString(from_sid) + "\\\"" + buildQuotedString(" to=") + "\\\"" +
+			buildQuotedString(to_sid) + "\\\"\\>\\<" + buildQuotedString("show") + "\\>" + buildQuotedString(show) + "\\<" +
+			buildQuotedString("/show") + "\\>\\<" + buildQuotedString("/presence") + "\\>"
 	executeCommand("ejabberdctl send_stanza_c2s " + from_name + " " + $domain + " " + resource + " " + pres_stanza)
 	return "Done"
 end
@@ -319,7 +316,8 @@ def sendPresenceStanzaWithType(from_name,to_name,presence_type)
 	resource = getUserResource(from_name);
 	from_sid = from_name + "@" + $domain;
 	to_sid = to_name + "@" + $domain;
-	pres_stanza = "\\<\\'presence type=\\'\\\"\\'" + presence_type + "\\'\\\"\\' from=\\'\\\"\\'" + from_sid + "\\'\\\"\\' to=\\'\\\"\\'" + to_sid + "\\'\\\"\\>\\<\\'/presence\\'\\>" 
+	pres_stanza = "\\<" + buildQuotedString("presence type=") + "\\\"" + buildQuotedString(presence_type) + "\\\"" + buildQuotedString(" from=") + "\\\"" + 
+		buildQuotedString(from_sid) + "\\\"" + buildQuotedString(" to=") + "\\\"" + buildQuotedString(to_sid) + "\\\"\\>\\<" + buildQuotedString("/presence") + "\\>" 
 	executeCommand("ejabberdctl send_stanza_c2s " + from_name + " " + $domain + " " + resource + " " + pres_stanza)
 	return "Done"
 end
@@ -356,17 +354,52 @@ def isEjabberdNodeStarted
 	return false
 end
 
+def getConnectedUsers
+        users = []
+	output = executeCommand("ejabberdctl connected-users")
+	sessions = output.split("\n")
+	sessions.each do |session|
+	  users << session.split("@")[0]
+	end
+	return users
+end
+
+def broadcast(users,msg)
+	output = executeCommand("ejabberdctl connected-users")
+        lines = output.split("\n");
+	lines.each do |line|
+		username = line.split("@")[0]
+		if (users == "all") or (users.length > 1 and users.include?(username))
+			s = line.split("@")[1];
+			resource = s.split("/")[1];
+			sendMessageToUser("SocialStream",username,msg)
+		end
+	end
+	return "Done"
+end
+
+#Determine how to scape characters for build quoted strings
 def checkEjabberdctlQuotedString
 	puts "checkForSimpleSlash: " + checkForSimpleSlash.to_s()
 	puts "checkForDoubleSlash: " + checkForDoubleSlash.to_s()
 end
 
+def checkAndSetEjabberdctlQuotedString
+	if checkForSimpleSlash
+		$checkForSimpleSlash = true
+	end
+	if checkForDoubleSlash
+		$checkForDoubleSlash = true
+	end
+	$checkEjabberdctlQuotedString = true	
+end
+
 def checkForDoubleSlash
 	command = "ejabberdctl send_message_chat example@localhost example@localhost \\'Hello quoted string\\'"
 	if execute_as_sudo
 		command = "sudo " + command
 	end
-	#puts "Executing " + command
+	
 	output = %x[#{command}]
 	firstLine = ""
 	lines = output.split("\n")
@@ -414,10 +447,14 @@ def checkForSimpleSlash
 end
 
 def buildQuotedString(msg)
-	if checkForSimpleSlash
+	if !$checkEjabberdctlQuotedString
+		checkAndSetEjabberdctlQuotedString
+	end
+	
+	if $checkForSimpleSlash
 		return "\'" + msg + "\'"
 	end
-	if checkForDoubleSlash
+	if $checkForDoubleSlash
 		return "\\'" + msg + "\\'"
 	end
 	return msg
@@ -431,7 +468,8 @@ def executeCommand(command)
 	command = buildCommand(command)
 	
 	if $verbose
-		puts "Executing: " + command
+		#Logging...
+		#puts "Executing: " + command
 		ejabberdLog("Executing (#{command})")
 	end
 
@@ -442,15 +480,20 @@ end
 
 def buildCommand(command)
 	if execute_as_sudo
-		command = "sudo -u ejabberd " + command
+		command = "sudo -u " + $ejabberd_user + " " + command
 	end
 	return command
 end
 
 def execute_as_sudo
-	current_user = %x["whoami"].split("\n")[0]
 	sudo_users = getOption("users_require_sudo=")
+
+	if sudo_users=="all"
+	 return true
+	end
+
 	sudo_users_array = sudo_users.split(",")
+        current_user = %x["whoami"].split("\n")[0]
 	if sudo_users_array.include?(current_user)
 		return true
 	end
@@ -468,7 +511,7 @@ end
 
 #Main thread
 
-log("Init Ejabberd Maintenance script")
+#log("Init Ejabberd Maintenance script")
 
 begin
 	if ARGV[0] and PARAMS_FOR_COMMANDS.keys.include?(ARGV[0])

data/presence/ejabberd/ejabberd_scripts/reset_connection_script

@@ -25,7 +25,7 @@ def getOption(option)
   return "Undefined"
 end
 
-$url = getOption("reset_connection_api=")
+$url = "http://" + getOption("web_domain=") + "/xmpp/resetConnection"
 $pass = getOption("ejabberd_password=")
 
 

data/presence/ejabberd/ejabberd_scripts/set_connection_script

@@ -25,7 +25,7 @@ def getOption(option)
   return "Undefined"
 end
 
-$url = getOption("set_connection_api=")
+$url = "http://" + getOption("web_domain=") + "/xmpp/setConnection"
 $pass = getOption("ejabberd_password=")
 
 

data/presence/ejabberd/ejabberd_scripts/set_presence_script

@@ -25,7 +25,7 @@ def getOption(option)
   return "Undefined"
 end
 
-$url = getOption("set_presence_api=")
+$url = "http://" + getOption("web_domain=") + "/xmpp/setPresence"
 $pass = getOption("ejabberd_password=")
 
 

data/presence/ejabberd/ejabberd_scripts/synchronize_presence_script

@@ -25,8 +25,9 @@ def getOption(option)
   return "Undefined"
 end
 
-$url = getOption("synchronize_presence_api=")
+$url = "http://" + getOption("web_domain=") + "/xmpp/synchronizePresence"
 $pass = getOption("ejabberd_password=")
+$scripts_path = getOption("scripts_path=")
 
 
 def log(text)
@@ -37,7 +38,8 @@ def synchronize()
   log("Start Synchronize")
  
   users = []
-  output = %x[ejabberdctl connected-users]
+  command = $scripts_path + "/emanagement getConnectedUsers"
+  output = %x[#{command}]
   sessions = output.split("\n")
   
   sessions.each do |session|

data/presence/ejabberd/ejabberd_scripts/unset_connection_script

@@ -25,7 +25,7 @@ def getOption(option)
   return "Undefined"
 end
 
-$url = getOption("unset_connection_api=")
+$url = "http://" + getOption("web_domain=") + "/xmpp/unsetConnection"
 $pass = getOption("ejabberd_password=")
 
 

data/presence/ejabberd/ejabberd_scripts/unset_presence_script

@@ -0,0 +1,48 @@
+#!/usr/bin/env ruby
+#Unset Presence Script
+#@author Aldo
+
+require 'logger'
+require 'rest_client'
+
+path = "/var/log/ejabberd/scripts.log"
+file = File.open(path, File::WRONLY | File::APPEND | File::CREAT)
+file.sync = true
+$logger = Logger.new(file)
+$logger.level = Logger::DEBUG
+
+def getOption(option)
+  File.open('/etc/ejabberd/ssconfig.cfg', 'r') do |f1|  
+    while line = f1.gets  
+      line = line.gsub(/\n/,'')
+      if line.match(/^#/)
+        #Comments
+      elsif line.match(/^#{option}/)
+        return line.gsub(/#{option}/,'')
+      end  
+    end  
+  end
+  return "Undefined"
+end
+
+$url = "http://" + getOption("web_domain=") + "/xmpp/unsetPresence"
+$pass = getOption("ejabberd_password=")
+
+
+def log(text)
+	$logger.info "Unset Presence Script: " + text
+end
+
+def unsetPresence(username)
+  log("unsetPresence(#{username})")
+  RestClient.post($url, :name => username, :password => $pass)
+  return true
+
+  rescue RestClient::Exception
+    log("RestClient::Exception with unsetPresence(#{username})")
+end
+
+
+unsetPresence(ARGV[0])
+
+

data/presence/ejabberd/mod_sspresence/mod_sspresence.erl

@@ -61,6 +61,10 @@ on_presence(User, _Server, _Resource, Packet) ->
 
 on_unset_presence(User, _Server, _Resource, _Status) ->
     ?INFO_MSG("mod_sspresence: on_unset_presence (~p)", [User]),
+    Login_path = string:concat(getOptionValue("scripts_path="), "/unset_presence_script "),
+    %% Wait for on_remove_connection
+    %% ?INFO_MSG("mod_sspresence: unset_presence_script call with  user (~p)", [User]),
+    %% os:cmd(string:join([Login_path, User , Status], " "));
     ok.
 
 on_packet_send(From, _To, {xmlelement, Type, _Attr, Subel} = _Packet) ->

data/presence/lib/social_stream/presence/models/buddy_manager.rb

@@ -39,7 +39,7 @@ module SocialStream
             elsif self.positive?
               #Case: Possitive tie unidirectional
               #Execute addBuddyToRoster(userSID,buddySID,buddyNick,buddyGroup,subscription_type)
-              subscription_type = "to"
+              subscription_type = "from"
               SocialStream::Presence::XmppServerOrder::addBuddyToRoster(user_sid,buddy_sid,buddy_name,"SocialStream",subscription_type)
             else
               #Negative Tie

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

@@ -1,5 +1,5 @@
 module Socialstream
   module Presence
-    VERSION = "0.1.3"
+    VERSION = "0.1.4"
   end
 end

data/presence/lib/social_stream/presence/xmpp_server_order.rb

@@ -31,32 +31,16 @@ module SocialStream
           end   
           
           
+
           def synchronizePresence
-            
-            if !isEjabberdNodeUp
+            if isEjabberdNodeUp
+              output = executeEmanagementCommand("getConnectedUsers",[])
+              user_slugs = output.split("\n")
+              synchronizePresenceForSlugs(user_slugs)
+            else
               resetPresence
               return "Xmpp Server Down: Reset Connected Users"
-            end 
-            
-            if SocialStream::Presence.remote_xmpp_server      
-              command = buildCommand("synchronize_presence_script","",[])
-              executeCommand(command)    
-            else
-              #SocialStream::Presence.remote_xmpp_server=false
-              
-              #Get connected users locally  
-              users = []
-              output = %x[ejabberdctl connected-users]
-              sessions = output.split("\n")
-
-              sessions.each do |session|
-                users << session.split("@")[0]
-                puts session.split("@")[0]
-              end
-              
-              synchronizePresenceForSlugs(users)  
-              
-            end
+            end  
           end
           
           
@@ -93,6 +77,7 @@ module SocialStream
           
      
           def synchronizePresenceForSlugs(user_slugs)
+            
             #Check connected users
             users = User.find_all_by_connected(true)
             
@@ -211,7 +196,7 @@ module SocialStream
          
           def isEjabberdNodeUp
               output = executeEmanagementCommand("isEjabberdNodeStarted",[])
-              nodeUp = output.split("\n")[3]
+              nodeUp = output.split("\n")[0]
               return (nodeUp and nodeUp.strip()=="true")
           end
         

data/social_stream.gemspec

@@ -11,9 +11,10 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.10.3')
+  s.add_runtime_dependency('social_stream-base', '~> 0.10.4')
   s.add_runtime_dependency('social_stream-documents', '~> 0.5.0')
   s.add_runtime_dependency('social_stream-events', '~> 0.1.0')
+  s.add_runtime_dependency('social_stream-linkser', '~> 0.0.1')
  
   # Development Gem dependencies
   #

data/spec/dummy/db/schema.rb

@@ -5,4 +5,5 @@ ActiveRecord::Schema.define(:version => 0) do
   CreateSocialStream.up
   ActsAsTaggableOnMigration.up
   CreateSocialStreamDocuments.up
+  CreateSocialStreamLinkser.up
 end

data/spec/support/db.rb

@@ -1,10 +1,15 @@
-require 'social_stream/migrations/documents'
-require 'social_stream/migrations/events'
+gems = %w{ documents events linkser }
 
-SocialStream::Migrations::Events.new.down
-SocialStream::Migrations::Documents.new.down
-SocialStream::Migrations::Base.new.down
+gems.each do |g|
+  require "social_stream/migrations/#{ g }"
+end
 
-SocialStream::Migrations::Base.new.up
-SocialStream::Migrations::Documents.new.up
-SocialStream::Migrations::Events.new.up
+gems.unshift("base")
+
+gems.reverse.each do |g|
+  "SocialStream::Migrations::#{ g.camelize }".constantize.new.down
+end
+
+gems.each do |g|
+  "SocialStream::Migrations::#{ g.camelize }".constantize.new.up
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream
 version: !ruby/object:Gem::Version 
-  hash: 45
+  hash: 39
   prerelease: 
   segments: 
   - 0
-  - 13
-  - 3
-  version: 0.13.3
+  - 14
+  - 0
+  version: 0.14.0
 platform: ruby
 authors: 
 - GING - DIT - UPM
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-02 00:00:00 +01:00
+date: 2011-12-05 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,12 +27,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 49
+        hash: 63
         segments: 
         - 0
         - 10
-        - 3
-        version: 0.10.3
+        - 4
+        version: 0.10.4
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -68,9 +68,25 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: capybara
+  name: social_stream-linkser
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 0
+        - 0
+        - 1
+        version: 0.0.1
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: capybara
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -82,11 +98,11 @@ dependencies:
         - 9
         version: 0.3.9
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: sqlite3
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -96,11 +112,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: ruby-debug
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -112,11 +128,11 @@ dependencies:
         - 3
         version: 0.10.3
   type: :development
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rspec-rails
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -128,11 +144,11 @@ dependencies:
         - 0
         version: 2.5.0
   type: :development
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: factory_girl
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -144,11 +160,11 @@ dependencies:
         - 2
         version: 1.3.2
   type: :development
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: forgery
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -160,11 +176,11 @@ dependencies:
         - 6
         version: 0.3.6
   type: :development
-  version_requirements: *id009
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: ci_reporter
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -176,7 +192,7 @@ dependencies:
         - 4
         version: 1.6.4
   type: :development
-  version_requirements: *id010
+  version_requirements: *id011
 description: Social Stream is a Ruby on Rails engine for building social network websites. It supports contacts, posts, file uploads, private messages and many more.
 email: 
 executables: []
@@ -1126,9 +1142,20 @@ files:
 - linkser/app/assets/javascripts/social_stream-linkser.js
 - linkser/app/assets/stylesheets/linkser.css.scss
 - linkser/app/assets/stylesheets/social_stream-linkser.css
+- linkser/app/controllers/links_controller.rb
+- linkser/app/controllers/linkser_controller.rb
+- linkser/app/models/link.rb
+- linkser/app/views/links/_link.html.erb
+- linkser/app/views/links/_link_preview.html.erb
+- linkser/app/views/links/_link_with_details.html.erb
+- linkser/app/views/links/create.js.erb
+- linkser/app/views/links/destroy.js.erb
+- linkser/app/views/links/show.html.erb
+- linkser/app/views/posts/_new_activity_fields.erb
 - linkser/config/locales/en.yml
 - linkser/config/locales/es.yml
 - linkser/config/routes.rb
+- linkser/db/migrate/20111129100618_create_social_stream_linkser.rb
 - linkser/lib/generators/social_stream/linkser/install_generator.rb
 - linkser/lib/social_stream-linkser.rb
 - linkser/lib/social_stream/linkser/engine.rb
@@ -1270,6 +1297,7 @@ files:
 - presence/db/migrate/20111116194112_add_chat_enabled_column_to_user.rb
 - presence/ejabberd/conf/ejabberd_example.cfg
 - presence/ejabberd/conf/ssconfig_example.cfg
+- presence/ejabberd/ejabberd_files.zip
 - presence/ejabberd/ejabberd_scripts/authentication_script
 - presence/ejabberd/ejabberd_scripts/development_scripts/compile_module
 - presence/ejabberd/ejabberd_scripts/development_scripts/generate_random_password
@@ -1284,6 +1312,7 @@ files:
 - presence/ejabberd/ejabberd_scripts/set_presence_script
 - presence/ejabberd/ejabberd_scripts/synchronize_presence_script
 - presence/ejabberd/ejabberd_scripts/unset_connection_script
+- presence/ejabberd/ejabberd_scripts/unset_presence_script
 - presence/ejabberd/mod_admin_extra/mod_admin_extra.beam
 - presence/ejabberd/mod_admin_extra/mod_admin_extra.erl
 - presence/ejabberd/mod_sspresence/mod_sspresence.beam