low_type 1.1.12 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2fcf04f2854f50e253d36245bf0d9fa90d94248a991e4717641a24c05450ec0
-  data.tar.gz: 9b928d0bc25abe8e6ea5587e20df05b81e34df27f5df77ae42e8b67e97bdb01e
+  metadata.gz: 218e91b66e1cd32b9760929f79046c215475f4b07416589443e92cd61ff35af5
+  data.tar.gz: bd69d269f5d4cab60a1e9b1277c93d62ab9540ae483a9c176921062150ef4430
 SHA512:
-  metadata.gz: a8286bae517dc33436bef96d00beac3880c030c408f50380d2ce69e94918155d139da500bd907f5d32e1423f2f0c1195b411f78e9cd7cfcaa87bcad01a4a4a2c
-  data.tar.gz: af7112a058d902e419e05cd6a698a79624b6441e5568a9b5194dde65f6bbafd645f0a5f8fd24c6b6bf8d88ec40a24bd969ae91a6300c00b1f68d6ec95685ab87
+  metadata.gz: e03cedbb09f99af96a08cd6a3d755e775cefea140f9fa25b4a920079298b0e65fefcc27a5600890404c6988b977d6dc3540d3db5abdab37e4347aad6f322bd1e
+  data.tar.gz: d31c9c3bd5e645043b4ad710c415858300013000862ab2ef0a6664e3e59751251c448c6a6cbaedf63147446aaa0aca1d5bac433b60952b7a7bd05a05b1342440

data/lib/expressions/type_expression.rb

@@ -2,6 +2,7 @@
 
 require 'expressions'
 
+require_relative 'value_expression'
 require_relative '../proxies/param_proxy'
 require_relative '../queries/type_query'
 
@@ -123,6 +124,10 @@ module Low
     end
 
     def hash_types_match_values?(types:, values:)
+      return true if values.empty? && empty_hash_default_value?
+      return values.empty? if types.empty?
+      return false if values.empty?
+
       # TODO: Shallow validation of hash could be made deeper with user config.
       types.keys[0] == values.keys[0].class && types.values[0] == values.values[0].class
     end
@@ -130,9 +135,10 @@ module Low
     def type_matches_value?(type:, value:, proxy:)
       if type.instance_of?(Class)
         return type.match?(value:) if Low::TypeQuery.complex_type?(expression: type)
+        return value.value <= type if value.instance_of?(ValueExpression)
 
-        return type == value.class
-      elsif type.instance_of?(::Low::TypeExpression)
+        return value.is_a?(type)
+      elsif type.instance_of?(Low::TypeExpression)
         type.validate!(value:, proxy:)
         return true
       end
@@ -145,5 +151,9 @@ module Low
 
       LowType.config.deep_type_check
     end
+
+    def empty_hash_default_value?
+      @default_value.is_a?(Hash) && @default_value.empty?
+    end
   end
 end

data/lib/expressions/value_expression.rb

@@ -1,16 +1,18 @@
 # frozen_string_literal: true
 
-# A value expression presents a type as a value:
-# 1. It is an instance
-# 2. It has a class method
-class ValueExpression
-  attr_reader :value
+module Low
+  # A value expression presents a type as a value:
+  #   1. It is an instance
+  #   2. It mimics the class method
+  class ValueExpression
+    attr_reader :value
 
-  def initialize(value:)
-    @value = value
-  end
+    def initialize(value:)
+      @value = value
+    end
 
-  def class
-    @value
+    def class
+      @value
+    end
   end
 end

data/lib/low_type.rb

@@ -31,23 +31,36 @@ require_relative 'types/complex_types'
 #      │              │                 │◄┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┤
 #      │              │                 │                 │               │
 module LowType
-  # We do as much as possible on class load rather than on object instantiation to be thread-safe and efficient.
+  # Defers evaluation and redefinition until after the class body finishes loading via TracePoint :end.
   def self.included(klass)
     file_path = Low::FileQuery.file_path(klass:)
     file_proxy = Lowkey.load(file_path)
     class_proxy = file_proxy[klass.name]
 
-    Low::Evaluator.evaluate(method_proxies: class_proxy.keyed_methods)
-
     klass.include Low::ExpressionHelpers
     klass.extend Low::ExpressionHelpers
     klass.extend Low::TypeAccessors
     klass.extend Low::Types
 
-    klass.prepend Low::Redefiner.redefine(method_proxies: class_proxy.instance_methods, class_proxy:)
-    klass.singleton_class.prepend Low::Redefiner.redefine(method_proxies: class_proxy.class_methods, class_proxy:)
+    # Use TracePoint :end to capture the class binding after the class body finishes loading.
+    # At :end time, trace.self is the including class and trace.binding is the class body's binding,
+    # stored on class_proxy.class_binding for use by LowType and other consumers.
+    tp = TracePoint.new(:end) do |trace|
+      next unless trace.self == klass
+
+      class_proxy.class_binding = trace.binding
+
+      Low::Evaluator.evaluate(method_proxies: class_proxy.keyed_methods)
+
+      klass.prepend Low::Redefiner.redefine(method_proxies: class_proxy.instance_methods, class_proxy:)
+      klass.singleton_class.prepend Low::Redefiner.redefine(method_proxies: class_proxy.class_methods, class_proxy:)
+
+      Low::Adapter::Loader.load(klass:, class_proxy:)
+
+      tp.disable
+    end
 
-    Low::Adapter::Loader.load(klass:, class_proxy:)
+    tp.enable
   end
 
   class << self

data/lib/queries/file_query.rb

@@ -6,24 +6,12 @@ module Low
   class FileQuery
     class << self
       def file_path(klass:)
-        includer_line = line_from_class(klass:) || line_from_include || ''
-        file_path = includer_line.split(':').first || ''
+        file_path = Object.const_source_location(klass.name).first
 
         return file_path if File.exist?(file_path)
 
         raise MissingFileError, "No file found at path '#{file_path}'"
       end
-
-      private
-
-      def line_from_class(klass:)
-        class_name = klass.to_s.split(':').last # Also remove the module namespaces from the class.
-        caller.find { |callee| callee.end_with?("<class:#{class_name}>'") }
-      end
-
-      def line_from_include
-        caller.find { |callee| callee.end_with?("include'") }
-      end
     end
   end
 end

data/lib/version.rb

@@ -2,6 +2,6 @@
 
 module Low
   module Type
-    VERSION = '1.1.12'
+    VERSION = '1.2.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: low_type
 version: !ruby/object:Gem::Version
-  version: 1.1.12
+  version: 1.2.0
 platform: ruby
 authors:
 - maedi
@@ -88,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.2
+rubygems_version: 4.0.6
 specification_version: 4
 summary: Elegant types in Ruby
 test_files: []