wamp_client 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72e6d6b94bf4b5f244885438e6c122c952d5d084
-  data.tar.gz: 0366993e7d42a1e3673210af8c8b4a05b63206e9
+  metadata.gz: 150daa5402442aaf1557dda7501439fa35266669
+  data.tar.gz: 72d8de49f166b98d2688c2602857c3eef5cbb07d
 SHA512:
-  metadata.gz: 0de90b5fc4cdf71d2e76b587a232530b47fb8e0ebd961c5a77299f130714c575ac36061a5c0bdeb75de5a535d9711a07523b79360d1d1c777738f0314f70179a
-  data.tar.gz: bf65fac58f124abb76d0c4518067f28f2046a29ffcb1d7fb0aede645654ae9d445ffeafded1c3d94aa759e316f9fd2738f38c72f8a2c3b4d2550a6ff21f6a4e8
+  metadata.gz: a16f76680f8b99352b8321729f9f538d40db5b5d208c864e1d6770cd89e31b9733a8b72bd1378321fe83523bd1829720b1e772ee12a2b6430ba7c76ca290379a
+  data.tar.gz: 986f7e28cd8773a040778704e28ca4c8f47f213157073f8bd51116599c2da0b70a42989decf524384f9b8374d1a6890b26b02beeace5ec1831c377371d5c072f

data/README.md

@@ -1,5 +1,6 @@
 # WampClient
 
