social_stream 0.21.4 → 0.22.0

data/social_stream.gemspec

@@ -11,11 +11,11 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.16.2')
+  s.add_runtime_dependency('social_stream-base', '~> 0.16.3')
   s.add_runtime_dependency('social_stream-documents', '~> 0.11.1')
   s.add_runtime_dependency('social_stream-events', '~> 0.8.1')
   s.add_runtime_dependency('social_stream-linkser', '~> 0.6.1')
-  s.add_runtime_dependency('social_stream-presence', '~> 0.7.5')
+  s.add_runtime_dependency('social_stream-presence', '~> 0.8.3')
  
   # Development Gem dependencies
   #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream
 version: !ruby/object:Gem::Version
-  version: 0.21.4
+  version: 0.22.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,22 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-21 00:00:00.000000000Z
+date: 2012-02-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: social_stream-base
-  requirement: &75850710 !ruby/object:Gem::Requirement
+  requirement: &80182220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.16.2
+        version: 0.16.3
   type: :runtime
   prerelease: false
-  version_requirements: *75850710
+  version_requirements: *80182220
 - !ruby/object:Gem::Dependency
   name: social_stream-documents
-  requirement: &75850300 !ruby/object:Gem::Requirement
+  requirement: &80181900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.11.1
   type: :runtime
   prerelease: false
-  version_requirements: *75850300
+  version_requirements: *80181900
 - !ruby/object:Gem::Dependency
   name: social_stream-events
-  requirement: &75849860 !ruby/object:Gem::Requirement
+  requirement: &80181640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 0.8.1
   type: :runtime
   prerelease: false
-  version_requirements: *75849860
+  version_requirements: *80181640
 - !ruby/object:Gem::Dependency
   name: social_stream-linkser
-  requirement: &75849420 !ruby/object:Gem::Requirement
+  requirement: &80181260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,21 +55,21 @@ dependencies:
         version: 0.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *75849420
+  version_requirements: *80181260
 - !ruby/object:Gem::Dependency
   name: social_stream-presence
-  requirement: &75848890 !ruby/object:Gem::Requirement
+  requirement: &80180810 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.5
+        version: 0.8.3
   type: :runtime
   prerelease: false
-  version_requirements: *75848890
+  version_requirements: *80180810
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &75848390 !ruby/object:Gem::Requirement
+  requirement: &80180510 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 0.3.9
   type: :development
   prerelease: false
-  version_requirements: *75848390
+  version_requirements: *80180510
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &75848090 !ruby/object:Gem::Requirement
+  requirement: &80180070 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *75848090
+  version_requirements: *80180070
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &75847660 !ruby/object:Gem::Requirement
+  requirement: &80179570 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *75847660
+  version_requirements: *80179570
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &75847080 !ruby/object:Gem::Requirement
+  requirement: &80179190 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +110,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *75847080
+  version_requirements: *80179190
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &75846630 !ruby/object:Gem::Requirement
+  requirement: &80178740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -121,10 +121,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *75846630
+  version_requirements: *80178740
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &75846270 !ruby/object:Gem::Requirement
+  requirement: &80178210 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,10 +132,10 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *75846270
+  version_requirements: *80178210
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &75845900 !ruby/object:Gem::Requirement
+  requirement: &80177720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -143,7 +143,7 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *75845900
+  version_requirements: *80177720
 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: 
@@ -1207,6 +1207,7 @@ files:
 - presence/app/assets/images/emoticons/sun.png
 - presence/app/assets/images/status/available.png
 - presence/app/assets/images/status/away.png
+- presence/app/assets/images/status/chat.png
 - presence/app/assets/images/status/dnd.png
 - presence/app/assets/images/status/offline.png
 - presence/app/assets/javascripts/chat_audio.js.erb
@@ -1219,6 +1220,7 @@ files:
 - presence/app/assets/javascripts/jquery.ui.chatbox.sstreampresence.js
 - presence/app/assets/javascripts/social_stream-presence.js
 - presence/app/assets/javascripts/store.js
+- presence/app/assets/javascripts/videochat.js.erb
 - presence/app/assets/javascripts/xmpp_client_management.js.erb
 - presence/app/assets/stylesheets/chat.css.scss
 - presence/app/assets/stylesheets/social_stream-presence.css
@@ -1228,6 +1230,7 @@ files:
 - presence/app/views/chat/_index.html.erb
 - presence/app/views/chat/_settings.html.erb
 - presence/app/views/xmpp/active_users.html.erb
+- presence/app/views/xmpp/getOpenTokSessionIDAndToken.xml.builder
 - presence/config/locales/en.yml
 - presence/config/locales/es.yml
 - presence/config/routes.rb
@@ -1246,25 +1249,31 @@ files:
 - presence/ejabberd/ejabberd_scripts/development_scripts/start_ejabberd.sh
 - presence/ejabberd/ejabberd_scripts/development_scripts/stop_ejabberd.sh
 - presence/ejabberd/ejabberd_scripts/emanagement
