wamp_client 0.0.9 → 0.1.0

data/spec/{transport_spec.rb → wamp/client/transport_spec.rb}

@@ -3,8 +3,8 @@ require "rspec/em"
 require 'websocket-eventmachine-client'
 require 'faye/websocket'
 
-describe WampClient::Transport do
-  describe WampClient::Transport::EventMachineBase do
+describe Wamp::Client::Transport do
+  describe Wamp::Client::Transport::EventMachineBase do
     it '#start/stop' do
       value = 0
       described_class.start_event_machine do
@@ -65,7 +65,7 @@ describe WampClient::Transport do
       }
     }
 
-    describe WampClient::Transport::WebSocketEventMachine do
+    describe Wamp::Client::Transport::WebSocketEventMachine do
       include RSpec::EM::FakeClock
       before { clock.stub }
       after { clock.reset }
@@ -131,7 +131,7 @@ describe WampClient::Transport do
       end
     end
 
-    describe WampClient::Transport::FayeWebSocket do
+    describe Wamp::Client::Transport::FayeWebSocket do
       include RSpec::EM::FakeClock
       before { clock.stub }
       after { clock.reset }

data/wamp_client.gemspec

@@ -1,11 +1,11 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'wamp_client/version'
+require 'wamp/client/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'wamp_client'
-  spec.version       = WampClient::VERSION
+  spec.version       = Wamp::Client::VERSION
   spec.authors       = ['Eric Chapman']
   spec.email         = ['eric.chappy@gmail.com']
   spec.summary       = %q{Web Application Messaging Protocol Client}

metadata

@@ -1,139 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: wamp_client
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - Eric Chapman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-28 00:00:00.000000000 Z
+date: 2018-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: rspec-eventmachine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: codecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: faye-websocket
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.10.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.10.4
 - !ruby/object:Gem::Dependency
   name: websocket-eventmachine-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: An implementation of The Web Application Messaging Protocol (WAMP)
@@ -143,34 +143,34 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".ruby-version"
+- .gitignore
+- .ruby-version
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - circle.yml
-- lib/wamp_client.rb
-- 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
-- lib/wamp_client/transport/base.rb
-- lib/wamp_client/transport/event_machine_base.rb
-- lib/wamp_client/transport/faye_web_socket.rb
-- lib/wamp_client/transport/web_socket_event_machine.rb
-- lib/wamp_client/version.rb
+- lib/wamp/client.rb
+- 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
+- lib/wamp/client/transport/base.rb
+- lib/wamp/client/transport/event_machine_base.rb
+- lib/wamp/client/transport/faye_web_socket.rb
+- lib/wamp/client/transport/web_socket_event_machine.rb
+- lib/wamp/client/version.rb
 - scripts/gen_message.rb
-- spec/auth_spec.rb
-- spec/check_spec.rb
-- spec/connection_spec.rb
-- spec/message_spec.rb
-- spec/session_spec.rb
 - spec/spec_helper.rb
-- spec/transport_spec.rb
+- spec/wamp/client/auth_spec.rb
+- spec/wamp/client/check_spec.rb
+- spec/wamp/client/connection_spec.rb
+- spec/wamp/client/message_spec.rb
+- spec/wamp/client/session_spec.rb
+- spec/wamp/client/transport_spec.rb
 - tasks/rspec.rake
 - wamp_client.gemspec
 homepage: https://github.com/ericchapman/ruby_wamp_client
@@ -183,25 +183,25 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Web Application Messaging Protocol Client
 test_files:
-- spec/auth_spec.rb
-- spec/check_spec.rb
-- spec/connection_spec.rb
-- spec/message_spec.rb
-- spec/session_spec.rb
 - spec/spec_helper.rb
-- spec/transport_spec.rb
+- spec/wamp/client/auth_spec.rb
+- spec/wamp/client/check_spec.rb
+- spec/wamp/client/connection_spec.rb
+- spec/wamp/client/message_spec.rb
+- spec/wamp/client/session_spec.rb
+- spec/wamp/client/transport_spec.rb

data/lib/wamp_client/check.rb

@@ -1,84 +0,0 @@
-=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
-
-    def self.included(base)
-      base.extend(ClassMethods)
-    end
-
-    module ClassMethods
-
-      def check_equal(name, expected, value)
-        raise ArgumentError, "The '#{name}' argument must have the value '#{expected}'.  Instead the value was '#{value}'" unless value == expected
-      end
-
-      def check_gte(name, expected, value)
-        raise ArgumentError, "The '#{name}' argument must be greater than or equal to '#{expected}'.  Instead the value was '#{value}'" unless value >= expected
-      end
-
-      def check_nil(name, param, nil_allowed)
-        raise ArgumentError, "The '#{name}' argument cannot be nil" if param.nil? and not nil_allowed
-      end
-
-      def check_int(name, param, nil_allowed=false)
-        check_nil(name, param, nil_allowed)
-        raise ArgumentError, "The '#{name}' argument must be an integer" unless param.nil? or param.is_a? Integer
-      end
-
-      def check_string(name, param, nil_allowed=false)
-        check_nil(name, param, nil_allowed)
-        raise ArgumentError, "The '#{name}' argument must be a string" unless param.nil? or param.is_a? String
-      end
-
-      def check_bool(name, param, nil_allowed=false)
-        check_nil(name, param, nil_allowed)
-        raise ArgumentError, "The '#{name}' argument must be a boolean" unless param.nil? or !!param == param
-      end
-
-      def check_dict(name, param, nil_allowed=false)
-        check_nil(name, param, nil_allowed)
-        raise ArgumentError, "The '#{name}' argument must be a hash" unless param.nil? or param.is_a? Hash
-      end
-
-      def check_list(name, param, nil_allowed=false)
-        check_nil(name, param, nil_allowed)
-        raise ArgumentError, "The '#{name}' argument must be an array" unless param.nil? or param.is_a? Array
-      end
-
-      def check_uri(name, param, nil_allowed=false)
-        check_string(name, param, nil_allowed)
-      end
-
-      def check_id(name, param, nil_allowed=false)
-        check_int(name, param, nil_allowed)
-      end
-    end
-
-  end
-end

