Merge branch 'master' into add-numeric-constraints

earlbread · web-flow · commit 9d15860d99c1 · 2018-08-17T13:46:26.000+09:00
diff --git a/CHANGES.md b/CHANGES.md
@@ -27,6 +27,10 @@ To be released.
     crashed when a thight list item contains blocks other than paragraphs.
  -  Package's version became shown on the generated docs.
     [[#297], [#304] by Jeong Ukjae]
+ -  Added `opengraphs` option for [OpenGraph] objects on docs.
+    [[#283], [#305] by GyuYong Jung]
+ -  Added syntax highlighting.
+    [[#310], [#311] by MinJune Kim]
 
 ### Python target
 
@@ -45,12 +49,15 @@ To be released.
 [#206]: https://github.com/nirum-lang/nirum/issues/206
 [#271]: https://github.com/nirum-lang/nirum/pull/271
 [#281]: https://github.com/nirum-lang/nirum/pull/281
+[#283]: https://github.com/spoqa/nirum/pull/283
 [#297]: https://github.com/nirum-lang/nirum/issues/297
 [#300]: https://github.com/nirum-lang/nirum/pull/300
 [#304]: https://github.com/nirum-lang/nirum/pull/304
+[#305]: https://github.com/nirum-lang/nirum/pull/305
 [CommonMark]: http://commonmark.org/
 [table syntax extension]: https://github.github.com/gfm/#tables-extension-
 [special attributes extension]: https://michelf.ca/projects/php-markdown/extra/#spe-attr
+[OpenGraph]: http://ogp.me/
 
 
 Version 0.4.1
diff --git a/app/nirum-docs.hs b/app/nirum-docs.hs
@@ -31,6 +31,7 @@ packageMetadata = Metadata
     , authors = [Author "Nirum team" Nothing Nothing]
     , Nirum.Package.Metadata.target = Docs
         { docsTitle = "Nirum"
+        , docsOpenGraph = []
         , docsStyle = style
         , docsHeader = ""
         , docsFooter = footer
diff --git a/docs/target/docs.md b/docs/target/docs.md
@@ -46,6 +46,14 @@ It goes to `<title>` elements of generated HTML pages.  It's usually a name of
 the Nirum package.
 
 
+### `opengraphs` (optional): OpenGraph
+
+It goes to `<meta>` elements of generated HTML pages. It mostly purposes to
+generate [OpenGraph] objects, but can be used for other metadata as well.
+
+[OpenGraph]: http://ogp.me/
+
+
 ### `style` (optional): Custom CSS
 
 It goes to very ending of the CSS file, which means it can override other
diff --git a/src/Nirum/Package/Metadata.hs b/src/Nirum/Package/Metadata.hs
@@ -48,6 +48,7 @@ module Nirum.Package.Metadata ( Author (Author, email, name, uri)
                               , readMetadata
                               , stringField
                               , tableField
+                              , tableArrayField
                               , textArrayField
                               , versionField
                               ) where
diff --git a/src/Nirum/Targets/Docs.hs b/src/Nirum/Targets/Docs.hs
@@ -56,6 +56,7 @@ import Nirum.Version (versionText)
 
 data Docs = Docs
     { docsTitle :: T.Text
+    , docsOpenGraph :: [OpenGraph]
     , docsStyle :: T.Text
     , docsHeader :: T.Text
     , docsFooter :: T.Text
@@ -69,6 +70,11 @@ data CurrentPage
     | DocumentPage FilePath
     deriving (Eq, Show)
 
+data OpenGraph = OpenGraph
+    { ogTag :: T.Text
+    , ogContent :: T.Text
+    } deriving (Eq, Ord, Show)
+
 makeFilePath :: ModulePath -> FilePath
 makeFilePath modulePath' = foldl (</>) "" $
     map toNormalizedString (toList modulePath') ++ ["index.html"]
@@ -104,7 +110,12 @@ $doctype 5
         <meta name="generator" content="Nirum #{versionText}">
         $forall Author { name = name' } <- authors md
             <meta name="author" content="#{name'}">
+        $forall OpenGraph { ogTag, ogContent } <- docsOpenGraph $ target pkg
+            <meta property="#{ogTag}" content="#{ogContent}">
         <link rel="stylesheet" href="#{root}style.css">
+        <link rel="stylesheet" href="#{hljsCss}">
+        <script src="#{hljsJs}"></script>
+        <script>hljs.initHighlightingOnLoad();</script>
     <body>
         #{preEscapedToMarkup $ docsHeader $ target pkg}
         <nav>
@@ -161,6 +172,12 @@ $doctype 5
     documentSortKey ("", _) = (False, 0, "")
     documentSortKey (fp@(fp1 : _), _) =
         (isUpper fp1, length (filter (== pathSeparator) fp), fp)
+    hljsBase :: T.Text
+    hljsBase = "https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/"
+    hljsCss :: T.Text
+    hljsCss = T.concat [hljsBase, "styles/github.min.css"]
+    hljsJs :: T.Text
+    hljsJs = T.concat [hljsBase, "highlight.min.js"]
 
 typeExpression :: BoundModule Docs -> TE.TypeExpression -> Html
 typeExpression _ expr = [shamlet|#{typeExpr expr}|]
@@ -490,7 +507,7 @@ strong code
 pre
     padding: 16px 10px
     background-color: #{gray1}
-    code
+    code, code.hljs
         background: none
 div
     border-top: 1px solid #{gray3}
@@ -619,15 +636,32 @@ instance Target Docs where
     targetName _ = "docs"
     parseTarget table = do
         title <- stringField "title" table
+        opengraphs <- optional $ opengraphsField "opengraphs" table
         style <- optional $ stringField "style" table
         header <- optional $ stringField "header" table
         footer <- optional $ stringField "footer" table
         return Docs
             { docsTitle = title
+            , docsOpenGraph = fromMaybe [] opengraphs
             , docsStyle = fromMaybe "" style
             , docsHeader = fromMaybe "" header
             , docsFooter = fromMaybe "" footer
             }
     compilePackage = compilePackage'
     showCompileError _ = id
     toByteString _ = id
+
+opengraphsField :: MetadataField -> Table -> Either MetadataError [OpenGraph]
+opengraphsField field' table = do
+    array <- tableArrayField field' table
+    opengraphs' <- mapM parseOpenGraph array
+    return $ toList opengraphs'
+  where
+    parseOpenGraph :: Table -> Either MetadataError OpenGraph
+    parseOpenGraph t = do
+      tag' <- stringField "tag" t
+      content' <- stringField "content" t
+      return OpenGraph
+          { ogTag = tag'
+          , ogContent = content'
+          }
