io_request 1.2.0 → 2.3.1

data/lib/io_request/utility/with_id.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+module IORequest
+  # Utility methods.
+  module Utility
+    # Extended Id of object
+    class ExtendedID
+      include Comparable
+
+      # Create new Id based on PID, thread ID and object ID.
+      def initialize(pid = nil, tid = nil, oid = nil)
+        @pid = pid || Process.pid
+        @tid = tid || Thread.current.object_id
+        @oid = oid || object_id
+      end
+
+      # @return [Integer] process ID.
+      attr_reader :pid
+
+      # @return [Integer] thread ID.
+      attr_reader :tid
+
+      # @return [Integer] object ID.
+      attr_reader :oid
+
+      # @return [String]
+      def to_s
+        "#{@pid}##{@tid}##{@oid}"
+      end
+
+      # Comparison operator.
+      def <=>(other)
+        if @pid == other.pid && @tid == other.tid
+          @oid <=> other.oid
+        elsif @pid == other.pid && @tid != other.tid
+          @tid <=> tid
+        else
+          @pid <=> other.pid
+        end
+      end
+
+      def self.from(obj)
+        case obj
+        when ExtendedID then new(obj.pid, obj.tid, obj.oid)
+        when String then new(*obj.split('#').map(&:to_i))
+        else
+          raise 'unknown type'
+        end
+      end
+    end
+    # Adds special method to return object ID.
+    module WithID
+      # Identifies object in thread and process.
+      def __with_id__extended_id
+        @__with_id__extended_id ||= ExtendedID.new
+      end
+      alias extended_id __with_id__extended_id
+    end
+  end
+end

data/lib/io_request/utility/with_prog_name.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module IORequest
+  # Utility methods.
+  module Utility
+    # Adds special method to identify object in log files.
+    module WithProgName
+      # Identifies object and thread it runs in.
+      def prog_name
+        "#{self.class.name}##{object_id} in Thread##{Thread.current.object_id}"
+      end
+    end
+  end
+end

data/lib/io_request/version.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
+
 module IORequest
   # Gem version.
-  VERSION = "1.2.0"
+  VERSION = '2.3.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: io_request
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Fizvlad
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-04 00:00:00.000000000 Z
+date: 2020-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -25,75 +25,75 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: logger
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: timeout-extensions
+  name: logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: '1.4'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: timeout-extensions
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 0.1.1
 description: 
 email:
 - fizvlad@mail.ru
@@ -102,20 +102,24 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/console
-- examples/simple_example.rb
 - io_request.gemspec
 - lib/io_request.rb
+- lib/io_request/authorizer.rb
 - lib/io_request/client.rb
+- lib/io_request/connection/ssl_sockets.rb
 - lib/io_request/logging.rb
 - lib/io_request/message.rb
-- lib/io_request/utility.rb
+- lib/io_request/utility/multi_thread.rb
+- lib/io_request/utility/with_id.rb
+- lib/io_request/utility/with_prog_name.rb
 - lib/io_request/version.rb
 homepage: https://github.com/fizvlad/io-request-rb
 licenses:
@@ -132,14 +136,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.1
+      version: 2.6.5
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.1.0.pre2
 signing_key: 
 specification_version: 4
 summary: Small gem to create JSON request/response type of connection over IO object

data/Gemfile.lock

