feat(checkable): rules inline

Nicolab · Apr 18, 2021 · 93ff867 · 93ff867
1 parent 99bda27
commit 93ff867
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 29 deletions.
diff --git a/spec/check/checkable/checkable_helper.cr b/spec/check/checkable/checkable_helper.cr
@@ -14,13 +14,11 @@ module H
 
     property email : String
     property age : Int32?, {
-      age: {
-        check: {
-          min:     {"Age should be more than 18", 18},
-          between: {"Age should be between 25 and 35", 25, 35},
-        },
-        clean: {type: Int32, to: :to_i32, nilable: true},
+      check: {
+        min:     {"Age should be more than 18", 18},
+        between: {"Age should be between 25 and 35", 25, 35},
       },
+      clean: {type: Int32, to: :to_i32, nilable: true},
     }
 
     def initialize(@email, @age)
@@ -72,22 +70,18 @@ module H
 
     property email : String
     property username : String?, {
-      username: {
-        required: "Username is required",
-        check:    {
-          min: {"Length must be more than 2", 2},
-        },
-        clean: {type: String},
+      required: "Username is required",
+      check:    {
+        min: {"Length must be more than 2", 2},
       },
+      clean: {type: String},
     }
     property age : Int32?, {
-      age: {
-        check: {
-          min:     {"Age should be more than 18", 18},
-          between: {"Age should be between 25 and 35", 25, 35},
-        },
-        clean: {type: Int32, to: :to_i32, message: "Wrong type", nilable: true},
+      check: {
+        min:     {"Age should be more than 18", 18},
+        between: {"Age should be between 25 and 35", 25, 35},
       },
+      clean: {type: Int32, to: :to_i32, message: "Wrong type", nilable: true},
     }
 
     # ---------------------------------------------------------------------------

diff --git a/spec/check/checkable/spec_helper.cr b/spec/check/checkable/spec_helper.cr
@@ -26,16 +26,14 @@ module H
     )
 
     property email : String, {
-      email: {
-        required: true,
-        check:    {
-          not_empty: {"Email should not be empty"},
-          email:     {"It is not a valid email"},
-        },
-        clean: {
-          type: String,
-          to:   :to_s,
-        },
+      required: true,
+      check:    {
+        not_empty: {"Email should not be empty"},
+        email:     {"It is not a valid email"},
+      },
+      clean: {
+        type: String,
+        to:   :to_s,
       },
     }
 

diff --git a/src/checkable.cr b/src/checkable.cr
@@ -83,7 +83,7 @@ module Check
         {% verbatim do %}
           {% for k, prop in PROPS %}
             {% if prop[:args] %}
-              Check.rules({{prop[:args].double_splat}})
+              Check.rules({{prop[:name]}}: { {{prop[:args].double_splat}} })
             {% end %}
           {% end %}
         {% end %}