WEBSocket 0.0.1 → 0.0.9b

data/WEBSocket.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
 Establish a websocket communication using Ruby standard sockets or Celluloid::IO sockets if required.
 EOS
   gem.summary       = %q{Establish a websocket communication}
-  gem.homepage      = "https://github.com/Ezveus/ruby-websocket"
+  gem.homepage      = "https://github.com/Ezveus/WEBSocket"
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/lib/WEBSocket.rb

@@ -1,3 +1,5 @@
+require "forwardable"
+
 require "websocket"
 require "uri"
 

data/lib/WEBSocket/Standard/server.rb

@@ -1,32 +1,116 @@
 module WEBSocket
-  class Server
+    class Server
+    extend Forwardable
+    def_delegators :@server, :listen, :sysaccept, :close, :closed?, :addr
 
-    if defined? Celluloid::IO
-      UnderlyingServer = Celluloid::IO::TCPServer
-    else
-      UnderlyingServer = TCPSocket
+    class AcceptedSocket
+      extend Forwardable
+      attr_reader :status
+
+      def_delegators :@socket, :close, :closed?
+      def_delegators :@socket, :addr, :peeraddr, :setsockopt
+
+      def acquire_ownership type
+        @socket.acquire_ownership type
+      end
+
+      def connect
+        @handshake = WebSocket::Handshake::Server.new
+        msg = @socket.readpartial 4096
+        @handshake << msg
+        until @handshake.finished?
+          msg = @socket.readpartial 4096
+          @handshake << msg
+        end
+        if @handshake.valid?
+          @socket.write @handshake.to_s
+          @status = :connected
+        end
+        self
+      end
+
+      def evented?
+        false
+      end
+
+      def initialize socket
+        @socket = socket
+        @status = :disconnected
+      end
+
+      def read length = nil, buffer = nil
+        s = @socket.read length, buffer
+        frame = WebSocket::Frame::Incoming::Server.new :version => @handshake.version
+        frame << s
+        frame.next.to_s
+      end
+
+      def read_nonblock length, buffer = nil
+        buffer ||= ''
+
+        s = @socket.read length, buffer
+        frame = WebSocket::Frame::Incoming::Server.new :version => @handshake.version
+        frame << s
+        frame.next.to_s
+      end
+
+      def readpartial length, buffer = nil
+        s = @socket.readpartial length, buffer
+        frame = WebSocket::Frame::Incoming::Server.new :version => @handshake.version
+        frame << s
+        frame.next.to_s
+      end
+
+      def release_ownership type
+        @socket.release_ownership type
+      end
+
+      def to_io
+        @socket
+      end
+
+      def wait_readable
+        @socket.wait_readable
+      end
+
+      def wait_writable
+        @socket.wait_writable
+      end
+
+      def write s
+        frame = WebSocket::Frame::Outgoing::Server.new :version => @handshake.version, :data => s, :type => :text
+        @socket.write frame.to_s
+      end
+
+      def write_nonblock s
+        frame = WebSocket::Frame::Outgoing::Server.new :version => @handshake.version, :data => s, :type => :text
+        @socket.write_nonblock frame.to_s
+      end
+
+      def << s
+        frame = WebSocket::Frame::Outgoing::Server.new :version => @handshake.version, :data => s, :type => :text
+        @socket << frame.to_s
+      end
     end
-    
+
     def initialize hostname, port
-      @server = UnderlyingServer.new hostname, port
+      @server = Celluloid::IO::TCPServer.new hostname, port
     end
 
     def accept
-      WEBSocket::Socket.from_underlying_socket @server.accept
+      AcceptedSocket.new(@server.accept).connect
     end
 
     def accept_nonblock
-      Celluloid::IO::TCPSocket.from_ruby_socket @server.accept_nonblock
+      AcceptedSocket.new(@server.accept_nonblock).connect
     end
 
     def to_io
       @server
     end
 
-    # Are we inside a Celluloid ::IO actor?
     def evented?
-      actor = Thread.current[:actor]
-      actor && actor.mailbox.is_a?(Celluloid::IO::Mailbox)
+      false
     end
   end
 end

data/lib/WEBSocket/Standard/socket.rb

@@ -1,16 +1,12 @@
 module WEBSocket
   class Socket
+    extend Forwardable
     attr_reader :status
 
-    def self.from_underlying_socket socket
-    end
+    def_delegators :@socket, :close, :closed?
+    def_delegators :@socket, :addr, :peeraddr, :setsockopt
 
     def acquire_ownership type
-      @socket.acquire_ownership type
-    end
-
-    def close
-      @socket.close
     end
 
     def connect host, port
@@ -22,7 +18,7 @@ module WEBSocket
     end
 
     def evented?
-      @socket.evented?
+      false
     end
 
     def initialize rhost, rport, lhost = nil, lport = nil
@@ -38,6 +34,15 @@ module WEBSocket
       frame.to_s
     end
 
+    def read_nonblock length, buffer = nil
+      buffer ||= ''
+      
+      @socket.read_nonblock length, buffer
+      frame = WebSocket::Frame::Incoming::Client.new :version => @handshake.version
+      frame << buffer
+      frame.to_s
+    end
+
     def readpartial length, buffer = nil
       s = @socket.readpartial length, buffer
       frame = WebSocket::Frame::Incoming::Client.new :version => @handshake.version
@@ -46,7 +51,6 @@ module WEBSocket
     end
 
     def release_ownership type
-      @socket.release_ownership type
     end
 
     def to_io
@@ -54,11 +58,9 @@ module WEBSocket
     end
 
     def wait_readable
-      @socket.wait_readable
     end
 
     def wait_writable
-      @socket.wait_writable
     end
 
     def write s
@@ -66,6 +68,11 @@ module WEBSocket
       @socket.write frame.to_s
     end
 
+    def write_nonblock s
+      frame = WebSocket::Frame::Outgoing::Client.new :version => @handshake.version, :data => s, :type => :text
+      @socket.write_nonblock frame.to_s
+    end
+
     def << s
       frame = WebSocket::Frame::Outgoing::Client.new :version => @handshake.version, :data => s, :type => :text
       @socket << frame.to_s

data/lib/WEBSocket/version.rb

@@ -1,4 +1,4 @@
 module WEBSocket
-  VERSION = "0.0.1"
+  VERSION = "0.0.9b"
   DATE = Time.now.to_s.split[0]
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: WEBSocket
 version: !ruby/object:Gem::Version
-  version: 0.0.1
-  prerelease: 
+  version: 0.0.9b
+  prerelease: 5
 platform: ruby
 authors:
 - Matthieu "Ezveus" Ciappara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-09 00:00:00.000000000 Z
+date: 2013-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket
@@ -57,7 +57,7 @@ files:
 - lib/WEBSocket/server.rb
 - lib/WEBSocket/socket.rb
 - lib/WEBSocket/version.rb
-homepage: https://github.com/Ezveus/ruby-websocket
+homepage: https://github.com/Ezveus/WEBSocket
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -72,9 +72,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24