@@ -1,29 +0,0 @@
-PATH
-  remote: .
-  specs:
-    io_request (1.2.0)
-      json (~> 2.0)
-      logger (~> 1.4)
-      timeout-extensions (~> 0.1.1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    json (2.3.0)
-    logger (1.4.1)
-    minitest (5.13.0)
-    rake (13.0.1)
-    timeout-extensions (0.1.1)
-
-PLATFORMS
-  ruby
-  x64-mingw32
-
-DEPENDENCIES
-  bundler (~> 2.0)
-  io_request!
-  minitest (~> 5.0)
-  rake (~> 13.0)
-
-BUNDLED WITH
-   2.0.2

data/examples/simple_example.rb

@@ -1,52 +0,0 @@
-require "io_request"
-
-r1, w1 = IO.pipe
-r2, w2 = IO.pipe
-
-client_1 = IORequest::Client.new read: r1, write: w2
-client_2 = IORequest::Client.new read: r2, write: w1
-
-# Use
-# Set up responders
-# Authorization
-client_2.respond type: "auth" do |request|
-  puts "Client 2: Authorization attempt as #{request.data[:username].inspect}"
-  sleep 2 # Some processing
-  { type: "auth_success" }
-end
-
-# Default
-client_2.respond do |request|
-  puts "Client 2: #{request.data.inspect}"
-  { type: "success" }
-end
-
-# Send requests
-auth = false
-auth_request = client_1.request(
-  data: { type: "auth", username: "mymail@example.com", password: "let's pretend password hash is here" },
-  sync: true
-) do |response|
-  unless response.data[:type] == "auth_success"
-    puts "Client 1: Authorization failed. Response: #{response.data.inspect}"
-    next
-  end
-
-  auth = true
-  # Do something
-end
-exit unless auth
-puts "Client 1: Authorized!"
-
-message = client_1.request(
-  data: { type: "message", message: "Hello!" },
-  sync: true
-) do |response|
-  puts "Client 1: Message responded"
-end
-
-# Close
-r1.close
-w1.close
-r2.close
-w2.close

data/lib/io_request/utility.rb

@@ -1,104 +0,0 @@
-module IORequest
-  # Utility methods.
-  module Utility
-    # Adds special method to identify object in log files.
-    module WithProgName
-      ##
-      # Identifies object and thread it runs in.
-      def prog_name
-        self_class = self.class
-        "#{self_class.name}##{object_id} in Thread##{Thread.current.object_id}"
-      end
-    end
-
-    # Adds some methods to spawn new threads and join them.
-    #
-    # @note This module creates instance variables with prefix +@_MultiThread_+.
-    module MultiThread
-      private
-
-      # @return [Array<Thread>] array of running threads
-      def running_threads
-        @_MultiThread_threads ||= []
-      end
-
-      # Runs block with provided arguments forwarded as arguments in separate thread.
-      #
-      # All the inline args will be passed to block.
-      #
-      # @param thread_name [String] thread name.
-      #
-      # @return [Thread]
-      def in_thread(*args, name: nil, &block)
-        @_MultiThread_threads ||= []
-        @_MultiThread_mutex ||= Mutex.new
-        # Synchronizing addition/deletion of new threads. That's important
-        @_MultiThread_mutex.synchronize do
-          new_thread = Thread.new(*args) do |*in_args|
-            begin
-              block.call(*in_args)
-            ensure
-              @_MultiThread_mutex.synchronize do
-                @_MultiThread_threads.delete(Thread.current)
-              end
-            end
-          end
-          @_MultiThread_threads << new_thread
-          new_thread.name = name if name
-          new_thread
-        end
-      end
-
-      # For each running thread.
-      def each_thread(&block)
-        @_MultiThread_threads ||= []
-
-        @_MultiThread_threads.each(&block)
-      end
-
-      # Kills each thread.
-      def kill_threads
-        each_thread(&:kill)
-        each_thread(&:join)
-      end
-
-      # Joins each thread.
-      def join_threads
-        each_thread(&:join)
-      end
-    end
-  end
-end
-
-# Extending Hash class.
-class Hash
-  # Use this on JSON objects to turn all the +String+ keys of hash to symbols.
-  #
-  # @param depth [Integer] maximum amount of hashes to handle. This is just a
-  #   simple way to protect from infinite loop.
-  #
-  # @return [self]
-  def symbolize_keys!(depth = 1000)
-    queue = [self]
-    count = 0
-    while h = queue.shift
-      h.transform_keys! { |key| key.is_a?(String) ? key.to_sym : key }
-      h.each_value { |v| queue.push(v) if v.is_a?(Hash) }
-      count += 1
-      break if count >= depth
-    end
-    self
-  end
-
-  # Whether provided hash is included into this one.
-  #
-  # @param other [Hash]
-  #
-  # @return [Boolean]
-  def contains?(other)
-    other.keys.all? do |key|
-      other[key] == self[key]
-    end
-  end
-end
-