Merge pull request #4 from OpenSesame/fix/macro_structs_generator

Errors: implemented macro for generating structures

Author: os-esh

Project.toml

@@ -1,14 +1,13 @@
 name = "Elasticsearch"
 uuid = "e586a49d-aa29-4ce5-8f91-fa4f824367bd"
 authors = ["Egor Shmorgun <egor.shmorgun@opensesame.com>"]
-version = "0.2.0"
+version = "0.2.1"
 
 [deps]
 CodecZlib = "944b1d66-785c-5afd-91f1-9de20f533193"
 Coverage = "a2441757-f6aa-5fb2-8edb-039e3f45d037"
 Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
 HTTP = "cd3eb016-35fb-5094-929b-558a96fad6f3"
-InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
 JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
 Mocking = "78c3b35d-d492-501b-9361-3d52fe80e533"
 Retry = "20febd7b-183b-5ae2-ac4a-720e7ce64774"

src/elastic_transport/transport/errors.jl

@@ -52,27 +52,26 @@ const HTTP_STATUSES = Dict(
   510 => :NotExtended
 )
 
-foreach(values(HTTP_STATUSES)) do exception_name
-  struct_expr = Meta.parse(
-    """
-    struct $exception_name <: ServerException
-      status
-      message::String
+macro generate_exception_structures(http_statuses_dict)
+  dict = eval(http_statuses_dict)
+  # dict = HTTP_STATUSES
+  return Expr(:block, map(values(dict)) do exception_name
+    quote
+      struct $exception_name <: ServerException
+        status
+        message::String
+      end
     end
-    """
-  )
-
-  eval(struct_expr)
+  end...)
 end
 
-using InteractiveUtils: subtypes
+@generate_exception_structures(HTTP_STATUSES)
 
-const CODE_TO_EXCEPTION = Dict(
-  Symbol(Base.typename(t).name) => t
-  for t in subtypes(ServerException)
-) |> t_codes -> Dict(
-  k => t_codes[v]
-  for (k, v) in HTTP_STATUSES
-)
+macro transform_exceptions_to_types(http_statuses_dict)
+  dict = eval(http_statuses_dict)
+  Dict(k => eval(v) for (k, v) in dict)
+end
+
+const CODE_TO_EXCEPTION = @transform_exceptions_to_types(HTTP_STATUSES)
 
 const HOST_UNREACHABLE_EXCEPTIONS = [HTTP.TimeoutError, HTTP.ConnectError]