wamp_client 0.1.4 → 0.2.0

data/lib/wamp/client/transport/base.rb

@@ -1,82 +1,16 @@
-=begin
-
-Copyright (c) 2018 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'
+require 'wamp/client/event'
 
 module Wamp
   module Client
     module Transport
       class Base
-
-        # Callback when the socket is opened
-        @on_open
-        def on_open(&on_open)
-          @on_open = on_open
-        end
-
-        # Callback when the socket is closed.  Parameters are
-        # @param reason [String] String telling the reason it was closed
-        @on_close
-        def on_close(&on_close)
-          @on_close = on_close
-        end
-
-        # Callback when a message is received.  Parameters are
-        # @param msg [Array] The parsed message that was received
-        @on_message
-        def on_message(&on_message)
-          @on_message = on_message
-        end
-
-        # Callback when there is an error.  Parameters are
-        # @param msg [String] The message from the error
-        @on_error
-        def on_error(&on_error)
-          @on_error = on_error
-        end
-
-        # Simple setter for callbacks
-        def on(event, &callback)
-          case event
-          when :open
-            self.on_open(&callback)
-          when :close
-            self.on_close(&callback)
-          when :message
-            self.on_message(&callback)
-          when :error
-            self.on_error(&callback)
-          else
-            raise RuntimeError, "Unknown on(event) '#{event}'"
-          end
-        end
+        include Event
 
         attr_accessor :uri, :proxy, :headers, :protocol, :serializer, :connected
 
+        create_event [:open, :close, :message, :error]
+
         # Constructor for the transport
         # @param options [Hash] The connection options.  the different options are as follows
         # @option options [String] :uri The url to connect to
@@ -96,13 +30,6 @@ module Wamp
 
           # Add the wamp.2.json protocol header
           self.headers['Sec-WebSocket-Protocol'] = self.protocol
-
-          # Initialize callbacks
-          @on_open = nil
-          @on_close = nil
-          @on_message = nil
-          @on_error = nil
-
         end
 
         # Connects to the WAMP Server using the transport

data/lib/wamp/client/transport/event_machine_base.rb

@@ -1,30 +1,3 @@
-=begin
-
-Copyright (c) 2018 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 'eventmachine'
 require_relative 'base'
 

data/lib/wamp/client/transport/faye_web_socket.rb

@@ -1,30 +1,3 @@
-=begin
-
-Copyright (c) 2018 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_relative 'event_machine_base'
 
 # This implementation uses the 'faye-websocket' Gem.
@@ -49,20 +22,20 @@ module Wamp
 
           self.socket.on(:open) do |event|
             self.connected = true
-            @on_open.call if @on_open
+            trigger :open
           end
 
           self.socket.on(:message) do |event|
-            @on_message.call(self.serializer.deserialize(event.data)) if @on_message
+            trigger :message, self.serializer.deserialize(event.data)
           end
 
           self.socket.on(:close) do |event|
             self.connected = false
-            @on_close.call(event.reason) if @on_close
+            trigger :close, event.reason
           end
 
           self.socket.on(:error) do |event|
-            @on_error.call(event.message) if @on_error
+            trigger :error, event.message
           end
         end
 

data/lib/wamp/client/transport/web_socket_event_machine.rb

@@ -1,30 +1,3 @@
-=begin
-
-Copyright (c) 2018 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_relative 'event_machine_base'
 
 # This implementation uses the 'websocket-eventmachine-client' Gem.
@@ -56,16 +29,16 @@ module Wamp
 
           self.socket.onopen do
             self.connected = true
-            @on_open.call if @on_open
+            trigger :open
           end
 
           self.socket.onmessage do |msg, type|
-            @on_message.call(self.serializer.deserialize(msg)) if @on_message
+            trigger :message, self.serializer.deserialize(msg)
           end
 
           self.socket.onclose do |code, reason|
             self.connected = false
-            @on_close.call(reason) if @on_close
+            trigger :close, reason
           end
         end
 

