tamashii-client 0.1.2 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be044e47ec7a244c52a655253dd614914f16d9c3
-  data.tar.gz: 572050ce905a7f055a1fe2db1551731a68962779
+  metadata.gz: aeeb6f1b88c8a5350d6be7c42bb6779f87b59e10
+  data.tar.gz: 10f952b754919daf6bba2f1a482d884e34f385e8
 SHA512:
-  metadata.gz: efaecb8ab11fb8facf2d0b9b6468f937699f4f5b24a4b553ac81340bdc4ab3a6c50b36712943d8c6eb079738749fc872411f0b774d29b449cbb6ef2e88d46d55
-  data.tar.gz: 8d6c7c85d20a035fd825c1c3bdd1e05e342eba5e68d282b119b5b54836153a3988864ad1f2c55af5db073caeb11e299ce66752d5b67bb678062295c05823607f
+  metadata.gz: f34b7b826b5ef70eab5235bbdd8ebf8d798f0b58773792008dd47133289500590d82ec34969c531eb74016242a953084600a6e73ed77df8fd91801655919c1ee
+  data.tar.gz: 33f6f01f482850cd410e1e27d9130f6367021148d8d154b6f45b8a7ff9628d244b9d5316d927d21fff84d44e7f00634c0f829c301ef87c9f9e7bc45a101bdf68

data/lib/tamashii/client.rb

@@ -1,3 +1,4 @@
+require "tamashii/config"
 require "tamashii/common"
 require "tamashii/client/version"
 require "tamashii/client/config"
@@ -7,12 +8,13 @@ module Tamashii
     autoload :Base, "tamashii/client/base"
 
     def self.config(&block)
-      return Config.class_eval(&block) if block_given?
-      Config
+      @config ||= Config.new
+      return instance_exec(@config, &block) if block_given?
+      @config
     end
 
     def self.logger
-      @logger ||= Tamashii::Logger.new(Config.log_file).tap do |logger|
+      @logger ||= Tamashii::Logger.new(self.config.log_file).tap do |logger|
         logger.progname = "WebSocket Client"
       end
     end

data/lib/tamashii/client/base.rb

@@ -6,7 +6,6 @@ require 'timeout'
 require 'websocket/driver'
 
 
-require "tamashii/common"
 require "tamashii/client/config"
 
 module Tamashii
@@ -20,8 +19,8 @@ module Tamashii
       end
 
       def initialize
-        entry_point_with_slash = Config.entry_point.start_with?("/") ? Config.entry_point : "/#{Config.entry_point}"
-        @url = "#{Config.use_ssl ? "wss" : "ws"}://#{Config.host}:#{Config.port}#{entry_point_with_slash}"
+        entry_point_with_slash = Tamashii::Client.config.entry_point.start_with?("/") ? Tamashii::Client.config.entry_point : "/#{Tamashii::Client.config.entry_point}"
+        @url = "#{Tamashii::Client.config.use_ssl ? "wss" : "ws"}://#{Tamashii::Client.config.host}:#{Tamashii::Client.config.port}#{entry_point_with_slash}"
 
         @callbacks = {}
 
@@ -118,8 +117,8 @@ module Tamashii
       end
 
       def wait_for_worker_thread
-        if !@thread.join(Config.closing_timeout)
-          logger.error "Unable to stop worker thread in #{Config.closing_timeout} second! Force kill the worker thread"
+        if !@thread.join(Tamashii::Client.config.closing_timeout)
+          logger.error "Unable to stop worker thread in #{Tamashii::Client.config.closing_timeout} second! Force kill the worker thread"
           kill_worker_thread
         end
       end
@@ -131,15 +130,15 @@ module Tamashii
       end
 
       def open_socket
-        Timeout::timeout(Config.opening_timeout) do
-          if Config.use_ssl
-            OpenSSL::SSL::SSLSocket.new(TCPSocket.new(Config.host, Config.port)).connect
+        Timeout::timeout(Tamashii::Client.config.opening_timeout) do
+          if Tamashii::Client.config.use_ssl
+            OpenSSL::SSL::SSLSocket.new(TCPSocket.new(Tamashii::Client.config.host, Tamashii::Client.config.port)).connect
           else
-            TCPSocket.new(Config.host, Config.port)
+            TCPSocket.new(Tamashii::Client.config.host, Tamashii::Client.config.port)
           end
         end
       rescue Timeout::Error => e
-        logger.error "Opening timeout after #{Config.opening_timeout} seconds"
+        logger.error "Opening timeout after #{Tamashii::Client.config.opening_timeout} seconds"
         nil
       rescue => e
         nil
@@ -163,7 +162,7 @@ module Tamashii
 
       def open_socket_async
         if !closing? && !stopped?
-          @open_socket_task = Concurrent::ScheduledTask.execute(Config.opening_retry_interval, &method(:open_socket_runner))
+          @open_socket_task = Concurrent::ScheduledTask.execute(Tamashii::Client.config.opening_retry_interval, &method(:open_socket_runner))
         else
           logger.warn "Client is closing, no longer need to create socket"
         end

data/lib/tamashii/client/config.rb

@@ -1,16 +1,17 @@
-require 'tamashii/common'
 module Tamashii
   module Client
-    class Config < Tamashii::Config
-      register :log_file, STDOUT
+    class Config
+      include Tamashii::Configurable
 
-      register :use_ssl, false
-      register :entry_point, ""
-      register :host, "localhost"
-      register :port, 3000
-      register :opening_timeout, 10
-      register :opening_retry_interval, 1
-      register :closing_timeout, 10
+      config :log_file, default: STDOUT
+
+      config :use_ssl, default: false
+      config :entry_point, default: ''
+      config :host, default: 'localhost'
+      config :port, default: 3000
+      config :opening_timeout, default: 10
+      config :opening_retry_interval, default: 1
+      config :closing_timeout, default: 10
 
       def log_level(level = nil)
         return Client.logger.level if level.nil?

data/lib/tamashii/client/version.rb

@@ -1,5 +1,5 @@
 module Tamashii
   module Client
-    VERSION = "0.1.2"
+    VERSION = "0.2.1"
   end
 end

data/tamashii-client.gemspec

@@ -32,7 +32,8 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "websocket-driver"
   spec.add_runtime_dependency "nio4r"
   spec.add_runtime_dependency "logger-colors"
-  spec.add_runtime_dependency "tamashii-common"
+  spec.add_runtime_dependency "tamashii-config"
+  spec.add_runtime_dependency "tamashii-common", ">= 0.2"
   spec.add_runtime_dependency "concurrent-ruby"
 
   spec.add_development_dependency "bundler", "~> 1.13"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tamashii-client
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.1
 platform: ruby
 authors:
 - 蒼時弦也
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-10 00:00:00.000000000 Z
+date: 2017-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket-driver
@@ -55,7 +55,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: tamashii-common
+  name: tamashii-config
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -68,6 +68,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: tamashii-common
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -209,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: The WebSocket client of Tamashii framework