sinatra-rocketio 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b79c54a4625daf478248080e3030bd3c616b6fa
-  data.tar.gz: fc17414c382d82e9d489c440ffa4b38aeafd5763
+  metadata.gz: 7d6fd962e14fc6929da8f5143c3ed8cd12776937
+  data.tar.gz: 6873e400995be6dcc7a2c3e8688fad3353db71f4
 SHA512:
-  metadata.gz: 819632a1f9940f5d01249518dbde89b6e660ad6f9fb1973a1f5a2d0a3d728ea31f7a3fad1926de32c41a4f11588e84729e16ab7b578e4535ee460b7537dd2d3e
-  data.tar.gz: 729e355f593282179ff61436757cddd0449a66e371c3def725d416dd403c275d3bd07694c2350b52fc37fdda0730f06757c2ff2f90236bb0cb060837c0c6aab2
+  metadata.gz: 116c61a5dc8ddfa031af77263ebc1e4205604b6be1d8e13db64cef399843763fade524cd74d99161029548a208d16fccab202c1caa9d81446ff6dd2672042518
+  data.tar.gz: 13276fb030f0f526468a138b85d574bf48ac357ee1f7faf69082b6b6ae5b4a13c4bd58f93db4a5e2f89810df780df50debcf8bd2b1d210f9a471985725cc3e0d

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.3.1 2013-10-03
+
+* bugfix of push
+
 === 0.3.0 2013-10-02
 
 * get client address with Sinatra::RocketIO::ClientInfo#address

data/lib/sinatra-rocketio/rocketio.rb

@@ -38,20 +38,26 @@ Sinatra::RocketIO.once :start do
   if options[:comet]
     Sinatra::CometIO.on :* do |event_name, *args|
       event_name = :__connect if event_name == :connect
+      session_id = args.size > 1 ? args[1] : args[0]
+      address = sessions.include?(session_id) ? sessions[session_id][:remote_addr] : nil
+      info = Sinatra::RocketIO::ClientInfo.new(:session => session_id, :address => address, :channel => Sinatra::RocketIO.channels[session_id], :type => :comet)
       if args.size > 1
-        Sinatra::RocketIO.emit event_name, args[0], Sinatra::RocketIO::ClientInfo.new(:session => args[1], :address => sessions[args[1]][:remote_addr], :channel => Sinatra::RocketIO.channels[args[1]], :type => :comet)
+        Sinatra::RocketIO.emit event_name, args[0], info
       else
-        Sinatra::RocketIO.emit event_name, Sinatra::RocketIO::ClientInfo.new(:session => args[0], :address => sessions[args[0]][:remote_addr], :channel => Sinatra::RocketIO.channels[args[0]], :type => :comet)
+        Sinatra::RocketIO.emit event_name, info
       end
     end
   end
   if options[:websocket]
     Sinatra::WebSocketIO.on :* do |event_name, *args|
       event_name = :__connect if event_name == :connect
+      session_id = args.size > 1 ? args[1] : args[0]
+      address = sessions.include?(session_id) ? sessions[session_id][:remote_addr] : nil
+      info = Sinatra::RocketIO::ClientInfo.new(:session => session_id, :address => address, :channel => Sinatra::RocketIO.channels[session_id], :type => :websocket)
       if args.size > 1
-        Sinatra::RocketIO.emit event_name, args[0], Sinatra::RocketIO::ClientInfo.new(:session => args[1], :address => sessions[args[1]][:remote_addr], :channel => Sinatra::RocketIO.channels[args[1]], :type => :websocket)
+        Sinatra::RocketIO.emit event_name, args[0], info
       else
-        Sinatra::RocketIO.emit event_name, Sinatra::RocketIO::ClientInfo.new(:session => args[0], :address => sessions[args[0]][:remote_addr], :channel => Sinatra::RocketIO.channels[args[0]], :type => :websocket)
+        Sinatra::RocketIO.emit event_name, info
       end
     end
   end

data/lib/sinatra-rocketio/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
   module RocketIO
-    VERSION = "0.3.0"
+    VERSION = "0.3.1"
   end
 end

data/rocketio.js

@@ -1,4 +1,4 @@
-// RocketIO.js v0.2.6 (websocketio:v0.3.3, cometio:v0.5.8)
+// RocketIO.js v0.3.1 (websocketio:v0.3.7, cometio:v0.5.9)
 // https://github.com/shokai/sinatra-rocketio
 // (c) 2013 Sho Hashimoto <hashimoto@shokai.org>
 // The MIT License

data/rocketio.min.js

@@ -1,4 +1,4 @@
-// RocketIO.js v0.2.6 (websocketio:v0.3.3, cometio:v0.5.8)
+// RocketIO.js v0.3.1 (websocketio:v0.3.7, cometio:v0.5.9)
 // https://github.com/shokai/sinatra-rocketio
 // (c) 2013 Sho Hashimoto <hashimoto@shokai.org>
 // The MIT License

data/sinatra-rocketio.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "json"
 
   gem.add_dependency "sinatra-cometio", ">= 0.5.9"
-  gem.add_dependency "sinatra-websocketio", ">= 0.3.7"
+  gem.add_dependency "sinatra-websocketio", ">= 0.3.8"
   gem.add_dependency "sinatra"
   gem.add_dependency "eventmachine", ">= 1.0.0"
   gem.add_dependency "event_emitter", ">= 0.2.5"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-rocketio
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Sho Hashimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-01 00:00:00.000000000 Z
+date: 2013-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.3.7
+        version: 0.3.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.3.7
+        version: 0.3.8
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -277,7 +277,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.1.5
 signing_key: 
 specification_version: 4
 summary: WebSocket/Comet IO plugin for Sinatra