jegolize 0.1.9 → 0.1.10

data/VERSION

@@ -1 +1 @@
-0.1.9
+0.1.10

data/app/controllers/jegol_controller.rb

@@ -20,7 +20,7 @@ class JegolController < ApplicationController
                                                                                 server_url,
                                                                                 {:timeout => 20})
   
-    render :json => {:jid=>@session_jid, :sid=>@session_id, :rid=>@session_random_id, :room => room, :nickname => nickname}
+    render :json => {:jid=>@session_jid, :sid=>@session_id, :rid=>@session_random_id, :room => room, :nickname => nickname, :bosh_service => JEGOL_CONFIG['bosh_service']}
   end
   
   def get_jid

data/config/jegol.yml

@@ -26,4 +26,7 @@
   muc_namespace: conference.<TODO: XMPP.MYSERVER.COM>
   
   #chat rooms are named [jegolizating_<ID>]
-  muc_name_constant: jegolizing_
+  muc_name_constant: jegolizing_
+  
+  #XMPP BOSH service url eg. relative url with rewriting /http-bind/, or absolute http://XMPP.MYSERVER.COM/http-bind/
+  bosh_service: <TODO: BOSH-SERVICE-URL>

data/jegolize.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jegolize}
-  s.version = "0.1.9"
+  s.version = "0.1.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alemeshet Alemu"]

data/public/javascripts/jegol.js

@@ -1,6 +1,8 @@
-var BOSH_SERVICE = '/http-bind/';//'http://dev.qworky.net:5280/http-bind/';//
-
+/*
+ * @auther: Alemeshet Alemu
+ */
 var JeGol = {
+	bosh_service: '/http-bind/',
     connection: null,
     room: null,
     nickname: null,
@@ -136,26 +138,12 @@ var JeGol = {
     * Establish connection
     * option 2- from server side json store request for SID
     */
-    loginSIDFromServer : function(serviceURL){
+    loginSIDFromServer : function(data){
         Strophe.info('Login started...');
         
-        Strophe.debug('Getting SID from SID service...');
-            
-        $.getJSON(serviceURL.jsonURL, function(data) {
-            Strophe.debug('SID service returned...');
-            try {
-				JeGol.room = data.room;
-				JeGol.nickname = data.nickname;
-				JeGol.connection.attach(data.jid, data.sid, data.rid, JeGol.onConnect);
+		JeGol.connection.attach(data.jid, data.sid, data.rid, JeGol.onConnect);
 		              
-				Strophe.info('Login complete.');
-              
-            }
-			catch(e){
-				Strophe.error('Login failed: ' + e.message);
-            }
-        
-        });
+		Strophe.info('Login complete.');
     },
     /**
     * Establish connection
@@ -479,9 +467,23 @@ $(document).bind('jegol_init', function(e, d){
 * On Connect event - initialize a strope connection and login from authenticated session service URL
 */
 $(document).bind('connect', function(e, d){
-   JeGol.connection = new Strophe.Connection(BOSH_SERVICE);
-   $('#jegol_connection_status').text('connecting...');
-   JeGol.loginSIDFromServer({jsonURL: $('#jegol_service_url').val()});
+	Strophe.debug('Getting SID from SID service...');
+            
+    var jsonURL = $('#jegol_service_url').val();
+    $.getJSON(jsonURL, function(data) {
+        Strophe.debug('SID service returned...');
+        try {
+			JeGol.room = data.room;
+			JeGol.nickname = data.nickname;
+			JeGol.bosh_service = data.bosh_service;
+			
+			JeGol.connection = new Strophe.Connection(JeGol.bosh_service);
+			JeGol.loginSIDFromServer(data);
+        }
+		catch(e){
+			Strophe.error('Login failed: ' + e.message);
+        }    
+    });
 });
 
 /**

metadata

@@ -2,7 +2,7 @@
 name: jegolize
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors: 
 - Alemeshet Alemu
@@ -157,7 +157,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 288232335
+      hash: -178680915
       segments: 
       - 0
       version: "0"