Refactor Git_presenters to Resolvers.

What this module really does is resolve Git types to values usable by
ogit views.

3 files changed, 78 insertions, 83 deletions

diff --git a/lib/handlers.ml b/lib/handlers.ml
index ff4c4a5..871931c 100644
--- a/lib/handlers.ml
+++ b/lib/handlers.ml
@@ -3,62 +3,63 @@
 let root _req = Views.root ()
 
 module Repo = struct
-  open Git_presenters
-
   let ( let* ) m f =
     let open Lwt.Infix in
     m >>= function
     | Ok x -> f x
     | Error e ->
-        let msg = Format.asprintf "%a" Store.pp_error e in
-        Views.error_page msg |> Dream_html.respond
-
-  let repo req = Dream.param req "repo"
-  let id_of_req req = Dream.param req "id"
+        let msg = Format.asprintf "%a" Resolvers.Store.pp_error e in
+        Views.error_page msg
 
   let summary req =
-    let* branches = all_branches (repo req) in
-    let* commits = recent_commits (repo req) 10 in
+    let repo = Dream.param req "repo" in
+    let* branches = Resolvers.all_branches repo in
+    let* commits = Resolvers.recent_commits repo 10 in
     let authors = [ "John Pork"; "Sebastian Jellybean" ] in
-    Views.Repo.summary (repo req) branches commits authors
+    Views.Repo.summary repo branches commits authors
 
   let log req =
-    let* commits = recent_commits (repo req) 100 in
-    Views.Repo.log (repo req) commits
+    let repo = Dream.param req "repo" in
+    let* commits = Resolvers.recent_commits repo 100 in
+    Views.Repo.log repo commits
 
   let files_at_head req =
-    let* tree = head_tree (repo req) in
-    Views.Repo.files (repo req) tree
+    let repo = Dream.param req "repo" in
+    let* tree = Resolvers.head_tree repo in
+    Views.Repo.files repo tree
 
   let file_id req =
-    let id = id_of_req req in
-    let* blob = blob_of_id (repo req) id in
-    Views.Repo.file (repo req) blob
+    let repo = Dream.param req "repo" in
+    let id = Dream.param req "repo" in
+    let* blob = Resolvers.blob_of_id repo id in
+    Views.Repo.file repo blob
 
   let refs req =
-    let* branches = all_branches (repo req) in
-    Views.Repo.refs (repo req) branches
+    let repo = Dream.param req "repo" in
+    let* branches = Resolvers.all_branches repo in
+    Views.Repo.refs repo branches
 
   let commit req =
-    let id = id_of_req req in
-    let* commit = commit_of_id (repo req) id in
-    Views.Repo.commit (repo req) commit
+    let repo = Dream.param req "repo" in
+    let id = Dream.param req "id" in
+    let* commit = Resolvers.commit_of_id repo id in
+    Views.Repo.commit repo commit
 end
 
 let all_handlers =
-  Dream.
-    [
-      get "/" root;
-      scope "/:repo" []
-        Repo.
-          [
-            get "/" summary;
-            get "/summary/" summary;
-            get "/log/" log;
-            get "/files/" files_at_head;
-            get "/files/:id" file_id;
-            get "/refs/" refs;
-            get "/commit/:id" commit;
-          ];
-      get "/static/**" (static "./lib/static");
-    ]
+  let open Dream in
+  [
+    get "/" root;
+    scope "/:repo" []
+      Repo.
+        [
+          get "/" summary;
+          get "/summary/" summary;
+          get "/log/" log;
+          get "/files/" files_at_head;
+          get "/files/:id" file_id;
+          get "/refs/" refs;
+          get "/commit/:id" commit;
+        ];
+    get "/static/**" (static "./lib/static");
+  ]
diff --git a/lib/git_presenters.ml b/lib/resolvers.ml
index 963f1bd..af8fd8b 100644
--- a/lib/git_presenters.ml
+++ b/lib/resolvers.ml
@@ -17,9 +17,6 @@ let repo_description repo =
 
 type user = Git.User.t
 