+[![Gem Version](https://badge.fury.io/rb/wamp_client.svg)](https://badge.fury.io/rb/wamp_client)
 [![Circle CI](https://circleci.com/gh/ericchapman/ruby_wamp_client/tree/master.svg?&style=shield&circle-token=92813c17f9c9510c4c644e41683e7ba2572e0b2a)](https://circleci.com/gh/ericchapman/ruby_wamp_client/tree/master)
 [![Codecov](https://img.shields.io/codecov/c/github/ericchapman/ruby_wamp_client/master.svg)](https://codecov.io/github/ericchapman/ruby_wamp_client)
 
@@ -9,6 +10,9 @@ Client for talking to a WAMP Router.  This is defined at
 
 ## Revision History
 
+ - v0.0.2:
+   - Added defer call result support
+   - Added progressive callee support
  - v0.0.1:
    - Initial Release
 
@@ -428,6 +432,84 @@ Options are
  - receive_progress [Boolean] - "true" if you support results being able to be sent progressively
  - disclose_me [Boolean] - "true" if the caller would like the callee to know the identity
 
+#### Errors
+Errors can either be raised OR returned as shown below
+
+```ruby
+handler = lambda do |args, kwargs, details|
+  raise 'error'
+  # OR
+  raise WampClient::CallError.new('wamp.error', ['some error'], {details: true})
+  # OR
+  WampClient::CallError.new('wamp.error', ['some error'], {details: true})
+end
+session.register('com.example.procedure', handler)
+```
+
+All 3 of the above examples will return a WAMP Error
+
+#### Deferred Call
+A deferred call refers to a call where the response needs to be asynchronously fetched before it can be returned to the
+caller.  This is shown below
+
+```ruby
+def add(args, kwargs, details)
+  defer = WampClient::Defer::CallDefer.new
+  EM.add_timer(2) {  # Something Async
+    defer.succeed(args[0]+args[1])
+  }
+  defer
+end
+session.register('com.example.procedure', method(:add))
+```
+
+Errors are returned as follows
+
+```ruby
+def add(args, kwargs, details)
+  defer = WampClient::Defer::CallDefer.new
+  EM.add_timer(2) {  # Something Async
+    defer.fail(WampClient::CallError.new('test.error'))
+  }
+  defer
+end
+session.register('com.example.procedure', method(:add))
+```
+
+#### Progressive Calls
+Progressive calls are ones that return the result in pieces rather than all at once.  They are invoked as follows
+
+**Caller**
+
+```ruby
+results = []
+session.call('com.example.procedure', [], {}, {receive_progress: true}) do |result, error, details|
+  results = results + result.args
+  unless details[:progress]
+    puts results # => [1,2,3,4,5,6]
+  end
+end
+```
+
+**Callee**
+
+```ruby
+def add(args, kwargs, details)
+  defer = WampClient::Defer::ProgressiveCallDefer.new
+  EM.add_timer(2) {  # Something Async
+    defer.progress(WampClient::CallResult.new([1,2,3]))
+  }
+  EM.add_timer(4) {  # Something Async
+    defer.progress(WampClient::CallResult.new([1,2,3]))
+  }
+  EM.add_timer(6) {  # Something Async
+    defer.succeed(WampClient::CallResult.new())
+  }
+  defer
+end
+session.register('com.example.procedure', method(:add))
+```
+
 ## Contributing
 
 1. Fork it ( https://github.com/ericchapman/ruby_wamp_client )

data/lib/wamp_client.rb

@@ -1,7 +1,35 @@
+=begin
+
+Copyright (c) 2016 Eric Chapman
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+=end
+
 require 'wamp_client/version'
 require 'wamp_client/message'
 require 'wamp_client/serializer'
 require 'wamp_client/transport'
 require 'wamp_client/connection'
 require 'wamp_client/session'
-require 'wamp_client/auth'
+require 'wamp_client/auth'
+require 'wamp_client/defer'

data/lib/wamp_client/auth.rb

@@ -1,3 +1,30 @@
+=begin
+
+Copyright (c) 2016 Eric Chapman
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+=end
+
 require 'openssl'
 require 'base64'
 

data/lib/wamp_client/check.rb

@@ -1,3 +1,30 @@
+=begin
+
+Copyright (c) 2016 Eric Chapman
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+=end
+
 module WampClient
   module Check
 

data/lib/wamp_client/connection.rb

@@ -1,3 +1,30 @@
+=begin
+
+Copyright (c) 2016 Eric Chapman
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+=end
+
 require 'websocket-eventmachine-client'
 require 'wamp_client/session'
 require 'wamp_client/transport'
@@ -53,7 +80,9 @@ module WampClient
     # @param options [Hash] The different options to pass to the connection
     # @option options [String] :uri The uri of the WAMP router to connect to
     # @option options [String] :realm The realm to connect to
-    # @option options [String] :protocol The protocol (default if wamp.2.json)
+    # @option options [String,nil] :protocol The protocol (default if wamp.2.json)
+    # @option options [String,nil] :authid The id to authenticate with
+    # @option options [Array, nil] :authmethods The different auth methods that the client supports
     # @option options [Hash] :headers Custom headers to include during the connection
     # @option options [WampClient::Serializer::Base] :serializer The serializer to use (default is json)
     def initialize(options)

data/lib/wamp_client/defer.rb

@@ -0,0 +1,68 @@
+=begin
+
+Copyright (c) 2016 Eric Chapman
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+=end
+
+module WampClient
+  module Defer
+
+    class CallDefer
+      attr_accessor :request
+
+      @on_complete
+      def on_complete(&on_complete)
+        @on_complete = on_complete
+      end
+
+      @on_error
+      def on_error(&on_error)
+        @on_error = on_error
+      end
+
+      def succeed(result)
+        @on_complete.call(self, result) if @on_complete
+      end
+
+      def fail(error)
+        @on_error.call(self, error) if @on_error
+      end
+
+    end
+
+    class ProgressiveCallDefer < CallDefer
+
+      @on_progress
+      def on_progress(&on_progress)
+        @on_progress = on_progress
+      end
+
+      def progress(result)
+        @on_progress.call(self, result) if @on_progress
+      end
+
+    end
+
+  end
+end

data/lib/wamp_client/message.rb

@@ -1,3 +1,30 @@
+=begin
+
+Copyright (c) 2016 Eric Chapman
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+=end
+
 require 'wamp_client/check'
 
 # !!!!THIS FILE IS AUTOGENERATED.  DO NOT HAND EDIT!!!!

data/lib/wamp_client/serializer.rb

@@ -1,3 +1,30 @@
+=begin
+
+Copyright (c) 2016 Eric Chapman
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+=end
+
 require 'json'
 
 module WampClient

data/lib/wamp_client/session.rb

@@ -1,3 +1,30 @@
+=begin
+
+Copyright (c) 2016 Eric Chapman
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+=end
+
 require 'wamp_client/transport'
 require 'wamp_client/message'
 require 'wamp_client/check'
@@ -22,7 +49,7 @@ module WampClient
               shared_registration: true,
               ##call_timeout: true,
               ##call_canceling: true,
-              # progressive_call_results: true,
+              progressive_call_results: true,
               registration_revocation: true
           }
       },
@@ -48,8 +75,18 @@ module WampClient
     attr_accessor :args, :kwargs
 
     def initialize(args=nil, kwargs=nil)
-      self.args = args
-      self.kwargs = kwargs
+      self.args = args || []
+      self.kwargs = kwargs || {}
+    end
+  end
+
+  class CallError < Exception
+    attr_accessor :error, :args, :kwargs
+
+    def initialize(error, args=nil, kwargs=nil)
+      self.error = error
+      self.args = args || []
+      self.kwargs = kwargs || {}
     end
   end
 
@@ -119,7 +156,7 @@ module WampClient
     attr_accessor :id, :realm, :transport, :verbose, :options
 
     # Private attributes
-    attr_accessor :_goodbye_sent, :_requests, :_subscriptions, :_registrations
+    attr_accessor :_goodbye_sent, :_requests, :_subscriptions, :_registrations, :_defers
 
     # Constructor
     # @param transport [WampClient::Transport::Base] The transport that the session will use
@@ -147,6 +184,7 @@ module WampClient
       # Init Subs and Regs in place
       self._subscriptions = {}
       self._registrations = {}
+      self._defers = {}
 
       # Setup Transport
       self.transport = transport
@@ -623,20 +661,69 @@ module WampClient
           begin
             value = h.call(args, kwargs, details)
 
-            if value.nil?
-              value = CallResult.new
-            elsif not value.is_a?(CallResult)
-              value = CallResult.new([value])
+            def send_error(request, error)
+              if error.nil?
+                error = CallError.new('wamp.error.runtime')
+              elsif not error.is_a?(CallError)
+                error = CallError.new('wamp.error.runtime', [error.to_s])
+              end
+
+              error_msg = WampClient::Message::Error.new(WampClient::Message::Types::INVOCATION, request, {}, error.error, error.args, error.kwargs)
+              self._send_message(error_msg)
+            end
+
+            def send_result(request, result, options={})
+              if result.nil?
+                result = CallResult.new
+              elsif result.is_a?(CallError)
+                # Do nothing
+              elsif not result.is_a?(CallResult)
+                result = CallResult.new([result])
+              end
+
+              if result.is_a?(CallError)
+                send_error(request, result)
+              else
+                yield_msg = WampClient::Message::Yield.new(request, options, result.args, result.kwargs)
+                self._send_message(yield_msg)
+              end
             end
 
-            # TODO: Handle promise or future
+            # If a defer was returned, handle accordingly
+            if value.is_a? WampClient::Defer::CallDefer
+              value.request = request
+
+              # Store the defer
+              self._defers[request] = value
+
+              # On complete, send the result
+              value.on_complete do |defer, result|
+                send_result(defer.request, result)
+                self._defers.delete(defer.request)
+              end
+
+              # On error, send the error
+              value.on_error do |defer, error|
+                send_error(defer.request, error)
+                self._defers.delete(defer.request)
+              end
+
+              # For progressive, return the progress
+              if value.is_a? WampClient::Defer::ProgressiveCallDefer
+                value.on_progress do |defer, result|
+                  send_result(defer.request, result, {progress: true})
+                end
+              end
+
+            # Else it was a normal response
+            else
+              send_result(request, value)
+            end
 
-            yield_msg = WampClient::Message::Yield.new(request, {}, value.args, value.kwargs)
-            self._send_message(yield_msg)
-          rescue Exception => e
-            error = WampClient::Message::Error.new(WampClient::Message::Types::INVOCATION, request, {}, 'wamp.error.runtime', [e.to_s])
-            self._send_message(error)
+          rescue Exception => error
+            send_error(request, error)
           end
+
         end
       end
     end

data/lib/wamp_client/transport.rb

@@ -1,3 +1,30 @@
+=begin
+
+Copyright (c) 2016 Eric Chapman
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+=end
+
 require 'wamp_client/serializer'
 
 module WampClient

data/lib/wamp_client/version.rb

@@ -1,3 +1,30 @@
+=begin
+
+Copyright (c) 2016 Eric Chapman
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+=end
+
 module WampClient
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/spec/session_spec.rb

@@ -566,23 +566,43 @@ describe WampClient::Session do
       welcome = WampClient::Message::Welcome.new(1234, {})
       transport.receive_message(welcome.payload)
 
-      # Register
-      @response = 'response'
-      @throw_error = false
+      # Register Response
       handler = lambda do |args, kwargs, details|
-
-        raise 'error' if @throw_error
-
         @response
       end
-
       session.register('test.procedure', handler, {test: 1})
       request_id = session._requests[:register].keys.first
-
-      # Generate server response
       registered = WampClient::Message::Registered.new(request_id, 3456)
       transport.receive_message(registered.payload)
 
+      # Defer Register
+      defer_handler = lambda do |args, kwargs, details|
+        @defer
+      end
+      session.register('test.defer.procedure', defer_handler)
+
+      request_id = session._requests[:register].keys.first
+      registered = WampClient::Message::Registered.new(request_id, 4567)
+      transport.receive_message(registered.payload)
+
+      # Register Error Response
+      handler = lambda do |args, kwargs, details|
+        raise 'error'
+      end
+      session.register('test.procedure.error', handler, {test: 1})
+      request_id = session._requests[:register].keys.first
+      registered = WampClient::Message::Registered.new(request_id, 5678)
+      transport.receive_message(registered.payload)
+
+      # Register Call Error Response
+      handler = lambda do |args, kwargs, details|
+        raise WampClient::CallError.new('test.error', ['error'])
+      end
+      session.register('test.procedure.call.error', handler, {test: 1})
+      request_id = session._requests[:register].keys.first
+      registered = WampClient::Message::Registered.new(request_id, 6789)
+      transport.receive_message(registered.payload)
+
       transport.messages = []
     end
 
@@ -620,7 +640,7 @@ describe WampClient::Session do
 
     end
 
-    it 'call result response' do
+    it 'result response' do
 
       @response = WampClient::CallResult.new(['test'], {test:1})
 
@@ -638,15 +658,120 @@ describe WampClient::Session do
 
     end
 
-    it 'call error response' do
+    it 'raise error response' do
+
+      # Generate server event
+      invocation = WampClient::Message::Invocation.new(7890, 5678, {test:1}, [2], {param: 'value'})
+      transport.receive_message(invocation.payload)
+
+      # Check and make sure yield message was sent
+      expect(transport.messages.count).to eq(1)
+      expect(transport.messages[0][0]).to eq(WampClient::Message::Types::ERROR)
+      expect(transport.messages[0][1]).to eq(WampClient::Message::Types::INVOCATION)
+      expect(transport.messages[0][2]).to eq(7890)
+      expect(transport.messages[0][3]).to eq({})
+      expect(transport.messages[0][4]).to eq('wamp.error.runtime')
+      expect(transport.messages[0][5]).to eq(['error'])
+
+    end
+
+    it 'raise call error response' do
+
+      # Generate server event
+      invocation = WampClient::Message::Invocation.new(7890, 6789, {test:1}, [2], {param: 'value'})
+      transport.receive_message(invocation.payload)
+
+      # Check and make sure yield message was sent
+      expect(transport.messages.count).to eq(1)
+      expect(transport.messages[0][0]).to eq(WampClient::Message::Types::ERROR)
+      expect(transport.messages[0][1]).to eq(WampClient::Message::Types::INVOCATION)
+      expect(transport.messages[0][2]).to eq(7890)
+      expect(transport.messages[0][3]).to eq({})
+      expect(transport.messages[0][4]).to eq('test.error')
+      expect(transport.messages[0][5]).to eq(['error'])
+
+    end
+
+    it 'return error response' do
 
-      @throw_error = true
+      @response = WampClient::CallError.new('wamp.error.runtime', ['error'], {error: true})
 
       # Generate server event
       invocation = WampClient::Message::Invocation.new(7890, 3456, {test:1}, [2], {param: 'value'})
       transport.receive_message(invocation.payload)
 
-      @throw_error = false
+      # Check and make sure yield message was sent
+      expect(transport.messages.count).to eq(1)
+      expect(transport.messages[0][0]).to eq(WampClient::Message::Types::ERROR)
+      expect(transport.messages[0][1]).to eq(WampClient::Message::Types::INVOCATION)
+      expect(transport.messages[0][2]).to eq(7890)
+      expect(transport.messages[0][3]).to eq({})
+      expect(transport.messages[0][4]).to eq('wamp.error.runtime')
+      expect(transport.messages[0][5]).to eq(['error'])
+      expect(transport.messages[0][6]).to eq({error: true})
+
+    end
+
+    it 'defer normal response' do
+
+      @response = WampClient::CallResult.new(['test'], {test:1})
+
+      @defer = WampClient::Defer::CallDefer.new
+
+      # Generate server event
+      invocation = WampClient::Message::Invocation.new(7890, 4567, {test:1}, [2], {param: 'value'})
+      transport.receive_message(invocation.payload)
+
+      expect(transport.messages.count).to eq(0)
+
+      @defer.succeed(@response)
+
+      # Check and make sure yield message was sent
+      expect(transport.messages.count).to eq(1)
+      expect(transport.messages[0][0]).to eq(WampClient::Message::Types::YIELD)
+      expect(transport.messages[0][1]).to eq(7890)
+      expect(transport.messages[0][2]).to eq({})
+      expect(transport.messages[0][3]).to eq(['test'])
+      expect(transport.messages[0][4]).to eq({test:1})
+
+    end
+
+    it 'defer error normal response' do
+
+      @defer = WampClient::Defer::CallDefer.new
+
+      # Generate server event
+      invocation = WampClient::Message::Invocation.new(7890, 4567, {test:1}, [2], {param: 'value'})
+      transport.receive_message(invocation.payload)
+
+      expect(transport.messages.count).to eq(0)
+
+      @defer.fail('error')
+
+      # Check and make sure yield message was sent
+      expect(transport.messages.count).to eq(1)
+      expect(transport.messages[0][0]).to eq(WampClient::Message::Types::ERROR)
+      expect(transport.messages[0][1]).to eq(WampClient::Message::Types::INVOCATION)
+      expect(transport.messages[0][2]).to eq(7890)
+      expect(transport.messages[0][3]).to eq({})
+      expect(transport.messages[0][4]).to eq('wamp.error.runtime')
+      expect(transport.messages[0][5]).to eq(['error'])
+
+    end
+
+    it 'defer error object response' do
+
+      @response = WampClient::CallError.new('wamp.error.runtime', ['error'], {error: true})
+
+      @defer = WampClient::Defer::CallDefer.new
+
+      # Generate server event
+      invocation = WampClient::Message::Invocation.new(7890, 4567, {test:1}, [2], {param: 'value'})
+      transport.receive_message(invocation.payload)
+
+      expect(transport.messages.count).to eq(0)
+
+      @defer.fail(@response)
 
       # Check and make sure yield message was sent
       expect(transport.messages.count).to eq(1)
@@ -656,6 +781,7 @@ describe WampClient::Session do
       expect(transport.messages[0][3]).to eq({})
       expect(transport.messages[0][4]).to eq('wamp.error.runtime')
       expect(transport.messages[0][5]).to eq(['error'])
+      expect(transport.messages[0][6]).to eq({error: true})
 
     end
   end
@@ -936,6 +1062,106 @@ describe WampClient::Session do
 
     end
 
+    it 'callee result support' do
+
+      # Defer Register
+      @defer = WampClient::Defer::ProgressiveCallDefer.new
+      defer_handler = lambda do |args, kwargs, details|
+        @defer
+      end
+      session.register('test.defer.procedure', defer_handler)
+
+      request_id = session._requests[:register].keys.first
+      registered = WampClient::Message::Registered.new(request_id, 4567)
+      transport.receive_message(registered.payload)
+
+      transport.messages = []
+
+      # Generate server event
+      invocation = WampClient::Message::Invocation.new(7890, 4567, {test:1}, [2], {param: 'value'})
+      transport.receive_message(invocation.payload)
+
+      expect(transport.messages.count).to eq(0)
+      expect(session._defers.count).to eq(1)
+
+      @defer.progress(WampClient::CallResult.new(['test1']))
+      expect(session._defers.count).to eq(1)
+      @defer.progress(WampClient::CallResult.new(['test2']))
+      expect(session._defers.count).to eq(1)
+      @defer.succeed(WampClient::CallResult.new(['test3']))
+      expect(session._defers.count).to eq(0)
+
+      expect(transport.messages.count).to eq(3)
+
+      # Check and make sure yield message was sent
+      expect(transport.messages[0][0]).to eq(WampClient::Message::Types::YIELD)
+      expect(transport.messages[0][1]).to eq(7890)
+      expect(transport.messages[0][2]).to eq({progress: true})
+      expect(transport.messages[0][3]).to eq(['test1'])
+
+      expect(transport.messages[1][0]).to eq(WampClient::Message::Types::YIELD)
+      expect(transport.messages[1][1]).to eq(7890)
+      expect(transport.messages[1][2]).to eq({progress: true})
+      expect(transport.messages[1][3]).to eq(['test2'])
+
+      expect(transport.messages.count).to eq(3)
+      expect(transport.messages[2][0]).to eq(WampClient::Message::Types::YIELD)
+      expect(transport.messages[2][1]).to eq(7890)
+      expect(transport.messages[2][2]).to eq({})
+      expect(transport.messages[2][3]).to eq(['test3'])
+
+    end
+
+    it 'callee error support' do
+
+      # Defer Register
+      @defer = WampClient::Defer::ProgressiveCallDefer.new
+      defer_handler = lambda do |args, kwargs, details|
+        @defer
+      end
+      session.register('test.defer.procedure', defer_handler)
+
+      request_id = session._requests[:register].keys.first
+      registered = WampClient::Message::Registered.new(request_id, 4567)
+      transport.receive_message(registered.payload)
+
+      transport.messages = []
+
+      # Generate server event
+      invocation = WampClient::Message::Invocation.new(7890, 4567, {test:1}, [2], {param: 'value'})
+      transport.receive_message(invocation.payload)
+
+      expect(transport.messages.count).to eq(0)
+      expect(session._defers.count).to eq(1)
+
+      @defer.progress(WampClient::CallResult.new(['test1']))
+      expect(session._defers.count).to eq(1)
+      @defer.progress(WampClient::CallResult.new(['test2']))
+      expect(session._defers.count).to eq(1)
+      @defer.fail(WampClient::CallError.new('test.error'))
+      expect(session._defers.count).to eq(0)
+
+      expect(transport.messages.count).to eq(3)
+
+      # Check and make sure yield message was sent
+      expect(transport.messages[0][0]).to eq(WampClient::Message::Types::YIELD)
+      expect(transport.messages[0][1]).to eq(7890)
+      expect(transport.messages[0][2]).to eq({progress: true})
+      expect(transport.messages[0][3]).to eq(['test1'])
+
+      expect(transport.messages[1][0]).to eq(WampClient::Message::Types::YIELD)
+      expect(transport.messages[1][1]).to eq(7890)
+      expect(transport.messages[1][2]).to eq({progress: true})
+      expect(transport.messages[1][3]).to eq(['test2'])
+
+      expect(transport.messages[2][0]).to eq(WampClient::Message::Types::ERROR)
+      expect(transport.messages[2][1]).to eq(WampClient::Message::Types::INVOCATION)
+      expect(transport.messages[2][2]).to eq(7890)
+      expect(transport.messages[2][3]).to eq({})
+      expect(transport.messages[2][4]).to eq('test.error')
+
+    end
+
   end
 
   describe 'auth' do

data/spec/spec_helper.rb

@@ -3,8 +3,10 @@ SimpleCov.start
 
 require_relative '../lib/wamp_client'
 
-require 'codecov'
-SimpleCov.formatter = SimpleCov::Formatter::Codecov
+if ENV['CODECOV_TOKEN']
+  require 'codecov'
+  SimpleCov.formatter = SimpleCov::Formatter::Codecov
+end
 
 require 'wamp_client'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wamp_client
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Eric Chapman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-09 00:00:00.000000000 Z
+date: 2016-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -125,6 +125,7 @@ files:
 - lib/wamp_client/auth.rb
 - lib/wamp_client/check.rb
 - lib/wamp_client/connection.rb
+- lib/wamp_client/defer.rb
 - lib/wamp_client/message.rb
 - lib/wamp_client/serializer.rb
 - lib/wamp_client/session.rb