websocket-client-simple 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41d96bb780744bc9b24e6d9d906ec304a9512da0
-  data.tar.gz: e75d9bb7d3e260404672b529bc66b949e2ed85ad
+  metadata.gz: 9b4e43f4364dbb6ced8350fa0da792cc7a2f6f87
+  data.tar.gz: 5312a46f3b77a301fdd7aa30d2dc4419b9090ec0
 SHA512:
-  metadata.gz: 6645e615fe8583fe8858a8904eb69e51621fae5a1341b12902084fec49321c44a5904907b68e68190638fbf4bce8783504a68f94a9570d5b1c7b668a5c40dd19
-  data.tar.gz: 9eec607a7ebefd55a4ab0d70cc8e4bdcefbcddf49a82a6e681851ec830016db3ae20110b208347119cf01e78674abfa37f62efd50f0d714f5238d75370804f9d
+  metadata.gz: 0ef747973068d4c96a560d81d7b962539f19e0c857965ae8fbaaf9ccaf50babeb9a2f2bcfc419906574b32b7ed7fc49e70ab99cfae311abbe34a4778b600e0ed
+  data.tar.gz: aa8b46b0a56891a845e3de9763f3758dc52a827986646ff3afb79ffb417c27f30deaf98586c41d50a071bbf147bf679053bd817a74017fcc8b5de2361c29fa33

data/.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
 rvm:
-  - '2.0.0'
   - '2.1.2'
 notifications:
   slack:

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.2.2 2014-11-18
+
+* add :ssl_version option to specify version of SSL/TLS
+  * thank you for contributing @tonybyrne
+
 === 0.2.1 2014-10-19
 
 * bugfix socket reading

data/lib/websocket-client-simple/client.rb

@@ -2,21 +2,23 @@ module WebSocket
   module Client
     module Simple
 
-      def self.connect(url)
-        ::WebSocket::Client::Simple::Client.new url
+      def self.connect(url, options={})
+        ::WebSocket::Client::Simple::Client.new(url, options)
       end
 
       class Client
         include EventEmitter
         attr_reader :url, :handshake
 
-        def initialize(url)
+        def initialize(url, options={})
           @url = url
           uri = URI.parse url
           @socket = TCPSocket.new(uri.host,
                                   uri.port || (uri.scheme == 'wss' ? 443 : 80))
           if ['https', 'wss'].include? uri.scheme
-            @socket = ::OpenSSL::SSL::SSLSocket.new(@socket)
+            ctx = OpenSSL::SSL::SSLContext.new
+            ctx.ssl_version = options[:ssl_version] || 'SSLv23'
+            @socket = ::OpenSSL::SSL::SSLSocket.new(@socket, ctx)
             @socket.connect
           end
           @handshake = ::WebSocket::Handshake::Client.new :url => url

data/lib/websocket-client-simple/version.rb

@@ -1,7 +1,7 @@
 module WebSocket
   module Client
     module Simple
-      VERSION = "0.2.1"
+      VERSION = "0.2.2"
     end
   end
 end

data/sample/echo_server.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 require 'eventmachine'
-require 'em-websocket'
+require 'websocket-eventmachine-server'
 
 PORT = (ARGV.shift || 8080).to_i
 
@@ -8,7 +8,8 @@ EM::run do
   @channel = EM::Channel.new
 
   puts "start websocket server - port:#{PORT}"
-  EM::WebSocket.start(:host => "0.0.0.0", :port => PORT) do |ws|
+
+  WebSocket::EventMachine::Server.start(:host => "0.0.0.0", :port => PORT) do |ws|
     ws.onopen do
       sid = @channel.subscribe do |mes|
         ws.send mes

data/test/test_helper.rb

@@ -3,6 +3,6 @@ require 'bundler'
 require 'minitest/autorun'
 require 'websocket-client-simple'
 require 'eventmachine'
-require 'em-websocket'
+require 'websocket-eventmachine-server'
 
 $:.unshift File.expand_path '../lib', File.dirname(__FILE__)

data/test/test_websocket_client_simple.rb

@@ -15,7 +15,7 @@ class TestWebSocketClientSimple < MiniTest::Test
       @channel = EM::Channel.new
 
       ## echo server
-      EM::WebSocket.start(:host => "0.0.0.0", :port => port) do |ws|
+      WebSocket::EventMachine::Server.start(:host => "0.0.0.0", :port => port) do |ws|
         ws.onopen do
           sid = @channel.subscribe do |mes|
             ws.send mes

data/websocket-client-simple.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest"
-  spec.add_development_dependency "em-websocket"
+  spec.add_development_dependency "websocket-eventmachine-server"
   spec.add_development_dependency "eventmachine"
 
   spec.add_dependency "websocket"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: websocket-client-simple
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Sho Hashimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-19 00:00:00.000000000 Z
+date: 2014-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: em-websocket
+  name: websocket-eventmachine-server
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="