social_stream-presence 0.13.1 → 0.13.2

data/app/views/chat/_index.html.erb

@@ -82,25 +82,19 @@
 	var BOSH_SERVICE = '<%= SocialStream::Presence.bosh_service || root_url + "http-bind/" %>';
 	var user_name = '<%=current_user.name%>';
   var user_slug = '<%=current_user.slug%>';
-  var user_jid = '<%=current_user.slug%>'+"@"+domain;
+  var user_jid = PRESENCE.XMPPClient.getJidFromSlug('<%=current_user.slug%>');
 	
 
-
   $(document).ready(function () {
 			
 		//Inicial field
 		$("#chat_partial").html($("#chat_connecting").html())
 	
-    if(getRestoreUserChatStatus()!="offline"){
-			if (authByCookie()){
-				connectToChat(user_jid,cookie,null);
-			} else {
-				//Auth by password
-				connectToChat(user_jid,null,null);
-			}
-      initialTimer = setTimeout("updateChatWindow()", 10000);
+    if((PRESENCE.PERSISTENCE.getRestoreUserChatStatus()!="offline")&&(cookie)){
+			PRESENCE.XMPPClient.connectToChat(user_jid,cookie);
+      initialTimer = setTimeout("PRESENCE.UIMANAGER.updateChatWindow()", 10000);
     } else {
-      updateChatWindow();
+      PRESENCE.UIMANAGER.updateChatWindow();
     }
       
 	  PRESENCE.CORE.init();
@@ -111,8 +105,8 @@
 <% if defined?(flow)!=nil and flow %>
   <script type="text/javascript">
 	  $(document).ready(function () {
-		  createMainChatBox();
-			addContentToMainChatBox(modifyChatPartialIfMainBox($("#chat_partial")));
+		  PRESENCE.WINDOW.createMainChatBox();
+			PRESENCE.WINDOW.addContentToMainChatBox(PRESENCE.WINDOW.modifyChatPartialIfMainBox($("#chat_partial")));
 			$("#chat_wrapper").find("#chat_partial").remove();
 		});
 	</script>

data/config/locales/en.yml

@@ -63,4 +63,5 @@ en:
       cancel: "{{name}} cancel the invitation"
       finish: "{{name}} close the game"
       waiting: Waiting for response...
-      unknown: Unknown response
+      unknown: Unknown response
+      clientIssue: "{{name}}'s client not support games"

data/config/locales/es.yml

@@ -63,4 +63,5 @@ es:
       cancel: "{{name}} canceló la partida"
       finish: "{{name}} ha cerrado el juego"
       waiting: Esperando respuesta...
-      unknown: Respuesta desconocida
+      unknown: Respuesta desconocida
+      clientIssue: "El cliente de {{name}} no tiene juegos"

data/ejabberd/ejabberd_scripts/authentication_script

@@ -32,6 +32,13 @@ def getOption(option)
 end
 
 $cookie_name = getOption("cookie_name=")
+$force_ssl = getOption("force_ssl=")
+
+if $force_ssl=="true"
+	$http="https"
+else
+	$http="http"
+end
 
 
 def auth(username,domain,password)
@@ -44,7 +51,7 @@ def auth(username,domain,password)
   #  return true
   #end
 
-  accessByPasswordUrl = "http://" + getWebDomainUrlFromDomain(domain) + "/users/sign_in"
+  accessByPasswordUrl = $http + "://" + getWebDomainUrlFromDomain(domain) + "/users/sign_in"
 
   begin
     response = RestClient.post accessByPasswordUrl, :user => { :email => username , :password => password }
@@ -70,7 +77,7 @@ end
 
 def authByCookie(username, domain, cookie)
   begin
-    accessByCookieUrl = "http://" + getWebDomainUrlFromDomain(domain) + "/api/me"
+    accessByCookieUrl = $http + "://" + getWebDomainUrlFromDomain(domain) + "/api/me"
     response = RestClient.get accessByCookieUrl, :cookies => {:"#{$cookie_name}" => cookie}
     doc = REXML::Document.new(response.body)
 

data/lib/generators/social_stream/presence/templates/initializer.rb

@@ -36,5 +36,9 @@ SocialStream::Presence.setup do |config|
   #config.opentok_api_key = ""
   #Replace with your OpenTok API secret.
   #config.opentok_api_secret = ""
+  
+  #Multiplayer Games Service
+  #Uncomment to enable Multiplayer Games Service
+  #config.games = true
 
 end

data/lib/social_stream/presence/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Presence
-    VERSION = "0.13.1"
+    VERSION = "0.13.2"
   end
 end

data/lib/social_stream/presence/xmpp_server_order.rb

@@ -269,6 +269,7 @@ module SocialStream
             autoconf.push("secure_rest_api=" + SocialStream::Presence.secure_rest_api.to_s)
             autoconf.push("cookie_name=" + Rails.application.config.session_options[:key])
             autoconf.push("web_domains=[" + SocialStream::Presence.domain + "]")
+            autoconf.push("force_ssl=" + Rails.application.config.force_ssl.to_s()) 
             
             #Param options
             if options

data/lib/social_stream-presence.rb

@@ -40,6 +40,8 @@ module SocialStream
     
     mattr_accessor :opentok_api_key
     mattr_accessor :opentok_api_secret
+    
+    mattr_accessor :games
 
     @@auth_method = "cookie"
     @@remote_xmpp_server = false
@@ -47,6 +49,7 @@ module SocialStream
     @@enable = false
     @@social_stream_presence_username = "social_stream_presence"
     @@opentok_api_key = "default"
+    @@games = false
     
     class << self
       def setup

metadata

@@ -1,80 +1,82 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: social_stream-presence
-version: !ruby/object:Gem::Version
-  version: 0.13.1
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.13.2
 platform: ruby
-authors:
+authors: 
 - Aldo Gordillo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-11 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-05-16 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: social_stream-base
-  requirement: &76276660 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 0.20.1
   type: :runtime
-  prerelease: false
-  version_requirements: *76276660
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: xmpp4r
-  requirement: &76276370 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *76276370
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: net-ssh
-  requirement: &75832620 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *75832620
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: net-sftp
-  requirement: &75832220 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *75832220
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: debugger
-  requirement: &75831550 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *75831550
-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.
-email:
+  version_requirements: *id005
+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.
+email: 
 - agordillos@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
 - Rakefile
@@ -272,27 +274,30 @@ files:
 - vendor/assets/stylesheets/jquery.ui.chatbox.css
 homepage: https://github.com/ging/social_stream/wiki/Getting-Started-With-Social-Stream-Presence
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: social_stream-presence
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Presence capabilities for Social Stream, the core for building social network
-  websites.
+summary: Presence capabilities for Social Stream, the core for building social network websites.
 test_files: []
+