diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -1,29 +1,49 @@
-# microformats2-parser [](https://hackage.haskell.org/package/microformats2-parser) [](https://travis-ci.org/myfreeweb/microformats2-parser) [](https://coveralls.io/r/myfreeweb/microformats2-parser) [](http://unlicense.org)
+# microformats2-parser [](https://hackage.haskell.org/package/microformats2-parser) [](https://travis-ci.org/myfreeweb/microformats2-parser) [](http://unlicense.org)
-[Microformats 2] parser for Haskell!
+[Microformats 2] parser for Haskell! [#IndieWeb]
-Originally created for [sweetroll] :-)
+Originally created for [sweetroll].
-The types are located in a separate package called [microformats2-types].
+- parses `items`, `rels`, `rel-urls`
+- resolves relative URLs (with support for the `` tag)
+- handles malformed HTML (the actual HTML parser is [tagstream-conduit])
+- high performance
+- extensively tested
+Also check out [http-link-header] because you often need to read links from the Link header!
+
[Microformats 2]: http://microformats.org/wiki/microformats2
+[#IndieWeb]: http://indiewebcamp.com
[sweetroll]: https://github.com/myfreeweb/sweetroll
-[microformats2-types]: https://github.com/myfreeweb/microformats2-types
+[tagstream-conduit]: https://hackage.haskell.org/package/tagstream-conduit
+[http-link-header]: https://github.com/myfreeweb/http-link-header
## [DEMO PAGE](https://unrelenting.technology/mf2/)
## Usage
+Look at the API docs [on Hackage](https://hackage.haskell.org/package/microformats2-parser) for more info, here's a quick overview:
+
```haskell
{-# LANGUAGE OverloadedStrings #-}
+
import Data.Microformats2.Parser
-import Data.Microformats2.Types
+import Data.Default
+import Network.URI
-parseEntry Sanitize $ documentRoot $ parseLBS "
"
```
-Look at the API docs [on Hackage](https://hackage.haskell.org/package/microformats2-parser) for more info.
+The `def` is the [default](https://hackage.haskell.org/package/data-default-class-0.0.1/docs/Data-Default-Class.html) configuration.
+
+The configuration includes:
+- `htmlMode`, an HTML parsing mode (`Unsafe` | `Escape` | **`Sanitize`**)
+- `baseUri`, the `Maybe URI` that represents the address you retrieved the HTML from, used for resolving relative addresses -- you should set it
+
+`parseMf2` will return an Aeson [Value](https://hackage.haskell.org/package/aeson-0.8.0.2/docs/Data-Aeson-Types.html#t:Value) structured like [canonical microformats2 JSON](http://microformats.org/wiki/microformats2).
+[lens-aeson](https://hackage.haskell.org/package/lens-aeson) is a good way to navigate it.
## Development
diff --git a/executable/Main.hs b/executable/Main.hs
--- a/executable/Main.hs
+++ b/executable/Main.hs
@@ -7,14 +7,19 @@
import Data.Microformats2.Parser
import Data.List
import Data.Maybe (fromMaybe)
+import Data.Aeson.Encode.Pretty
+import Data.Aeson.Types (object)
+import Data.Default
import qualified Data.Text.Lazy as TL
import Data.Streaming.Network (bindPath)
import qualified Data.Stringable as S
import Network.Wai.Handler.Warp
import qualified Network.Wai.Handler.CGI as CGI
+import Network.Wai.Middleware.Autohead
import qualified Network.Socket as S
+import Network.URI (parseURI)
import Web.Scotty
-import Text.Blaze.Html5 as H
+import Text.Blaze.Html5 as H hiding (main, param, object)
import Text.Blaze.Html5.Attributes as A
import Text.Blaze.Html.Renderer.Utf8 (renderHtml)
import qualified Options as O
@@ -33,52 +38,56 @@
exampleValue = "
|] `shouldBe` Just "This is text content without any stuff."
+
+ describe "getInnerTextWithImgs" $ do
+ it "returns textContent with handling imgs" $ do
+ let txtraw = getInnerTextWithImgs . documentRoot . parseLBS
+ txtraw [xml|
|] `shouldBe` Just "This is text content with an alt and-src."
diff --git a/test-suite/Data/Microformats2/Parser/InternalSpec.hs b/test-suite/Data/Microformats2/Parser/InternalSpec.hs
deleted file mode 100644
--- a/test-suite/Data/Microformats2/Parser/InternalSpec.hs
+++ /dev/null
@@ -1,97 +0,0 @@
-{-# LANGUAGE OverloadedStrings, UnicodeSyntax, QuasiQuotes, CPP #-}
-
-module Data.Microformats2.Parser.InternalSpec (spec) where
-
-import Test.Hspec
-import TestCommon
-import Text.HTML.DOM
-import Text.XML.Lens (documentRoot)
-import Data.Microformats2.Parser.Internal
-#if __GLASGOW_HASKELL__ < 709
-import Control.Applicative
-#endif
-
-{-# ANN module ("HLint: ignore Redundant do"::String) #-}
-
-spec ∷ Spec
-spec = do
- describe "extractProperty" $ do
- it "parses p- properties" $ do
- let nm = extractProperty P "name" . documentRoot . parseLBS
- nm [xml|
Hello Basic|] `shouldBe` pure "Hello Basic"
- nm [xml|
Hello Nested|] `shouldBe` pure "Hello Nested"
- nm [xml|
HA|] `shouldBe` pure "Hello Abbr"
- nm [xml|
HA|] `shouldBe` pure "HA"
- nm [xml|
|] `shouldBe` pure "Hello Data"
- nm [xml|
|] `shouldBe` pure "Hello Input"
- nm [xml|
|] `shouldBe` pure "Hello Img"
- nm [xml|
|] `shouldBe` pure "Hello Area"
- nm [xml|
ignore Hello|] `shouldBe` pure "HelloValuePattern"
- nm [xml|
ignore HiValue-Title|] `shouldBe` pure "HelloValue-Title"
- nm [xml|
Hello |] `shouldBe` pure "Hello Span With Img"
- nm [xml|
Hello
- nope|] `shouldBe` pure "Hello Span With Img&& Value Title"
-
- it "parses u- properties" $ do
- let ur = extractProperty U "url" . documentRoot . parseLBS
- ur [xml|
without any stuff.
+ 
|] `shouldBe` pure "HelloValuePattern"
- nm [xml|
|] `shouldBe` pure "/yo/img"
- ur [xml|
|] `shouldBe` pure "selfie.png"
- ph [xml|