summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfozworth <>2015-04-14 13:18:00 (GMT)
committerhdiff <hdiff@hdiff.luite.com>2015-04-14 13:18:00 (GMT)
commit809f92cf71e6c6f7d04a879479c253453cf366b3 (patch)
treeb81430c3ada546cc73e35914b07e4e588125b701
parenteb6a85477e3c07b3435be2393188028381370926 (diff)
version 1.0.11.0.1
-rw-r--r--CHANGELOG.md5
-rw-r--r--README.md8
-rw-r--r--blunt.cabal9
-rw-r--r--library/Blunt.hs9
-rw-r--r--library/Blunt/Markup.hs2
5 files changed, 23 insertions, 10 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 54a7c70..4660edf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
# Change log
+## v1.0.1 (2015-04-14)
+
+- Fixed HTML entities.
+- Improved SEO.
+
## v1.0.0 (2015-04-11)
- Removed input from WebSocket response.
diff --git a/README.md b/README.md
index 359c9d3..1567852 100644
--- a/README.md
+++ b/README.md
@@ -9,8 +9,8 @@
</p>
<p align="center">
- <a href="https://hackage.haskell.org/package/blunt"><img alt="Version" src="https://img.shields.io/hackage/v/blunt.svg?label=version&style=flat-square"></a>
- <a href="http://packdeps.haskellers.com/feed?needle=blunt"><img alt="Dependencies" src="https://img.shields.io/hackage-deps/v/blunt.svg?label=dependencies&style=flat-square"></a>
+ <a href="https://hackage.haskell.org/package/blunt"><img alt="Version" src="https://img.shields.io/hackage/v/blunt.svg?label=version&amp;style=flat-square"></a>
+ <a href="http://packdeps.haskellers.com/feed?needle=blunt"><img alt="Dependencies" src="https://img.shields.io/hackage-deps/v/blunt.svg?label=dependencies&amp;style=flat-square"></a>
</p>
<hr>
@@ -45,7 +45,9 @@ $ cd blunt
$ cabal sandbox init
$ cabal install happy
-$ cabal install
+$ cabal install --only-dependencies
+$ cabal run
+# http://localhost:8080
```
## Deploy
diff --git a/blunt.cabal b/blunt.cabal
index 461dcfd..da48dd7 100644
--- a/blunt.cabal
+++ b/blunt.cabal
@@ -1,5 +1,5 @@
name: blunt
-version: 1.0.0
+version: 1.0.1
cabal-version: >=1.10
build-type: Simple
license: MIT
@@ -7,9 +7,12 @@ license-file: LICENSE.md
maintainer: Taylor Fausak <taylor@fausak.me>
homepage: https://blunt.herokuapp.com
bug-reports: https://github.com/tfausak/blunt/issues
-synopsis: Point-free Haskell as a service.
+synopsis: Convert between pointfree and pointful expressions.
description:
- <https://github.com/tfausak/blunt>
+ Blunt is a web front end to the pointfree and pointful libraries. While you
+ can install and run it locally, there's no real reason to prefer it over
+ the @pointfree@ and @pointful@ executables. Instead, use the hosted
+ version: <https://blunt.herokuapp.com>.
category: Web
extra-source-files:
CHANGELOG.md
diff --git a/library/Blunt.hs b/library/Blunt.hs
index 769363d..f09fbb1 100644
--- a/library/Blunt.hs
+++ b/library/Blunt.hs
@@ -31,14 +31,17 @@ ws :: ServerApp
ws pending = do
connection <- acceptRequest pending
forkPingThread connection 30
- forever <| do
+ forever (app connection)
+ where
+ app connection = do
message <- receiveData connection
result <- convert message
sendTextData connection (encode result)
http :: Application
-http = logStdout .> gzip def <| \ request respond ->
- respond <| case (requestMethod request, pathInfo request) of
+http = (\ request -> apply (app request)) |> logStdout .> gzip def
+ where
+ app request = case (requestMethod request, pathInfo request) of
("GET", []) -> responseLBS status headers body where
status = ok200
headers = [("Content-Type", "text/html; charset=utf-8")]
diff --git a/library/Blunt/Markup.hs b/library/Blunt/Markup.hs
index e8d082a..2c3afb1 100644
--- a/library/Blunt/Markup.hs
+++ b/library/Blunt/Markup.hs
@@ -20,7 +20,7 @@ html = doctypehtml_ <| do
, content_ "initial-scale = 1, maximum-scale = 1, minimum-scale = 1, width = device-width"
]
- title_ "Blunt"
+ title_ "Blunt \183 Online Haskell pointfree converter"
style_ [] style