data/lib/wamp/client/version.rb

@@ -1,32 +1,5 @@
-=begin
-
-Copyright (c) 2018 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 Wamp
   module Client
-    VERSION = '0.1.4'
+    VERSION = '0.2.0'
   end
 end

data/lib/wamp/client.rb

@@ -1,37 +1,10 @@
-=begin
-
-Copyright (c) 2018 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/connection'
 require 'wamp/client/session'
 require 'wamp/client/auth'
-require 'wamp/client/defer'
+require 'wamp/client/response'
 require 'logger'
 
 module Wamp

data/spec/spec_helper.rb

@@ -1,150 +1,16 @@
 require 'simplecov'
 SimpleCov.start
 
-require_relative '../lib/wamp/client'
+require 'wamp/client'
 
 if ENV['CODECOV_TOKEN']
   require 'codecov'
   SimpleCov.formatter = SimpleCov::Formatter::Codecov
 end
 
-require 'wamp/client'
+Dir[File.expand_path('spec/support/**/*.rb')].each { |f| require f }
+
 require "rspec/em"
 
 Wamp::Client.log_level = :error
 
-module SpecHelper
-
-  class TestTransport < Wamp::Client::Transport::EventMachineBase
-    @@event_machine_on = false
-    attr_accessor :messages
-
-    def initialize(options)
-      super(options)
-      @connected = true
-      self.messages = []
-    end
-
-    def connect
-      self.add_timer(1000) do
-        @on_open.call if @on_open
-      end
-    end
-
-    def disconnect
-      @connected = false
-      @on_close.call if @on_close
-    end
-
-    def self.start_event_machine(&block)
-      @@event_machine_on = true
-      block.call
-    end
-
-    def self.stop_event_machine
-      @@event_machine_on = false
-    end
-
-    def self.event_machine_on?
-      @@event_machine_on
-    end
-
-    def send_message(msg)
-      self.messages.push(msg)
-    end
-
-    def receive_message(msg)
-
-      # Emulate serialization/deserialization
-      serialize = self.serializer.serialize(msg)
-      deserialize = self.serializer.deserialize(serialize)
-
-      # Call the received message
-      @on_message.call(deserialize) if @on_message
-    end
-
-  end
-
-  class WebSocketEventMachineClientStub
-    attr_accessor :last_message
-
-    def initialize
-      EM.add_timer(1) {
-        @onopen.call if @onopen != nil
-      }
-    end
-
-    @onopen
-    def onopen(&onopen)
-      @onopen = onopen
-    end
-
-    @onmessage
-    def onmessage(&onmessage)
-      @onmessage = onmessage
-    end
-
-    @onclose
-    def onclose(&onclose)
-      @onclose = onclose
-    end
-
-    def close
-      @onclose.call if @onclose != nil
-      true
-    end
-
-    def send(message, type)
-      self.last_message = message
-    end
-
-    def receive(message)
-      @onmessage.call(message, {type:'text'}) if @onmessage != nil
-    end
-
-  end
-
-  class FayeWebSocketClientStub
-    class Event
-      attr_accessor :data, :reason
-    end
-
-    attr_accessor :last_message
-
-    def initialize
-      EM.add_timer(1) {
-        @on_open.call(Event.new) if @on_open != nil
-      }
-    end
-
-    @on_open
-    @on_message
-    @on_close
-    def on(event, &block)
-      if event == :open
-        @on_open = block
-      elsif event == :close
-        @on_close = block
-      elsif event == :message
-        @on_message = block
-      end
-    end
-
-    def close
-      event = Event.new
-      event.reason = 'closed'
-      @on_close.call(event) if @on_close != nil
-    end
-
-    def send(message)
-      self.last_message = message
-    end
-
-    def receive(message)
-      event = Event.new
-      event.data = message
-      @on_message.call(event) if @on_message != nil
-    end
-
-  end
-end

