wamp-client 0.0.3 → 0.0.4

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+/.rbenv-version

data/lib/wamp/client/version.rb

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

data/lib/wamp/client.rb

@@ -1,6 +1,7 @@
+# -*- coding: utf-8 -*-
 require "wamp/client/version"
 require "net/ws"
-require "json"
+require "yajl/json_gem"
 require "timeout"
 
 
@@ -70,7 +71,7 @@ module WAMP
 
     def publish(uri_or_curie, data)
       payload = [TYPEID_PUBLISH, uri_or_curie, data]
-      @ws.send_text(JSON.dump(payload))
+      @ws.send_text(JSON.dump(payload).force_encoding("utf-8"))
     end
 
 

data/test/support/wamp_server.py

@@ -0,0 +1,27 @@
+import sys
+
+from twisted.internet import reactor
+from twisted.python import log
+from autobahn.wamp import WampServerFactory, \
+                          WampServerProtocol, \
+                          exportRpc
+from autobahn.websocket import listenWS
+
+class RpcServerProtocol(WampServerProtocol):
+
+   @exportRpc
+   def add(self, x, y):
+      return x + y
+
+   def onSessionOpen(self):
+      self.registerForPubSub("/mpd/test")
+
+if __name__ == '__main__':
+   factory = WampServerFactory("ws://localhost:9001", debug=True)
+   factory.protocol = RpcServerProtocol
+   log.startLogging(sys.stdout)
+   listenWS(factory)
+   print "Here we go"
+   sys.stdout.flush() # flush the line so that tests know we're up
+   sys.stderr.flush()
+   reactor.run()

data/test/test_helper.rb

@@ -0,0 +1,3 @@
+require File.dirname(__FILE__) + "/../lib/wamp/client"
+require "minitest/autorun"
+require "minitest/rg"

data/test/unit/client_spec.rb

@@ -0,0 +1,77 @@
+# -*- coding: utf-8 -*-
+require File.expand_path("../test_helper", File.dirname(__FILE__))
+require "open3"
+require File.expand_path("../../../rmpd/lib/rmpd", File.dirname(__FILE__))
+
+
+describe WAMP::Client do
+
+  def with_echo_server(&block)
+    echo_server_path = File.expand_path("../support/echo_server.py",
+                                        File.dirname(__FILE__))
+
+    Open3.popen3(echo_server_path) do |stdin, stdout, stderr|
+      stdout.readline # the readline tells us the server is up
+      yield "localhost", 9001
+    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
+
+    listener = WAMP::Client.new("ws://#{host}:#{port}",
+                              :subprotocols => ["wamp"])
+    listener.open
+    listener.subscribe(CHANNEL, proc {|x| $stderr.puts "Rx: %p" % [x]})
+
+    puts "listener subscribed"
+
+
+    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)
+
+    client.publish(CHANNEL, "∆AIMON")
+
+    puts "checking..."
+    listener.check(0.1)
+
+    client.publish(CHANNEL, {"file" => "∆AIMON"})
+
+    puts "checking..."
+    listener.check(0.1)
+
+    config = StringIO.new <<EOF
+development:
+  hostname: admin@localhost
+  port: 6601
+
+test:
+  hostname: admin@localhost
+  port: 6601
+EOF
+
+    rmpd = Rmpd::Connection.new(config)
+    pi = rmpd.search("artist", "aimon", "title", "current")
+    client.publish(CHANNEL, pi)
+
+    puts "checking..."
+    listener.check(0.1)
+
+    puts "closing"
+    client.close
+    listener.close
+
+  end
+
+end

data/wamp-client.gemspec

@@ -15,10 +15,14 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = WAMP::Client::VERSION
 
+  gem.add_dependency("yajl-ruby")
+  gem.add_dependency("net-ws", "~> 0.0.3")
+
+  gem.add_development_dependency("debugger")
   gem.add_development_dependency("rake")
   gem.add_development_dependency("pry")
-  gem.add_development_dependency("debugger")
+  gem.add_development_dependency("minitest")
+  gem.add_development_dependency("minitest-spec")
+  gem.add_development_dependency("minitest-rg")
 
-  gem.add_dependency("json")
-  gem.add_dependency("net-ws", "~> 0.0.2")
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wamp-client
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,56 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-18 00:00:00.000000000 Z
+date: 2013-01-28 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: net-ws
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.3
+- !ruby/object:Gem::Dependency
+  name: debugger
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -44,7 +92,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: debugger
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -60,14 +108,14 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: minitest-spec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -76,21 +124,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: net-ws
+  name: minitest-rg
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.2
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: '0'
 description: WAMP client
 email:
 - ericw@xmtp.net
@@ -105,6 +153,9 @@ files:
 - Rakefile
 - lib/wamp/client.rb
 - lib/wamp/client/version.rb
+- test/support/wamp_server.py
+- test/test_helper.rb
+- test/unit/client_spec.rb
 - wamp-client.gemspec
 homepage: ''
 licenses: []
@@ -120,7 +171,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 222954112629255642
+      hash: 4170054363117719336
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -129,11 +180,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 222954112629255642
+      hash: 4170054363117719336
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: WAMP client
-test_files: []
+test_files:
+- test/support/wamp_server.py
+- test/test_helper.rb
+- test/unit/client_spec.rb