Bump version to 0.3

README.md

@@ -1 +1,21 @@
 # utoy
+
+## Building the executable
+
+```
+$ $(nix-build utoy.nix)/bin/utoy
+```
+
+## Building the Docker image
+
+```
+$ docker load < $(nix-build nix/docker-image.nix)
+```
+
+## Development Shell
+
+Includes Stack, `haskell-language-server`, `gen-hie` etc.
+
+```
+$ nix-shell
+```

app/Main.hs

@@ -62,7 +62,7 @@ app = serve (Proxy :: Proxy API) server
 
 type API =
   "bytes" :> Capture "bytes" Text :> Get '[PlainText, HTML] BytesModel
-  :<|> "codepoints" :> Capture "codepoints" Text :> Get '[PlainText] CodepointsModel
+  :<|> "codepoints" :> Capture "codepoints" Text :> Get '[PlainText, HTML] CodepointsModel
   :<|> "text" :> Capture "text" Text :> Get '[HTML] TextModel
 
 server :: Server API
@@ -108,12 +108,7 @@ instance MimeRender PlainText BytesModel where
       ]
 
 instance MimeRender HTML BytesModel where
-  mimeRender _ model = renderHtml $ H.docTypeHtml $ do
+  mimeRender _ model = renderHtml $ documentWithBody $ do
-    H.head $ do
-      H.meta ! A.charset "utf-8"
-      H.title "utoy"
-      H.style $ H.toHtml $ Encoding.decodeUtf8 $(embedFile "static/utoy.css")
-    H.body $ do
     H.table $ for_ model.codepoints $ \(bytes, eiC) -> do
       H.tr $ do
         H.td $ H.pre $ H.toHtml $ unlines $ map unwords [map showByteHex bytes, map showByteBin bytes]
@@ -121,8 +116,7 @@ instance MimeRender HTML BytesModel where
           Left err ->
             H.td ! A.colspan "4" $ H.toHtml $ "Decoding error: " ++ err
           Right c -> do
-              H.td $ do
+            H.td $ H.input ! A.class_ "charbox" ! A.value (H.toValue [c])
-                H.input ! A.class_ "charbox" ! A.value (H.toValue [c])
             H.td $ H.code $ printfHtml "U+%04X" c
             H.td $ H.code $ H.toHtml $ intercalate ", " $ maybeToList (UnicodeNames.name c) ++ map (++ "*") (UnicodeNames.nameAliases c)
             H.td $ H.code $ H.toHtml $ fromMaybe "" $ blockName c
@@ -162,6 +156,20 @@ instance MimeRender PlainText CodepointsModel where
     | (codepoint, eiC) <- model.codepoints
     ]
 
+instance MimeRender HTML CodepointsModel where
+  mimeRender _ model = renderHtml $ documentWithBody $ do
+    H.table $ for_ model.codepoints $ \(codepoint, eiC) ->
+      H.tr $ do
+        H.td $ H.code $ H.toHtml $ Text.pack $ printf "0x%X" codepoint
+        case eiC of
+          Left err -> do
+            H.td ! A.colspan "4" $ H.code $ H.toHtml $ "Decoding error: " <> Text.pack err
+          Right c -> do
+            H.td $ H.input ! A.class_ "charbox" ! A.value (H.toValue [c])
+            H.td $ H.code $ printfHtml "U+%04X" c
+            H.td $ H.code $ H.toHtml $ intercalate ", " $ maybeToList (UnicodeNames.name c) ++ map (++ "*") (UnicodeNames.nameAliases c)
+            H.td $ H.code $ H.toHtml $ fromMaybe "" $ blockName c
+
 -- /text/<text>
 
 newtype TextModel = TextModel
@@ -169,12 +177,7 @@ newtype TextModel = TextModel
   }
 
 instance MimeRender HTML TextModel where
-  mimeRender _ model = renderHtml $ H.docTypeHtml $ do
+  mimeRender _ model = renderHtml $ documentWithBody $ do
-    H.head $ do
-      H.meta ! A.charset "utf-8"
-      H.title "utoy"
-      H.style $ H.toHtml $ Encoding.decodeUtf8 $(embedFile "static/utoy.css")
-    H.body $ do
     H.table $ for_ (Text.unpack model.text) $ \c -> do
       H.tr $ do
         H.td $ H.input ! A.class_ "charbox" ! A.value (H.toValue [c])
@@ -203,6 +206,15 @@ orThrow (Right val) _ = pure val
 printfHtml :: PrintfArg a => String -> a -> H.Html
 printfHtml fmt = (H.toHtml :: String -> H.Html) . printf fmt
 
+documentWithBody :: H.Html -> H.Html
+documentWithBody body =
+  H.docTypeHtml $ do
+    H.head $ do
+      H.meta ! A.charset "utf-8"
+      H.title "utoy"
+      H.style $ H.toHtml $ Encoding.decodeUtf8 $(embedFile "static/utoy.css")
+    H.body body
+
 -- HTML routes
 
 data HTML

nix/docker-image.nix

@@ -4,6 +4,6 @@ let
 in
   pkgs.dockerTools.buildImage {
     name = "git.pbrinkmeier.de/paul/utoy";
-    tag = "0.2";
+    tag = utoy.version;
     config.Cmd = [ "${utoy}/bin/utoy" ];
   }

package.yaml

@@ -1,7 +1,7 @@
 # Adapted from new-template.hsfiles
 
 name:                utoy
-version:             0.2
+version:             0.3
 git:                 "https://git.pbrinkmeier.de/paul/utoy"
 license:             MIT
 author:              "Paul Brinkmeier"

utoy.cabal

@@ -5,7 +5,7 @@ cabal-version: 1.12
 -- see: https://github.com/sol/hpack
 
 name:           utoy
-version:        0.2
+version:        0.3
 author:         Paul Brinkmeier
 maintainer:     hallo@pbrinkmeier.de
 copyright:      2023 Paul Brinkmeier

utoy.nix

@@ -8,7 +8,7 @@ let
   utoy =
     { mkDerivation }:
     mkDerivation {
-      version = "0.2";
+      version = "0.3";
       pname = "utoy";
       license = pkgs.lib.licenses.mit;
       src =