low_type 1.0.5 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3961ddca967c11281e439d8909cca6fcbd651c55c58757970c75de8eabd45265
-  data.tar.gz: 4f570cb1e811ab14d03613fadd017885e9303f2db3ca66d0abee4cef048365aa
+  metadata.gz: 6ef30b8ad7d079a95270a664aacb4b28255cad9dcd743451e1f78b1391549222
+  data.tar.gz: 4e4329460d20826d604b99d1d7e57cee581cb7c3d8e6ffe2621e7ed383967b57
 SHA512:
-  metadata.gz: 3fe326bebb6320cc806228e380ea5d207ec715ade50f804ee9058be352534c4ada8ddae3042d2211ec6c83068e5b1152d194dcf8e1dab946bd7f40fcdf58f43f
-  data.tar.gz: 3c1c00aaf642cfbe13eea29e35029b2710eaa609959cc117bda00a4023ad569ef21ecee495145317526a55be846ae37a11a8da5ccc0fc47de93a2a738a0bf626
+  metadata.gz: c08f01a89a82f293c0320034eceff0831b87a63ec52c45f0bd01ebd23ef067af2099bd8f554c45579ef285284c9afa34713556962a8a2b167d99bf5bc65ce73b
+  data.tar.gz: d90226573c175294ecc61258b1ed013f9b2351b4fdea32672bed0cf0786dbbea64341021710d21c0826feb152257fbaf4fc11d24cf180b9b3ac739523afef74a

data/lib/factories/expression_factory.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require_relative '../type_expression'
+require_relative '../value_expression'
+
+module LowType
+  class ExpressionFactory
+    class << self
+      def type_expression_with_value(type:)
+        TypeExpression.new(default_value: ValueExpression.new(value: type))
+      end
+    end
+  end
+end

data/lib/factories/proxy_factory.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require_relative '../proxies/return_proxy'
-require_relative '../file_parser'
+require_relative '../queries/file_parser'
 require_relative '../type_expression'
 
 module LowType

data/lib/instance_types.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'proxies/return_proxy'
+require_relative 'queries/type_query'
 require_relative 'type_expression'
 
 module LowType
@@ -50,7 +51,7 @@ module LowType
     def type_expression(expression)
       if expression.instance_of?(TypeExpression)
         expression
-      elsif ::LowType.type?(expression)
+      elsif ::LowType::TypeQuery.type?(expression)
         TypeExpression.new(type: expression)
       end
     end

data/lib/local_types.rb

@@ -1,10 +1,9 @@
 # frozen_string_literal: true
 
+require_relative 'factories/expression_factory'
 require_relative 'proxies/file_proxy'
 require_relative 'proxies/local_proxy'
 require_relative 'types/error_types'
-require_relative 'type_expression'
-require_relative 'value_expression'
 
 module LowType
   module LocalTypes
@@ -26,7 +25,7 @@ module LowType
     alias low_type type
 
     def value(type)
-      LowType.value(type:)
+      ExpressionFactory.type_expression_with_value(type:)
     end
     alias low_value value
   end

data/lib/low_type.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 require_relative 'adapters/adapter_loader'
+require_relative 'syntax/syntax'
 require_relative 'types/complex_types'
+require_relative 'queries/file_parser'
+require_relative 'queries/file_query'
 require_relative 'instance_types'
 require_relative 'local_types'
 require_relative 'redefiner'
-require_relative 'syntax/syntax'
-require_relative 'type_expression'
-require_relative 'value_expression'
 
 module LowType
   # We do as much as possible on class load rather than on instantiation to be thread-safe and efficient.
@@ -20,14 +20,14 @@ module LowType
       end
     end
 
-    file_path = LowType.file_path
+    file_path = FileQuery.file_path(klass:)
     parser = FileParser.new(klass:, file_path:)
     line_numbers = parser.line_numbers
 
     klass.extend InstanceTypes
     klass.include LocalTypes
