z

.gitignore

@@ -18,3 +18,6 @@ w_dev
 *.os
 *.o
 .sconsign.dblite
+site
+*.pyc
+wayward_synth.plugin

.gitmodules

@@ -3,4 +3,4 @@
 	url = https://github.com/simonask/libevhtp.git
 [submodule "3rdparty/synth"]
   path = 3rdparty/synth
-  url = https://github.com/ajg/synth.git
+  url = https://github.com/simonask/synth.git

SConstruct

@@ -2,13 +2,15 @@ from wayward_build import *
 import os
 
 wayward_support_sources = Split("""
+  wayward/support/any.cpp
+  wayward/support/benchmark.cpp
   wayward/support/format.cpp
   wayward/support/uri.cpp
-  wayward/support/node.cpp
   wayward/support/json.cpp
   wayward/support/datetime/datetime.cpp
   wayward/support/datetime/clock.cpp
   wayward/support/datetime/interval.cpp
+  wayward/support/datetime/type.cpp
   wayward/support/logger.cpp
   wayward/support/error.cpp
   wayward/support/command_line_options.cpp
@@ -17,42 +19,156 @@ wayward_support_sources = Split("""
   wayward/support/http.cpp
   wayward/support/teamwork.cpp
   wayward/support/plugin.cpp
-  wayward/support/mutable_node.cpp
+  wayward/support/data_franca/spectator.cpp
+  wayward/support/data_franca/mutator.cpp
+  wayward/support/data_franca/object.cpp
+  wayward/support/string.cpp
+  wayward/support/types.cpp
   3rdparty/libevhtp/evhtp.c
   3rdparty/libevhtp/htparse/htparse.c
   3rdparty/libevhtp/evthr/evthr.c
   """)
 
+wayward_support_headers = Split("""
+  wayward/support/uri.hpp
+  wayward/support/types.hpp
+  wayward/support/type_info.hpp
+  wayward/support/type.hpp
+  wayward/support/thread_local.hpp
+  wayward/support/teamwork.hpp
+  wayward/support/string.hpp
+  wayward/support/result.hpp
+  wayward/support/plugin.hpp
+  wayward/support/options.hpp
+  wayward/support/monad.hpp
+  wayward/support/meta.hpp
+  wayward/support/maybe.hpp
+  wayward/support/logger.hpp
+  wayward/support/json.hpp
+  wayward/support/intrusive_list.hpp
+  wayward/support/http.hpp
+  wayward/support/format.hpp
+  wayward/support/fiber.hpp
+  wayward/support/event_loop.hpp
+  wayward/support/error.hpp
+  wayward/support/either.hpp
+  wayward/support/datetime.hpp
+  wayward/support/data_visitor.hpp
+  wayward/support/data_franca.hpp
+  wayward/support/command_line_options.hpp
+  wayward/support/cloning_ptr.hpp
+  wayward/support/bitflags.hpp
+  wayward/support/benchmark.hpp
+  wayward/support/any.hpp
+  wayward/support/data_franca/adapter.hpp
+  wayward/support/data_franca/adapters.hpp
+  wayward/support/data_franca/mutator.hpp
+  wayward/support/data_franca/node.hpp
+  wayward/support/data_franca/object.hpp
+  wayward/support/data_franca/reader.hpp
+  wayward/support/data_franca/spectator.hpp
+  wayward/support/data_franca/types.hpp
+  wayward/support/data_franca/writer.hpp
+  wayward/support/datetime/clock.hpp
+  wayward/support/datetime/datetime.hpp
+  wayward/support/datetime/duration_units.hpp
+  wayward/support/datetime/interval.hpp
+  wayward/support/datetime/timezone.hpp
+  wayward/support/datetime/type.hpp
+  """)
+
 wayward_sources = Split("""
   wayward/app.cpp
   wayward/render.cpp
   wayward/log.cpp
   wayward/template_engine.cpp
+  wayward/respond_to.cpp
+  wayward/content_type.cpp
+  """)
+
+wayward_headers = Split("""
+  wayward/content_type.hpp
+  wayward/respond_to.hpp
+  wayward/routes.hpp
+  wayward/session.hpp
+  wayward/template_engine.hpp
+  wayward/w.hpp
+  w
   """)
 
 w_util_sources = Split("""
   w_util/server.cpp
   w_util/recompiler.cpp
   w_util/main.cpp
+  w_util/init.cpp
   """)
 
 wayward_testing_sources = Split("""
   wayward/testing/time_machine.cpp
   """)
 
+wayward_testing_headers = Split("""
+  wayward/testing/time_machine.hpp
+  """)
+
 persistence_sources = Split("""
   persistence/connection_provider.cpp
   persistence/connection_retainer.cpp
   persistence/adapter.cpp
   persistence/data_store.cpp
   persistence/connection_pool.cpp
   persistence/p.cpp
-  persistence/postgresql.cpp
-  persistence/postgresql_renderers.cpp
+  persistence/adapters/postgresql/connection.cpp
+  persistence/adapters/postgresql/renderers.cpp
   persistence/primary_key.cpp
   persistence/relational_algebra.cpp
-  persistence/types.cpp
-  persistence/datetime.cpp
+  persistence/insert.cpp
+  persistence/property.cpp
+  persistence/data_as_literal.cpp
+  persistence/projection.cpp
+  persistence/column.cpp
+  persistence/assign_attributes.cpp
+  """)
+
+persistence_headers = Split("""
+  persistence/adapters/postgresql/connection.hpp
+  persistence/adapters/postgresql/renderers.hpp
+  persistence/adapter.hpp
+  persistence/assign_attributes.hpp
+  persistence/association.hpp
+  persistence/ast.hpp
+  persistence/belongs_to.hpp
+  persistence/column.hpp
+  persistence/column_abilities.hpp
+  persistence/column_traits.hpp
+  persistence/connection.hpp
+  persistence/connection_pool.hpp
+  persistence/connection_provider.hpp
+  persistence/connection_retainer.hpp
+  persistence/context.hpp
+  persistence/create.hpp
+  persistence/data_as_literal.hpp
+  persistence/data_store.hpp
+  persistence/datetime.hpp
+  persistence/destroy.hpp
+  persistence/has_many.hpp
+  persistence/has_one.hpp
+  persistence/insert.hpp
+  persistence/p.hpp
+  persistence/persistence_macro.hpp
+  persistence/primary_key.hpp
+  persistence/projection.hpp
+  persistence/projection_as_structured_data.hpp
+  persistence/property.hpp
+  persistence/record.hpp
+  persistence/record_as_structured_data.hpp
+  persistence/record_ptr.hpp
+  persistence/record_type.hpp
+  persistence/record_type_builder.hpp
+  persistence/relational_algebra.hpp
+  persistence/result_set.hpp
+  persistence/validation_errors.hpp
+  p
   """)
 
 wayward_synth_sources = Split("""
@@ -61,14 +177,14 @@ wayward_synth_sources = Split("""
 
 env = WaywardEnvironment(DefaultEnvironment())
 
-wayward_support = WaywardLibrary(env, 'wayward_support', wayward_support_sources)
+wayward_support = WaywardLibrary(env, 'wayward_support', wayward_support_sources, wayward_support_headers)
 env_with_ws = env.Clone()
 env_with_ws.Append(LIBS = [wayward_support])
-wayward         = WaywardLibrary(env_with_ws, 'wayward', wayward_sources)
-wayward_testing = WaywardLibrary(env_with_ws, 'wayward_testing', wayward_testing_sources)
+wayward         = WaywardLibrary(env_with_ws, 'wayward', wayward_sources, wayward_headers)
+wayward_testing = WaywardLibrary(env_with_ws, 'wayward_testing', wayward_testing_sources, wayward_headers)
 
 env_for_synth = env.Clone()
-env_for_synth.Append(CPPPATH = Split('3rdparty/synth'))
+env_for_synth.Append(CPPPATH = Split('3rdparty/synth 3rdparty/synth/external/boost'))
 wayward_synth   = WaywardPlugin(env_for_synth, 'wayward_synth', wayward_synth_sources)
 
 if platform.system() == 'Linux':
@@ -79,13 +195,15 @@ else:
 
 persistence_env.Append(CCFLAGS = Split(libpq_cflags))
 persistence_env.Append(LINKFLAGS = Split(libpq_libs))
-persistence = WaywardLibrary(persistence_env, 'persistence', persistence_sources)
+persistence = WaywardLibrary(persistence_env, 'persistence', persistence_sources, persistence_headers)
 
 WaywardAddDefaultLibraries([wayward, persistence, wayward_support])
 
 w_dev = WaywardProgram(env_with_ws, 'w_dev', w_util_sources, rpaths = ['.'])
 
-Export('env', 'wayward', 'wayward_support', 'persistence', 'wayward_testing', 'WaywardProgram', 'WaywardLibrary', 'WaywardEnvironment')
+env.Alias('install', ['install-bin', 'install-lib', 'install-inc'])
+
+Export('env', 'wayward', 'wayward_support', 'persistence', 'wayward_testing', 'WaywardProgram', 'WaywardInternalProgram', 'WaywardLibrary', 'WaywardEnvironment')
 
 build_tests = ARGUMENTS.get('build_tests', 'yes')
 if build_tests == 'yes':

TODO.md

@@ -13,8 +13,6 @@ Persistence
 Wayward
 -------
 
-- Params de-/restructuralization
-- Dictionary class that returns Maybe<T> for non-existing values.
 - Make sure that plugin architecture (and Synth) is working on Linux.
 
 Wayward Support
@@ -24,3 +22,4 @@ Wayward Support
 - Path utility functions (maybe a path class).
 - A string class that does proper UTF-8 handling.
 - A HTML class representing a string that is unescaped HTML.
+- Find better names for everything in data_franca.

docs/index.md

@@ -0,0 +1,70 @@
+# Wayward Overview
+
+[GitHub](https://github.com/simonask/w)
+
+Did your dad ever tell you: "Writing web apps in C++ is dangerous and stupid! You should know better!"?
+
+Well he's not the boss of you! You can do whatever you want!
+
+Wayward ("`<w>`") is a web framework for writing HTTP-aware apps in C++. It uses [libevent](http://libevent.org/) behind
+the scenes to create a compact HTTP server that can act as the backend for your app.
+
+`<w>` is heavily inspired by the Ruby framework Sinatra, and aims to keep things as simple as possible.
+It uses the C++ Standard Template Library extensively.
+
+***WARNING!*** Wayward is as of yet still in early alpha, and should not, I repeat *NOT* be used in production just yet. Several big pieces are missing, and the rest is a semi-explosive mess that is probably unfit for human *and* animal consumption. Don't say you weren't warned. If you're looking for production-quality code, come back in a few releases, I'm sure we'll have something cooking for you.
+
+
+## Getting Started
+
+Wayward is both a library and a command-line utility, named `w_dev`. Wayward apps can exist without `w_dev`, but it does make life for developers a lot easier. `w_dev` creates projects, generates standardized components in projects, and has a built-in development server that automatically rebuilds and restarts your app when you make changes to it, allowing for live "Rails-style" coding.
+
+### Building `w_dev`
+
+1. Make sure dependencies are installed (git, scons, clang, libevent).
+2. `git clone --recursive https://github.com/simonask/w.git`
+3. `cd w`
+4. `scons -j8 w_dev` (This will only build the necessary components for `w_dev`. Running with `-jN` makes scons run tasks in parallel.)
+
+### Creating a Project
+
+1. `cd ~/your/path/to/projects`
+2. `path/to/w_dev new my_project`
+3. Wait for `w_dev` to finish installing dependencies in your project dir.
+4. You now have a project named `my_project` in `~/your/path/to/projects`.
+
+### Building and Running
+
+1. `cd my_project`
+3. `path/to/w_dev server my_project`
+4. Browse to `localhost:3000`. The first request in the lifetime of the project will take some time.
+
+On the first request to the app server, `w_dev` will build your app. This may take about a minute the very first time because it also needs to build Wayward and dependencies, but subsequent requests will only cause a rebuild of the things that have changed in your own project. Normal turnaround for an incremental build should be very short.
+
+
+## Sample "Hello World"
+
+    #include <w>
+
+    int main(int argc, char** argv) {
+      w::App app { argc, argv };
+
+      app.get("/", [](w::Request& req) {
+        return w::render_text("Hello, World!");
+      });
+
+      return app.run();
+    }
+
+## Dependencies
+
+Dependency management in C++ apps is a pain, so `<w>` tries to keep it to a minimum.
+
+- [libevent 2.0.x](http://libevent.org/)
+- [Clang](http://clang.llvm.org/) and [libc++](http://libcxx.llvm.org/) — GCC will be supported in the future, but there are some disagreements between Clang++ and g++ that are holding back that development
+- SCons 2.3.0 or newer.
+- For Persistence: `libpq` (from PostgreSQL).
+
+`<w>` has been tested on the following platforms:
+
+- OS X 10.9.2 with Apple Clang-503.0.40

docs/persistence.md

@@ -0,0 +1 @@
+# Persistence ORM Framework

docs/wayward/overview.md

@@ -0,0 +1,37 @@
+# Wayward Web Framework
+
+Wayward lives in the namespace `wayward`, which by default is aliased as `w`. To disable this, compile your app with `WAYWARD_NO_SHORTHAND_NAMESPACE` defined. Every time you see `w::`, it can be substituted for `wayward::`.
+
+The core of a Wayward app is an instance of `App`, which is used to define the routes and bring up a listening HTTP server.
+
+The simplest Wayward app looks like this:
+
+    #include <w>
+
+    int main(int argc, char** argv) {
+      w::App app { argc, argv };
+
+      app.get("/", [](w::Request& req) {
+        return w::render_text("Hello, World!");
+      });
+
+      return app.run();
+    }
+
+A slightly more advanced example could include a parameter in the route definition:
+
+    #include <w>
+
+    int main(int argc, char** argv) {
+      w::App app { argc, argv };
+
+      app.get("/hello/:person", [](w::Request& req) {
+        return w::render_text("Hello, {0}!", req.params["person"]);
+      });
+    }
+
+Going to `/hello/Steve` will then render the text "Hello, Steve!" in the browser.
+
+See the documentation for [Routing](routing.md) for more ways to define routes.
+
+See the [Advanced Routes](advanced_routes.md) for ways to define more complex route handlers.

docs/wayward/request.md

@@ -0,0 +1,9 @@
+# Requests
+
+All route handlers get called with a reference to a `w::Request` object. The `Request` object is a simple structure representing an HTTP request.
+
+See also: [Wayward Support: HTTP Library](support/http.md)
+
+From the perspective of a route handler, the most interesting parts of a request are the headers, the params, the [URI](support/uri.md), and the request body, if one is provided.
+
+Params defined in the route with the `:` syntax will appear in the `params` member, as well as any GET and POST parameters passed from the client.

docs/wayward/response.md

@@ -0,0 +1,23 @@
+# Rendering Responses
+
+Wayward comes with a number of predefined ways to render a quick HTTP response.
+
+## w::not_found
+
+Returns a generic 404 Not Found with Content-Type `text/plain`.
+
+## w::render_text
+
+Invoke: `render_text(format, ...)`
+
+Returns a 200 OK response with Content-Type `text/plain`. The body of the response is the interpolation of the arguments. `w::render_text` treats its arguments equivalent to [`w::format`](support/format.md).
+
+## w::redirect
+
+Invoke: `redirect(new_url, [status])`
+
+Returns a 302 Found response (or a different status code, if `status` is set), with the `Location` header set to `new_url`.
+
+## w::render
+
+See: [Templates](templates.md)