rib 0.10.0.0 → 0.12.0.0

raw patch · 5 files changed

+35/−37 lines, 5 filesdep +iso8601-timedep −pandoc-include-codedep ~base-nopreludedep ~dhalldep ~relude

Dependencies added: iso8601-time

Dependencies removed: pandoc-include-code

Dependency ranges changed: base-noprelude, dhall, relude, time

Files

• CHANGELOG.md +6/−0
• README.md +2/−2
• rib.cabal +7/−7
• src/Rib/Extra/OpenGraph.hs +18/−20
• src/Rib/Parser/Pandoc.hs +2/−8

@@ -1,5 +1,11 @@ # Change Log for rib +## 0.12++- Removed pandoc-include-code+- Allow dhall 1.30+- default.nix: Allow overriding compiler+ ## 0.10.0.0  - API

@@ -15,13 +15,13 @@  Use ghcid for quicker compilation cycles: -```+```bash nix-shell --run ghcid ```  To test your changes, clone [rib-sample](https://github.com/srid/rib-sample) and run it using your local rib checkout: -```+```bash cd .. git clone https://github.com/srid/rib-sample.git cd rib-sample

@@ -1,6 +1,6 @@ cabal-version: 2.4 name: rib-version: 0.10.0.0+version: 0.12.0.0 license: BSD-3-Clause copyright: 2019 Sridhar Ratnakumar maintainer: srid@srid.ca@@ -32,12 +32,12 @@     build-depends:         aeson >=1.4.2 && <1.5,         async,-        base-noprelude >=4.7 && <5,+        base-noprelude >=4.12 && <4.14,         binary >=0.8.6 && <0.9,         clay >=0.13.3,         cmdargs >=0.10.20 && <0.11,         containers >=0.6.0 && <0.7,-        dhall >= 1.30 && <1.31,+        dhall >= 1.30 && <1.33,         directory >= 1.0 && <2.0,         exceptions,         foldl,@@ -51,13 +51,13 @@         mtl >=2.2.2 && <2.3,         optparse-applicative >= 0.15,         pandoc >=2.7 && <3,-        pandoc-include-code >=1.5 && <1.6,         pandoc-types >=1.20,-        relude >= 0.6 && < 0.7,+        relude >= 0.6 && < 0.8,         safe-exceptions,         shake >= 0.18.5,         text >=1.2.3 && <1.3,-        time >= 1.9,+        time,+        iso8601-time,         wai >=3.2.2 && <3.3,         wai-app-static >=3.1.6 && <3.2,         warp@@ -86,7 +86,7 @@   hs-source-dirs: test    main-is: Spec.hs   build-depends:-    base-noprelude >=4.7 && <5,+    base-noprelude >=4.12 && <4.14,     relude,     hspec,     QuickCheck

@@ -12,7 +12,7 @@ where  import Data.Time (UTCTime)-import Data.Time.Format.ISO8601 (formatShow, iso8601Format)+import Data.Time.ISO8601 (formatISO8601) import Lucid import Lucid.Base (makeAttribute) import Relude@@ -21,16 +21,15 @@ -- The OpenGraph metadata -- -- This type can be directly rendered to HTML using `toHTML`.-data OpenGraph-  = OpenGraph-      { _openGraph_title :: Text,-        _openGraph_url :: Maybe URI.URI,-        _openGraph_author :: Maybe Text,-        _openGraph_description :: Maybe Text,-        _openGraph_siteName :: Text,-        _openGraph_type :: Maybe OGType,-        _openGraph_image :: Maybe URI.URI-      }+data OpenGraph = OpenGraph+  { _openGraph_title :: Text,+    _openGraph_url :: Maybe URI.URI,+    _openGraph_author :: Maybe Text,+    _openGraph_description :: Maybe Text,+    _openGraph_siteName :: Text,+    _openGraph_type :: Maybe OGType,+    _openGraph_image :: Maybe URI.URI+  }   deriving (Eq, Show)  instance ToHtml OpenGraph where@@ -66,14 +65,13 @@       metaOg "type" "website"  -- TODO: _article_profile :: [Profile]-data Article-  = Article-      { _article_section :: Maybe Text,-        _article_modifiedTime :: Maybe UTCTime,-        _article_publishedTime :: Maybe UTCTime,-        _article_expirationTime :: Maybe UTCTime,-        _article_tag :: [Text]-      }+data Article = Article+  { _article_section :: Maybe Text,+    _article_modifiedTime :: Maybe UTCTime,+    _article_publishedTime :: Maybe UTCTime,+    _article_expirationTime :: Maybe UTCTime,+    _article_tag :: [Text]+  }   deriving (Eq, Show)  instance ToHtml Article where@@ -86,7 +84,7 @@     metaOg "article:tag" `mapM_` _article_tag     where       metaOgTime k t =-        metaOg k $ toText $ formatShow iso8601Format t+        metaOg k $ toText $ formatISO8601 t  -- Open graph meta element metaOg :: Applicative m => Text -> Text -> HtmlT m ()

@@ -3,8 +3,6 @@ {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE Rank2Types #-} {-# LANGUAGE ScopedTypeVariables #-}-{-# LANGUAGE TypeApplications #-}-{-# LANGUAGE ViewPatterns #-}  -- | Helpers for working with Pandoc documents module Rib.Parser.Pandoc@@ -36,9 +34,8 @@ import Rib.Shake (ribInputDir) import System.FilePath import Text.Pandoc-import Text.Pandoc.Filter.IncludeCode (includeCode) import qualified Text.Pandoc.Readers-import Text.Pandoc.Walk (query, walkM)+import Text.Pandoc.Walk (query) import Text.Pandoc.Writers.Shared (toTableOfContents)  -- | Pure version of `parse`@@ -61,10 +58,7 @@     inputDir <- ribInputDir     content <- toText <$> readFile' (inputDir </> f)     fmap (first show) $ runExceptT $ do-      v' <- runIO' $ textReader readerSettings content-      liftIO $ walkM includeSources v'-  where-    includeSources = includeCode $ Just $ Format "html5"+      runIO' $ textReader readerSettings content  -- | Render a Pandoc document to HTML render :: Monad m => Pandoc -> HtmlT m ()