Merge pull request #69 from Flexiana/easier-component-maintenance

Add a easier way to manage components

Author: ianffcs

.clj-kondo/config.edn

@@ -0,0 +1,3 @@
+{:lint-as {nubank.workspaces.core/defcard clojure.core/def
+           nubank.workspaces.core/deftest clojure.test/deftest
+           xiana.core/flow-> clojure.core/->}}

project.clj

@@ -1,4 +1,4 @@
-(defproject com.flexiana/framework "0.1.7"
+(defproject com.flexiana/framework "0.1.8"
   :description "Framework"
   :url "https://github.com/Flexiana/framework"
   :license {:name "FIXME" :url "FIXME"}

src/framework/components/app/core.clj

@@ -41,17 +41,19 @@
                        (assoc :controller-error e)
                        (assoc :response {:status 500 :body "Internal Server error"}))))))
 
-(defn default-handler
-  [{request :request {router :router} :deps :as state}]
-  (let [match (r/match-by-path (:ring-router router) (:uri request))
+(defn route
+  [{request          :request
+    {router :router} :deps
+    :as              state}]
+  (let [match (r/match-by-path router (:uri request))
         method (:request-method request)
         handler (or (get-in match [:data :handler]) (-> match :result method :handler))
-        controller (or (get-in match [:data :action]) (-> match :data method :action))]
-    (if controller
+        action (or (get-in match [:data :action]) (-> match :data method :action))]
+    (if action
       (xiana/ok (-> state
                     (?assoc-in [:request-data :match] match)
                     (?assoc-in [:request-data :handler] handler)
-                    (assoc-in [:request-data :action] controller)))
+                    (assoc-in [:request-data :action] action)))
 
       (if handler
         (xiana/ok (-> state
@@ -96,22 +98,54 @@
                     (fn [x] (add-http-request x http-request))
                     (fn [x] (init-acl x acl-cfg))]
                    (-> this :router-interceptors (select-interceptors :enter identity))
-                   [(fn [x] (default-handler x))]
+                   [(fn [x] (route x))]
                    (-> this :router-interceptors (select-interceptors :leave reverse))
+
                    (-> this :controller-interceptors (select-interceptors :enter identity))
                    [(fn [x] (run-controller x))]
                    (-> this :controller-interceptors (select-interceptors :leave reverse))))
                (xiana/extract)
                (get :response))))))
 
 (defn make-app
-  [{config :config
-    acl-cfg :acl-cfg
-    session-backend :session-backend
-    router-interceptors :router-interceptors
+  "DEPRECATED"
+  [{config                  :config
+    acl-cfg                 :acl-cfg
+    session-backend         :session-backend
+    router-interceptors     :router-interceptors
     controller-interceptors :controller-interceptors}]
   (map->App {:config                  config
              :acl-cfg                 acl-cfg
              :session-backend         session-backend
              :router-interceptors     router-interceptors
              :controller-interceptors controller-interceptors}))
+
+(defn ->app
+  [{acl-cfg         :acl-cfg
+    session-backend :session-backend
+    :as             config}]
+  (with-meta config
+    `{component/start ~(fn [{:keys [router db]
+                             :as   this}]
+                         (let [state (xiana.core/flow->
+                                       (create-empty-state)
+                                       (add-deps {:router router, :db db})
+                                       (add-session-backend session-backend)
+                                       (init-acl acl-cfg))]
+                           (assoc this
+                             :handler
+                             (fn [http-request]
+                               (xiana/flow->
+                                 state
+                                 (add-http-request http-request)
+                                 (-> this :router-interceptors (select-interceptors :enter identity))
+                                 [(fn [x] (route x))]
+                                 (-> this :router-interceptors (select-interceptors :leave reverse))
+
+                                 (-> this :controller-interceptors (select-interceptors :enter identity))
+                                 [(fn [x] (run-controller x))]
+                                 (-> this :controller-interceptors (select-interceptors :leave reverse))
+                                 (xiana/extract)
+                                 (get :response))))))
+      component/stop  ~(fn [this]
+                         (dissoc this :handler))}))

src/framework/components/router/core.clj

@@ -7,12 +7,23 @@
   [db]
   component/Lifecycle
   (stop [this] this)
-  (start
-    [this]
-    (assoc this :ring-router (ring/router (concat
-                                            (:routes (:specific-component this)) ; adds routes specific to some component
-                                            (:custom-routes this))))))
+  (start [this]
+         (assoc this :ring-router (ring/router (concat
+                                                 (:routes (:specific-component this)) ; adds routes specific to some component
+                                                 (:custom-routes this))))))
 
 (defn make-router
+  "DEPRECATED"
   [routes]
   (map->Router {:custom-routes routes}))
+
+(defn ->router
+  [_config routes]
+  (with-meta {:custom-routes routes}
+    `{component/start ~(fn [this]
+                         (assoc this :router
+                           (ring/router (concat
+                                          (-> this :specific-component :routes)
+                                          (-> this :custom-routes)))))
+      component/stop  ~(fn [this]
+                         (dissoc this :router))}))

src/framework/components/web_server/core.clj

@@ -1,7 +1,10 @@
 (ns framework.components.web-server.core
   (:require
     [com.stuartsierra.component :as component]
-    [ring.adapter.jetty :as jetty]))
+    [ring.adapter.jetty :as jetty])
+  (:import
+    (org.eclipse.jetty.server
+      Server)))
 
 (defrecord WebServer
   [http-server app config]
@@ -16,5 +19,19 @@
     this))
 
 (defn make-web-server
+  "DEPRECATED"
   [config]
   (map->WebServer {:config config}))
+
+(defn ->web-server
+  [{web-cfg :framework.app/web-server
+    :as     config}]
+  (with-meta config
+    `{component/start ~(fn [{{handler :handler} :app
+                             :as                this}]
+                         (assoc this :web-server
+                           (jetty/run-jetty handler web-cfg)))
+      component/stop  ~(fn [{:keys [^Server web-server]
+                             :as   this}]
+                         (.stop web-server)
+                         (dissoc this :web-server))}))

src/framework/db/storage.clj

@@ -3,6 +3,7 @@
     [com.stuartsierra.component :as component]
     [next.jdbc :as jdbc]))
 
+;; DEPRECATED
 (defrecord PostgreSQL
   [config]
   component/Lifecycle
@@ -14,6 +15,15 @@
   (stop [this]
         (dissoc this :datasource :connection)))
 
-(defn postgresql
-  [config]
-  (->PostgreSQL config))
+(defn ->postgresql
+  [{pg-cfg :framework.db.storage/postgresql}]
+  (with-meta pg-cfg
+    `{component/start ~(fn [this]
+                         (let [datasource (jdbc/get-datasource pg-cfg)]
+                           (-> this
+                               (assoc :datasource datasource)
+                               (assoc :connection (jdbc/get-connection datasource)))))
+      component/stop  ~(fn [{:keys [connection]
+                             :as   this}]
+                         (.close connection)
+                         (dissoc this :datasource :connection))}))