-    klass.prepend LowType::Redefiner.redefine(method_nodes: parser.instance_methods, klass:, line_numbers:, file_path:)
-    klass.singleton_class.prepend LowType::Redefiner.redefine(method_nodes: parser.class_methods, klass:, line_numbers:, file_path:)
+    klass.prepend Redefiner.redefine(method_nodes: parser.instance_methods, klass:, line_numbers:, file_path:)
+    klass.singleton_class.prepend Redefiner.redefine(method_nodes: parser.class_methods, klass:, line_numbers:, file_path:)
 
     if (adapter = Adapter::Loader.load(klass:, parser:, file_path:))
       adapter.process
@@ -36,8 +36,6 @@ module LowType
   end
 
   class << self
-    # Public API.
-
     def config
       config = Struct.new(:deep_type_check, :severity_level, :union_type_expressions)
       @config ||= config.new(false, :error, true)
@@ -46,37 +44,5 @@ module LowType
     def configure
       yield(config)
     end
-
-    # Internal API.
-
-    def file_path
-      includer_file = caller.find { |callee| callee.end_with?("include'") }
-      includer_file.split(':').first
-    end
-
-    # TODO: Unit test.
-    def type?(type)
-      LowType.basic_type?(type:) || LowType.complex_type?(type:)
-    end
-
-    def basic_type?(type:)
-      type.class == Class
-    end
-
-    def complex_type?(type:)
-      !basic_type?(type:) && LowType.typed_hash?(type:)
-    end
-
-    def typed_hash?(type:)
-      type.is_a?(::Hash) && LowType.basic_type?(type: type.keys.first) && LowType.basic_type?(type: type.values.first)
-    end
-
-    def value?(expression)
-      !expression.respond_to?(:new) && expression != Integer
-    end
-
-    def value(type:)
-      TypeExpression.new(default_value: ValueExpression.new(value: type))
-    end
   end
 end

data/lib/{file_parser.rb → queries/file_parser.rb}

@@ -62,7 +62,7 @@ module LowType
 
       @instance_methods = []
       @class_methods = []
-      @line_numbers = { class_start: 0, class_end: root_node.respond_to?(:end_line) ? root_node.end_line : 1}
+      @line_numbers = { class_start: 0, class_end: root_node.respond_to?(:end_line) ? root_node.end_line : nil}
     end
 
     def visit_def_node(node)

data/lib/queries/file_query.rb

@@ -0,0 +1,21 @@
+module LowType
+  class FileQuery
+    class << self
+      def file_path(klass:)
+        includer_line = line_with_class(klass:) || line_with_include || ''
+        includer_line.split(':').first || ''
+      end
+
+      private
+
+      def line_with_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_with_include
+        caller.find { |callee| callee.end_with?("include'") }
+      end
+    end
+  end
+end

data/lib/queries/type_query.rb

@@ -0,0 +1,26 @@
+module LowType
+  # TODO: Unit test.
+  class TypeQuery
+    class << self
+      def type?(type)
+        basic_type?(type:) || complex_type?(type:)
+      end
+
+      def basic_type?(type:)
+        type.class == Class
+      end
+
+      def complex_type?(type:)
+        !basic_type?(type:) && typed_hash?(type:)
+      end
+
+      def typed_hash?(type:)
+        type.is_a?(::Hash) && basic_type?(type: type.keys.first) && basic_type?(type: type.values.first)
+      end
+
+      def value?(expression)
+        !expression.respond_to?(:new) && expression != Integer
+      end
+    end
+  end
+end

data/lib/redefiner.rb

@@ -1,11 +1,14 @@
 # frozen_string_literal: true
 
+require_relative 'factories/expression_factory'
 require_relative 'factories/proxy_factory'
 require_relative 'proxies/file_proxy'
 require_relative 'proxies/method_proxy'
 require_relative 'proxies/param_proxy'
 require_relative 'syntax/syntax'
+require_relative 'queries/type_query'
 require_relative 'type_expression'
+require_relative 'value_expression'
 
 module LowType
   # Redefine methods to have their arguments and return values type checked.
