Fix JSON discriminator for Bool false value (#14779)

crystal-lang · Jul 5, 2024 · 074ec99 · 074ec99
1 parent 5ab6e4b
commit 074ec99
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/spec/std/json/serializable_spec.cr b/spec/std/json/serializable_spec.cr
@@ -419,7 +419,8 @@ class JSONVariableDiscriminatorValueType
   use_json_discriminator "type", {
                                          0 => JSONVariableDiscriminatorNumber,
     "1"                                    => JSONVariableDiscriminatorString,
-    true                                   => JSONVariableDiscriminatorBool,
+    true                                   => JSONVariableDiscriminatorBoolTrue,
+    false                                  => JSONVariableDiscriminatorBoolFalse,
     JSONVariableDiscriminatorEnumFoo::Foo  => JSONVariableDiscriminatorEnum,
     JSONVariableDiscriminatorEnumFoo8::Foo => JSONVariableDiscriminatorEnum8,
   }
@@ -431,7 +432,10 @@ end
 class JSONVariableDiscriminatorString < JSONVariableDiscriminatorValueType
 end
 
-class JSONVariableDiscriminatorBool < JSONVariableDiscriminatorValueType
+class JSONVariableDiscriminatorBoolTrue < JSONVariableDiscriminatorValueType
+end
+
+class JSONVariableDiscriminatorBoolFalse < JSONVariableDiscriminatorValueType
 end
 
 class JSONVariableDiscriminatorEnum < JSONVariableDiscriminatorValueType
@@ -1130,7 +1134,10 @@ describe "JSON mapping" do
       object_string.should be_a(JSONVariableDiscriminatorString)
 
       object_bool = JSONVariableDiscriminatorValueType.from_json(%({"type": true}))
-      object_bool.should be_a(JSONVariableDiscriminatorBool)
+      object_bool.should be_a(JSONVariableDiscriminatorBoolTrue)
+
+      object_bool = JSONVariableDiscriminatorValueType.from_json(%({"type": false}))
+      object_bool.should be_a(JSONVariableDiscriminatorBoolFalse)
 
       object_enum = JSONVariableDiscriminatorValueType.from_json(%({"type": 4}))
       object_enum.should be_a(JSONVariableDiscriminatorEnum)

diff --git a/src/json/serialization.cr b/src/json/serialization.cr
@@ -448,7 +448,7 @@ module JSON
           end
         end
 
-        unless discriminator_value
+        if discriminator_value.nil?
           raise ::JSON::SerializableError.new("Missing JSON discriminator field '{{field.id}}'", to_s, nil, *location, nil)
         end
-Original file line number
+Diff line change
@@ Expand Up / @@ -448,7 +448,7 @@ module JSON @@
               end
             end
-            unless discriminator_value
+            if discriminator_value.nil?
               raise ::JSON::SerializableError.new("Missing JSON discriminator field '{{field.id}}'", to_s, nil, *location, nil)
             end
@@ Expand Down @@