websocket-client-simple 0.2.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e514163b26ef3c9a5b777947059c009d6b058ae
-  data.tar.gz: 264e3ce953723f8e9e99c6a1bc6a54433f4a6c96
+  metadata.gz: a973fb2e4bcd3952b65cf09ebd8675abfe23e11c
+  data.tar.gz: fade26f5f38188f55c5b8366145ba7df3dfe0db2
 SHA512:
-  metadata.gz: 852d3a16f5538e187e492410b37c4e46b1aa29eb14d25d0dc2257ce9a2d319d13428eb99fef3a860da647b27e22665a8e185efa21d351bdf03ce0021662670e1
-  data.tar.gz: 2b889144abf61793096c056c0555395c1bf4d1bf23357c29afc1567d5c3fa401e6e0047d78a270e89fc8befc0fbe395868e4ffc281e4f5cb17865aca4e64c8f9
+  metadata.gz: 5ff340d539e7dce6a4afcea177e4162b2cd81c7a41d8f038d0088d41bdb9499093f5db48e652fa6133f3a36f29e5a0155dd84912e60a3db6a12a91ae9cb7e6ea
+  data.tar.gz: 78b41ebe27e136107797411146eab54fb1f4c7fa9501f9d47d055afca96d94ea55822e94fa49c81d8488ccf15f415b4db1826728c9b159a86f98c73e701478af

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.3.0 2016-02-20
+
+* "connect" method runs a given block before connecting WebSocket  #12
+
 === 0.2.5 2016-02-18
 
 * bugfixed sending when broken pipe  #15

data/README.md

@@ -5,8 +5,7 @@ Simple WebSocket Client for Ruby
 - https://github.com/shokai/websocket-client-simple
 - https://rubygems.org/gems/websocket-client-simple
 
