low_type 0.7.2 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e76dff27cdb0b8d263e8204299df281bd1e05b2097039b1045aa85f98134568
-  data.tar.gz: a6775344f9cd73a4275e0dad7d510bae20a3257922a702d938f0c2506363a1bf
+  metadata.gz: c5873e2b3ecceaa3a28a589739addeb22c0914c808b0e7edcfbad5b3194c8bc9
+  data.tar.gz: 6a5f1d91ee6307859d743fe0a0958c498d253ea2665aae10d966682019ed7e2b
 SHA512:
-  metadata.gz: 6a0e1d2c4d89357e1add9051be9be3c0bd972d1aa737c1c5ff6f7ff5ca22fbf4590dc08b52f72f9f6fe252678ce89cbd16a8eee892255f55d4a04218323cd254
-  data.tar.gz: 4e9d03cd8588500dfafadeb423f06641e2981532106c342366a90f7fe36a8dcb96ef4191f3231f7f3cb5f21492d7bf61f790d020af31d224bea8d459d902de1b
+  metadata.gz: 391d16f40bbaad2191ab9bbe1d98b3a2607af954c57b03d7000af5a94b232a2b43695a344846676725b571e122adce0ca68ee123a809633a4107adbc14aa49ab
+  data.tar.gz: 4bf9a082a30330a929b9190009da152755d45cb8e213203d206305f8a8fcd16fa19b9a893f40de05078cc73bc37809609b7bd9f2cdd1d5224ca1ebb079df9c13

data/lib/error_types.rb

@@ -0,0 +1,5 @@
+module LowType
+  class ArgumentTypeError < TypeError; end;
+  class LocalTypeError < TypeError; end;
+  class ReturnTypeError < TypeError; end;
+end

data/lib/proxies/local_proxy.rb

@@ -1,5 +1,5 @@
 require_relative '../interfaces/error_interface'
-require_relative '../errors'
+require_relative '../error_types'
 
 module LowType
   class LocalProxy < ErrorInterface

data/lib/proxies/param_proxy.rb

@@ -1,5 +1,5 @@
 require_relative '../interfaces/error_interface'
-require_relative '../errors'
+require_relative '../error_types'
 
 module LowType
   class ParamProxy < ErrorInterface

data/lib/proxies/return_proxy.rb

@@ -1,5 +1,5 @@
 require_relative '../interfaces/error_interface'
-require_relative '../errors'
+require_relative '../error_types'
 
 module LowType
   class ReturnProxy < ErrorInterface

data/lib/type_expression.rb

@@ -46,15 +46,20 @@ module LowType
 
       raise proxy.error_type, proxy.error_message(value:)
     rescue proxy.error_type => e
+      file_paths = [FILE_PATH, LowType::Redefiner::FILE_PATH]
+      raise proxy.error_type, e.message, backtrace_with_proxy(file_paths:, backtrace: e.backtrace, proxy:)
+    end
+
+    def backtrace_with_proxy(file_paths:, proxy:, backtrace:)
       # Remove LowType file paths from the backtrace.
-      internal_file_paths = [FILE_PATH, LowType::Redefiner::FILE_PATH]
-      external_backtrace = e.backtrace.reject { |line| internal_file_paths.include?(line.split(':').first) }
+      filtered_backtrace = backtrace.reject { |line| file_paths.find { |file_path| line.include?(file_path) } }
 
       # Add the proxied file to the backtrace.
-      file = proxy.file
-      proxy_file_backtrace = "#{file.path}:#{file.line}:in '#{file.scope}'"
+      proxy_file_backtrace = "#{proxy.file.path}:#{proxy.file.line}:in '#{proxy.file.scope}'"
+      from_prefix = filtered_backtrace.first.match(/\s+from /)
+      proxy_file_backtrace = "#{from_prefix}#{proxy_file_backtrace}" if from_prefix
 
-      raise proxy.error_type, e.message, [proxy_file_backtrace, *external_backtrace]
+      [proxy_file_backtrace, *filtered_backtrace]
     end
 
     def valid_types

data/lib/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: low_type
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.4
 platform: ruby
 authors:
 - maedi
@@ -17,7 +17,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/errors.rb
+- lib/error_types.rb
 - lib/interfaces/error_interface.rb
 - lib/low_type.rb
 - lib/parser.rb

data/lib/errors.rb

@@ -1,3 +0,0 @@
-class ArgumentTypeError < TypeError; end;
-class LocalTypeError < TypeError; end;
-class ReturnTypeError < TypeError; end;