em-websocket-client 0.1.1 → 0.1.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a87cb48e8fd3e317eec9a00a887c165fd5b1ba31
+  data.tar.gz: d56ac8a767faab371c2eb347e2ca337ea327c9ee
+SHA512:
+  metadata.gz: 4d651353c8fbebfb87068536d7cb5d40960551d2ae6ccdda2d189dba5779edfbcc43fd13b286bb392b0e202e007269f778fc0b959f08880aec74f388e4d14ae0
+  data.tar.gz: bcae5a4dc45a43e09a878fe064f43e12ae1c553bf17797499441ff026ac05fd22db0f23a069e23c0038ab5e24fd713a9ef367d676c16a86bc929ff4875237465

data/Gemfile

@@ -1,12 +1,11 @@
 source "http://rubygems.org"
 
 gem "eventmachine"
-gem "libwebsocket"
+gem "websocket"
 
 group :development do
   gem "rspec", "~> 2.3.0"
   gem "yard", "~> 0.6.0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.6.4"
-  gem "rcov", ">= 0"
+  gem "bundler", "~> 1.3.0"
+  gem "jeweler", "~> 1.8.0"
 end

data/README.md

@@ -3,7 +3,7 @@
 This gem implements a simple websocket client inside EventMachine.
 This might be useful for testing web socket servers or consuming
 WebSocket APIs. In particular it supports the
-[hixie-76](http://tools.ietf.org/html/draft-hixie-thewebsocketprotocol-76)
+[RFC6455](http://tools.ietf.org/html/rfc6455)
 version of the protocol, which is also implemented in Chrome and
 Safari. At this time, the wss (WebSocket over SSL) protocol is not
 supported.
@@ -24,10 +24,10 @@ EM.run do
   conn.errback do |e|
     puts "Got error: #{e}"
   end
-  
+
   conn.stream do |msg|
     puts "<#{msg}>"
-    if msg == "done"
+    if msg.data == "done"
       conn.close_connection
     end
   end

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/em-websocket-client.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{em-websocket-client}
-  s.version = "0.1.1"
+  s.name = "em-websocket-client"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Micah Wylde"]
-  s.date = %q{2011-08-02}
-  s.description = %q{A WebSocket client implementation for EventMachine}
-  s.email = %q{mwylde@wesleyan.edu}
+  s.date = "2013-10-12"
+  s.description = "A WebSocket client implementation for EventMachine"
+  s.email = "mwylde@wesleyan.edu"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md"
@@ -27,40 +27,37 @@ Gem::Specification.new do |s|
     "em-websocket-client.gemspec",
     "lib/em-websocket-client.rb"
   ]
-  s.homepage = %q{http://github.com/mwylde/em-websocket-client}
+  s.homepage = "http://github.com/mwylde/em-websocket-client"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{EventMachine WebSocket Client}
+  s.rubygems_version = "2.0.3"
+  s.summary = "EventMachine WebSocket Client"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<eventmachine>, [">= 0"])
-      s.add_runtime_dependency(%q<libwebsocket>, [">= 0"])
+      s.add_runtime_dependency(%q<websocket>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.3.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.0"])
     else
       s.add_dependency(%q<eventmachine>, [">= 0"])
-      s.add_dependency(%q<libwebsocket>, [">= 0"])
+      s.add_dependency(%q<websocket>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_dependency(%q<yard>, ["~> 0.6.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<bundler>, ["~> 1.3.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.0"])
     end
   else
     s.add_dependency(%q<eventmachine>, [">= 0"])
-    s.add_dependency(%q<libwebsocket>, [">= 0"])
+    s.add_dependency(%q<websocket>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.3.0"])
     s.add_dependency(%q<yard>, ["~> 0.6.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<bundler>, ["~> 1.3.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.0"])
   end
 end
 

data/lib/em-websocket-client.rb

@@ -1,33 +1,6 @@
+require 'eventmachine'
 require 'uri'
-require 'libwebsocket'
-
-# Monkey patch libwebsocket to support parameters in URLs
-module LibWebSocket
-  class URL
-    def parse(string)
-      return nil unless string.is_a?(String)
-
-      uri = Addressable::URI.parse(string)
-
-      scheme = uri.scheme
-      return nil unless scheme
-
-      self.secure = true if scheme.match(/ss\Z/m)
-
-      host = uri.host
-      host = '/' unless host && host != ''
-      self.host = host
-      self.port = uri.port.to_s if uri.port
-
-      request_uri = uri.path
-      request_uri = '/' unless request_uri && request_uri != ''
-      request_uri += "?" + uri.query if uri.query
-      self.resource_name = request_uri
-
-      return self
-    end
-  end
-end
+require 'websocket'
 
 module EventMachine
   class WebSocketClient < Connection
@@ -44,36 +17,37 @@ module EventMachine
 
     def post_init
       @handshaked = false
-      @frame  = LibWebSocket::Frame.new
+      @frame  = ::WebSocket::Frame::Incoming::Client.new
     end
 
     def connection_completed
-      @hs = LibWebSocket::OpeningHandshake::Client.new(:url => @url)
+      @connect.yield if @connect
+      @hs = ::WebSocket::Handshake::Client.new(:url => @url)
       send_data @hs.to_s
     end
 
     def stream &cb; @stream = cb; end
+    def connected &cb; @connect = cb; end
     def disconnect &cb; @disconnect = cb; end
-    
+
     def receive_data data
       if !@handshaked
-        result = @hs.parse data
-        fail @hs.error unless result
-        
-        if @hs.done?
+        @hs << data
+        if @hs.finished?
           @handshaked = true
           succeed
         end
       else
-        @frame.append(data)
+        @frame << data
         while msg = @frame.next
           @stream.call(msg) if @stream
         end
       end
     end
 
-    def send_msg s
-      frame = LibWebSocket::Frame.new(s)
+    def send_msg(s, args={})
+      type = args[:type] || :text
+      frame = ::WebSocket::Frame::Outgoing::Client.new(:data => s, :type => type, :version => @hs.version)
       send_data frame.to_s
     end
 

metadata

@@ -1,105 +1,107 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: em-websocket-client
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.1.1
+version: !ruby/object:Gem::Version
+  version: 0.1.2
 platform: ruby
-authors: 
+authors:
 - Micah Wylde
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-02 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-10-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: libwebsocket
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: websocket
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.0
+- !ruby/object:Gem::Dependency
   name: yard
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+- !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.0.0
+      - !ruby/object:Gem::Version
+        version: 1.3.0
   type: :development
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.6.4
-  type: :development
-  prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rcov
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: 1.8.0
   type: :development
   prerelease: false
-  version_requirements: *id007
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.0
 description: A WebSocket client implementation for EventMachine
 email: mwylde@wesleyan.edu
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.md
-files: 
+files:
 - .document
 - .rspec
 - Gemfile
@@ -109,36 +111,28 @@ files:
 - VERSION
 - em-websocket-client.gemspec
 - lib/em-websocket-client.rb
-has_rdoc: true
 homepage: http://github.com/mwylde/em-websocket-client
-licenses: 
+licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -3387102389269862192
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: EventMachine WebSocket Client
 test_files: []
-