wamp_client 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22086142dd8573b78491561c8f332d8e536250cf
-  data.tar.gz: f9d9182d4b29904e87d4b1aaf9626de3bb80eea5
+  metadata.gz: 5735e4d3344f243325a9226289448ea18b3cf27d
+  data.tar.gz: cbd5aa1d9ae5d059d8ebbc655a6fd3b80ff17c32
 SHA512:
-  metadata.gz: 02ef5205e5f30a9fed3b8307eb52eacfe0f37b9829995d9132efdddeb4154ed13fc26e2e15153383257fa0dd33c4b1145db661627e96f45ecbed273d5dc6f329
-  data.tar.gz: 8b634eb7e49a67b4305b9e986994aad836dbb0145f1b0eebe2c1d169beb66747e10cec77db2c8a10c9a8816480cd225ee924c027b2c2eaf0d743e217921fbe89
+  metadata.gz: 15aa5f6f522da9cc50c336078d2d93d0190bbe07449177499f77df36464c2a14d80a359e6190ebaa6cb762bceecd2080677d0c51501d44f5d952ceb94e297b11
+  data.tar.gz: 135d51166dfb40468ebb8eb603a5707cb9cb02d1b5685378499849e8b2d8cb167d87031956e1b367cf679ba0bde03e18f4b6c420efac9bf2178586fe0fdea6ac

data/README.md

@@ -10,6 +10,8 @@ Please use [wamp_rails](https://github.com/ericchapman/ruby_wamp_rails) to integ
 
 ## Revision History
 
+ - v0.1.2:
+   - Updated logging to use the standard Ruby logger
  - v0.1.1:
    - Added 'add_tick_loop' method to the transport to abstract the event machine
  - v0.1.0:

data/lib/wamp/client.rb

@@ -32,3 +32,40 @@ require 'wamp/client/connection'
 require 'wamp/client/session'
 require 'wamp/client/auth'
 require 'wamp/client/defer'
+require 'logger'
+
+module Wamp
+  module Client
+
+    # Returns the logger object
+    #
+    def self.logger
+      unless defined?(@logger)
+        @logger = Logger.new(STDOUT)
+        @logger.level = Logger::INFO
+      end
+      @logger
+    end
+
+    # Sets the log level
+    #
+    # @param log_level [Symbol] - the desired log level
+    def self.log_level=(log_level)
+      level =
+          case log_level
+          when :error
+            Logger::ERROR
+          when :debug
+            Logger::DEBUG
+          when :fatal
+            Logger::FATAL
+          when :warn
+            Logger::WARN
+          else
+            Logger::INFO
+          end
+      self.logger.level = level
+    end
+
+  end
+end

data/lib/wamp/client/connection.rb

@@ -32,7 +32,7 @@ require 'wamp/client/transport/faye_web_socket'
 module Wamp
   module Client
     class Connection
-      attr_accessor :options, :transport_class, :transport, :session, :verbose
+      attr_accessor :options, :transport_class, :transport, :session
 
       @reconnect = true
 
@@ -108,7 +108,6 @@ module Wamp
       def initialize(options)
         self.transport_class = options.delete(:transport) || Wamp::Client::Transport::WebSocketEventMachine
         self.options = options || {}
-        self.verbose = options[:verbose] || false
       end
 
       # Opens the connection
@@ -183,7 +182,8 @@ module Wamp
 
         # Setup transport callbacks
         self.transport.on(:open) do
-          puts "TRANSPORT OPEN" if self.verbose
+
+          logger.info("#{self.class.name} TRANSPORT OPEN")
 
           # Call the callback
           @on_connect.call if @on_connect
@@ -194,7 +194,7 @@ module Wamp
         end
 
         self.transport.on(:close) do |reason|
-          puts "TRANSPORT CLOSED: #{reason}" if self.verbose
+          logger.info("#{self.class.name} TRANSPORT CLOSED: #{reason}")
           @open = false
 
           unless @retrying
@@ -214,7 +214,7 @@ module Wamp
         end
 
         self.transport.on(:error) do |message|
-          puts "TRANSPORT ERROR: #{message}"
+          logger.error("#{self.class.name} TRANSPORT ERROR: #{message}")
         end
 
         @open = true
@@ -236,7 +236,7 @@ module Wamp
 
           self._create_transport
 
-          puts "Attempting Reconnect... Next attempt in #{@retry_timer} seconds" if self.verbose
+          logger.info("#{self.class.name} RECONNECT in #{@retry_timer} seconds")
           self.transport_class.add_timer(@retry_timer*1000) do
             self._retry if @retrying
           end
@@ -244,6 +244,14 @@ module Wamp
 
       end
 
+      private
+
+      # Returns the logger
+      #
+      def logger
+        Wamp::Client.logger
+      end
+
     end
   end
 end

data/lib/wamp/client/session.rb

@@ -181,7 +181,7 @@ module Wamp
         end
       end
 
-      attr_accessor :id, :realm, :transport, :verbose, :options
+      attr_accessor :id, :realm, :transport, :options
 
       # Private attributes
       attr_accessor :_goodbye_sent, :_requests, :_subscriptions, :_registrations, :_defers
@@ -197,7 +197,6 @@ module Wamp
         self.id = nil
         self.realm = nil
         self.options = options || {}
-        self.verbose = self.options[:verbose]
 
         # Outstanding Requests
         self._requests = {
@@ -294,7 +293,7 @@ module Wamp
       # Sends a message
       # @param msg [Wamp::Client::Message::Base]
       def _send_message(msg)
-        puts 'TX: ' + msg.to_s if self.verbose
+        logger.debug("#{self.class.name} TX: #{msg.to_s}")
         self.transport.send_message(msg.payload)
       end
 
@@ -304,10 +303,8 @@ module Wamp
 
         message = Wamp::Client::Message::Base.parse(msg)
 
-        if self.verbose
-          puts 'RX: ' + message.to_s if message
-          puts 'RX(non-wamp): ' + msg.to_s unless message
-        end
+        logger.debug("#{self.class.name} RX: #{message.to_s}")
+        logger.debug("#{self.class.name} RX(non-samp): #{msg.to_s}")
 
         # WAMP Session is not open
         if self.id.nil?
@@ -996,6 +993,14 @@ module Wamp
 
       #endregion
 
+      private
+
+      # Returns the logger
+      #
+      def logger
+        Wamp::Client.logger
+      end
+
     end
   end
 end

data/lib/wamp/client/version.rb

@@ -27,6 +27,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 module Wamp
   module Client
-    VERSION = '0.1.1'
+    VERSION = '0.1.2'
   end
 end

data/spec/spec_helper.rb

@@ -11,6 +11,8 @@ end
 require 'wamp/client'
 require "rspec/em"
 
+Wamp::Client.log_level = :error
+
 module SpecHelper
 
   class TestTransport < Wamp::Client::Transport::EventMachineBase

metadata

@@ -1,139 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: wamp_client
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Eric Chapman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-23 00:00:00.000000000 Z
+date: 2018-12-03 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,8 +143,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-version
+- ".gitignore"
+- ".ruby-version"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -183,17 +183,17 @@ 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.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Web Application Messaging Protocol Client