data/spec/support/faye_web_socket_client_stub.rb

@@ -0,0 +1,43 @@
+class FayeWebSocketClientStub
+  class Event
+    attr_accessor :data, :reason
+  end
+
+  attr_accessor :last_message
+
+  def initialize
+    EM.add_timer(1) {
+      @on_open.call(Event.new) if @on_open != nil
+    }
+  end
+
+  @on_open
+  @on_message
+  @on_close
+  def on(event, &block)
+    if event == :open
+      @on_open = block
+    elsif event == :close
+      @on_close = block
+    elsif event == :message
+      @on_message = block
+    end
+  end
+
+  def close
+    event = Event.new
+    event.reason = 'closed'
+    @on_close.call(event) if @on_close != nil
+  end
+
+  def send(message)
+    self.last_message = message
+  end
+
+  def receive(message)
+    event = Event.new
+    event.data = message
+    @on_message.call(event) if @on_message != nil
+  end
+
+end

data/spec/support/test_transport.rb

@@ -0,0 +1,50 @@
+class TestTransport < Wamp::Client::Transport::EventMachineBase
+  @@event_machine_on = false
+  attr_accessor :messages
+
+  def initialize(options)
+    super(options)
+    @connected = true
+    self.messages = []
+  end
+
+  def connect
+    self.add_timer(1000) do
+      trigger :open
+    end
+  end
+
+  def disconnect
+    @connected = false
+    trigger :close
+  end
+
+  def self.start_event_machine(&block)
+    @@event_machine_on = true
+    block.call
+  end
+
+  def self.stop_event_machine
+    @@event_machine_on = false
+  end
+
+  def self.event_machine_on?
+    @@event_machine_on
+  end
+
+  def send_message(msg)
+    self.messages.push(msg)
+  end
+
+  def receive_message(msg)
+
+    # Emulate serialization/deserialization
+    serialize = self.serializer.serialize(msg)
+    deserialize = self.serializer.deserialize(serialize)
+
+    # Call the received message
+    trigger :message, deserialize
+  end
+
+end
+

data/spec/support/web_socket_event_machine_client_stub.rb

@@ -0,0 +1,39 @@
+class WebSocketEventMachineClientStub
+  attr_accessor :last_message
+
+  def initialize
+    EM.add_timer(1) {
+      @onopen.call if @onopen != nil
+    }
+  end
+
+  @onopen
+  def onopen(&onopen)
+    @onopen = onopen
+  end
+
+  @onmessage
+  def onmessage(&onmessage)
+    @onmessage = onmessage
+  end
+
+  @onclose
+  def onclose(&onclose)
+    @onclose = onclose
+  end
+
+  def close
+    @onclose.call if @onclose != nil
+    true
+  end
+
+  def send(message, type)
+    self.last_message = message
+  end
+
+  def receive(message)
+    @onmessage.call(message, {type:'text'}) if @onmessage != nil
+  end
+
+end
+

data/spec/wamp/client/connection_spec.rb

@@ -6,13 +6,13 @@ describe Wamp::Client::Connection do
   before { clock.stub }
   after { clock.reset }
 
-  before(:each) { SpecHelper::TestTransport.stop_event_machine }
+  before(:each) { TestTransport.stop_event_machine }
 
   let(:options) {
     {
         uri: 'wss://example.com',
         realm: 'realm1',
-        transport: SpecHelper::TestTransport,
+        transport: TestTransport,
     }
   }
   let(:connection) { described_class.new(options) }
@@ -37,11 +37,11 @@ describe Wamp::Client::Connection do
   end
 
   def check_em_on
-    expect(SpecHelper::TestTransport.event_machine_on?).to eq(true)
+    expect(TestTransport.event_machine_on?).to eq(true)
   end
 
   def check_em_off
-    expect(SpecHelper::TestTransport.event_machine_on?).to eq(false)
+    expect(TestTransport.event_machine_on?).to eq(false)
   end
 
   describe 'transport' do