wamp-client 0.0.4 → 0.0.5

data/lib/wamp/client.rb

@@ -18,8 +18,8 @@ module WAMP
     TYPEID_EVENT = 8
 
 
-    def initialize(uri, options=nil)
-      options ||= {:subprotocols => ["wamp"]}
+    def initialize(uri, options={})
+      options = {:subprotocols => ["wamp"]}.merge(options)
       @session_id = nil
       @ws = Net::WS.new(uri, options)
       @subscriptions = {}

data/lib/wamp/client/version.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 module WAMP
   class Client
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

data/test/support/wamp_server.py

@@ -1,3 +1,5 @@
+#!/usr/bin/env python2.7 -u -Wall
+
 import sys
 
 from twisted.internet import reactor
@@ -18,7 +20,7 @@ class RpcServerProtocol(WampServerProtocol):
 
 if __name__ == '__main__':
    factory = WampServerFactory("ws://localhost:9001", debug=True)
-   factory.protocol = RpcServerProtocol
+   factory.protocol = WampServerProtocol
    log.startLogging(sys.stdout)
    listenWS(factory)
    print "Here we go"

data/test/unit/client_spec.rb

@@ -9,49 +9,48 @@ describe WAMP::Client do
   def with_echo_server(&block)
     echo_server_path = File.expand_path("../support/echo_server.py",
                                         File.dirname(__FILE__))
+    wamp_server_path = File.expand_path("../support/wamp_server.py",
+                                        File.dirname(__FILE__))
 
-    Open3.popen3(echo_server_path) do |stdin, stdout, stderr|
+    puts "bringing up echo server"
+    Open3.popen3(wamp_server_path) do |stdin, stdout, stderr, wait_thr|
+      pid = wait_thr.pid
       stdout.readline # the readline tells us the server is up
-      yield "localhost", 9001
+      block.call("localhost", 9001)
+      puts "tearing down echo server"
+      Process.kill("TERM", pid)
     end
   end
 
-  # it "should be sane" do
-  #   true.must_equal true
-  # end
-
   it "can send and receive message" do
     CHANNEL = "/mpd/test"
 
     host = "localhost"; port = 9001
+    with_echo_server do |host, port|
+      listener = WAMP::Client.new("ws://#{host}:#{port}")
+      listener.open
+      listener.subscribe(CHANNEL, proc {|x| $stderr.puts "Rx: %p" % [x]})
 
-    listener = WAMP::Client.new("ws://#{host}:#{port}",
-                              :subprotocols => ["wamp"])
-    listener.open
-    listener.subscribe(CHANNEL, proc {|x| $stderr.puts "Rx: %p" % [x]})
+      puts "listener subscribed"
 
-    puts "listener subscribed"
 
+      client = WAMP::Client.new("ws://#{host}:#{port}").tap {|x| x.open}
+      client.publish(CHANNEL, "testing 1 2 3")
 
-    client = WAMP::Client.new("ws://#{host}:#{port}",
-                              :subprotocols => ["wamp"])
-    puts client.open
-    client.publish(CHANNEL, "testing 1 2 3")
+      puts "checking..."
+      listener.check(0.1)
 
-    puts "checking..."
-    listener.check(0.1)
+      client.publish(CHANNEL, "∆AIMON")
 
-    client.publish(CHANNEL, "∆AIMON")
+      puts "checking..."
+      listener.check(0.1)
 
-    puts "checking..."
-    listener.check(0.1)
+      client.publish(CHANNEL, {"file" => "∆AIMON"})
 
-    client.publish(CHANNEL, {"file" => "∆AIMON"})
+      puts "checking..."
+      listener.check(0.1)
 
-    puts "checking..."
-    listener.check(0.1)
-
-    config = StringIO.new <<EOF
+      config = StringIO.new <<EOF
 development:
   hostname: admin@localhost
   port: 6601
@@ -61,16 +60,17 @@ test:
   port: 6601
 EOF
 
-    rmpd = Rmpd::Connection.new(config)
-    pi = rmpd.search("artist", "aimon", "title", "current")
-    client.publish(CHANNEL, pi)
+      rmpd = Rmpd::Connection.new(config)
+      pi = rmpd.search("artist", "aimon", "title", "current")
+      client.publish(CHANNEL, pi)
 
-    puts "checking..."
-    listener.check(0.1)
+      puts "checking..."
+      listener.check(0.1)
 
-    puts "closing"
-    client.close
-    listener.close
+      puts "closing"
+      client.close
+      listener.close
+    end
 
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wamp-client
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-28 00:00:00.000000000 Z
+date: 2013-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
@@ -171,7 +171,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4170054363117719336
+      hash: -4201952591777948766
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -180,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4170054363117719336
+      hash: -4201952591777948766
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23