-(* let all_authors store = *)
-(*   let* store = store repo in *)
-
 type commit = {
   hash : string;
   short_hash : string;
diff --git a/lib/views.ml b/lib/views.ml
index e65a249..fc211c5 100644
--- a/lib/views.ml
+++ b/lib/views.ml
@@ -11,8 +11,6 @@ type body_data = {
 }
 
 module Components = struct
-  open Dream_html
-
   module Topnav = struct
     type t = None | Summary | Log | Files | Refs
 
@@ -36,23 +34,21 @@ module Components = struct
 end
 
 module Page = struct
-  open Dream_html
-  open HTML
-
-  let header title subtitle =
-    let subtitle =
-      if String.starts_with ~prefix:"Unnamed repository" subtitle then ""
-      else subtitle
+  let page_header header1 header2 =
+    let header2 =
+      if String.starts_with ~prefix:"Unnamed repository" header2 then ""
+      else header2
     in
-    null [ h1 [] [ txt "%s" title ]; h2 [] [ txt "%s" subtitle ] ]
+    HTML.(null [ h1 [] [ txt "%s" header1 ]; h2 [] [ txt "%s" header2 ] ])
 
-  let footer () =
+  let page_footer () =
     let today = Unix.localtime (Unix.time ()) in
     let year = string_of_int (today.Unix.tm_year + 1900) in
     let footer_text = Printf.sprintf "Copyright %s %s" year config.user in
-    footer [] [ txt "%s" footer_text ]
+    HTML.footer [] [ txt "%s" footer_text ]
 
   let render ?(page_title = "Ogit") body_data =
+    let open HTML in
     html []
       [
         head []
@@ -64,10 +60,10 @@ module Page = struct
           ];
         body []
           [
-            header body_data.title body_data.subtitle;
+            page_header body_data.title body_data.subtitle;
             body_data.topnav;
             div [ id "main" ] body_data.content;
-            footer ();
+            page_footer ();
           ];
       ]
 end
@@ -76,7 +72,7 @@ let root () =
   let all_repositories =
     let repos =
       Sys.readdir config.git_project_root
-      |> Array.to_list (* |> List.sort String.compare *)
+      |> Array.to_list |> List.sort String.compare
     in
     let li_of_repo repo =
       HTML.li [] [ Routes.link_to (Routes.Repo repo) (txt "%s" repo) ]
@@ -94,7 +90,7 @@ let root () =
   respond @@ Page.render body_data
 
 module Repo = struct
-  open Git_presenters
+  open Resolvers
 
   let page_title repo = Printf.sprintf "%s — %s" repo (repo_description repo)
   let li_of_author author = HTML.(li [] [ txt "%s" author ])
@@ -242,29 +238,30 @@ module Repo = struct
 end
 
 let error_page message =
-  HTML.(
-    html []
-      [
-        head []
-          [
-            title [] "Fatal error";
-            link [ rel "stylesheet"; href "/static/styles.css" ];
-            link
-              [ rel "icon"; type_ "image/x-icon"; href "/static/git_icon.svg" ];
-          ];
-        body []
-          [
-            h1 [] [ txt "Fatal Error" ];
-            div
-              [ id "main" ]
-              [
-                p [] [ b [] [ txt "%s" message ] ];
-                p []
-                  [
-                    txt
-                      "Your best course of action is to press the 'back' \
-                       button in your browser.";
-                  ];
-              ];
-          ];
-      ])
+  let open HTML in
+  respond
+  @@ html []
+       [
+         head []
+           [
+             title [] "Fatal error";
+             link [ rel "stylesheet"; href "/static/styles.css" ];
+             link
+               [ rel "icon"; type_ "image/x-icon"; href "/static/git_icon.svg" ];
+           ];
+         body []
+           [
+             h1 [] [ txt "Fatal Error" ];
+             div
+               [ id "main" ]
+               [
+                 p [] [ b [] [ txt "%s" message ] ];
+                 p []
+                   [
+                     txt
+                       "Your best course of action is to press the 'back' \
+                        button in your browser.";
+                   ];
+               ];
+           ];
+       ]