-- presence/ejabberd/ejabberd_scripts/reset_connection_script
+- presence/ejabberd/ejabberd_scripts/manageWebDomains
 - presence/ejabberd/ejabberd_scripts/rest_api_client_script
-- presence/ejabberd/ejabberd_scripts/set_script_header.sh
 - presence/ejabberd/ejabberd_scripts/synchronize_presence_script
 - presence/ejabberd/installer.sh
 - 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
 - presence/ejabberd/mod_sspresence/mod_sspresence.erl
+- presence/lib/OpenTok/Exceptions.rb
+- presence/lib/OpenTok/OpenTokSDK.rb
+- presence/lib/OpenTok/Session.rb
 - presence/lib/generators/social_stream/presence/install_generator.rb
 - presence/lib/generators/social_stream/presence/templates/initializer.rb
+- presence/lib/open_tok.rb
+- presence/lib/opentok.rb
 - presence/lib/social_stream-presence.rb
 - presence/lib/social_stream/migrations/presence.rb
 - presence/lib/social_stream/presence/engine.rb
 - 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/presence/xmpp_ssclient.rb
 - presence/lib/social_stream/views/settings/presence.rb
 - presence/lib/tasks/presence/installer.rake
+- presence/lib/tasks/presence/multidomain.rake
 - presence/lib/tasks/presence/synchronize.rake
 - presence/social_stream-presence.gemspec
 - presence/spec/demo/.gitignore
@@ -1318,6 +1327,7 @@ files:
 - presence/spec/demo/vendor/plugins/.gitkeep
 - presence/spec/discover.rb
 - presence/spec/spec_helper.rb
+- presence/vendor/assets/javascripts/TB.min.js
 - presence/vendor/assets/javascripts/jquery.tools.tooltip.js
 - presence/vendor/assets/javascripts/liquidmetal.js
 - presence/vendor/assets/javascripts/strophe.js

data/presence/ejabberd/ejabberd_scripts/reset_connection_script