@@ -39,8 +42,12 @@ module LowType
 
         Module.new do
           method_nodes.each do |method_node|
-            method_start = method_node.start_line
-            next unless method_start > class_start && method_node.end_line <= class_end
+            method_start = method_node.respond_to?(:start_line) ? method_node.start_line : nil
+            method_end = method_node.respond_to?(:end_line) ? method_node.end_line : nil
+
+            if method_start && method_end && class_end
+              next unless method_start > class_start && method_end <= class_end
+            end
 
             name = method_node.name
 
@@ -92,7 +99,7 @@ module LowType
 
               if expression.is_a?(TypeExpression)
                 param_proxies << ParamProxy.new(type_expression: expression, name:, type:, position:, file:)
-              elsif ::LowType.type?(expression)
+              elsif ::LowType::TypeQuery.type?(expression)
                 param_proxies << ParamProxy.new(type_expression: TypeExpression.new(type: expression), name:, type:, position:, file:)
               end
             end
@@ -135,7 +142,7 @@ module LowType
 
       # Value expressions are eval()'d in the context of this module class (the instance doesn't exist yet) so alias API.
       def value(type)
-        LowType.value(type:)
+        ExpressionFactory.type_expression_with_value(type:)
       end
     end
   end

data/lib/syntax/syntax.rb

@@ -1,17 +1,19 @@
 # frozen_string_literal: true
 
+require_relative '../queries/type_query'
+
 module LowType
   module Syntax
     refine Array.singleton_class do
       def [](*types)
-        return LowType::TypeExpression.new(type: [*types]) if types.all? { |type| LowType.type?(type) }
+        return LowType::TypeExpression.new(type: [*types]) if types.all? { |type| LowType::TypeQuery.type?(type) }
         super
       end
     end
 
     refine Hash.singleton_class do
       def [](type)
-        return LowType::TypeExpression.new(type:) if LowType.type?(type)
+        return LowType::TypeExpression.new(type:) if LowType::TypeQuery.type?(type)
         super
       end
     end

data/lib/type_expression.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'proxies/param_proxy'
+require_relative 'queries/type_query'
 
 module LowType
   root_path = File.expand_path(__dir__)
@@ -24,7 +25,7 @@ module LowType
       if expression.instance_of?(::LowType::TypeExpression)
         @types += expression.types
         @default_value = expression.default_value
-      elsif ::LowType.value?(expression)
+      elsif ::LowType::TypeQuery.value?(expression)
         @default_value = expression
       else
         @types << expression
@@ -45,7 +46,7 @@ module LowType
 
       @types.each do |type|
         # Example: HTML is a subclass of String and should pass as a String.
-        return true if LowType.basic_type?(type:) && type <= value.class
+        return true if LowType::TypeQuery.basic_type?(type:) && type <= value.class
         return true if type.is_a?(::Array) && value.is_a?(::Array) && array_types_match_values?(types: type, values: value)
         return true if type.is_a?(::Hash) && value.is_a?(::Hash) && hash_types_match_values?(type:, value:)
       end

data/lib/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: low_type
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.7
 platform: ruby
 authors:
 - maedi
@@ -19,8 +19,8 @@ extra_rdoc_files: []
 files:
 - lib/adapters/adapter_loader.rb
 - lib/adapters/sinatra_adapter.rb
+- lib/factories/expression_factory.rb
 - lib/factories/proxy_factory.rb
-- lib/file_parser.rb
 - lib/instance_types.rb
 - lib/interfaces/adapter_interface.rb
 - lib/interfaces/error_interface.rb
@@ -31,6 +31,9 @@ files:
 - lib/proxies/method_proxy.rb
 - lib/proxies/param_proxy.rb
 - lib/proxies/return_proxy.rb
+- lib/queries/file_parser.rb
+- lib/queries/file_query.rb
+- lib/queries/type_query.rb
 - lib/redefiner.rb
 - lib/syntax/syntax.rb
 - lib/syntax/union_types.rb