iodine 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1fd668ed3460e3102fbd0ba91c8be5d89100356
-  data.tar.gz: 59416be95eb95921a05f9fa520aa8d61e843388f
+  metadata.gz: 688611fe0ab9da4acb64bac423d6f72899e981a0
+  data.tar.gz: afa9582b3fde67b3ea77aa7389d078cc00c762ba
 SHA512:
-  metadata.gz: 89add89d23f96c6870250a0028dc5298051147233c11d561f970f68b262e548e62454e92f6a78869c9938b46760cc5f4b146070b397e9ed593e5b1ba7704aa3e
-  data.tar.gz: 38db9c8b52f4ecf1083c1509f12a7aaa302bdfce668dbb592c09fea19a55a8c08d3d44439e559b116b2a879dedfdeb7ad7dbe56ae880c82dec1844aba90d1a70
+  metadata.gz: acf6eb30f924bb79ed5026bfef62e4ee30ca09dd07b93a33fc4db8be8237da6f273ac8f9208622099a5c55c3a94894826e65baebdca4c8b87009254206ed4e1a
+  data.tar.gz: 2d9ab314382fe82fa514cc5f38def28d79e39ff5e5c8e66277e972347a788481129f556aafa81bbf54ad0a3410664814844c91cc71876fe41b914e57d1fc3a08

data/CHANGELOG.md

@@ -8,9 +8,15 @@ Please notice that this change log contains changes for upcoming releases as wel
 
 ***
 
-Change log v.0.1.14
+Change log v.0.1.15
+
+**Update**: IO reactor will now update IO status even when tasks are pending. IO will still be read only when there are no more tasks to handle, but this allows chained tasks to relate to the updated IO status. i.e. this should improve websocket availability for broadcasting (delay from connection to availability might occure until IO is registered).
+
+**Update**: Websockets now support the `on_ping` callback, which will be called whenever a ping was sent without error.
 
-**
+***
+
+Change log v.0.1.14
 
 **Update**: the Response now supports `redirect_to` for both permanent and temporary redirection, with an optional `flash` cookie setup.
 

data/lib/iodine/core_init.rb

@@ -52,20 +52,20 @@ module Iodine
 		@status_loop = Proc.new {|io|  @io_out << io if io.closed? || !(io.stat.readable? rescue false) }
 		@close_callback = Proc.new {|prot| prot.on_close if prot }
 		@reactor = [ (Proc.new do
+			@ios.keys.each(&@status_loop)
+			@ios.values.each(&@timeout_proc)
+			until @io_in.empty?
+				n_io = @io_in.pop
+				@ios[n_io[0]] = n_io[1]
+			end
+			until @io_out.empty?
+				o_io = @io_out.pop
+				o_io.close unless o_io.closed?
+				run @ios.delete(o_io), &@close_callback
+			end
 			if @queue.empty?
 				#clear any closed IO objects.
 				@time = Time.now
-				@ios.keys.each(&@status_loop)
-				@ios.values.each(&@timeout_proc)
-				until @io_in.empty?
-					n_io = @io_in.pop
-					@ios[n_io[0]] = n_io[1]
-				end
-				until @io_out.empty?
-					o_io = @io_out.pop
-					o_io.close unless o_io.closed?
-					run @ios.delete(o_io), &@close_callback
-				end
 				# react to IO events
 				begin
 					r = IO.select(@ios.keys, nil, nil, 0.15)

data/lib/iodine/http/websocket_handler.rb

@@ -28,6 +28,9 @@ module Iodine
 			# cleanup, if needed, using this callback.
 			def on_close
 			end
+			# called whenever a ping is sent (no data transfer caused timeout).
+			def on_ping
+			end
 			# extra cleanup, if needed, when server is shutting down while the websocket is connected.
 			#
 			# You can use on_close unless some "going away" cleanup is required.
@@ -48,15 +51,17 @@ module Iodine
 
 			# Write data to the client, using Websockets encoded frames.
 			def write data
-				# We leverage the fact that the Http response can be used to send Websocket data.
-				#
-				# you can also use Websocket#send_data or it's alias Websocket#<< for example:
+				# We can use Websocket#send_data or it's alias Websocket#<< for example:
 				#
 				#        # @request[:io] contains the Websockets Protocol instance
 				#        @request[:io] << data
 				#
 				# do NOT use Websocket#write (which writes the data directly, bypassing the protocol).
-				@response << data
+				#
+				# We can also leverage the fact that the Http response can be used to send Websocket data.
+				#
+				#        @response << data
+				(@___ws_io ||= @request[:io]) << data
 			end
 
 			# Send messages directly to a specific Websocket.
@@ -71,7 +76,7 @@ module Iodine
 			# This implementation is limited to a single process on a single server.
 			# Consider using Redis for a scalable implementation.
 			def broadcast data
-				::Iodine::Http::Websockets.broadcast data, self
+				::Iodine::Http::Websockets.broadcast data, @request[:io]
 			end
 			# Closes the connection
 			def close

data/lib/iodine/http/websockets.rb

@@ -81,9 +81,9 @@ module Iodine
 			end
 			alias :<< :send_data
 
-			# Sends a ping.
+			# Sends a ping and calles the :on_ping callback (if exists).
 			def ping
-				write PING_FRAME
+				write(PING_FRAME) && ( (@handler.respond_to?(:on_ping) && @handler.on_ping) || true)
 			end
 			# Sends an empty pong.
 			def pong

data/lib/iodine/version.rb

@@ -1,3 +1,3 @@
 module Iodine
-  VERSION = "0.1.14"
+  VERSION = "0.1.15"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iodine
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - Boaz Segev