0.9 updates (#68)

* Update for PureScript 0.9

* Update build

* Add badges to README

* Add installation note

Author: garyb

.gitignore

@@ -1,8 +1,6 @@
 /.*
 !/.gitignore
-/output/
-/node_modules/
+!/.travis.yml
 /bower_components/
-/tmp/
 /node_modules/
-/dist/
+/output/

.travis.yml

@@ -1,19 +1,17 @@
 language: node_js
 dist: trusty
 sudo: required
-node_js:
-  - 5
+node_js: 6
 install:
-  - npm install [email protected] bower -g
-  - npm install && bower install
+  - npm install -g bower
+  - npm install
+  - bower install --production
 script:
-  - pulp test
-
+  - npm run -s build
+  - bower install
+  - npm -s test
 after_success:
-  - >-
-    test $TRAVIS_TAG &&
-    psc-publish > .pursuit.json &&
-    curl -X POST http://pursuit.purescript.org/packages \
-      -d @.pursuit.json \
-      -H 'Accept: application/json' \
-      -H "Authorization: token ${GITHUB_TOKEN}"
+- >-
+  test $TRAVIS_TAG &&
+  echo $GITHUB_TOKEN | pulp login &&
+  echo y | pulp publish --no-push

README.md

@@ -1,7 +1,17 @@
 # purescript-markdown
 
+[![Latest release](http://img.shields.io/bower/v/purescript-markdown.svg)](https://github.com/slamdata/purescript-markdown/releases)
+[![Build Status](https://travis-ci.org/slamdata/purescript-markdown.svg?branch=master)](https://travis-ci.org/slamdata/purescript-markdown)
+[![Dependency Status](https://www.versioneye.com/user/projects/578f7ce40ca92d004c89e13e/badge.svg?style=flat)](https://www.versioneye.com/user/projects/578f7ce40ca92d004c89e13e)
+
 A Purescript library for parsing SlamData's dialect of Markdown, called *SlamDown*, which is mostly a safe, clean subset of CommonMark.
 
+## Installation
+
+```
+bower install purescript-markdown
+```
+
 ## Usage
 
 

bower.json

@@ -22,15 +22,16 @@
     "package.json"
   ],
   "dependencies": {
-    "purescript-const": "^0.5.0",
-    "purescript-functions": "^0.1.0",
-    "purescript-functor-compose": "^0.0.1",
-    "purescript-hugenums": "^1.3.0",
-    "purescript-lists": "^0.7.10",
-    "purescript-parsing": "^0.8.0",
-    "purescript-prelude": "^0.1.3",
-    "purescript-strongcheck": "^0.14.4",
-    "purescript-validation": "^0.2.1",
-    "purescript-sets": "^0.5.7"
+    "purescript-const": "^1.0.0",
+    "purescript-functor-compose": "garyb/purescript-functor-compose#d37327f2daf87dd75a979840a2662d664baf3313",
+    "purescript-hugenums": "^2.0.0",
+    "purescript-lists": "^1.0.0",
+    "purescript-parsing": "^1.0.0",
+    "purescript-partial": "^1.1.2",
+    "purescript-prelude": "^1.0.0",
+    "purescript-sets": "^1.0.0",
+    "purescript-strings": "^1.1.0",
+    "purescript-strongcheck": "^1.0.0",
+    "purescript-validation": "^1.0.0"
   }
 }

package.json

@@ -1,6 +1,14 @@
 {
   "private": true,
+  "scripts": {
+    "clean": "rimraf output && rimraf .pulp-cache",
+    "build": "pulp build --censor-lib --strict",
+    "test": "pulp test"
+  },
   "devDependencies": {
-    "purescript": "^0.8.5"
+    "pulp": "^9.0.1",
+    "purescript": "^0.9.1",
+    "purescript-psa": "^0.3.9",
+    "rimraf": "^2.5.0"
   }
 }

src/Text/Markdown/SlamDown/Eval.purs

@@ -4,10 +4,13 @@ module Text.Markdown.SlamDown.Eval
   ) where
 
 import Prelude
+
 import Control.Alt ((<|>))
+
+import Data.Array as A
 import Data.Const (Const(..))
-import Data.Identity (Identity(..), runIdentity)
 import Data.Functor.Compose (Compose(..), decompose)
+import Data.Identity (Identity(..), runIdentity)
 import Data.List as L
 import Data.Maybe as M
 import Data.String as S
@@ -34,7 +37,7 @@ eval fs = everywhereM b i
   b ∷ SD.Block a → m (SD.Block a)
   b (SD.CodeBlock (SD.Fenced true info) code) =
     SD.CodeBlock (SD.Fenced false info) <<< pure <<< SD.renderValue
-      <$> fs.code (M.Just info) (S.joinWith "\n" (L.fromList code))
+      <$> fs.code (M.Just info) (S.joinWith "\n" (A.fromFoldable code))
   b other = pure $ other
 
   i ∷ SD.Inline a → m (SD.Inline a)

src/Text/Markdown/SlamDown/Parser.purs

@@ -4,23 +4,23 @@ module Text.Markdown.SlamDown.Parser
   , validateSlamDown
   ) where
 
-import Prelude
+import Prelude hiding (min)
 
-import Data.Foldable (any, all)
 import Data.Either (Either)
+import Data.Foldable (any, all)
+import Data.List ((:))
 import Data.List as L
 import Data.Maybe as M
 import Data.Monoid (mempty)
 import Data.String as S
 import Data.Traversable (traverse)
-import Data.Validation as V
+import Data.Validation.Semigroup as V
+
+import Partial.Unsafe (unsafePartial)
 
-import Text.Markdown.SlamDown.Syntax as SD
 import Text.Markdown.SlamDown.Parser.Inline as Inline
 import Text.Markdown.SlamDown.Parser.References as Ref
-
-infixr 6 L.Cons as :
-
+import Text.Markdown.SlamDown.Syntax as SD
 
 data Container a
   = CText String
@@ -56,7 +56,7 @@ allChars p = all p <<< S.split ""
 
 removeNonIndentingSpaces ∷ String → String
 removeNonIndentingSpaces s
-  | S.count (isSpace <<< S.fromChar) s < 4 = S.dropWhile (isSpace <<< S.fromChar) s
+  | S.count (isSpace <<< S.singleton) s < 4 = S.dropWhile (isSpace <<< S.singleton) s
   | otherwise = s
 
 isRuleChar ∷ String → Boolean
@@ -74,15 +74,15 @@ isRule s =
 isATXHeader ∷ String → Boolean
 isATXHeader s =
   let
-    level = S.count (\c → S.fromChar c == "#") s
+    level = S.count (\c → S.singleton c == "#") s
     rest = S.drop level s
   in
     level >= 1 && level <= 6 && S.take 1 rest == " "
 
 splitATXHeader ∷ String → { level ∷ Int, contents ∷ String }
 splitATXHeader s =
   let
-    level = S.count (\c → S.fromChar c == "#") s
+    level = S.count (\c → S.singleton c == "#") s
     contents = S.drop (level + 1) s
   in
     { level: level
@@ -117,7 +117,7 @@ splitBlockquote ss =
   blockquoteContents s = S.drop (if S.take 2 s == "> " then 2 else 1) s
 
 countLeadingSpaces ∷ String → Int
-countLeadingSpaces = S.count (isSpace <<< S.fromChar)
+countLeadingSpaces = S.count (isSpace <<< S.singleton)
 
 isBulleted ∷ String → Boolean
 isBulleted s =
@@ -136,7 +136,7 @@ isBulleted s =
 isOrderedListMarker ∷ String → Boolean
 isOrderedListMarker s =
   let
-    n = S.count (isDigit <<< S.fromChar) s
+    n = S.count (isDigit <<< S.singleton) s
     next = S.take 1 (S.drop n s)
     ls = countLeadingSpaces (S.drop (n + 1) s)
   in
@@ -146,14 +146,14 @@ listItemType ∷ String → SD.ListType
 listItemType s
   | isBulleted s = SD.Bullet (S.take 1 s)
   | otherwise =
-      let n = S.count (isDigit <<< S.fromChar) s
+      let n = S.count (isDigit <<< S.singleton) s
       in SD.Ordered (S.take 1 (S.drop n s))
 
 listItemIndent ∷ String → Int
 listItemIndent s
   | isBulleted s = 1 + min 4 (countLeadingSpaces (S.drop 1 s))
   | otherwise =
-      let n = S.count (isDigit <<< S.fromChar) s
+      let n = S.count (isDigit <<< S.singleton) s
       in n + 1 + min 4 (countLeadingSpaces (S.drop (n + 1) s))
 
 isListItemLine ∷ String → Boolean
@@ -207,7 +207,7 @@ splitIndentedChunks ss =
 isCodeFence ∷ String → Boolean
 isCodeFence s = isSimpleFence s || (isEvaluatedCode s && isSimpleFence (S.drop 1 s))
   where
-  isSimpleFence s = S.count (isFenceChar <<< S.fromChar) s >= 3
+  isSimpleFence s = S.count (isFenceChar <<< S.singleton) s >= 3
 
 isEvaluatedCode ∷ String → Boolean
 isEvaluatedCode s = S.take 1 s == "!"
@@ -218,7 +218,7 @@ isFenceChar "`" = true
 isFenceChar _ = false
 
 codeFenceInfo ∷ String → String
-codeFenceInfo = S.trim <<< S.dropWhile (isFenceChar <<< S.fromChar)
+codeFenceInfo = S.trim <<< S.dropWhile (isFenceChar <<< S.singleton)
 
 codeFenceChar ∷ String → String
 codeFenceChar = S.take 1
@@ -240,7 +240,7 @@ splitCodeFence indent fence ss =
     }
   where
   isClosingFence ∷ String → Boolean
-  isClosingFence s = S.count (\c → S.fromChar c == fence) (removeNonIndentingSpaces s) >= 3
+  isClosingFence s = S.count (\c → S.singleton c == fence) (removeNonIndentingSpaces s) >= 3
 
   removeIndentTo ∷ String → String
   removeIndentTo s = S.drop (min indent (countLeadingSpaces s)) s
@@ -289,7 +289,7 @@ parseContainers acc (L.Cons s ss)
   | isLinkReference (removeNonIndentingSpaces s) =
       let
         s1 = removeNonIndentingSpaces s
-        b = Data.Maybe.Unsafe.fromJust $ Ref.parseLinkReference s1
+        b = unsafePartial M.fromJust $ Ref.parseLinkReference s1
       in
         parseContainers (L.Cons (CLinkReference b) acc) ss
   | otherwise = parseContainers (L.Cons (CText s) acc) ss
@@ -372,6 +372,6 @@ tabsToSpaces = S.replace "\t" "    "
 parseMd ∷ ∀ a. (SD.Value a) ⇒ String → Either String (SD.SlamDownP a)
 parseMd s = map SD.SlamDown bs
   where
-    lines = L.toList $ S.split "\n" $ S.replace "\r" "" $ tabsToSpaces s
+    lines = L.fromFoldable $ S.split "\n" $ S.replace "\r" "" $ tabsToSpaces s
     ctrs = parseContainers mempty lines
     bs = parseBlocks ctrs