interop 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6369ad96be9d4e4a7946a23c56d4a06b96dc23553b2bb602e6708e34154561c7
-  data.tar.gz: fdf11d65dec06324fc6207c18318b17130a51ddaf580b5069f48710ee12605ed
+  metadata.gz: '084751018d90a52509edf5a1c67f864ee9990b95970ef3a5018617c21406fe8f'
+  data.tar.gz: 31de67481b086a640eb322088cd06d908813ba1e495de10fbbf122e8596ee59a
 SHA512:
-  metadata.gz: 06c118089ef25d6c1f122bacdefd11e7ecdd923fb82ccc3ad853e9782d768e374c43b6a55cd96f4bb9d11f582262facc50f9f2e4c0edf0f601e403b68e278369
-  data.tar.gz: 70b6a14d430ffb08785a731aec8a0cea4a782faae584b9b9758af5306ba5d4483fee103d3e5ed5c371501dbed5fc0eecfadec8541deef222248f3af7dd22a2f9
+  metadata.gz: ae2e8597f69cc61b6a341f95ddcff5547fd99055070ed8ae991975a71f8ebdc555e37a7f4f6503572dfd8840fdad101d44f3739da57ed5c288e7d272b576862e
+  data.tar.gz: fbb8c6666a20fed2de479ed56b7db5885a526117c6ba2801c3cdff2d89e30c861ae735d6f0bed0b5c8285bbeedec26fe321388305ee7a6f646c8e2404a956450

data/lib/interop/error.rb

@@ -7,6 +7,9 @@ module Hx
       class InvalidHeader < Fatal
       end
 
+      class Unexpected < Fatal
+      end
+
       class NotDecodable < self
       end
     end

data/lib/interop/rpc/base.rb

@@ -10,6 +10,7 @@ module Hx
         def initialize(reader, writer = reader)
           @connection = Connection.build(reader, writer)
           @dispatcher = Dispatcher.new
+          yield self if block_given?
           @io_thread  = Thread.new do
             run
           rescue StandardError => e

data/lib/interop/rpc/controller.rb

@@ -15,7 +15,7 @@ module Hx
           end
 
           klass = self
-          lambda do |message|
+          lambda do |message, _message_class|
             controller = klass.new(message)
             controller.__send__ action
             controller.response

data/lib/interop/rpc/dispatcher.rb

@@ -6,8 +6,8 @@ module Hx
       # Message dispatcher used by Client and Server.
       class Dispatcher
         Route = Struct.new :matcher, :handler do
-          def call(message)
-            handler[message]
+          def call(*args)
+            handler.call(*args)
           end
 
           def match?(message)
@@ -43,7 +43,9 @@ module Hx
 
         def make_matcher(criteria)
           case criteria
-          when Proc
+          when Array, Set
+            make_array_matcher criteria
+          when Proc, Method
             criteria
           when String, Regexp
             -> message { criteria === message.headers[Headers::CLASS] }
@@ -54,6 +56,22 @@ module Hx
           end
         end
 
+        def make_array_matcher(array)
+          if array.all? { |item| item.is_a?(String) || item.is_a?(Symbol) }
+            make_any_class_matcher Set.new(array.map(&:to_s)).freeze
+          else
+            make_any_matcher array.map(&method(:make_matcher))
+          end
+        end
+
+        def make_any_class_matcher(classes)
+          -> message { classes.include? message.headers[Headers::CLASS] }
+        end
+
+        def make_any_matcher(matchers)
+          -> message { matchers.any? { |c| c.match? message } }
+        end
+
         def make_handler(*args, &block)
           return block if block && args.empty?
 

data/lib/interop/rpc/server.rb

@@ -21,7 +21,7 @@ module Hx
 
         def run
           super do |request|
-            response = make_response(dispatcher.match(request)&.call request)
+            response = make_response(dispatcher.match(request)&.call request, request[Headers::CLASS])
             response[Headers::ID] = request[Headers::ID]
             write response
           rescue StandardError => e

data/lib/interop/stream_reader.rb

@@ -1,3 +1,5 @@
+require 'set'
+
 require 'interop/message'
 require 'interop/reader'
 
@@ -21,15 +23,8 @@ module Hx
       def _read
         @mutex.synchronize do
           message      = Message.new(read_headers)
-          length       = message.headers[Headers::CONTENT_LENGTH]&.to_i
-          message.body =
-            if length&.positive?
-              @stream.read length
-            elsif length.nil?
-              read_paragraph.join
-            else
-              ''
-            end
+          length       = message.headers[Headers::CONTENT_LENGTH]
+          message.body = length.nil? || length.empty? ? read_paragraph.join : read_length(length.to_i)
           message
         end
       end
@@ -39,7 +34,7 @@ module Hx
       # @return [Hash]
       def read_headers
         read_paragraph.to_h do |line|
-          line.strip.split(/:\s*/).tap do |pair|
+          line.strip.split(/:\s*/, 2).tap do |pair|
             raise Error::InvalidHeader unless pair.length == 2
           end
         end
@@ -53,6 +48,15 @@ module Hx
           lines << line
         end
       end
+
+      def read_length(length)
+        result = length.positive? ? @stream.read(length) : ''
+        sep    = @stream.read(1)
+        sep    = @stream.read(1) if sep == "\r"
+        raise Error::Unexpected, "Expected a newline after #{length} bytes" unless sep == "\n"
+
+        result
+      end
     end
   end
 end

data/lib/interop/version.rb

@@ -1,5 +1,5 @@
 module Hx
   module Interop
-    VERSION = '0.1.0'.freeze
+    VERSION = '0.2.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: interop
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Neil E. Pearson
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-03 00:00:00.000000000 Z
+date: 2021-08-10 00:00:00.000000000 Z
 dependencies: []
 description: Ruby implementation of hx/interop cross-language interop abstraction
 email: