pipe_rpc 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db3929008eaf1ac0b4d3d3d2f54ca17ea82ffa9c
-  data.tar.gz: 7737ad82b6cc89bb348179659b64617f28a5b1a1
+  metadata.gz: d754a16c8369ffd2cfbeda827a6ec49028326c21
+  data.tar.gz: 20c0a704f6f64b13f2a2a661bec384c3f8d117d6
 SHA512:
-  metadata.gz: 5a70e27fe8b73c7630c1101f4234d78d991254965c598839622763bd5f37197294bbef0dbdaad93f0f3b35c5659f36f88157fbba6a9d8f5b0a809b8b96f0f70d
-  data.tar.gz: a4ebe6276e87fb6d8613c4f8f721c59c001e6f8635a029848ef0c3be912aaafe44c5f6015c7691af1400557c2d275b0fc2af09d1d7615f0f90c0c317947ff545
+  metadata.gz: 340cdcba3e23c86ecaba149671f948e27a73e27f97737c3e03507ac9ff8b49b678341270b5e0f2f2529257bcc2cf1f3bcf16b62a02a9708bd13c05f2db99695e
+  data.tar.gz: 526a134f5533eda00100d4459ef8885688a3a581cb518515ceb7d5e7e0608f3f1888ca1aadd08738718ff935d830c375561d8a5eb2745f6b17a4e6ee65b5b35e

data/lib/pipe_rpc/client_request_error_response.rb

@@ -21,9 +21,7 @@ module PipeRpc
     private
 
     def no_method_error
-      method = @data.fetch(:method)
-      args = @data.fetch(:args)
-      NoMethodError.new("undefined method `#{method}' for <Client:#{@request.server}>", method, args)
+      NoMethodError.new("undefined method `#{@data.fetch(:method)}' for <Client:#{@request.server}>")
     end
 
     def argument_error

data/lib/pipe_rpc/error.rb

@@ -1,5 +1,5 @@
 module PipeRpc
-  class Error < RuntimeError; end
+  class Error < StandardError; end
   class ClosedError < Error; end
   class UnknownError < Error; end
 
@@ -7,8 +7,10 @@ module PipeRpc
   class MessageParseError < MessageError; end
   class InvalidMessageError < MessageError; end
 
-  class NoRequestForResponseError < Error; end
-  class NoServerError < Error; end
-  class InternalError < Error; end
-  class ReflectedError < Error; end
+  class EvaluationError < Error; end
+  class NoMethodError < EvaluationError; end
+  class ArgumentError < EvaluationError; end
+  class InternalError < EvaluationError; end
+  class NoServerError < EvaluationError; end
+  class ReflectedError < EvaluationError; end
 end

data/lib/pipe_rpc/hub_message.rb

@@ -18,6 +18,16 @@ module PipeRpc
         @body.has_key? :error and @body[:id].nil?
       end
 
+      def handle
+        if response?
+          guarded{ handler.handle if handler }
+        else
+          handler.handle if handler
+        end
+      end
+
+      private
+
       def handler_type
         if request?
           Hub::Request
@@ -31,18 +41,16 @@ module PipeRpc
       end
 
       def handler
-        handler_type.new(@hub, @body)
+        @handler ||= guarded{ handler_type.new(@hub, @body) }
+      end
+
+      def guarded
+        yield
       rescue => e
-        @hub.socket.write ErrorResponse.new(id: @body[:id], error: { code: -32600,
+        @hub.socket.write PipeRpc::ErrorResponse.new(id: @body[:id], error: { code: -32600,
               data: { message: e.message } })
         nil
       end
-
-      def handle
-        handler.tap do |handler|
-          handler.handle if handler
-        end
-      end
     end
   end
 end

data/lib/pipe_rpc/hub_requests.rb

@@ -23,9 +23,11 @@ module PipeRpc
     end
 
     def inject_result_for(id, result)
-      request = @requests.delete(id)
-      raise NoRequestForResponseError.new("no request with id '#{id.inspect}'") unless request
-      request.result.value = result
+      if request = @requests.delete(id)
+        request.result.value = result
+      else
+        raise "no request with id '#{id.inspect}'"
+      end
     end
 
     def wait_for_results_through(iteration)

data/lib/pipe_rpc/version.rb

@@ -1,3 +1,3 @@
 module PipeRpc
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pipe_rpc
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Christopher Aue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-14 00:00:00.000000000 Z
+date: 2016-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json