-[![Build Status](https://travis-ci.org/shokai/websocket-client-simple.png?branch=master)](https://travis-ci.org/shokai/websocket-client-simple)
-
+[![Circle CI](https://circleci.com/gh/shokai/websocket-client-simple.svg?style=svg)](https://circleci.com/gh/shokai/websocket-client-simple)
 
 Installation
 ------------
@@ -44,6 +43,20 @@ loop do
 end
 ```
 
+`connect` runs a given block before connecting websocket
+
+```ruby
+WebSocket::Client::Simple.connect 'ws://example.com:8888' do |ws|
+  ws.on :open do
+    puts "connect!"
+  end
+
+  ws.on :message do |msg|
+    puts msg.data
+  end
+end
+```
+
 
 Sample
 ------

data/circle.yml

@@ -0,0 +1,3 @@
+machine:
+  ruby:
+    version: "2.2.2"

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

@@ -3,14 +3,18 @@ module WebSocket
     module Simple
 
       def self.connect(url, options={})
-        ::WebSocket::Client::Simple::Client.new(url, options)
+        client = ::WebSocket::Client::Simple::Client.new
+        yield client if block_given?
+        client.connect url, options
+        return client
       end
 
       class Client
         include EventEmitter
         attr_reader :url, :handshake
 
-        def initialize(url, options={})
+        def connect(url, options={})
+          return if @socket
           @url = url
           uri = URI.parse url
           @socket = TCPSocket.new(uri.host,

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

@@ -1,7 +1,7 @@
 module WebSocket
   module Client
     module Simple
-      VERSION = "0.2.5"
+      VERSION = "0.3.0"
     end
   end
 end

data/test/echo_server.rb

@@ -0,0 +1,26 @@
+module EchoServer
+  def self.start
+    WebSocket::EventMachine::Server.start(:host => "0.0.0.0", :port => self.port) do |ws|
+      @channel = EM::Channel.new
+      ws.onopen do
+        sid = @channel.subscribe do |mes|
+          ws.send mes  # echo to client
+        end
+        ws.onmessage do |msg|
+          @channel.push msg
+        end
+        ws.onclose do
+          @channel.unsubscribe sid
+        end
+      end
+    end
+  end
+
+  def self.port
+    (ENV['WS_PORT'] || 18080).to_i
+  end
+
+  def self.url
+    "ws://localhost:#{self.port}"
+  end
+end

data/test/test_connect_block.rb

@@ -0,0 +1,33 @@
+require File.expand_path 'test_helper', File.dirname(__FILE__)
+
+class TestWebSocketClientSimple < MiniTest::Test
+  
+  def test_onopen
+    
+    EM::run{
+      
+      EchoServer.start
+
+      res = nil
+
+      EM::add_timer 1 do
+        WebSocket::Client::Simple.connect EchoServer.url do |client|
+          client.on :open do
+            client.send "hello world"
+          end
+
+          client.on :message do |msg|
+            res = msg.to_s
+          end
+        end
+      end
+
+      EM::add_timer 2 do
+        assert_equal res, "hello world"
+        EM::stop_event_loop
+      end
+    }
+    
+  end
+  
+end

data/test/test_helper.rb

@@ -4,5 +4,6 @@ require 'minitest/autorun'
 require 'websocket-client-simple'
 require 'eventmachine'
 require 'websocket-eventmachine-server'
+require_relative 'echo_server'
 
 $:.unshift File.expand_path '../lib', File.dirname(__FILE__)

data/test/test_websocket_client_simple.rb

@@ -1,40 +1,20 @@
-require File.expand_path 'test_helper', File.dirname(__FILE__)
+require_relative 'test_helper'
 
 class TestWebSocketClientSimple < MiniTest::Test
 
-  def port
-    (ENV['WS_PORT'] || 18080).to_i
-  end
-
   def test_echo
     msgs = ['foo','bar','baz']
     res1 = []
     res2 = []
 
     EM::run{
-      @channel = EM::Channel.new
-
-      ## echo server
-      WebSocket::EventMachine::Server.start(:host => "0.0.0.0", :port => port) do |ws|
-        ws.onopen do
-          sid = @channel.subscribe do |mes|
-            ws.send mes
-          end
-          ws.onmessage do |msg|
-            @channel.push msg
-          end
-          ws.onclose do
-            @channel.unsubscribe sid
-          end
-        end
-      end
+      EchoServer.start
 
       ## client1 --> server --> client2
       EM::add_timer 1 do
-        url = "ws://localhost:#{port}"
-        client1 = WebSocket::Client::Simple.connect url
+        client1 = WebSocket::Client::Simple.connect EchoServer.url
+        client2 = WebSocket::Client::Simple.connect EchoServer.url
         assert_equal client1.open?, false
-        client2 = WebSocket::Client::Simple.connect url
         assert_equal client2.open?, false
 
         client1.on :message do |msg|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: websocket-client-simple
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.0
 platform: ruby
 authors:
 - Sho Hashimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-18 00:00:00.000000000 Z
+date: 2016-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -116,12 +116,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".travis.yml"
 - Gemfile
 - History.txt
 - LICENSE.txt
 - README.md
 - Rakefile
+- circle.yml
 - lib/websocket-client-simple.rb
 - lib/websocket-client-simple/client.rb
 - lib/websocket-client-simple/version.rb
@@ -129,6 +129,8 @@ files:
 - sample/echo_server.rb
 - sample/webbrowser/index.html
 - sample/webbrowser/main.js
+- test/echo_server.rb
+- test/test_connect_block.rb
 - test/test_helper.rb
 - test/test_websocket_client_simple.rb
 - websocket-client-simple.gemspec
@@ -157,5 +159,7 @@ signing_key:
 specification_version: 4
 summary: Simple WebSocket Client for Ruby
 test_files:
+- test/echo_server.rb
+- test/test_connect_block.rb
 - test/test_helper.rb
 - test/test_websocket_client_simple.rb

data/.travis.yml

@@ -1,7 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - '2.1.2'
-notifications:
-  slack:
-    secure: avBo0DyucPM8qK2F2qNT5yirZJNcXWfY9d4QKxZLfOa4aQZJ6y/x78Guo8fki/8ZLNnud+rsty3/QkPxBi3YUWcyIuCXMEcuYc8BWOjL+oD37DPgJxGg6ANKxuMotZMUzZweplkd/KgafugOHr7fsPt5UwX2ZYrZr+ksuemEoxs=