metarpc 0.0.1 → 0.0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 298f8b1a42cd14096c6aea8b808c6b90fd04fdc2fec1c2a9999d4f91c1195582
-  data.tar.gz: d4ead54bba04fe30a8016c572d4871eecc6a1a5fbce8d6e0a4062dd9dd6931da
+  metadata.gz: 0c39e7104662301dc68561a54ace87f5f6826f17f94773890e0d07beeab31aa2
+  data.tar.gz: d74160dd168e6064084094670e8e70db8615959e31dd7fdbfa395b517f97c00c
 SHA512:
-  metadata.gz: 227de707133d3ebfbf4db2184ff7ae50162b8c395f56544bd7c0fbcdda5accec9a8fb5e8a457bfd5a85f0c70b487686286cd78ab1556c37df00f921a14b20cfb
-  data.tar.gz: 22de052bee3742e3495b47edfc68f79e0e916f4e00f52fc5db1749459230cacaeffee3618b1f097b6bb659894ea533914dd9209428db59bdaf7d7955147df847
+  metadata.gz: c8106b3e246dcad98ef390fc3ce0f2ea8ea3bb604611a6ac7a8e2b760a2ed557b3ad884392ab6d8c0022b9c7326eb4187b9f0b1f8d47a80e8555383fe603e80c
+  data.tar.gz: 4d4833dc9484449c7f91295f6b033994791a1587316d10b95564133fcbcc368fb02cb890d220b803d0076b93e9efd408ea5f0bc58bc7af97b539538ec613b145

data/lib/metarpc/callable.rb

@@ -6,8 +6,49 @@ module MetaRPC
       klass.send(:extend, ClassMethods)
     end
 
-    def json_rpc_error(code)
-      raise RPCError.new(code), "Failed to call JSON RPC method : #{code}"
+    def raise_json_rpc_error(code)
+      raise RPCError.new(code), "Failed to call JSON RPC method: #{code}"
+    end
+
+    DYNAMIC_TYPE_SUFFIXES = {
+      nil => :not_nullable_nor_spread,
+      '?*' => :nullable_spread,
+      '*?' => :spread_nullable,
+      '?' => :nullable,
+      '*' => :spread
+    }.freeze
+    DYNAMIC_TYPE_REGEXP = /^(\w+)(\?|\?\*|\*\?|\*)?$/.freeze
+
+    def validate_type(item, klass, nullable: false)
+      return raise_json_rpc_error(:invalid_params) if item.nil? && !nullable
+
+      raise_json_rpc_error(:invalid_params) unless (item.present? && item.is_a?(klass)) || item.nil?
+    end
+
+    def validate_spread(items, klass, items_nullable: false, spread_nullable: false)
+      raise_json_rpc_error(:invalid_params) if items.nil? && !spread_nullable
+      items&.each { |item| validate_type(item, klass, nullable: items_nullable) }
+    end
+
+    def validate_dynamic_type(item, contract_type)
+      matched_type = contract_type.match(DYNAMIC_TYPE_REGEXP)
+      klass = matched_type[1].constantize
+      type_suffix = DYNAMIC_TYPE_SUFFIXES[matched_type[2]]
+
+      case type_suffix
+      when :not_nullable_nor_spread
+        validate_type(item, klass)
+      when :nullable
+        validate_type(item, klass, nullable: true)
+      when :spread
+        validate_spread(item, klass)
+      when :nullable_spread
+        validate_spread(item, klass, items_nullable: true)
+      when :spread_nullable
+        validate_spread(item, klass, spread_nullable: true)
+      else
+        raise_json_rpc_error(:internal_error)
+      end
     end
 
     def validate_item(item, contract_type)
@@ -17,37 +58,14 @@ module MetaRPC
       when Array
         validate_array(item, contract_type)
       when Class
-        raise json_rpc_error(:invalid_params) unless item.is_a?(contract_type)
+        raise_json_rpc_error(:invalid_params) unless item.is_a?(contract_type)
       when String
-        klass, nullable, spread = if contract_type.end_with?('!')
-                                    [contract_type.delete('!').constantize, true, false]
-
-                                  elsif contract_type.end_with?('!...')
-                                    [contract_type.delete('!...').constantize, true, true]
-
-                                  elsif contract_type.end_with?('...')
-                                    [contract_type.delete('...').constantize, false, true]
-
-                                  else
-                                    [contract_type.constantize, false, false]
-                                  end
-
-        if spread
-          raise json_rpc_error(:invalid_params) unless item.is_a?(Array)
-
-          item.each do |sub_item|
-            next if sub_item.nil? && nullable
-            raise json_rpc_error(:invalid_params) unless sub_item.present? && sub_item.is_a?(klass)
-          end
-        else
-          return if item.nil? && nullable
-          raise json_rpc_error(:invalid_params) unless item.present? && item.is_a?(klass)
-        end
+        validate_dynamic_type(item, contract_type)
       else
-        raise json_rpc_error(:internal_error)
+        raise_json_rpc_error(:internal_error)
       end
     rescue NameError
-      raise json_rpc_error(:internal_error)
+      raise_json_rpc_error(:internal_error)
     end
 
     def validate_array(args, contract)
@@ -58,7 +76,7 @@ module MetaRPC
 
     def validate_hash(args, contract)
       contract.each do |arg_name, contract_type|
-        raise json_rpc_error(:invalid_params) unless args.key?(arg_name)
+        raise_json_rpc_error(:invalid_params) unless args.key?(arg_name)
 
         validate_item(args[arg_name], contract_type)
       end
@@ -87,7 +105,7 @@ module MetaRPC
           when Hash
             validate_item(args[0], params_contract)
           else
-            raise json_rpc_error(:internal_error)
+            raise_json_rpc_error(:internal_error)
           end
 
           old_method.bind(self).call(*args, &block)
@@ -96,7 +114,7 @@ module MetaRPC
 
         rescue StandardError => err
           error_handler&.call(err)
-          raise json_rpc_error(:server_error)
+          raise_json_rpc_error(:server_error)
         end
 
         @__ignoring_added_methods = false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metarpc
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2.1
 platform: ruby
 authors:
 - Thesaurio Team
@@ -58,6 +58,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.63.1
+- !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
 description: Build a RPC API with ease
 email: hello@thesaur.io
 executables: []