Move all modules into the 'guix web' namespace.

* guix-web/config.scm: Delete.
* guix-web/controller.scm: Delete.
* guix-web/package.scm: Delete.
* guix-web/render.scm: Delete.
* guix-web/server.scm: Delete.
* guix-web/sxml.scm: Delete.
* guix-web/util.scm: Delete.
* guix-web/view/html.scm: Delete.
* guix-web/view/json.scm: Delete.
* guix/web/config.scm: New file.
* guix/web/controller.scm: New file.
* guix/web/package.scm: New file.
* guix/web/render.scm: New file.
* guix/web/server.scm: New file.
* guix/web/sxml.scm: New file.
* guix/web/util.scm: New file.
* guix/web/view/html.scm: New file.
* guix/web/view/json.scm: New file.
* guix/scripts/web.scm: Tweak imports.
* Makefile.am (SOURCES): Add new files and remove deleted ones.

1 files changed, 49 insertions, 0 deletions

diff --git a/guix/web/server.scm b/guix/web/server.scm
new file mode 100644
index 0000000..e95487f
--- /dev/null
+++ b/guix/web/server.scm
@@ -0,0 +1,49 @@
+;;; guix-web - Web interface for GNU Guix
+;;; Copyright © 2014  David Thompson <davet@gnu.org>
+;;;
+;;; This program is free software: you can redistribute it and/or
+;;; modify it under the terms of the GNU Affero General Public License
+;;; as published by the Free Software Foundation, either version 3 of
+;;; the License, or (at your option) any later version.
+;;;
+;;; This program is distributed in the hope that it will be useful,
+;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;;; Affero General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU Affero General Public
+;;; License along with this program.  If not, see
+;;; <http://www.gnu.org/licenses/>.
+
+(define-module (guix web server)
+  #:use-module (ice-9 match)
+  #:use-module (srfi srfi-1)
+  #:use-module (web http)
+  #:use-module (web request)
+  #:use-module (web server)
+  #:use-module (web uri)
+  #:use-module (guix web config)
+  #:use-module (guix web controller)
+  #:use-module (guix web render)
+  #:use-module (guix web util)
+  #:export (start-guix-web))
+
+(define (run-controller controller request)
+  (controller (cons (request-method request)
+                    (request-path-components request))))
+
+(define (handler request body controller)
+  (format #t "~a ~a\n"
+          (request-method request)
+          (uri-path (request-uri request)))
+  (apply values
+         (append
+          (run-controller controller request)
+          (list controller))))
+
+(define (start-guix-web controller)
+  (run-server (lambda args (apply handler args))
+              'http
+              `(#:addr ,INADDR_ANY
+                #:port ,guix-web-port)
+              controller))