data/lib/wamp_client/connection.rb

@@ -1,247 +0,0 @@
-=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/session'
-require 'wamp_client/transport/web_socket_event_machine'
-require 'wamp_client/transport/faye_web_socket'
-
-module WampClient
-  class Connection
-    attr_accessor :options, :transport_class, :transport, :session, :verbose
-
-    @reconnect = true
-
-    @open = false
-    def is_open?
-      @open
-    end
-
-    # Called when the connection is established
-    @on_connect
-    def on_connect(&on_connect)
-      @on_connect = on_connect
-    end
-
-    # Called when the WAMP session is established
-    # @param session [WampClient::Session]
-    # @param details [Hash]
-    @on_join
-    def on_join(&on_join)
-      @on_join = on_join
-    end
-
-    # Called when the WAMP session presents a challenge
-    # @param authmethod [String]
-    # @param extra [Hash]
-    @on_challenge
-    def on_challenge(&on_challenge)
-      @on_challenge = on_challenge
-    end
-
-    # Called when the WAMP session is terminated
-    # @param reason [String] The reason the session left the router
-    # @param details [Hash] Object containing information about the left session
-    @on_leave
-    def on_leave(&on_leave)
-      @on_leave = on_leave
-    end
-
-    # Called when the connection is terminated
-    # @param reason [String] The reason the transport was disconnected
-    @on_disconnect
-    def on_disconnect(&on_disconnect)
-      @on_disconnect = on_disconnect
-    end
-
-    # Simple setter for callbacks
-    def on(event, &callback)
-      case event
-        when :connect
-          self.on_connect(&callback)
-        when :join
-          self.on_join(&callback)
-        when :challenge
-          self.on_challenge(&callback)
-        when :leave
-          self.on_leave(&callback)
-        when :disconnect
-          self.on_disconnect(&callback)
-        else
-          raise RuntimeError, "Unknown on(event) '#{event}'"
-      end
-    end
-
-    # @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] :proxy The proxy to get to the router
-    # @option options [String] :realm The realm to connect to
-    # @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)
-      self.transport_class = options.delete(:transport) || WampClient::Transport::WebSocketEventMachine
-      self.options = options || {}
-      self.verbose = options[:verbose] || false
-    end
-
-    # Opens the connection
-    def open
-
-      raise RuntimeError, 'The connection is already open' if self.is_open?
-
-      @reconnect = true
-      @retry_timer = 1
-      @retrying = false
-
-      self.transport_class.start_event_machine do
-        # Create the transport
-        self._create_transport
-      end
-
-    end
-
-    # Closes the connection
-    def close
-
-      raise RuntimeError, 'The connection is already closed' unless self.is_open?
-
-      # Leave the session
-      @reconnect = false
-      @retrying = false
-      session.leave
-
-    end
-
-    def _create_session
-      self.session = WampClient::Session.new(self.transport, self.options)
-
-      # Setup session callbacks
-      self.session.on(:challenge) do |authmethod, extra|
-        self._finish_retry
-        @on_challenge.call(authmethod, extra) if @on_challenge
-      end
-
-      self.session.on(:join) do |details|
-        self._finish_retry
-        @on_join.call(self.session, details) if @on_join
-      end
-
-      self.session.on(:leave) do |reason, details|
-
-        unless @retrying
-          @on_leave.call(reason, details) if @on_leave
-        end
-
-        if @reconnect
-          # Retry
-          self._retry unless @retrying
-        else
-          # Close the transport
-          self.transport.disconnect
-        end
-      end
-
-      self.session.join(self.options[:realm])
-    end
-
-    def _create_transport
-
-      if self.transport
-        self.transport.disconnect
-        self.transport = nil
-      end
-
-      # Initialize the transport
-      self.transport = self.transport_class.new(self.options)
-
-      # Setup transport callbacks
-      self.transport.on(:open) do
-        puts "TRANSPORT OPEN" if self.verbose
-
-        # Call the callback
-        @on_connect.call if @on_connect
-
-        # Create the session
-        self._create_session
-
-      end
-
-      self.transport.on(:close) do |reason|
-        puts "TRANSPORT CLOSED: #{reason}" if self.verbose
-        @open = false
-
-        unless @retrying
-          @on_disconnect.call(reason) if @on_disconnect
-        end
-
-        # Nil out the session since the transport closed underneath it
-        self.session = nil
-
-        if @reconnect
-          # Retry
-          self._retry unless @retrying
-        else
-          # Stop the Event Machine
-          self.transport_class.stop_event_machine
-        end
-      end
-
-      self.transport.on(:error) do |message|
-        puts "TRANSPORT ERROR: #{message}"
-      end
-
-      @open = true
-
-      self.transport.connect
-
-    end
-
-    def _finish_retry
-      @retry_timer = 1
-      @retrying = false
-    end
-
-    def _retry
-
-      if self.session == nil or not self.session.is_open?
-        @retry_timer = 2*@retry_timer unless @retry_timer == 32
-        @retrying = true
-
-        self._create_transport
-
-        puts "Attempting Reconnect... Next attempt in #{@retry_timer} seconds" if self.verbose
-        self.transport_class.add_timer(@retry_timer*1000) do
-          self._retry if @retrying
-        end
-      end
-
-    end
-
-  end
-end