WEBSocket 0.1.0 → 0.1.1

data/.gitignore

@@ -16,3 +16,4 @@ test/tmp
 test/version_tmp
 tmp
 *-debug.rb
+.rvmrc

data/Rakefile

@@ -1 +1,34 @@
 require "bundler/gem_tasks"
+
+task :default => [:build]
+
+def rake rule
+  Process.fork do
+    Process.exec 'rake', rule
+  end
+  Process.wait
+end
+
+task :standardServer do
+  desc "Launch a echo server to make tests. Uses standard Ruby sockets"
+  Dir.chdir 'test'
+  rake "standardServer"
+end
+
+task :standardClient do
+  desc "Launch a hello world client to make tests. Uses standard Ruby sockets"
+  Dir.chdir 'test'
+  rake "standardClient"
+end
+
+task :celluloidServer do
+  desc "Launch a echo server to make tests. Uses Celluloid::IO sockets"
+  Dir.chdir 'test'
+  rake "celluloidServer"
+end
+
+task :celluloidClient do
+  desc "Launch a hello world client to make tests. Uses Celluloid::IO sockets"
+  Dir.chdir 'test'
+  rake "celluloidClient"
+end

data/WEBSocket.gemspec

@@ -19,5 +19,5 @@ EOS
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
-  gem.add_runtime_dependency 'websocket', '~> 1.0.6', '>= 1.0.6'
+  gem.add_runtime_dependency 'websocket', '~> 1.0', '>= 1.0.6'
 end

data/lib/WEBSocket.rb

@@ -5,4 +5,5 @@ require "uri"
 
 require "WEBSocket/version"
 require "WEBSocket/socket"
+require "WEBSocket/acceptedSocket"
 require "WEBSocket/server"

data/lib/WEBSocket/Celluloid/acceptedSocket.rb

@@ -0,0 +1,34 @@
+module WEBSocket
+  class AcceptedSocket < Base::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 evented?
+      @socket.evented?
+    end
+
+    def initialize socket
+      @socket = socket
+      @status = :disconnected
+    end
+
+    def release_ownership type
+      @socket.release_ownership type
+    end
+
+    def wait_readable
+      @socket.wait_readable
+    end
+
+    def wait_writable
+      @socket.wait_writable
+    end
+  end
+end

data/lib/WEBSocket/Celluloid/server.rb

@@ -1,114 +1,12 @@
 module WEBSocket
-  class Server
+  class Server < Base::Server
     extend Forwardable
     def_delegators :@server, :listen, :sysaccept, :close, :closed?, :addr
 
-    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?
-        @socket.evented?
-      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 = Celluloid::IO::TCPServer.new hostname, port
     end
 
-    def accept
-      AcceptedSocket.new(@server.accept).connect
-    end
-
-    def accept_nonblock
-      AcceptedSocket.new(@server.accept_nonblock).connect
-    end
-
-    def to_io
-      @server
-    end
-
     def evented?
       @server.evented?
     end

data/lib/WEBSocket/Celluloid/socket.rb

@@ -1,5 +1,5 @@
 module WEBSocket
-  class Socket
+  class Socket < Base::Socket
     extend Forwardable
     attr_reader :status
 
@@ -10,14 +10,6 @@ module WEBSocket
       @socket.acquire_ownership type
     end
 
-    def connect host, port
-      @handshake = WebSocket::Handshake::Client.new :url => "ws://#{host}:#{port}"
-      @socket.write @handshake.to_s
-      msg = @socket.readpartial 4096
-      @handshake << msg
-      @status = :connected
-    end
-
     def evented?
       @socket.evented?
     end
@@ -28,37 +20,10 @@ module WEBSocket
       connect rhost, rport
     end
 
-    def read length = nil, buffer = nil
-      s = @socket.read length, buffer
-      frame = WebSocket::Frame::Incoming::Client.new :version => @handshake.version
-      frame << s
-      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
-      frame << s
-      frame.to_s
-    end
-
     def release_ownership type
       @socket.release_ownership type
     end
 
-    def to_io
-      @socket
-    end
-
     def wait_readable
       @socket.wait_readable
     end
