... | ... |
@@ -8,7 +8,7 @@ gem 'rails', '~> 3.2.11' |
8 | 8 |
gem "mongoid", "~> 3.0.20" |
9 | 9 |
gem "xmpp4r", "~> 0.5" |
10 | 10 |
gem "thin", "~> 1.5.0" |
11 |
-gem "websocket-rails", "~> 0.4.2" |
|
11 |
+gem "websocket-rails", "~> 0.4.3" |
|
12 | 12 |
|
13 | 13 |
# Gems used only for assets and not required |
14 | 14 |
# in production environments by default. |
... | ... |
@@ -202,7 +202,7 @@ GEM |
202 | 202 |
execjs (>= 0.3.0) |
203 | 203 |
multi_json (~> 1.0, >= 1.0.2) |
204 | 204 |
websocket (1.0.7) |
205 |
- websocket-rails (0.4.2) |
|
205 |
+ websocket-rails (0.4.3) |
|
206 | 206 |
em-synchrony |
207 | 207 |
faye-websocket |
208 | 208 |
hiredis |
... | ... |
@@ -239,5 +239,5 @@ DEPENDENCIES |
239 | 239 |
thin (~> 1.5.0) |
240 | 240 |
timecop |
241 | 241 |
uglifier (>= 1.0.3) |
242 |
- websocket-rails (~> 0.4.2) |
|
242 |
+ websocket-rails (~> 0.4.3) |
|
243 | 243 |
xmpp4r (~> 0.5) |
... | ... |
@@ -1,21 +1,25 @@ |
1 | 1 |
class RosterController < WebsocketRails::BaseController |
2 |
- include Jabber |
|
2 |
+ #include Jabber |
|
3 | 3 |
|
4 | 4 |
def initialize_session |
5 |
- controller_store[:friends] = {} |
|
5 |
+ #controller_store[:friends] = {} |
|
6 | 6 |
end |
7 | 7 |
|
8 | 8 |
def connect |
9 |
- hack_sessions() |
|
10 |
- |
|
9 |
+ #hack_sessions() |
|
10 |
+ #Rails.logger.info "ahojte" |
|
11 |
+ Rails.logger.info "login now" |
|
11 | 12 |
login() |
12 |
- get_roster() |
|
13 |
+ trigger_success msg: "asdds" |
|
14 |
+ |
|
15 |
+ #login() |
|
16 |
+ #get_roster() |
|
13 | 17 |
end |
14 | 18 |
|
15 | 19 |
## |
16 | 20 |
# Vrat vsetkych priatelov v rosteri |
17 | 21 |
def get_roster |
18 |
- controller_store[:friends] |
|
22 |
+ #controller_store[:friends] |
|
19 | 23 |
end |
20 | 24 |
|
21 | 25 |
## |
... | ... |
@@ -26,8 +30,19 @@ class RosterController < WebsocketRails::BaseController |
26 | 26 |
|
27 | 27 |
private |
28 | 28 |
|
29 |
+ def login |
|
30 |
+ Rails.logger.info session[:token].inspect |
|
31 |
+ #user_id = Token.find_by(token: session[:token]).user_id |
|
32 |
+ #Rails.logger.info "user ID" + user_id.inspect |
|
33 |
+ end |
|
34 |
+ |
|
29 | 35 |
def hack_sessions |
30 |
- session[:a] = true |
|
31 |
- session.delete :a |
|
36 |
+ #session[:a] = true |
|
37 |
+ #Rails.logger.info session.inspect |
|
38 |
+ |
|
39 |
+ #Rails.logger.info request.session.inspect |
|
40 |
+ #Rails.logger.info request.cookies["rack.session"] |
|
41 |
+ #session.delete :a |
|
42 |
+ #Rails.logger.info session.inspect |
|
32 | 43 |
end |
33 | 44 |
end |