@@ -1,300 +0,0 @@
-#!/usr/bin/env ruby
-#Rest Api Client Script
-#Version: 13-12-2011
-#@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
-
-#Constants
-$secure_rest_api = getOption("secure_rest_api=")
-$pass = getOption("ejabberd_password=")
-$scripts_path = getOption("scripts_path=")
-$script_title = "Reset Connection Script"
-
-
-def log(title,text)
-	$logger.info title + ": " + text
-end
-
-def getMethodName
-  caller[0] =~ /`(.*?)'/
-  $1
-end
-
-
-#####################
-#####  Example  #####
-#####################
-#def myHook(param1,param2)
-#    log(getMethodName,"(My message: #{param1},#{param2})")
-#    url = "http://" + getOption("web_domain=") + "/xmpp/hookRoute"
-
-#    params = {}
-#    encrypted_params = {}
-#    #Add params to sent in clear
-#    params[:param1_in_server]=param1
-#    #Add params to sent cipher
-#    encrypted_params[:param2_in_server]=param2
-
-#    return [getMethodName,generic_api_call(url,params,encrypted_params)]
-#end
-
-def setConnection(username)
-    log($script_title,"#{getMethodName}(#{username})")
-    url = "http://" + getOption("web_domain=") + "/xmpp/setConnection"
-
-    params = {}
-    encrypted_params = {}
-    encrypted_params[:name]=username
-
-    return [getMethodName,generic_api_call(url,params,encrypted_params)]
-end
-
-
-def unsetConnection(username)
-    log($script_title,"#{getMethodName}(#{username})")
-    url = "http://" + getOption("web_domain=") + "/xmpp/unsetConnection"
-
-    params = {}
-    encrypted_params = {}
-    encrypted_params[:name]=username
-
-    return [getMethodName,generic_api_call(url,params,encrypted_params)]
-end
-
-
-def setPresence(username,status)
-    log($script_title,"#{getMethodName}(#{username},#{status})")
-    url = "http://" + getOption("web_domain=") + "/xmpp/setPresence"
-
-    params = {}
-    encrypted_params = {}
-    encrypted_params[:name]=username
-    encrypted_params[:status]=status
-
-    return [getMethodName,generic_api_call(url,params,encrypted_params)]
-end
-
-
-def unsetPresence(username)
-    log($script_title,"#{getMethodName}(#{username})")
-    url = "http://" + getOption("web_domain=") + "/xmpp/unsetPresence"
-
-    params = {}
-    encrypted_params = {}
-    encrypted_params[:name]=username
-
-    return [getMethodName,generic_api_call(url,params,encrypted_params)]
-end
-
-
-def resetConnection()
-    log($script_title,"Call #{getMethodName}()")
-    url = "http://" + getOption("web_domain=") + "/xmpp/resetConnection"
-
-    params = {}
-    encrypted_params = {}
-
-    return [getMethodName,generic_api_call(url,params,encrypted_params)]
-end
-
-
-def synchronize()
-    log($script_title,"Call #{getMethodName}()")
-    url = "http://" + getOption("web_domain=") + "/xmpp/synchronizePresence"
-
-
-    #Get connected users using Emanagement
-    users = []
-    command = $scripts_path + "/emanagement getConnectedUsers"
-    output = %x[#{command}]
-    sessions = output.split("\n")
-
-    sessions.each do |session|
-      users << session.split("@")[0]
-    end
-    #Finish
-
-
-    #In this cases users always will be sent in clear (not cipher)
-    #(Too much data to cipher)
-    #Anyway, we must to build the hash to pass the authentication
-    params = {}
-    encrypted_params = {}
-    params[:name]=users.join(",")
-
-    return [getMethodName,generic_api_call(url,params,encrypted_params)]
-end
-
-
-
-#Params must include the password and all the parameters to be sent in clear.
-#Anyway, If "secure_rest_api" is disable, encrypted_params will be send in clear.
-def generic_api_call(url,params,encrypted_params)
-
-  begin
-    unless params
- 	params = {}
-    end
-
-    unless encrypted_params
- 	 encrypted_params = {}
-    end
-
-    params[:password]=$pass
-
-    response=sendHttpRequest(url,params,encrypted_params)
-    puts response.body
-
-    if response.body.include?("Ok")
-    	return true
-    else
-    	return false
-    end
-
-  rescue => e
-    log($script_title,"#{e.class.name}: #{e.message}")
-    puts("#{e.class.name}: #{e.message}")
-    return false
-  end
-end
-
-
-#Send HTTP Request to Social Stream Presence API
-def sendHttpRequest(url,params,encrypted_params)
-
-    unless params[:password]
-	return "params[:password] required in sendHttpRequest";
-    end
-
-
-    if $secure_rest_api == "true"
-	#Require libraries
-	require 'openssl'
-
-	xmpp_private_key_path = $scripts_path + "/rsa_keys/xmpp_rsa_key_private.pem";
-    	web_public_key_path = $scripts_path + "/rsa_keys/web_rsa_key_public.pem";
-    	xmpp_private_key = OpenSSL::PKey::RSA.new(File.read(xmpp_private_key_path))
-    	web_public_key = OpenSSL::PKey::RSA.new(File.read(web_public_key_path))
-
-	request_params = {};
-
-	#Copy non encypted params
-        params.each do |key,value|
-	  unless key.to_s == "password"
-		request_params[key] = value
-	  end 
-        end
-
-	#Include encrypted params
-	if encrypted_params and encrypted_params.empty? == false
-	  request_params[:encrypted_params] = web_public_key.public_encrypt(encrypted_params.to_s)
-	end
-	
-	#Generating stamp
-	#1 Get constant password
-	password = params[:password];
-	#2 Generating timestamp
-	timestamp = Time.now.utc.to_s
-	#3 Calculating Hash
-    	hash = calculateHash(request_params)
-
-	#Add cipher stamp to the request
-	request_params[:password] = xmpp_private_key.private_encrypt(password+"#####"+timestamp+"#####"+hash)
-	
-	#Replace previous params
-	params = request_params
-    else
-	#Non secure mode: send encrypted params in clear
-	if encrypted_params
-	  encrypted_params.each do |key,value|
-	      params[key] = value
-	  end
-	end
-    end
-    
-    response = RestClient.get url, :params => params
-    return response
-end
-
-
-def calculateHash(request_params)
-	require 'digest/md5'
-
-	unless request_params
-		request_params = {};
-	end
-
-	hash = "";
-        request_params.each do |key,value|
-              hash = hash + key.to_s + value.to_s
-        end
-        return Digest::MD5.hexdigest(hash)
-end
-
-
-
-
-def invokeApiCall(method,args)
-	length = args.length;
-	case length
-	when 0
-	  return send(method)
-	when 1
-	  return send(method,args[0])
-	when 2
-	  return send(method,args[0],args[1])
-	when 3
-	  return send(method,args[0],args[1],args[2])
-	when 4
-	  return send(method,args[0],args[1],args[2],args[3])
-	else
-	  return send(method,args)
-	end
-end
-
-
-#Main Program
-
-begin
-
-	args = []
-	method = "resetConnection";
-
-	if (response = invokeApiCall(method, args) and response[1])
-	  	puts $script_title  + ": #{response[0]} [OK]"
-	  	log( $script_title  , "#{response[0]} [OK]" )
-	else
-	  	puts $script_title  + ": #{response[0]} [FAIL]"
-	  	log( $script_title  , "#{response[0]} [FAIL]" )
-	end
-
-rescue => e
-	log($script_title,"#{e.class.name}: #{e.message}")
-   	puts("#{e.class.name}: #{e.message}")
-    	exit 1
-end
-