@@ -8,7 +8,7 @@ gem 'rails', '~> 3.2.11'

 gem "mongoid", "~> 3.0.20"

 gem "xmpp4r", "~> 0.5"

 gem "thin", "~> 1.5.0"

-gem "websocket-rails", "~> 0.4.2"

+gem "websocket-rails", "~> 0.4.3"

 # Gems used only for assets and not required

 # in production environments by default.

@@ -202,7 +202,7 @@ GEM

       execjs (>= 0.3.0)

       multi_json (~> 1.0, >= 1.0.2)

     websocket (1.0.7)

-    websocket-rails (0.4.2)

+    websocket-rails (0.4.3)

       em-synchrony

       faye-websocket

       hiredis

@@ -239,5 +239,5 @@ DEPENDENCIES

   thin (~> 1.5.0)

   timecop

   uglifier (>= 1.0.3)

-  websocket-rails (~> 0.4.2)

+  websocket-rails (~> 0.4.3)

   xmpp4r (~> 0.5)

@@ -1,21 +1,25 @@

 class RosterController < WebsocketRails::BaseController

-    include Jabber

+    #include Jabber

     def initialize_session

-        controller_store[:friends] = {}

+        #controller_store[:friends] = {}

     end

     def connect

-        hack_sessions()

-

+        #hack_sessions()

+        #Rails.logger.info "ahojte"

+        Rails.logger.info "login now"

         login()

-        get_roster()

+        trigger_success msg: "asdds"

+

+        #login()

+        #get_roster()

     end

     ##

     # Vrat vsetkych priatelov v rosteri

     def get_roster

-        controller_store[:friends]

+        #controller_store[:friends]

     end

     ##

@@ -26,8 +30,19 @@ class RosterController < WebsocketRails::BaseController

     private

+    def login

+        Rails.logger.info session[:token].inspect

+        #user_id = Token.find_by(token: session[:token]).user_id

+        #Rails.logger.info "user ID" + user_id.inspect

+    end

+

     def hack_sessions

-        session[:a] = true

-        session.delete :a

+        #session[:a] = true

+        #Rails.logger.info session.inspect

+

+        #Rails.logger.info request.session.inspect

+        #Rails.logger.info request.cookies["rack.session"]

+        #session.delete :a

+        #Rails.logger.info session.inspect

     end

 end