nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

hm why do we update gems so rarely? Lets do it for em-websocket

Browse source
This commit is contained in:
Jonne Hass 2011-11-03 01:08:53 +01:00
parent d0d31a6f78
commit c4a4516369
3 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -109,7 +109,7 @@ gem 'faraday-stack'
# web sockets # web sockets
gem 'em-synchrony', :platforms => :ruby_19 gem 'em-synchrony', :platforms => :ruby_19
gem 'em-websocket', :git => 'git://github.com/igrigorik/em-websocket', :ref => 'e278f5a1c4db60be7485' gem 'em-websocket'
### GROUPS #### ### GROUPS ####

14
Gemfile.lock
View file

@ -47,15 +47,6 @@ GIT
specs: specs:
http_accept_language (1.0.1) http_accept_language (1.0.1)
GIT
remote: git://github.com/igrigorik/em-websocket
revision: e278f5a1c4db60be7485859520a069e08bfe1247
ref: e278f5a1c4db60be7485
specs:
em-websocket (0.2.0)
addressable (>= 2.1.1)
eventmachine (>= 0.12.9)
GEM GEM
remote: http://rubygems.org/ remote: http://rubygems.org/
specs: specs:
@ -169,6 +160,9 @@ GEM
diff-lcs (1.1.3) diff-lcs (1.1.3)
em-synchrony (0.2.0) em-synchrony (0.2.0)
eventmachine (>= 0.12.9) eventmachine (>= 0.12.9)
em-websocket (0.3.5)
addressable (>= 2.1.1)
eventmachine (>= 0.12.9)
erubis (2.6.6) erubis (2.6.6)
abstract (>= 1.0.0) abstract (>= 1.0.0)
eventmachine (0.12.10) eventmachine (0.12.10)
@ -505,7 +499,7 @@ DEPENDENCIES
devise_invitable (= 0.5.0) devise_invitable (= 0.5.0)
diaspora-client! diaspora-client!
em-synchrony em-synchrony
em-websocket! em-websocket
excon (= 0.2.4) excon (= 0.2.4)
factory_girl_rails factory_girl_rails
faraday faraday

4
script/websocket_server.rb
View file

@ -62,10 +62,10 @@ begin
begin begin
debug_pp ws.request debug_pp ws.request
cookies = ws.request["Cookie"].split(';') cookies = ws.request["cookie"].split(';')
session_key = "_diaspora_session=" session_key = "_diaspora_session="
enc_diaspora_cookie = cookies.detect{|c| c.include?(session_key)}.gsub(session_key,'') enc_diaspora_cookie = cookies.detect{|c| c.include?(session_key)}.gsub(session_key,'')
cookie = Marshal.load(enc_diaspora_cookie.unpack("m*").first) cookie = Marshal.load(enc_diaspora_cookie.strip.unpack("m*").first)
debug_pp cookie debug_pp cookie