Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
- run: opam exec -- make

# Tests on Windows are disabled because of a difference in ppx_expect
# output. See https://github.com/aantron/dream/pull/282. This difference
# output. See https://github.com/camlworks/dream/pull/282. This difference
# remains as of ppx_expect 0.16.
- run: opam exec -- make test
if: runner.os != 'Windows'
Expand Down Expand Up @@ -110,7 +110,7 @@ jobs:
touch output
tail -f output | grep --line-buffered 'Ctrl' | xargs -L1 -I FOO bash -c "echo Success && touch success && killall middleware.exe" &
tail -f output &
((curl -fsSL https://raw.githubusercontent.com/aantron/dream/$GITHUB_SHA/example/quickstart.sh | bash -s $GITHUB_SHA) || true) > output 2>&1
((curl -fsSL https://raw.githubusercontent.com/camlworks/dream/$GITHUB_SHA/example/quickstart.sh | bash -s $GITHUB_SHA) || true) > output 2>&1
sleep 1
if [ -f success ]
then
Expand Down
98 changes: 49 additions & 49 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ Easy-to-use, feature-complete Web framework without boilerplate.

<p align="center">
<img
src="https://raw.githubusercontent.com/aantron/dream/master/docs/asset/sample.png"
src="https://raw.githubusercontent.com/camlworks/dream/master/docs/asset/sample.png"
alt="Source code of minimal app using the Dream Web framework for OCaml">
</p>

<p align="center">
<a href="#quick-start">Quick Start</a> |
<a href="https://github.com/aantron/dream/tree/master/example#readme">
<a href="https://github.com/camlworks/dream/tree/master/example#readme">
Tutorial</a> |
<a href="https://aantron.github.io/dream/">Reference</a>
<a href="https://camlworks.github.io/dream/">Reference</a>
&nbsp;&nbsp;
</p>

Expand Down Expand Up @@ -79,43 +79,43 @@ Dream binary][one-binary], or use Dream in a subcommand. Dream tries to be as
functional as possible, touching global runtime state only lazily, when called
into.

[https]: https://github.com/aantron/dream/tree/master/example/l-https#folders-and-files
[websocket]: https://github.com/aantron/dream/tree/master/example/k-websocket#folders-and-files
[graphql]: https://github.com/aantron/dream/tree/master/example/w-graphql-subscription#folders-and-files
[templates]: https://github.com/aantron/dream/tree/master/example/7-template#folders-and-files
[reason-templates]: https://github.com/aantron/dream/tree/master/example/r-template#folders-and-files
[middleware]: https://github.com/aantron/dream/tree/master/example/2-middleware#folders-and-files
[handler]: https://aantron.github.io/dream/#type-handler
[routing]: https://github.com/aantron/dream/tree/master/example/3-router#folders-and-files
[cookies]: https://aantron.github.io/dream/#cookies
[forms]: https://aantron.github.io/dream/#forms
[sessions]: https://github.com/aantron/dream/tree/master/example/b-session#folders-and-files
[back-ends]: https://aantron.github.io/dream/#back-ends
[errors]: https://github.com/aantron/dream/tree/master/example/9-error#folders-and-files
[crypto]: https://aantron.github.io/dream/#cryptography
[logging]: https://github.com/aantron/dream/tree/master/example/2-middleware#folders-and-files
[melange]: https://github.com/aantron/dream/tree/master/example/r-fullstack-melange#folders-and-files
[rescript]: https://github.com/aantron/dream/tree/master/example/w-fullstack-rescript#folders-and-files
[jsoo]: https://github.com/aantron/dream/tree/master/example/w-fullstack-jsoo#folders-and-files
[types]: https://aantron.github.io/dream/#types
[basic-read]: https://aantron.github.io/dream/#val-body
[streaming]: https://aantron.github.io/dream/#streaming
[raw]: https://aantron.github.io/dream/#builtin
[https]: https://github.com/camlworks/dream/tree/master/example/l-https#folders-and-files
[websocket]: https://github.com/camlworks/dream/tree/master/example/k-websocket#folders-and-files
[graphql]: https://github.com/camlworks/dream/tree/master/example/w-graphql-subscription#folders-and-files
[templates]: https://github.com/camlworks/dream/tree/master/example/7-template#folders-and-files
[reason-templates]: https://github.com/camlworks/dream/tree/master/example/r-template#folders-and-files
[middleware]: https://github.com/camlworks/dream/tree/master/example/2-middleware#folders-and-files
[handler]: https://camlworks.github.io/dream/#type-handler
[routing]: https://github.com/camlworks/dream/tree/master/example/3-router#folders-and-files
[cookies]: https://camlworks.github.io/dream/#cookies
[forms]: https://camlworks.github.io/dream/#forms
[sessions]: https://github.com/camlworks/dream/tree/master/example/b-session#folders-and-files
[back-ends]: https://camlworks.github.io/dream/#back-ends
[errors]: https://github.com/camlworks/dream/tree/master/example/9-error#folders-and-files
[crypto]: https://camlworks.github.io/dream/#cryptography
[logging]: https://github.com/camlworks/dream/tree/master/example/2-middleware#folders-and-files
[melange]: https://github.com/camlworks/dream/tree/master/example/r-fullstack-melange#folders-and-files
[rescript]: https://github.com/camlworks/dream/tree/master/example/w-fullstack-rescript#folders-and-files
[jsoo]: https://github.com/camlworks/dream/tree/master/example/w-fullstack-jsoo#folders-and-files
[types]: https://camlworks.github.io/dream/#types
[basic-read]: https://camlworks.github.io/dream/#val-body
[streaming]: https://camlworks.github.io/dream/#streaming
[raw]: https://camlworks.github.io/dream/#builtin
[alpn]: https://en.wikipedia.org/wiki/Application-Layer_Protocol_Negotiation
[libs]: https://github.com/aantron/dream/tree/master/src
[deploy]: https://github.com/aantron/dream/tree/master/example#deploying
[jsx]: https://github.com/aantron/dream/tree/master/example/r-tyxml#folders-and-files
[one-binary]: https://github.com/aantron/dream/tree/master/example/w-one-binary#folders-and-files
[libs]: https://github.com/camlworks/dream/tree/master/src
[deploy]: https://github.com/camlworks/dream/tree/master/example#deploying
[jsx]: https://github.com/camlworks/dream/tree/master/example/r-tyxml#folders-and-files
[one-binary]: https://github.com/camlworks/dream/tree/master/example/w-one-binary#folders-and-files

<br>

## Quick start

You can get
[one](https://github.com/aantron/dream/tree/master/example/2-middleware#folders-and-files)
[one](https://github.com/camlworks/dream/tree/master/example/2-middleware#folders-and-files)
of the first [tutorials][tutorial] and build it locally with:

<pre><b>bash -c "$(curl -fsSL https://raw.githubusercontent.com/aantron/dream/master/example/quickstart.sh)"</b></pre>
<pre><b>bash -c "$(curl -fsSL https://raw.githubusercontent.com/camlworks/dream/master/example/quickstart.sh)"</b></pre>

### opam

Expand All @@ -141,16 +141,16 @@ After that, go to any of the [examples][tutorial], such as
dune exec ./middleware.exe
```

[esy-example]: https://github.com/aantron/dream/tree/master/example/w-esy#folders-and-files
[quickstart.sh]: https://github.com/aantron/dream/blob/master/example/quickstart.sh
[esy-example]: https://github.com/camlworks/dream/tree/master/example/w-esy#folders-and-files
[quickstart.sh]: https://github.com/camlworks/dream/blob/master/example/quickstart.sh
[esy]: https://esy.sh/
[2-middleware]: https://github.com/aantron/dream/tree/master/example/2-middleware#folders-and-files
[2-middleware]: https://github.com/camlworks/dream/tree/master/example/2-middleware#folders-and-files

## esy

Visit any of the [examples][tutorial], such as
[**`2-middleware`**][2-middleware], and re-create the files locally. The file
[`esy.json`](https://github.com/aantron/dream/blob/master/example/2-middleware/esy.json)
[`esy.json`](https://github.com/camlworks/dream/blob/master/example/2-middleware/esy.json)
shows how to depend on Dream. All of the examples are installed by running `npx
esy`, and started with `npx esy start`.

Expand All @@ -173,16 +173,16 @@ esy`, and started with `npx esy start`.
- [**API reference**][api-main]
- [Watching][watch] and [live reloading][reload].

[tutorial]: https://github.com/aantron/dream/tree/master/example#readme
[examples]: https://github.com/aantron/dream/tree/master/example#examples
[1-hello]: https://github.com/aantron/dream/tree/master/example/1-hello#folders-and-files
[r-hello]: https://github.com/aantron/dream/tree/master/example/r-hello#folders-and-files
[reason-examples]: https://github.com/aantron/dream/tree/master/example#reason
[deploying]: https://github.com/aantron/dream/tree/master/example#deploying
[api-main]: https://aantron.github.io/dream/#types
[fullstack]: https://github.com/aantron/dream/tree/master/example#full-stack
[watch]: https://github.com/aantron/dream/tree/master/example/w-watch#folders-and-files
[reload]: https://github.com/aantron/dream/tree/master/example/w-live-reload#folders-and-files
[tutorial]: https://github.com/camlworks/dream/tree/master/example#readme
[examples]: https://github.com/camlworks/dream/tree/master/example#examples
[1-hello]: https://github.com/camlworks/dream/tree/master/example/1-hello#folders-and-files
[r-hello]: https://github.com/camlworks/dream/tree/master/example/r-hello#folders-and-files
[reason-examples]: https://github.com/camlworks/dream/tree/master/example#reason
[deploying]: https://github.com/camlworks/dream/tree/master/example#deploying
[api-main]: https://camlworks.github.io/dream/#types
[fullstack]: https://github.com/camlworks/dream/tree/master/example#full-stack
[watch]: https://github.com/camlworks/dream/tree/master/example/w-watch#folders-and-files
[reload]: https://github.com/camlworks/dream/tree/master/example/w-live-reload#folders-and-files

<br>

Expand Down Expand Up @@ -215,7 +215,7 @@ esy`, and started with `npx esy start`.

## Contact

Apart from the [issues](https://github.com/aantron/dream/issues), good places
Apart from the [issues](https://github.com/camlworks/dream/issues), good places
to discuss Dream are...

- #dream on the [Reason Discord](https://discord.gg/2JTYRq2rYh).
Expand All @@ -232,7 +232,7 @@ Highlight `@antron` to poke @aantron specifically.
All kinds of contributions are welcome, including examples, links to blogs,
related libraries, and, of course, PRs! See [CONTRIBUTING.md][contributing.md].

[contributing.md]: https://github.com/aantron/dream/blob/master/docs/CONTRIBUTING.md
[contributing.md]: https://github.com/camlworks/dream/blob/master/docs/CONTRIBUTING.md

<br>

Expand Down Expand Up @@ -261,9 +261,9 @@ several influences that cannot be discovered directly:
[komar]: https://github.com/apsheronets
[eot]: https://github.com/EmileTrotignon/embedded_ocaml_templates
[trotignon]: https://github.com/EmileTrotignon
[opamfile]: https://github.com/aantron/dream/blob/master/dream.opam
[opamfile]: https://github.com/camlworks/dream/blob/master/dream.opam
[opium]: https://github.com/rgrinberg/opium
[vendor]: https://github.com/aantron/dream/tree/master/src/vendor
[vendor]: https://github.com/camlworks/dream/tree/master/src/vendor
[rgrinberg]: https://github.com/rgrinberg
[anmonteiro]: https://github.com/anmonteiro
[soupault]: https://github.com/dmbaturin/soupault
Expand Down
14 changes: 7 additions & 7 deletions docs/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

Contributions are very welcome. This includes not only code PRs, but also:

- [Examples](https://github.com/aantron/dream/tree/master/example#readme)
- [Docs fixes](https://aantron.github.io/dream/)
- [Bug reports](https://github.com/aantron/dream/issues)
- Links to [blogs](https://github.com/aantron/dream#example-repositories)
- [Examples](https://github.com/camlworks/dream/tree/master/example#readme)
- [Docs fixes](https://camlworks.github.io/dream/)
- [Bug reports](https://github.com/camlworks/dream/issues)
- Links to [blogs](https://github.com/camlworks/dream#example-repositories)
&mdash; different people benefit from different presentations!
- Links to projects that use Dream &mdash; to serve as large examples
- Links to [libraries](https://github.com/aantron/dream#recommended-projects)
- Links to [libraries](https://github.com/camlworks/dream#recommended-projects)
to use with Dream
- And more!

Expand All @@ -35,7 +35,7 @@ npx esy ls-builds
If you'd like to contribute code, clone the repository with

```
git clone https://github.com/aantron/dream.git
git clone https://github.com/camlworks/dream.git
cd dream
```

Expand Down Expand Up @@ -133,7 +133,7 @@ dependency.
## Docs

To build the docs, go to
[`docs/web/`](https://github.com/aantron/dream/tree/master/docs/web) and run
[`docs/web/`](https://github.com/camlworks/dream/tree/master/docs/web) and run

```
make deps
Expand Down
2 changes: 1 addition & 1 deletion docs/web/postprocess/common.ml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
(* This file is part of Dream, released under the MIT license. See LICENSE.md
for details, or visit https://github.com/aantron/dream.
for details, or visit https://github.com/camlworks/dream.

Copyright 2021 Anton Bachin *)

Expand Down
2 changes: 1 addition & 1 deletion docs/web/postprocess/index.ml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
(* This file is part of Dream, released under the MIT license. See LICENSE.md
for details, or visit https://github.com/aantron/dream.
for details, or visit https://github.com/camlworks/dream.

Copyright 2021 Anton Bachin *)

Expand Down
2 changes: 1 addition & 1 deletion docs/web/site/docs.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* This file is part of Dream, released under the MIT license. See
LICENSE.md for details, or visit https://github.com/aantron/dream.
LICENSE.md for details, or visit https://github.com/camlworks/dream.

Copyright 2021 Anton Bachin */

Expand Down
2 changes: 1 addition & 1 deletion docs/web/site/docs.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// This file is part of Dream, released under the MIT license. See LICENSE.md
// for details, or visit https://github.com/aantron/dream.
// for details, or visit https://github.com/camlworks/dream.
//
// Copyright 2021 Anton Bachin *)

Expand Down
14 changes: 7 additions & 7 deletions docs/web/templates/index.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!-- This file is part of Dream, released under the MIT license. See LICENSE.md
for details, or visit https://github.com/aantron/dream.
for details, or visit https://github.com/camlworks/dream.

Copyright 2021 Anton Bachin -->

Expand Down Expand Up @@ -38,8 +38,8 @@ <h6>Tidy Web framework for OCaml and ReasonML</h6>
<ul>
<li><code>1.0.0~alpha7</code></li>
<li><code>opam install dream</code></li>
<li><a target="_blank" rel="noreferrer noopener" href="https://github.com/aantron/dream">GitHub</a></li>
<li><a target="_blank" rel="noreferrer noopener" href="https://github.com/aantron/dream/edit/master/src/dream.mli">Edit these docs</a></li>
<li><a target="_blank" rel="noreferrer noopener" href="https://github.com/camlworks/dream">GitHub</a></li>
<li><a target="_blank" rel="noreferrer noopener" href="https://github.com/camlworks/dream/edit/master/src/dream.mli">Edit these docs</a></li>
</ul>

<div class="toolbar">
Expand Down Expand Up @@ -121,13 +121,13 @@ <h6>Tidy Web framework for OCaml and ReasonML</h6>

<ul>
<li>
A <a target="_blank" rel="noreferrer noopener" href="https://github.com/aantron/dream/tree/master/example#readme">
A <a target="_blank" rel="noreferrer noopener" href="https://github.com/camlworks/dream/tree/master/example#readme">
Tutorial</a> &mdash; get started at
<a target="_blank" rel="noreferrer noopener" href="https://github.com/aantron/dream/tree/master/example/1-hello#folders-and-files">
<a target="_blank" rel="noreferrer noopener" href="https://github.com/camlworks/dream/tree/master/example/1-hello#folders-and-files">
<code>1-hello</code></a>!
</li>
<li>
Many <a target="_blank" rel="noreferrer noopener" href="https://github.com/aantron/dream/tree/master/example#reason">
Many <a target="_blank" rel="noreferrer noopener" href="https://github.com/camlworks/dream/tree/master/example#reason">
Examples</a>, covering all kinds of scenarios.
</li>
</ul>
Expand All @@ -141,7 +141,7 @@ <h6>Tidy Web framework for OCaml and ReasonML</h6>
Copyright © 2021-2024 Anton Bachin.
<br>
Released under the MIT license. See
<a href="https://github.com/aantron/dream/blob/master/LICENSE.md">
<a href="https://github.com/camlworks/dream/blob/master/LICENSE.md">
LICENSE.md
</a>
</footer>
Expand Down
8 changes: 4 additions & 4 deletions dream-httpaf.opam
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ synopsis: "Internal: shared http/af stack for Dream (server) and Hyper (client)"
description: "This package does not have a stable API."

license: "MIT"
homepage: "https://github.com/aantron/dream"
doc: "https://aantron.github.io/dream"
bug-reports: "https://github.com/aantron/dream/issues"
dev-repo: "git+https://github.com/aantron/dream.git"
homepage: "https://github.com/camlworks/dream"
doc: "https://camlworks.github.io/dream"
bug-reports: "https://github.com/camlworks/dream/issues"
dev-repo: "git+https://github.com/camlworks/dream.git"

author: "Anton Bachin <antonbachin@yahoo.com>"
maintainer: "Anton Bachin <antonbachin@yahoo.com>"
Expand Down
8 changes: 4 additions & 4 deletions dream-mirage.opam
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ Security topics are introduced throughout, wherever they are
applicable."""

license: "MIT"
homepage: "https://github.com/aantron/dream"
doc: "https://aantron.github.io/dream"
bug-reports: "https://github.com/aantron/dream/issues"
dev-repo: "git+https://github.com/aantron/dream.git"
homepage: "https://github.com/camlworks/dream"
doc: "https://camlworks.github.io/dream"
bug-reports: "https://github.com/camlworks/dream/issues"
dev-repo: "git+https://github.com/camlworks/dream.git"

author: "Anton Bachin <antonbachin@yahoo.com>"
maintainer: "Anton Bachin <antonbachin@yahoo.com>"
Expand Down
8 changes: 4 additions & 4 deletions dream-pure.opam
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ synopsis: "Internal: shared HTTP types for Dream (server) and Hyper (client)"
description: "This package does not have a stable API."

license: "MIT"
homepage: "https://github.com/aantron/dream"
doc: "https://aantron.github.io/dream"
bug-reports: "https://github.com/aantron/dream/issues"
dev-repo: "git+https://github.com/aantron/dream.git"
homepage: "https://github.com/camlworks/dream"
doc: "https://camlworks.github.io/dream"
bug-reports: "https://github.com/camlworks/dream/issues"
dev-repo: "git+https://github.com/camlworks/dream.git"

author: "Anton Bachin <antonbachin@yahoo.com>"
maintainer: "Anton Bachin <antonbachin@yahoo.com>"
Expand Down
8 changes: 4 additions & 4 deletions dream.opam
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ Security topics are introduced throughout, wherever they are
applicable."""

license: "MIT"
homepage: "https://github.com/aantron/dream"
doc: "https://aantron.github.io/dream"
bug-reports: "https://github.com/aantron/dream/issues"
dev-repo: "git+https://github.com/aantron/dream.git"
homepage: "https://github.com/camlworks/dream"
doc: "https://camlworks.github.io/dream"
bug-reports: "https://github.com/camlworks/dream/issues"
dev-repo: "git+https://github.com/camlworks/dream.git"

author: "Anton Bachin <antonbachin@yahoo.com>"
maintainer: "Anton Bachin <antonbachin@yahoo.com>"
Expand Down
4 changes: 2 additions & 2 deletions example/1-hello/1-hello.opam
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ depends: [
]

synopsis: "One of the Dream examples"
homepage: "https://github.com/aantron/dream"
bug-reports: "https://github.com/aantron/dream/issues"
homepage: "https://github.com/camlworks/dream"
bug-reports: "https://github.com/camlworks/dream/issues"
author: "Anton Bachin <antonbachin@yahoo.com>"
license: "MIT"
maintainer: "Anton Bachin <antonbachin@yahoo.com>"
4 changes: 2 additions & 2 deletions example/2-middleware/2-middleware.opam
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ depends: [
]

synopsis: "One of the Dream examples"
homepage: "https://github.com/aantron/dream"
bug-reports: "https://github.com/aantron/dream/issues"
homepage: "https://github.com/camlworks/dream"
bug-reports: "https://github.com/camlworks/dream/issues"
author: "Anton Bachin <antonbachin@yahoo.com>"
license: "MIT"
maintainer: "Anton Bachin <antonbachin@yahoo.com>"
Loading
Loading