#40: Adds explicit handling of 'boolean' json type (#42)

Closes #40

Author: dragonwasrobot

lib/printers/all_of_printer.ex

@@ -64,6 +64,7 @@ defmodule JS2E.Printers.AllOfPrinter do
       type: field_type}
   end
 
+
   @spec create_type_name(Types.typeDefinition) :: String.t
   defp create_type_name(property_type) do
 
@@ -77,6 +78,9 @@ defmodule JS2E.Printers.AllOfPrinter do
         "number" ->
           "Float"
 
+        "boolean" ->
+          "Bool"
+
         _ ->
           upcase_first property_type_value
       end
@@ -156,6 +160,9 @@ defmodule JS2E.Printers.AllOfPrinter do
       "number" ->
         "Decode.float"
 
+      "boolean" ->
+        "Decode.bool"
+
       _ ->
         "Decode.#{property_type_value}"
     end

lib/printers/any_of_printer.ex

@@ -78,6 +78,9 @@ defmodule JS2E.Printers.AnyOfPrinter do
         "number" ->
           "Float"
 
+        "boolean" ->
+          "Bool"
+
         _ ->
           upcase_first property_type_value
       end
@@ -157,6 +160,9 @@ defmodule JS2E.Printers.AnyOfPrinter do
       "number" ->
         "Decode.float"
 
+      "boolean" ->
+        "Decode.bool"
+
       _ ->
         "Decode.#{property_type_value}"
     end

lib/printers/array_printer.ex

@@ -53,17 +53,20 @@ defmodule JS2E.Printers.ArrayPrinter do
   @spec determine_decoder_name(Types.typeDefinition) :: String.t
   defp determine_decoder_name(items_type) do
 
-    if get_string_name(items_type) == "PrimitiveType" do
+    if primitive_type?(items_type) do
       items_type_value = items_type.type
 
-      cond do
-        items_type_value == "integer" ->
+      case items_type do
+        "integer" ->
           "Decode.int"
 
-        items_type_value == "number" ->
+        "number" ->
           "Decode.float"
 
-        true ->
+        "boolean" ->
+          "Decode.bool"
+
+        _ ->
           "Decode.#{downcase_first items_type_value}"
       end
 
@@ -81,17 +84,20 @@ defmodule JS2E.Printers.ArrayPrinter do
   @spec determine_type_name(Types.typeDefinition) :: String.t
   defp determine_type_name(items_type) do
 
-    if get_string_name(items_type) == "PrimitiveType" do
+    if primitive_type?(items_type) do
       items_type_value = items_type.type
 
-      cond do
-        items_type_value == "integer" ->
+      case items_type_value do
+        "integer" ->
           "Int"
 
-        items_type_value == "number" ->
+        "number" ->
           "Float"
 
-        true ->
+        "boolean" ->
+          "Bool"
+
+        _ ->
           upcase_first items_type_value
       end
 
@@ -131,16 +137,19 @@ defmodule JS2E.Printers.ArrayPrinter do
   @spec determine_encoder_name(Types.typeDefinition) :: String.t
   defp determine_encoder_name(items_type) do
 
-    if get_string_name(items_type) == "PrimitiveType" do
+    if primitive_type?(items_type) do
       items_type_value = items_type.type
 
-      cond do
-        items_type_value == "integer" ->
+      case items_type_value do
+        "integer" ->
           "Encode.int"
 
-        items_type_value == "number" ->
+        "number" ->
           "Encode.float"
 
+        "boolean" ->
+          "Encode.bool"
+
         true ->
           "Encode.#{downcase_first items_type_value}"
       end

lib/printers/enum_printer.ex

@@ -33,7 +33,7 @@ defmodule JS2E.Printers.EnumPrinter do
                            values: values}, _type_dict, _schema_dict) do
 
     type_name = upcase_first name
-    clauses = values |> Enum.map(&(create_elm_value(&1, type)))
+    clauses = values |> Enum.map(&(create_elm_value!(&1, type)))
 
     type_template(type_name, clauses)
   end
@@ -69,7 +69,7 @@ defmodule JS2E.Printers.EnumPrinter do
         "Float"
 
       _ ->
-        raise "Unknown enum type: #{type}"
+        raise "Unknown or unsupported enum type: #{type}"
     end
   end
 
@@ -78,7 +78,7 @@ defmodule JS2E.Printers.EnumPrinter do
 
     values |> Enum.map(fn value ->
       raw_value = create_decoder_case(value, type)
-      parsed_value = create_elm_value(value, type)
+      parsed_value = create_elm_value!(value, type)
 
       %{raw_value: raw_value,
         parsed_value: parsed_value}
@@ -125,7 +125,7 @@ defmodule JS2E.Printers.EnumPrinter do
 
     values |> Enum.map(fn value ->
 
-      elm_value = create_elm_value(value, type)
+      elm_value = create_elm_value!(value, type)
       json_value = create_encoder_case(value, type)
 
       %{elm_value: elm_value,
@@ -145,13 +145,19 @@ defmodule JS2E.Printers.EnumPrinter do
       "number" ->
         "Encode.float #{value}"
 
+      "boolean" ->
+        "Encode.bool #{value}"
+
+      "null" ->
+        "Encode.null"
+
       _ ->
         raise "Unknown or unsupported enum type: #{type}"
     end
   end
 
-  @spec create_elm_value(String.t, String.t) :: String.t
-  defp create_elm_value(value, type) do
+  @spec create_elm_value!(String.t, String.t) :: String.t
+  defp create_elm_value!(value, type) do
     Logger.debug "Value: #{value}, Type: #{type}"
 
     case type do

lib/printers/object_printer.ex

@@ -87,12 +87,18 @@ defmodule JS2E.Printers.ObjectPrinter do
       property_type_value = property_type.type
 
       case property_type_value do
+        "string" ->
+          "String"
+
         "integer" ->
           "Int"
 
         "number" ->
           "Float"
 
+        "boolean" ->
+          "Bool"
+
         _ ->
           upcase_first property_type_value
       end
@@ -175,7 +181,7 @@ defmodule JS2E.Printers.ObjectPrinter do
       enum_type?(property_type) ->
         property_type_decoder =
           property_type.type
-          |> determine_primitive_type_decoder()
+          |> determine_primitive_type_decoder!()
 
         create_decoder_enum_clause(property_name, property_type_decoder,
           decoder_name, is_required)
@@ -185,25 +191,12 @@ defmodule JS2E.Printers.ObjectPrinter do
     end
   end
 
-  @spec determine_primitive_type_decoder(String.t) :: String.t
-  defp determine_primitive_type_decoder(property_type_value) do
-    case property_type_value do
-      "integer" ->
-        "Decode.int"
-
-      "number" ->
-        "Decode.float"
-
-      _ ->
-        "Decode.#{property_type_value}"
-    end
-  end
-
   @spec create_decoder_name(Types.typeDefinition) :: String.t
   defp create_decoder_name(property_type) do
 
     if primitive_type?(property_type) do
-      determine_primitive_type_decoder(property_type.type)
+      primitive_type_name = property_type.type
+      determine_primitive_type_decoder!(primitive_type_name)
     else
 
       property_type_name = property_type.name