websocket-eventmachine-client 1.0.1 → 1.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: bf7ffbade416b4c84219e2277f22ef31f0755778
+  data.tar.gz: 9178f2572d0b033c0d44f6f6925faf0ef07e89fa
+SHA512:
+  metadata.gz: 7dc1c07da7158d64d095702b6f742e0f610b4eae2712445ede2346bc2f7ed1314f2dfd81999183b9d929da71d284b0a28c2f681f551fd41c02a2854b1eb1f08b
+  data.tar.gz: eea80e6a5c18d4064a92886259eb5a8b0ec309087da9c753199825ed0dc03fd50b01e45f7d965b3f37ddf663d15450a34114980aa98bfedee6bcdf5baab87361

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.1.0
+
+- ssl support
+
 ## 1.0.1
 
 - ensure compatibility with em-websocket

data/README.md

@@ -32,11 +32,13 @@ EM.run do
     puts "Received message: #{msg}"
   end
 
-  ws.onclose do
-    puts "Disconnected"
+  ws.onclose do |code, reason|
+    puts "Disconnected with status code: #{code}"
   end
 
-  ws.send "Hello Server!"
+  EventMachine.next_tick do
+    ws.send "Hello Server!"
+  end
 
 end
 ```
@@ -49,6 +51,8 @@ Following options can be passed to WebSocket::EventMachine::Client initializer:
 - `[Integer] :port` - Port of server to connect
 - `[String] :uri` - Full URI for server(optional - use instead of host/port combination)
 - `[Integer] :version` - Version of WebSocket to use. Default: 13
+- `[Hash] :headers` - HTTP headers to use in the handshake. Example: `{'Cookie' => 'COOKIENAME=Value'}`
+- `[Boolean] :ssl` - Force SSL/TLS regardless of URI scheme or port
 
 ## Methods
 
@@ -70,11 +74,16 @@ end
 
 Called after closing connection.
 
+Parameters:
+
+- `[Integer] code` - status code
+- `[String] reason` - optional reason for closure
+
 Example:
 
 ```ruby
-ws.onclose do
-  puts "Client disconnected"
+ws.onclose do |code, reason|
+  puts "Client disconnected with status code: #{code} and reason: #{reason}"
 end
 ```
 

data/examples/autobahn_client.rb

@@ -6,7 +6,7 @@ EM.epoll
 EM.run do
 
   host   = 'ws://localhost:9001'
-  agent  = "WebSocket-EventMachine-Client (1.0.0)"
+  agent  = "WebSocket-EventMachine-Client (1.0.1)"
   cases  = 0
   skip   = []
 

data/lib/websocket/eventmachine/client.rb

@@ -20,6 +20,8 @@ module WebSocket
       # @option args [String] :host The host IP/DNS name
       # @option args [Integer] :port The port to connect too(default = 80)
       # @option args [Integer] :version Version of protocol to use(default = 13)
+      # @option args [Hash] :headers HTTP headers to use in the handshake
+      # @option args [Boolean] :ssl Force SSL/TLS connection
       def self.connect(args = {})
         host = nil
         port = nil
@@ -27,10 +29,15 @@ module WebSocket
           uri = URI.parse(args[:uri])
           host = uri.host
           port = uri.port
+          args[:ssl] = true if uri.scheme == 'wss'
         end
         host = args[:host] if args[:host]
         port = args[:port] if args[:port]
-        port ||= 80
+        if args[:ssl]
+          port ||= 443
+        else
+          port ||= 80
+        end
 
         ::EventMachine.connect host, port, self, args
       end
@@ -40,6 +47,8 @@ module WebSocket
       # @option args [String] :host The host IP/DNS name
       # @option args [Integer] :port The port to connect too(default = 80)
       # @option args [Integer] :version Version of protocol to use(default = 13)
+      # @option args [Hash] :headers HTTP headers to use in the handshake
+      # @option args [Boolean] :ssl Force SSL/TLS connection
       def initialize(args)
         @args = args
       end
@@ -57,10 +66,22 @@ module WebSocket
       end
 
       # Called by EventMachine after connecting.
-      # Sends handshake to server
+      # Sends handshake to server or starts SSL/TLS
       # Eventmachine internal
       # @private
       def connection_completed
+        if @args[:ssl]
+          start_tls
+        else
+          send(@handshake.to_s, :type => :plain)
+        end
+      end
+
+      # Called by EventMachine after SSL/TLS handshake.
+      # Sends websocket handshake
+      # Eventmachine internal
+      # @private
+      def ssl_handshake_completed
         send(@handshake.to_s, :type => :plain)
       end
 

data/lib/websocket/eventmachine/client/version.rb

@@ -1,7 +1,7 @@
 module WebSocket
   module EventMachine
     class Client
-      VERSION = '1.0.1'
+      VERSION = '1.1.0'
     end
   end
 end

metadata

@@ -1,30 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: websocket-eventmachine-client
 version: !ruby/object:Gem::Version
-  version: 1.0.1
-  prerelease: 
+  version: 1.1.0
 platform: ruby
 authors:
 - Bernard Potocki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-26 00:00:00.000000000 Z
+date: 2014-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket-eventmachine-base
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 description: WebSocket client for Ruby
@@ -34,7 +31,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG.md
 - Gemfile
 - README.md
@@ -48,26 +45,25 @@ files:
 - websocket-eventmachine-client.gemspec
 homepage: http://github.com/imanel/websocket-eventmachine-client
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: WebSocket client for Ruby
 test_files: []