sinatra-websocketio 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d7891b6aad93861982e3e0ba15f735e06837e4a
-  data.tar.gz: bae64259a47ea48715acc6b64b48856b3d35c982
+  metadata.gz: 454a37ab537ba60d23f20d1b3d28a907f6124713
+  data.tar.gz: 7243a6732a908bbf7efb2c48e3874e2bd09e28d1
 SHA512:
-  metadata.gz: 5e7aa76c655ab3a5910e16b3974098a9df363e730c850eddbc9c341a252bf53c1854c5eb3ddeb55386d1ee25133e40fec724bfc1d37ba4ebde8f4bc5bb9aebcb
-  data.tar.gz: c90d1adca5c5250d17c4f29f5d630519ce5f89c018a04f591c0019e99d887d01d571047d461bda40cd1046992d9ef8aa04817bef2c58a3e6a966bac2134b2f7c
+  metadata.gz: 410c6ef3758faec426ef6d8956d6af34172efe65d4d4f7900b5ec541a46fe61f58410cd227399856bac8a2e9ee9dc5c6eb7b694be35a4f855886c7a527ace91e
+  data.tar.gz: f0f99248f0c0691fa94b7e7e37f3bbbaf98b1b2b1898b8f2b82cb7d4277bcd548dc4fe2ee2313f87679b91137c904a7c0789034e8a6406b1f9062d7913b191be

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.3.6 2013-10-01
+
+* store REMOTE_ADDR into Sinatra::WebSocketIO.sessions
+
 === 0.3.5 2013-08-09
 
 * push "__heartbeat" message from server every 300 sec

data/lib/sinatra-websocketio/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
   module WebSocketIO
-    VERSION = "0.3.5"
+    VERSION = "0.3.6"
   end
 end

data/lib/sinatra-websocketio/websocketio.rb

@@ -15,15 +15,19 @@ module Sinatra
         end
         puts "Sinatra::WebSocketIO.start port:#{options[:port]}"
         EM::WebSocket.run :host => "0.0.0.0", :port => options[:port] do |ws|
-          ws.onopen do |handshake|
+          ws.onopen do |handshake, connection|
             params = parse_handshake_params handshake.path
-            session_id = params[:session] || (create_session Socket.unpack_sockaddr_in ws.get_peername)
+            remote_addr = Socket.unpack_sockaddr_in(ws.get_peername)[1]
+            session_id = params[:session] || create_session(remote_addr)
 
             if self.sessions.include? session_id
               ws.send({:type => :error, :data => "invalid session_id (#{session_id})"}.to_json)
               ws.close
             else
-              self.sessions[session_id] = ws
+              self.sessions[session_id] = {
+                :websocket => ws,
+                :remote_addr => remote_addr
+              }
               ws.onclose do
                 self.sessions.delete session_id
                 self.emit :disconnect, session_id
@@ -52,7 +56,7 @@ module Sinatra
     def self.push(type, data, opt={})
       if opt.include? :to
         return unless self.sessions.include? opt[:to]
-        s = self.sessions[opt[:to]]
+        s = self.sessions[opt[:to]][:websocket]
         begin
           s.send({:type => type, :data => data}.to_json)
         rescue => e
@@ -66,7 +70,7 @@ module Sinatra
     end
 
     def self.sessions
-      @@sessions ||= Hash.new
+      @@sessions ||= Hash.new{|h,k| h[k] = {:websocket => nil, :remote_addr => nil} }
     end
 
     def self.create_session(ip_addr)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-websocketio
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Sho Hashimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-09 00:00:00.000000000 Z
+date: 2013-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler