low_type 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d845917e9ed4afc79db302fe7f5a2955a4e299d7bd415e82e2f26af3b14cd25f
-  data.tar.gz: f9213b5731f3805ebf1e99efa0ccdd741b955464403842aeaa171d0b41fff146
+  metadata.gz: af6b3684e92cdf1cd8276d6c06b93d7a83667fdc8ebe32590c26a992d64cfb89
+  data.tar.gz: fb341f9d4ec022a3e2aeda982a30646b44d1a2389ed5d0e473cf8d3c4846fa2b
 SHA512:
-  metadata.gz: 6066f8c29073720201a83438c58067ef37d2b02b493f108e31bee624069b68a7049e3a64aebe20da851f7b8e13e7d599c02deb1adbb9050ccd271a895933c6c2
-  data.tar.gz: 16c144045ae7666c1ab42610e641d9b4946b14cc9adf22023239a55dbfcbc5a8da714b53c94972a883249008512bcc56a60b465ce9ba9da1908a0151856afa7c
+  metadata.gz: 57df3e2a9db8a10f2008c7e7d14ff66cf24562bd80266676ad56c176277eafb76982401db097c3ce98f759fe318d5052095a55366742915c76967449ec22abfc
+  data.tar.gz: cccd7db020ccabd34684347b4e67182ac40b0425acdc23e31a99bd78369c575f2b80a8deabe6ba0c67ae900f2c775e2fe020b0097ce9147aad47aa04d5c3e858

data/lib/interfaces/proxy_interface.rb

@@ -1,6 +1,6 @@
 module LowType
   class ProxyInterface
-    def error_type(value:)
+    def error_type
       raise NotImplementedError
     end
 

data/lib/proxies/local_proxy.rb

@@ -10,12 +10,12 @@ module LowType
       @name = name
     end
 
-    def error_type(value:)
+    def error_type
       LocalTypeError
     end
 
     def error_message(value:, line:)
-      "Invalid variable type #{value.class} in '#{@name.class}' on line #{line}. Valid types: '#{@type_expression.valid_types.join(', ')}'"
+      "Invalid variable type #{value.class} in '#{@name.class}' on line #{line}. Valid types: '#{@type_expression.valid_types}'"
     end
   end
 end

data/lib/proxies/param_proxy.rb

@@ -12,15 +12,12 @@ module LowType
       @position = position
     end
 
-    def error_type(value:)
-      return ArgumentError if value.nil?
+    def error_type
       ArgumentTypeError
     end
 
     def error_message(value:, line: nil)
-      return "Missing argument for parameter '#{@name}'. Position: #{@position}" if value.nil?
-
-      "Invalid argument type '#{value.class}' for parameter '#{@name}'. Valid types: '#{@type_expression.valid_types.join(', ')}'"
+      "Invalid argument type '#{value.class}' for parameter '#{@name}'. Valid types: '#{@type_expression.valid_types}'"
     end
   end
 end

data/lib/proxies/return_proxy.rb

@@ -10,12 +10,12 @@ module LowType
       @name = name
     end
 
-    def error_type(value:)
+    def error_type
       ReturnTypeError
     end
 
     def error_message(value:, line: nil)
-      "Invalid return type '#{value.class}' for method '#{@name}'. Valid types: '#{@type_expression.valid_types.join(', ')}'"
+      "Invalid return type '#{value.class}' for method '#{@name}'. Valid types: '#{@type_expression.valid_types}'"
     end
   end
 end

data/lib/type_expression.rb

@@ -30,7 +30,7 @@ module LowType
     def validate!(value:, proxy:, line: nil)
       if value.nil?
         return true if @default_value.nil?
-        raise proxy.error_type(value:), proxy.error_message(value:, line:) if required?
+        raise proxy.error_type, proxy.error_message(value:, line:) if required?
       end
 
       @types.each do |type|
@@ -42,13 +42,14 @@ module LowType
         end
       end
 
-      raise proxy.error_type(value:), proxy.error_message(value:, line:)
+      raise proxy.error_type, proxy.error_message(value:, line:)
     end
 
     def valid_types
       types = @types.map { |type| type.inspect.to_s }
-      return types + ['nil'] if @default_value.nil?
-      types
+      types = types + ['nil'] if @default_value.nil?
+
+      types.join(' | ')
     end
   end
 end

data/lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LowType
-  VERSION = '0.7.0'
+  VERSION = '0.7.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: low_type
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - maedi