@@ -66,20 +31,5 @@ module WEBSocket
     def wait_writable
       @socket.wait_writable
     end
-
-    def write s
-      frame = WebSocket::Frame::Outgoing::Client.new :version => @handshake.version, :data => s, :type => :text
-      @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
-    end
   end
 end

data/lib/WEBSocket/Standard/acceptedSocket.rb

@@ -0,0 +1,14 @@
+module WEBSocket
+  class AcceptedSocket < Base::AcceptedSocket
+    extend Forwardable
+    attr_reader :status
+
+    def_delegators :@socket, :close, :closed?
+    def_delegators :@socket, :addr, :peeraddr, :setsockopt
+
+    def initialize socket
+      @socket = socket
+      @status = :disconnected
+    end
+  end
+end

data/lib/WEBSocket/Standard/server.rb

@@ -1,116 +1,10 @@
 module WEBSocket
-    class Server
+  class Server < Base::Server
     extend Forwardable
     def_delegators :@server, :listen, :sysaccept, :close, :closed?, :addr
 
-    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 = TCPServer.new hostname, port
     end
-
-    def accept
-      AcceptedSocket.new(@server.accept).connect
-    end
-
-    def accept_nonblock
-      AcceptedSocket.new(@server.accept_nonblock).connect
-    end
-
-    def to_io
-      @server
-    end
-
-    def evented?
-      false
-    end
   end
 end

data/lib/WEBSocket/Standard/socket.rb

@@ -1,81 +1,15 @@
 module WEBSocket
-  class Socket
+  class Socket < Base::Socket
     extend Forwardable
     attr_reader :status
 
     def_delegators :@socket, :close, :closed?
     def_delegators :@socket, :addr, :peeraddr, :setsockopt
 
-    def acquire_ownership type
-    end
-
-    def connect host, port
-      @handshake = WebSocket::Handshake::Client.new :url => "ws://#{host}:#{port}"
-      @socket.write @handshake.to_s
-      msg = @socket.readpartial 4096
-      @handshake << msg
-      @status = :connected
-    end
-
-    def evented?
-      false
-    end
-
     def initialize rhost, rport, lhost = nil, lport = nil
       @status = :disconnected
       @socket = TCPSocket.new rhost, rport, lhost, lport
       connect rhost, rport
     end
-
-    def read length = nil, buffer = nil
-      s = @socket.read length, buffer
-      frame = WebSocket::Frame::Incoming::Client.new :version => @handshake.version
-      frame << s
-      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
-      frame << s
-      frame.to_s
-    end
-
-    def release_ownership type
-    end
-
-    def to_io
-      @socket
-    end
-
-    def wait_readable
-    end
-
-    def wait_writable
-    end
-
-    def write s
-      frame = WebSocket::Frame::Outgoing::Client.new :version => @handshake.version, :data => s, :type => :text
-      @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
-    end
   end
 end

data/lib/WEBSocket/acceptedSocket.rb

@@ -0,0 +1,96 @@
+module WEBSocket
+  module Base
+    class AcceptedSocket
+      def 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 from_frame_to_text str
+        frame = WebSocket::Frame::Incoming::Server.new :version => @handshake.version
+        frame << str
+        frame.next.to_s
+      end
+
+      def from_text_to_frame str
+        frame = WebSocket::Frame::Outgoing::Server.new :version => @handshake.version, :data => str, :type => :text
+        frame.to_s
+      end
+
+      def read length = nil, buffer = nil
+        s = nil
+        if length
+          if length.kind_of? Numeric
+            s = @socket.read length + 4, buffer
+          elsif buffer.nil?
+            s = @socket.read nil, length
+          end
+        else
+          s = @socket.read nil, nil
+        end
+        from_frame_to_text s
+      end
+
+      def read_nonblock length, buffer = nil
+        buffer ||= ''
+
+        @socket.read_nonblock length + 4, buffer
+        from_frame_to_text buffer
+      end
+
+      def readpartial length, buffer = nil
+        s = @socket.readpartial length + 4, buffer
+        from_frame_to_text s
+      end
+
+      def release_ownership type
+      end
+
+      def to_io
+        @socket
+      end
+
+      def wait_readable
+      end
+
+      def wait_writable
+      end
+
+      def write s
+        @socket.write from_text_to_frame(s.to_s)
+      end
+
+      def write_nonblock s
+        @socket.write_nonblock from_text_to_frame(s.to_s)
+      end
+
+      def << s
+        @socket << from_text_to_frame(s.to_s)
+      end
+    end
+  end
+end
+
+if defined? Celluloid::IO
+  require 'WEBSocket/Celluloid/acceptedSocket'
+else
+  require 'socket'
+  require 'WEBSocket/Standard/acceptedSocket'
+end

