low_type 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f39ec6a2c5d0986b75bd52a8bec8033b38bd5ba094515994fa655e253b47a669
-  data.tar.gz: f7aa54e8ce075b121a8e8fed025ea5a60e13a151a6891cb6aaedbe63432f8769
+  metadata.gz: b01f96320aa0543e44d8b4b40430903af4966174fb9ae1533ddf7240c1919ec1
+  data.tar.gz: 87094ba39f9755fce4befa350b7ce33d7bd807a9774f1366340a0c9003788933
 SHA512:
-  metadata.gz: 021eec0aae1a09604d45f5911647000f1620a0d1482cd743ee5066ae660b7e425af246a4806b7ef50763bc1dad3587631eeeea5e428abb7cc20308dec043d9f1
-  data.tar.gz: a238797c74dbe741db04a104ebad2f081d197bd5cea38dde2ae4ee5cb4a6735de183d1722b08229691d063c14e2f8ffd2662957fb19573f840bb19bc01cc4626
+  metadata.gz: 2b4ff1cca9f7763084b3283a13b34955863a81074a6161703c3993aa6d0916180804f8b6058ee35779be159eec7000d9c2f676c656254a67039cb3548073f10d
+  data.tar.gz: 39aad0e4a488963333b31c8ec21fc6586e78e5d0ebf76a6546997183ada9ce6baacbd0107ecd0ed71ce5e5c9fa14d8597936b5db874edc48fdc6c082651ea72e

data/lib/low_type.rb

@@ -6,6 +6,19 @@ require_relative 'type_expression'
 module LowType
   # We do as much as possible on class load rather than on instantiation to be thread-safe and efficient.
   def self.included(klass)
+
+    # Array[] class method returns a type expression only for the duration of this "included" hook.
+    array_class_method = Array.method('[]').unbind
+    Array.define_singleton_method('[]') do |expression|
+      TypeExpression.new(type: [(expression)])
+    end
+
+    # Hash[] class method returns a type expression only for the duration of this "included" hook.
+    hash_class_method = Hash.method('[]').unbind
+    Hash.define_singleton_method('[]') do |expression|
+      TypeExpression.new(type: expression)
+    end
+
     class << klass
       def low_params
         @low_params ||= {}
@@ -24,8 +37,12 @@ module LowType
 
     parser = Parser.new(file_path: LowType.file_path(klass:))
     private_start_line = parser.private_start_line
+
     klass.prepend LowType::Redefiner.redefine_methods(method_nodes: parser.instance_methods, private_start_line:, klass:)
     klass.singleton_class.prepend LowType::Redefiner.redefine_methods(method_nodes: parser.class_methods, private_start_line:, klass:)
+  ensure
+    Array.define_singleton_method('[]', array_class_method)
+    Hash.define_singleton_method('[]', hash_class_method)
   end
 
   class << self
@@ -44,6 +61,4 @@ module LowType
 
   class ValueExpression; end
   class Boolean; end # TrueClass or FalseClass
-  class KeyValue; end # KeyValue[String => Hash]
-  class MixedTypes; end # MixedTypes[String | Integer]
 end

data/lib/redefiner.rb

@@ -8,12 +8,7 @@ module LowType
       def redefine_methods(method_nodes:, private_start_line:, klass:)
         Module.new do
           method_nodes.each do |method_node|
-            args = method_node.parameters.slice
-
-            proxy_method = eval("-> (#{args}) {}")
-            required_args, required_kwargs = Redefiner.required_args(proxy_method)
-
-            klass.low_params[method_node.name] = Redefiner.type_expressions_from_params(proxy_method, args, required_args, required_kwargs)
+            klass.low_params[method_node.name] = Redefiner.param_proxy_with_type_expressions(method_node)
             next if klass.low_params[method_node.name].empty?
 
             define_method(method_node.name) do |*args, **kwargs|
@@ -34,28 +29,14 @@ module LowType
         end
       end
 
-      def required_args(proxy_method)
-        required_args = []
-        required_kwargs = {}
-
-        proxy_method.parameters.each do |param|
-          param_type, param_name = param
-
-          case param_type
-          when :req
-            required_args << nil
-          when :keyreq
-            required_kwargs[param_name] = nil
-          end
-        end
-
-        [required_args, required_kwargs]
-      end
+      def param_proxy_with_type_expressions(method_node)
+        params = method_node.parameters.slice
+        proxy_method = eval("-> (#{params}) {}")
+        required_args, required_kwargs = Redefiner.required_args(proxy_method)
 
-      def type_expressions_from_params(proxy_method, args, required_args, required_kwargs)
         typed_method = eval(
           <<~RUBY
-            -> (#{args}) {
+            -> (#{params}) {
               param_proxies = []
 
               proxy_method.parameters.each_with_index do |param, position|
@@ -78,6 +59,28 @@ module LowType
 
         # Call method with only its required args to evaluate type expressions (which are stored as default values).
         typed_method.call(*required_args, **required_kwargs)
+
+      # TODO: Write spec for this.
+      rescue ArgumentError => e
+        raise ArgumentError, "Incorrect param syntax"
+      end
+
+      def required_args(proxy_method)
+        required_args = []
+        required_kwargs = {}
+
+        proxy_method.parameters.each do |param|
+          param_type, param_name = param
+
+          case param_type
+          when :req
+            required_args << nil
+          when :keyreq
+            required_kwargs[param_name] = nil
+          end
+        end
+
+        [required_args, required_kwargs]
       end
     end
   end

data/lib/type_expression.rb

@@ -29,7 +29,16 @@ module LowType
         raise ArgumentError, "Missing required argument of type '#{@types.join(', ')}' for '#{name}'"
       end
 
-      raise TypeError, "Invalid type '#{arg.class}' for '#{name}'" unless @types.include?(arg.class)
+      @types.each do |type|
+        return true if LowType.type?(type) && type == arg.class 
+        # TODO: Shallow validation of enumerables could be made deeper with user config.
+        return true if type.class == Array && arg.class == Array && type.first == arg.first.class
+        if type.class == Hash && arg.class == Hash && type.keys[0] == arg.keys[0].class && type.values[0] == arg.values[0].class
+          return true
+        end
+      end
+
+      raise TypeError, "Invalid type '#{arg.class}' for '#{name}'"
     end
   end
 end

data/lib/version.rb

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

metadata

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