[#14] merge main

Author: lispyclouds

README.md

@@ -20,7 +20,6 @@ Currently unsupported (raise an issue if needed!):
 - Other coercion libs
 - `oneOf` composed schema (mostly can be handled by `anyOf`)
 - Some string formats:
-  - DateTime
   - Email
   - File
 

src/navi/transform.clj

@@ -22,6 +22,8 @@
     ObjectSchema
     Schema
     StringSchema
+    DateTimeSchema
+    DateSchema
     UUIDSchema]
    [io.swagger.v3.oas.models.parameters
     CookieParameter
@@ -91,6 +93,12 @@
         :else
         content-fn)))
 
+  DateSchema
+  (p/transform [_] inst?)
+
+  DateTimeSchema
+  (p/transform [_] inst?)
+
   UUIDSchema
   (p/transform [_] uuid?)
 

test/navi/impl_test.clj

@@ -6,15 +6,17 @@
 
 (ns navi.impl-test
   (:require
+   [clojure.java.io :as io]
    [clojure.test :refer [deftest is testing]]
    [navi.core :as navi]
-   [navi.impl :as i]
-   [clojure.java.io :as io])
+   [navi.impl :as i])
   (:import
    [clojure.lang ExceptionInfo]
    [io.swagger.v3.oas.models Operation PathItem]
    [io.swagger.v3.oas.models.media
     Content
+    DateSchema
+    DateTimeSchema
     IntegerSchema
     MediaType
     ObjectSchema
@@ -39,7 +41,17 @@
   (testing "convert an optional OpenAPI Map entry"
     (let [property (Map/entry "id" (StringSchema.))]
       (is (= [:id {:optional true} string?]
-             (i/->prop-schema #{"x"} property))))))
+             (i/->prop-schema #{"x"} property)))))
+
+  (testing "convert a DateTime OpenAPI Map entry"
+    (let [property (Map/entry "timestamp" (DateTimeSchema.))]
+      (is (= [:timestamp inst?]
+             (i/->prop-schema #{"timestamp"} property)))))
+
+  (testing "convert a Date OpenAPI Map entry"
+    (let [property (Map/entry "date" (DateSchema.))]
+      (is (= [:date inst?]
+             (i/->prop-schema #{"date"} property))))))
 
 (deftest openapi-parameters-to-malli-spec
   (testing "convert a required OpenAPI Parameter"
@@ -144,22 +156,23 @@
       (is (= {:get {:handler "a handler"
                     :parameters {:path [:map [:x int?]]}}}
              (i/path-item->data path-item handlers))))))
+
 (defn find-route [rts path method]
-        (some (fn [[p r]]
-                (when (= p path)
-                  (get r method)))
-              rts))
+  (some (fn [[p r]]
+          (when (= p path)
+            (get r method)))
+        rts))
 
 (deftest security-requirements-test
   (testing "Verifying security requirements from security-users.yml"
     ;; A dummy map of operationId to handler (the actual function doesn't matter for this test).
-    (let [handlers {"listUsers"          (constantly :ok)
-                    "listUsersSingle"    (constantly :ok)
-                    "listUsersNoScope"   (constantly :ok)
+    (let [handlers {"listUsers" (constantly :ok)
+                    "listUsersSingle" (constantly :ok)
+                    "listUsersNoScope" (constantly :ok)
                     "listUsersNoSecurity" (constantly :ok)}
           api-spec (slurp (io/resource "security-users.yml"))
-          routes   (navi/routes-from api-spec handlers)]
-      
+          routes (navi/routes-from api-spec handlers)]
+
       (testing "multiple security schemes"
         (let [route (find-route routes "/users" :get)]
           (is (some? route) "Should have found /users GET route")

test/navi/transform_test.clj

@@ -17,6 +17,8 @@
     ByteArraySchema
     ComposedSchema
     Content
+    DateSchema
+    DateTimeSchema
     IntegerSchema
     JsonSchema
     MediaType
@@ -34,6 +36,10 @@
    [java.util LinkedHashMap]))
 
 (deftest primitives
+  (testing "datetime"
+    (is (= inst? (p/transform (DateTimeSchema.)))))
+  (testing "date"
+    (is (= inst? (p/transform (DateSchema.)))))
   (testing "string"
     (is (= string? (p/transform (StringSchema.)))))
   (testing "integer"
@@ -84,6 +90,40 @@
   (testing "nil"
     (is (= any? (p/transform nil)))))
 
+(deftest date-schema-transformations
+  (testing "DateSchema transforms to inst? predicate"
+    (let [schema (DateSchema.)]
+      (is (= inst? (p/transform schema)))))
+
+  (testing "DateTimeSchema transforms to inst? predicate"
+    (let [schema (DateTimeSchema.)]
+      (is (= inst? (p/transform schema)))))
+
+  (testing "inst? validates different date types"
+    (let [schema (DateTimeSchema.)
+          pred (p/transform schema)]
+      (testing "java.util.Date"
+        (is (pred (java.util.Date.))))
+      (testing "java.time.Instant"
+        (is (pred (java.time.Instant/now))))
+      (testing "java.time.LocalDateTime converted to Instant"
+        (is (pred (-> (java.time.LocalDateTime/now)
+                      (.atZone (java.time.ZoneId/systemDefault))
+                      .toInstant))))
+      (testing "java.time.ZonedDateTime converted to Instant"
+        (is (pred (-> (java.time.ZonedDateTime/now)
+                      .toInstant))))
+      (testing "java.time.OffsetDateTime converted to Instant"
+        (is (pred (-> (java.time.OffsetDateTime/now)
+                      .toInstant))))))
+
+  (testing "inst? rejects invalid inputs"
+    (let [schema (DateTimeSchema.)
+          pred (p/transform schema)]
+      (is (not (pred "2024-01-01")))
+      (is (not (pred nil)))
+      (is (not (pred 123))))))
+
 (deftest string-formats
   (testing "uuid"
     (is (= uuid? (p/transform (UUIDSchema.)))))