data/lib/WEBSocket/server.rb

@@ -1,3 +1,25 @@
+module WEBSocket
+  module Base
+    class Server
+      def accept
+        WEBSocket::AcceptedSocket.new(@server.accept).connect
+      end
+
+      def accept_nonblock
+        WEBSocket::AcceptedSocket.new(@server.accept_nonblock).connect
+      end
+
+      def to_io
+        @server
+      end
+
+      def evented?
+        false
+      end
+    end
+  end
+end
+
 if defined? Celluloid::IO
   require 'WEBSocket/Celluloid/server'
 else

data/lib/WEBSocket/socket.rb

@@ -1,3 +1,86 @@
+module WEBSocket
+  module Base
+    class Socket
+      def acquire_ownership type
+      end
+
+      def connect host, port
+        @handshake = WebSocket::Handshake::Client.new :url => "ws://#{host}:#{port}"
+        @socket.write @handshake.to_s
+        msg = @socket.readpartial 4096
+        @handshake << msg
+        @status = :connected
+      end
+
+      def evented?
+        false
+      end
+
+      def from_frame_to_text str
+        frame = WebSocket::Frame::Incoming::Client.new :version => @handshake.version
+        frame << str
+        frame.next.to_s
+      end
+
+      def from_text_to_frame str
+        frame = WebSocket::Frame::Outgoing::Client.new :version => @handshake.version, :data => str, :type => :text
+        frame.to_s
+      end
+
+      def read length = nil, buffer = nil
+        s = nil
+        if length
+          if length.kind_of? Numeric
+            s = @socket.read length + 4, buffer
+          elsif buffer.nil?
+            s = @socket.read nil, length
+          end
+        else
+          s = @socket.read nil, nil
+        end
+        from_frame_to_text s
+      end
+
+      def read_nonblock length, buffer = nil
+        buffer ||= ''
+
+        @socket.read_nonblock length + 4, buffer
+        from_frame_to_text buffer
+      end
+
+      def readpartial length, buffer = nil
+        s = @socket.readpartial length + 4, buffer
+        from_frame_to_text s
+      end
+
+      def release_ownership type
+      end
+
+      def to_io
+        @socket
+      end
+
+      def wait_readable
+      end
+
+      def wait_writable
+      end
+
+      def write s
+        @socket.write from_text_to_frame(s.to_s)
+      end
+
+      def write_nonblock s
+        @socket.write_nonblock from_text_to_frame(s.to_s)
+      end
+
+      def << s
+        @socket << from_text_to_frame(s.to_s)
+      end
+    end
+  end
+end
+
 if defined? Celluloid::IO
   require 'WEBSocket/Celluloid/socket'
 else

data/lib/WEBSocket/version.rb

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

data/test/Rakefile

@@ -0,0 +1,15 @@
+task :standardServer do
+  ruby "standard/serverTest.rb"
+end
+
+task :standardClient do
+  ruby "standard/clientTest.rb"
+end
+
+task :celluloidServer do
+  ruby "celluloid/serverTest.rb"
+end
+
+task :celluloidClient do
+  ruby "celluloid/clientTest.rb"
+end

data/test/celluloid/clientTest.rb

@@ -0,0 +1,16 @@
+$:.unshift '../lib'
+
+require 'celluloid/io'
+require 'WEBSocket'
+
+Host = '127.0.0.1'
+Port = 4242
+Size = 4096
+
+client = WEBSocket::Socket.new Host, Port
+$stderr.puts "==> Client was created : #{client}[#{Host}:#{Port}]"
+s = "Hello World"
+client.write s
+$stderr.puts "==> Written #{s}"
+s2 = client.readpartial Size
+$stderr.puts "==> Read #{s2}"

data/test/celluloid/serverTest.rb

@@ -0,0 +1,32 @@
+$:.unshift '../lib'
+
+require 'celluloid/io'
+require 'WEBSocket'
+
+Host = '127.0.0.1'
+Port = 4242
+Size = 4096
+
+Signal.trap "INT" do
+  puts "\rExiting"
+  exit 0
+end
+
+server = WEBSocket::Server.new Host, Port
+$stderr.puts "==> Server was created : #{server}[#{Host}:#{Port}]"
+client = server.accept
+$stderr.puts "==> AcceptedSocket was created : #{client}"
+_, port, host = client.peeraddr
+$stderr.puts "==> Received connection from #{host}:#{port}"
+loop do
+  s = nil
+  begin
+    s = client.readpartial Size
+  rescue EOFError
+    break
+  end
+  break if s.nil? or s == ""
+  $stderr.puts "==> Read #{s}"
+  client.write s
+  $stderr.puts "==> Written #{s}"
+end

data/test/standard/clientTest.rb

@@ -0,0 +1,15 @@
+$:.unshift '../lib'
+
+require 'WEBSocket'
+
+Host = '127.0.0.1'
+Port = 4242
+Size = 4096
+
+client = WEBSocket::Socket.new Host, Port
+$stderr.puts "==> Client was created : #{client}[#{Host}:#{Port}]"
+s = "Hello World"
+client.write s
+$stderr.puts "==> Written #{s}"
+s2 = client.readpartial Size
+$stderr.puts "==> Read #{s2}"

data/test/standard/serverTest.rb

@@ -0,0 +1,31 @@
+$:.unshift '../lib'
+
+require 'WEBSocket'
+
+Host = '127.0.0.1'
+Port = 4242
+Size = 4096
+
+Signal.trap "INT" do
+  puts "\rExiting"
+  exit 0
+end
+
+server = WEBSocket::Server.new Host, Port
+$stderr.puts "==> Server was created : #{server}[#{Host}:#{Port}]"
+client = server.accept
+$stderr.puts "==> AcceptedSocket was created : #{client}"
+_, port, host = client.peeraddr
+$stderr.puts "==> Received connection from #{host}:#{port}"
+loop do
+  s = nil
+  begin
+    s = client.readpartial Size
+  rescue EOFError
+    break
+  end
+  break if s.nil? or s == ""
+  $stderr.puts "==> Read #{s}"
+  client.write s
+  $stderr.puts "==> Written #{s}"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: WEBSocket
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-12 00:00:00.000000000 Z
+date: 2013-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.6
+        version: '1.0'
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.6
@@ -29,7 +29,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.6
+        version: '1.0'
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.6
@@ -50,13 +50,21 @@ files:
 - Rakefile
 - WEBSocket.gemspec
 - lib/WEBSocket.rb
+- lib/WEBSocket/Celluloid/acceptedSocket.rb
 - lib/WEBSocket/Celluloid/server.rb
 - lib/WEBSocket/Celluloid/socket.rb
+- lib/WEBSocket/Standard/acceptedSocket.rb
 - lib/WEBSocket/Standard/server.rb
 - lib/WEBSocket/Standard/socket.rb
+- lib/WEBSocket/acceptedSocket.rb
 - lib/WEBSocket/server.rb
 - lib/WEBSocket/socket.rb
 - lib/WEBSocket/version.rb
+- test/Rakefile
+- test/celluloid/clientTest.rb
+- test/celluloid/serverTest.rb
+- test/standard/clientTest.rb
+- test/standard/serverTest.rb
 homepage: https://github.com/Ezveus/WEBSocket
 licenses: []
 post_install_message: 
@@ -81,4 +89,9 @@ rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Establish a websocket communication
-test_files: []
+test_files:
+- test/Rakefile
+- test/celluloid/clientTest.rb
+- test/celluloid/serverTest.rb
+- test/standard/clientTest.rb
+- test/standard/serverTest.rb