em-ws-client 0.1.2 → 0.2.0

data/spec/helper.rb

@@ -0,0 +1,3 @@
+$: << File.dirname(__FILE__) + "/../lib"
+
+require "em-ws-client"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em-ws-client
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-26 00:00:00.000000000Z
+date: 2012-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &19668100 !ruby/object:Gem::Requirement
+  requirement: &11601440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,18 +21,7 @@ dependencies:
         version: 1.0.0.beta.4
   type: :runtime
   prerelease: false
-  version_requirements: *19668100
-- !ruby/object:Gem::Dependency
-  name: state_machine
-  requirement: &19649660 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.2
-  type: :runtime
-  prerelease: false
-  version_requirements: *19649660
+  version_requirements: *11601440
 description: A simple, fun, evented WebSocket client for your ruby projects
 email: dan@shove.io
 executables: []
@@ -41,14 +30,21 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
+- LICENSE
 - README.markdown
 - Rakefile
+- autobahn/fuzzer.rb
+- autobahn/report.html
 - em-ws-client.gemspec
-- example/echo.rb
-- lib/codec/draft10decoder.rb
-- lib/codec/draft10encoder.rb
 - lib/em-ws-client.rb
-- spec/em-ws-client.rb
+- lib/em-ws-client/client.rb
+- lib/em-ws-client/decoder.rb
+- lib/em-ws-client/encoder.rb
+- lib/em-ws-client/handshake.rb
+- lib/em-ws-client/protocol.rb
+- spec/codec_spec.rb
+- spec/handshake_spec.rb
+- spec/helper.rb
 homepage: https://github.com/dansimpson/em-ws-client
 licenses: []
 post_install_message: 
@@ -69,7 +65,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: EventMachine WebSocket Client

data/example/echo.rb

@@ -1,33 +0,0 @@
-$: << File.dirname(__FILE__) + "/../lib/"
-
-require "em-ws-client"
-
-
-dec = EM::Draft10Decoder.new
-enc = EM::Draft10Encoder.new
-
-puts dec.decode(enc.encode("monkey"))
-
-EM.run do
-
-  conn = EM::WebSocketClient.new("ws://localhost:8080/test")
-  puts conn.state
-  puts conn.disconnected?
-
-  conn.onopen do
-    puts "Opened"
-
-    EM.add_periodic_timer(2) do
-      conn.send_data "Ping!"
-    end
-  end
-
-  conn.onclose do
-    puts "Closed"
-  end
-
-  conn.onmessage do |msg|
-    puts msg
-  end
-
-end

data/lib/codec/draft10decoder.rb

@@ -1,122 +0,0 @@
-module EM
-
-  # A replaying decoder for the IETF Hybi
-  # WebSocket protocol specification
-  class Draft10Decoder
-
-    CONTINUATION  = 0x0
-    TEXT_FRAME    = 0x1
-    BINARY_FRAME  = 0x2
-    CLOSE         = 0x8
-    PING          = 0x9
-    PONG          = 0xA
-
-    def initialize
-      @buffer = ""
-      @chunks = ""
-    end
-
-    # Decode a WebSocket frame
-    # +data+ the frame data
-    # returns false if the packet is incomplete
-    # and a decoded message otherwise
-    def decode data
-
-      # broken frame
-      if data && data.length < 2
-        return false
-      end
-
-      # put the data into the buffer, as
-      # we might be replaying
-      @buffer << data
-
-      # decode the first 2 bytes, with
-      # opcode, lengthgth, masking bit, and frag bit
-      h1, h2 = @buffer.unpack("CC")
-
-      # check the fragmentation bit to see
-      # if this is a message fragment
-      @chunked = ((h1 & 0x80) != 0x80)
-
-      # used to keep track of our position in the buffer
-      offset = 2
-
-      # see above for possible opcodes
-      opcode = (h1 & 0x0F)
-
-      # the leading length idicator
-      length = (h2 & 0x7F)
-
-      # masking bit, is the data masked with
-      # a specified masking key?
-      masked = ((h2 & 0x80) == 0x80)
-
-      # spare no bytes hybi!
-      if length > 125
-        if length == 126
-          length = @buffer.unpack("@#{offset}n").first
-          offset += 2
-        else
-          length1, length2 = @buffer.unpack("@#{offset}NN")
-          # TODO.. bigint?
-          offset += 8
-        end
-      end
-
-      # unpack the masking key
-      if masked
-        key = @buffer.unpack("@#{offset}N").first
-        offset += 4
-      end
-
-      # replay on next frame
-      if @buffer.size < (length + offset)
-        return false
-      end
-
-      # Read the important bits
-      payload = @buffer.unpack("@#{offset}C#{length}")
-
-      # Unmask the data if it's masked
-      if masked
-        payload.size.times do |i|
-          payload[i] = ((payload[i] ^ (key >> ((3 - (i % 4)) * 8))) & 0xFF)
-        end
-      end
-      
-      # finally, extract the message!
-      payload = payload.pack("C*")
-
-      case opcode
-      when CONTINUATION
-        @chunks << payload
-        unless @chunked
-          result = @chunks
-          @chunks = ""
-          return result
-        end
-        false
-      when TEXT_FRAME
-        unless @chunked
-          @buffer = ""
-          @buffer.slice!(offset + length)
-          return payload
-        end
-        false
-      when BINARY_FRAME
-        false #TODO
-      when CLOSE
-        false #TODO
-      when PING
-        false #TODO send pong
-      when PONG
-        false
-      else
-        false
-      end
-    end
-
-
-  end
-end

data/lib/codec/draft10encoder.rb

@@ -1,45 +0,0 @@
-module EM
-  class Draft10Encoder
-
-    # Encode a standard payload to a hybi10
-    # WebSocket frame
-  	def encode data
-      frame = []
-      frame << (0x1 | 0x80)
-
-      packr = "CC"
-
-      # append frame length and mask bit 0x80
-      len = data.size
-      if len <= 125
-        frame << (len | 0x80)
-      elsif length < 65536
-        frame << (126 | 0x80)
-        frame << (len)
-        packr << "n"
-      else
-        frame << (127 | 0x80)
-        frame << (len >> 32)
-        frame << (len & 0xFFFFFFFF)
-        packr << "NN"
-      end
-
-      # generate a masking key
-      key = rand(2 ** 31)
-
-      # mask each byte with the key
-      frame << key
-      packr << "N"
-
-      # The spec says we have to waste cycles and
-      # impact the atmosphere with a small amount of
-      # heat dissapation
-      data.size.times do |i|
-        frame << ((data.getbyte(i) ^ (key >> ((3 - (i % 4)) * 8))) & 0xFF)
-      end
-
-      frame.pack("#{packr}C*")
-  	end
-
-  end
-end