low_type 0.8.5 → 0.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40a701625494d482b8d9aa6092f8f924cd84ebc3310186e4dc9c1af38ff67cd4
-  data.tar.gz: f24a27f11822f27177132eb8b840a9cdc4081867a171e338131a45e3b1a3b787
+  metadata.gz: 94ec8cf1ae80a7540248e9a0a97e2e9bbc99fb81724f9a89e3d35de0ccd3dfaa
+  data.tar.gz: f1bf339671b5d17ec247814a08ea665aca64df51f404f625dff5d6bf77cf7c2e
 SHA512:
-  metadata.gz: 62f84ed471ba858386cba1a1eb8876d62612701bc5760b1e60dd78cb37e10f1741228a4ec7ccbdf0eefbbe94cb13ffca12180ea1d8feedcd7d2c42ed627c4289
-  data.tar.gz: 02c5577b08fc0ca6ab7e564efb550e11d80ff0521feeaff34aac291332f777507b04c40c9fea038976bacef187c5c769a6ea7a26060ba906cd0d95189b8c9c4c
+  metadata.gz: 7a6ff0fa4038f53cd1650f27e7523ec2e0c0ac75c66190d62d976dbaded7887c2dc1900cb514709255af87f1c01545eb7c0748c100cd8133ea947c3d03f0c785
+  data.tar.gz: 141e666816a66e0446b0d9559d288dc24b7e838c200537fbfd5b18297533f8812517e37e29d3bcf7388efbef82fffb1aa90a6407037c4803db8bc6a1b26645f8

data/lib/adapters/sinatra_adapter.rb

@@ -51,9 +51,7 @@ module LowType
               proxy.type_expression.types.each do |type|
                 value = SinatraAdapter.reconstruct_return_value(type:, response:)
                 unless proxy.type_expression.validate(value:, proxy:)
-                  status(500)
-                  body(proxy.error_message(value: value.inspect))
-                  break
+                  halt 500, {}, proxy.error_message(value: value.inspect)
                 end
               end
             end
@@ -72,12 +70,11 @@ module LowType
         HTML => -> (response) { response.body.first },
         JSON => -> (response) { response.body.first },
 
-        # TODO: Should these be Enumerable[T] instead? How would we match a Module of a class in a hash key?
-        # NOTE: These keys represent types, not type expressions.
-        #       A type lives inside a type expression and is actually an instance representing that type.
-        [String] => -> (response) { response.body },
-        [Integer, String] => -> (response) { [response.status, *response.body] },
-        [Integer, Hash, String] => -> (response) { [response.status, response.headers, *response.body] },
+        [String] => -> (response) { response.body }, # Body is stored internally as an array.
+        [Integer, String] => -> (response) { [response.status, response.body.first] },
+        [Integer, Hash, String] => -> (response) { [response.status, response.headers, response.body.first] },
+
+        # TODO: Represent Enumerable[T]. How would we match a Module of a class in a hash key?
       }
 
       raise AllowedTypeError, 'Did you mean "Response.finish"?' if type.to_s == 'Response'

data/lib/type_expression.rb

@@ -7,6 +7,7 @@ module LowType
     attr_reader :types, :default_value
 
     def initialize(type: nil, default_value: :LOW_TYPE_UNDEFINED)
+      # Types can be instance representations of a structure.
       @types = []
       @types << type unless type.nil?
       @default_value = default_value
@@ -38,9 +39,9 @@ module LowType
 
       @types.each do |type|
         return true if LowType.type?(type) && type <= value.class # Example: HTML is a subclass of String and should pass as a String.
+        return true if ::Array === type && ::Array === value && array_types_match_values?(types: type, values: value)
 
         # TODO: Shallow validation of enumerables could be made deeper with user config.
-        return true if type.class == ::Array && value.class == ::Array && type.first == value.first.class
         if type.class == ::Hash && value.class == ::Hash && type.keys[0] == value.keys[0].class && type.values[0] == value.values[0].class
           return true
         end
@@ -56,8 +57,8 @@ module LowType
       end
 
       @types.each do |type|
-        return true if LowType.type?(type) && type == value.class 
-        return true if type.class == ::Array && value.class == ::Array && array_types_match_values?(types: type, values: value)
+        return true if LowType.type?(type) && type == value.class
+        return true if ::Array === type && ::Array === value && array_types_match_values?(types: type, values: value)
 
         # TODO: Shallow validation of hash could be made deeper with user config.
         if type.class == ::Hash && value.class == ::Hash && type.keys[0] == value.keys[0].class && type.values[0] == value.values[0].class
@@ -80,10 +81,16 @@ module LowType
     private
 
     def array_types_match_values?(types:, values:)
-      # TODO: Probably better to use an each that breaks early when types run out.
-      types.zip(values) do |type, value|
-        return false unless type === value
+      # [T, T, T]
+      if types.length > 1
+        types.each_with_index do |type, index|
+          return false unless type === values[index]
+        end
+      # [T]
+      elsif types.length == 1
+        return false unless types.first == values.first.class
       end
+      # TODO: Deep type check (all elements for [T]).
 
       true
     end

data/lib/version.rb

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

metadata

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