metarpc 0.0.2.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c39e7104662301dc68561a54ace87f5f6826f17f94773890e0d07beeab31aa2
-  data.tar.gz: d74160dd168e6064084094670e8e70db8615959e31dd7fdbfa395b517f97c00c
+  metadata.gz: 6fa5bd3e70fe9ed9b8f0c735f44beb2c6a4b4b3308ea283ef6c357364e84494f
+  data.tar.gz: 1758aae21035e1989f40941393edf4489a0560633d1ff2323242bc7be71fa3a4
 SHA512:
-  metadata.gz: c8106b3e246dcad98ef390fc3ce0f2ea8ea3bb604611a6ac7a8e2b760a2ed557b3ad884392ab6d8c0022b9c7326eb4187b9f0b1f8d47a80e8555383fe603e80c
-  data.tar.gz: 4d4833dc9484449c7f91295f6b033994791a1587316d10b95564133fcbcc368fb02cb890d220b803d0076b93e9efd408ea5f0bc58bc7af97b539538ec613b145
+  metadata.gz: 3da83b5c3c5efde19ef03cdee229cddb2dd57585f8bef7d211f7e06b45a2c8c1d0ae62e69b45a95ff3928a88510bece2a498f3d8a2acfa1f5ab06881d058f295
+  data.tar.gz: 3290917b8c704ea71b024a0bddf8eb3d416e4f52e882680d0f826081dba265d05bcf5ac4facbc24d303db2ed9ab9715a1ca1b9c223a3ab4ab9900b25f064ceb4

data/lib/metarpc/callable.rb

@@ -99,10 +99,11 @@ module MetaRPC
         define_method method_name do |*args, &block|
           case params_contract
           when nil
-            raise json_rpc_error(:invalid_params) unless args.empty?
+            raise_json_rpc_error(:invalid_params) unless args.empty?
           when Array
             validate_item(args, params_contract)
           when Hash
+            raise_json_rpc_error(:invalid_params) unless args[0].is_a?(Hash)
             validate_item(args[0], params_contract)
           else
             raise_json_rpc_error(:internal_error)

data/lib/metarpc/client.rb

@@ -0,0 +1,70 @@
+module MetaRPC
+  class Client
+    attr_reader :metarpc_url, :metarpc_pending_batch, :metarpc_header_setter_func
+
+    def initialize(url, header_setter_func = nil)
+      @metarpc_url = URI.parse(url)
+      @metarpc_header_setter_func = header_setter_func
+    end
+
+    def respond_to_missing?(_sym)
+      true
+    end
+
+    def method_missing(sym, *args, &blk)
+      call = metarpc_build_method(sym, args)
+      return metarpc_pending_batch << { call: call, on_response: blk } if metarpc_pending_batch
+
+      metarpc_execute_request(call)
+    end
+
+    def rpc_batch(&blk)
+      @metarpc_pending_batch = []
+      instance_exec(&blk)
+      metarpc_execute_request(metarpc_pending_batch.map { |p| p[:call] })
+      @metarpc_pending_batch = nil
+    end
+
+    def metarpc_build_method(method, args)
+      {
+        jsonrpc: '2.0',
+        method: method,
+        params: args[0].is_a?(Hash) && args.count == 1 ? args[0] : args,
+        id: SecureRandom.uuid
+      }
+    end
+
+    def metarpc_execute_request(call)
+      body = call.to_json
+      headers = metarpc_header_setter_func.call(body) if metarpc_header_setter_func.present?
+      (headers ||= {})['Content-Type'] = 'text/json'
+
+      http = Net::HTTP.new(metarpc_url.host, metarpc_url.port)
+      request = Net::HTTP::Post.new(metarpc_url.request_uri, headers)
+      request.body = body
+
+      metarpc_parse_response(http.request(request).body)
+    end
+
+    def metarpc_parse_response(raw_response)
+      response = JSON.parse(raw_response)
+      return metarpc_handle_batch_response(response) if metarpc_pending_batch
+
+      response.deep_symbolize_keys!
+      raise RpcClientError.new(response[:error]), "#{response[:error][:code]} #{response[:error][:message]}" if response.key?(:error)
+
+      response[:result]
+    end
+
+    def metarpc_handle_batch_response(response)
+      response.each do |raw_call_response|
+        call_response = raw_call_response.deep_symbolize_keys
+        pending_batch = metarpc_pending_batch.find { |batch| batch[:call][:id] == call_response[:id] }
+        next unless pending_batch[:on_response].present?
+
+        response = ResponseWrapper.new(call_response)
+        pending_batch[:on_response].call(response)
+      end
+    end
+  end
+end

data/lib/metarpc/interpreter.rb

@@ -90,7 +90,7 @@ module MetaRPC
     end
 
     def raise_error(code)
-      raise RPCError.new(code), 'Error on interpreter'
+      raise RPCError.new(code), "Error on interpreter : #{code}"
     end
   end
 end

data/lib/metarpc/response_wrapper.rb

@@ -0,0 +1,20 @@
+module MetaRPC
+  class ResponseWrapper
+    def initialize(response)
+      @response = response
+    end
+
+    def enforce_correct_value
+      raise RpcClientError.new(@response[:error]), "#{@response[:error][:code]} #{@response[:error][:message]}" if @response.key?(:error)
+    end
+
+    def value
+      enforce_correct_value
+      @response[:result]
+    end
+
+    def [](key)
+      value[key]
+    end
+  end
+end

data/lib/metarpc/rpc_client_error.rb

@@ -0,0 +1,9 @@
+module MetaRPC
+  class RpcClientError < StandardError
+    attr_reader :rpc_error
+
+    def initialize(rpc_error)
+      @rpc_error = rpc_error
+    end
+  end
+end

data/lib/metarpc/rpc_error.rb

@@ -1,7 +1,7 @@
 module MetaRPC
   # RPC possible errors
   class RPCError < StandardError
-    attr_reader :code
+    attr_reader :code, :forced_code
 
     CODE_TO_MESSAGE = {
       parse_error: {
@@ -31,11 +31,15 @@ module MetaRPC
     }.freeze
 
     def initialize(code)
-      @code = code
+      if code.is_a?(Symbol)
+        @code = code
+      else
+        @forced_code = code
+      end
     end
 
     def to_h
-      CODE_TO_MESSAGE[code]
+      forced_code || CODE_TO_MESSAGE[code]
     end
   end
 end

data/lib/metarpc.rb

@@ -1,6 +1,13 @@
+require 'net/http'
+require 'uri'
 require 'json'
+require 'securerandom'
 require 'active_support/all'
 
+require_relative 'metarpc/response_wrapper'
+require_relative 'metarpc/rpc_client_error'
+require_relative 'metarpc/client'
+
 require_relative 'metarpc/rpc_error'
 require_relative 'metarpc/callable'
 require_relative 'metarpc/interpreter'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metarpc
 version: !ruby/object:Gem::Version
-  version: 0.0.2.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Thesaurio Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-27 00:00:00.000000000 Z
+date: 2019-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,6 +30,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -59,19 +73,59 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.63.1
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 0.16.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 0.16.1
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.5
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.5.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.5.1
 description: Build a RPC API with ease
 email: hello@thesaur.io
 executables: []
@@ -80,7 +134,10 @@ extra_rdoc_files: []
 files:
 - lib/metarpc.rb
 - lib/metarpc/callable.rb
+- lib/metarpc/client.rb
 - lib/metarpc/interpreter.rb
+- lib/metarpc/response_wrapper.rb
+- lib/metarpc/rpc_client_error.rb
 - lib/metarpc/rpc_error.rb
 homepage: http://rubygems.org/gems/hola
 licenses: