celluloid-websocket 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d733c0d77a7b8675ae67ca19cd02d13ad663604c
-  data.tar.gz: 2c99aa7d39b6ccb6f72e059d29ce29d0951fb5cf
+  metadata.gz: a07647426e3725074e726481bfe0aff559c554f6
+  data.tar.gz: 7150f7bddb3bcf2273b57f902c8e7eb2768bb0f2
 SHA512:
-  metadata.gz: 043592123bc8623b6f52da908b31f80e9a2198cb7a78d30db0dee45e02b50be1a6362a62a8762ba56e66239ced5da513f076904e9bd673c7885eeb16bfe178d1
-  data.tar.gz: 260e59ee216cde92225a1b05511cca21a0a1e72724e928d5acd94246dc5ff05accfc1231fdf3aed68f1d12ceae4958924b62712883aca06147b6efb6a6899bb8
+  metadata.gz: c15d27a28211f17cfb91dd39aa97a408ef0cda3263bc7b7ef0560912a36a5c7c024ed49e2a1fbd4cf7c34bd7bb7126daf858b667734e794176d3006afad90238
+  data.tar.gz: 8ce021df180f45d42f18d4a3eede73dcdcfbad9af4a9e20067a5c43b4eb1c5efaebc6d75ec4e5d1aa738b52f30066c7a663fb7168dac05fee303cc71b4e21b0e

data/README.md

@@ -25,19 +25,24 @@ Simply inherit your Rack app from Celluloid::WebSocket::Rack, and implement the
 ```
 require 'celluloid/websocket/rack'
 
-class WebSocketEcho < Celluloid::WebSocket::Rack
+class WebSocketEcho < Celluloid::WebSocket
 	def on_open
 		@counter = 0
-
 		while(true)
 			message = read
+
 			@counter += 1
-			write("#{@counter}: #{message}")			
+			write("#{@counter}: #{message}")
 		end
 	end
+
+	def on_error(*args)
+		puts args.inspect
+	end
 end
 
-run(WebSocketEcho)
+run WebSocketEcho.rack
+
 ```
 
 You can try it out by cloning this repository running `bundle` and then:

data/examples/message_counter.ru

@@ -1,9 +1,8 @@
 require 'celluloid/websocket/rack'
 
-class WebSocketEcho < Celluloid::WebSocket::Rack
+class WebSocketEcho < Celluloid::WebSocket
 	def on_open
 		@counter = 0
-
 		while(true)
 			message = read
 
@@ -17,4 +16,4 @@ class WebSocketEcho < Celluloid::WebSocket::Rack
 	end
 end
 
-run(WebSocketEcho)
+run WebSocketEcho.rack

data/lib/celluloid/websocket.rb

@@ -6,10 +6,13 @@ require 'rack/request'
 module Celluloid
 	class WebSocket
 		extend Forwardable
+		include Celluloid
+
+		finalizer :shutdown
 
 		attr_accessor :socket, :env
 
-		def initialize(env, socket)
+		def initialize_websocket(env, socket)
 			@env = env
 			@socket = socket
 
@@ -24,6 +27,8 @@ module Celluloid
 			@message_stream = MessageStream.new(socket, @driver)
 
 			@driver.start
+
+			on_open if respond_to? :on_open
 		rescue EOFError
 			close
 		end
@@ -50,8 +55,12 @@ module Celluloid
 		alias_method :<<, :write
 
 		def close
-			@driver.close
-			@socket.close
+			@driver.close unless @driver.nil? || @driver.closed?
+			@socket.close unless @socket.nil? || @socket.closed?
+		end
+
+		def shutdown
+			close
 		end
 
 		private

data/lib/celluloid/websocket/rack.rb

@@ -7,36 +7,22 @@ require 'forwardable'
 
 module Celluloid
 	class WebSocket
-		class Rack
-			extend Forwardable
-			include Celluloid::IO
-			include Celluloid::Logger
+		def self.rack(config={})
+			lambda do |env|
+				# We need to create the pool in the first request
+				# because we might've been forked before.
+				@pool ||= pool(config)
 
-			finalizer :shutdown
-
-			def_delegators :@websocket, :socket, :env, :addr, :peeraddr, :read, :read_every, :write, :<<, :closed?, :close, :cancel_timer!
-
-			def self.call(env)
 				if env['HTTP_UPGRADE'].nil? || env['HTTP_UPGRADE'].downcase != 'websocket'
 					return [400, {}, "No Upgrade header or Upgrade not for websocket."]
 				end
 
 				env['rack.hijack'].call
 				socket = Celluloid::IO::RackSocket.new(env['rack.hijack_io'].to_io)
-
-				actor = new()
-				actor.async.initialize_websocket(env, socket)
+				
+				@pool.async.initialize_websocket(env, socket)
 				[200,{},""]
 			end
-
-			def initialize_websocket(req, socket)
-				@websocket = WebSocket.new(req, socket)
-				on_open if respond_to? :on_open
-			end
-
-			def shutdown
-				@websocket.close if @websocket
-			end
 		end
 	end
 end

data/lib/celluloid/websocket/version.rb

@@ -1,5 +1,5 @@
 module Celluloid
 	class WebSocket
-		VERSION = "0.0.2"
+		VERSION = "0.0.4"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: celluloid-websocket
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Tinco Andringa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-12 00:00:00.000000000 Z
+date: 2015-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler