WIP new JSON for queries

.github/workflows/spellcheck.yml

@@ -26,5 +26,6 @@ jobs:
         pip install -e '.[docs]'
     - name: Check spelling
       run: |
+        codespell README.md --ignore-words docs/codespell-ignore-words.txt
         codespell docs/*.rst --ignore-words docs/codespell-ignore-words.txt
         codespell datasette -S datasette/static --ignore-words docs/codespell-ignore-words.txt

Justfile

@@ -0,0 +1,41 @@
+export DATASETTE_SECRET := "not_a_secret"
+
+# Run tests and linters
+@default: test lint
+
+# Setup project
+@init:
+  pipenv run pip install -e '.[test,docs]'
+
+# Run pytest with supplied options
+@test *options:
+  pipenv run pytest {{options}}
+
+@codespell:
+  pipenv run codespell README.md --ignore-words docs/codespell-ignore-words.txt
+  pipenv run codespell docs/*.rst --ignore-words docs/codespell-ignore-words.txt
+  pipenv run codespell datasette -S datasette/static --ignore-words docs/codespell-ignore-words.txt
+
+# Run linters: black, flake8, mypy, cog
+@lint: codespell
+  pipenv run black . --check
+  pipenv run flake8
+  pipenv run cog --check README.md docs/*.rst
+
+# Rebuild docs with cog
+@cog:
+  pipenv run cog -r README.md docs/*.rst
+
+# Serve live docs on localhost:8000
+@docs: cog
+  pipenv run blacken-docs -l 60 docs/*.rst
+  cd docs && pipenv run make livehtml
+
+# Apply Black
+@black:
+  pipenv run black .
+
+@serve:
+  pipenv run sqlite-utils create-database data.db
+  pipenv run sqlite-utils create-table data.db docs id integer title text --pk id --ignore
+  pipenv run python -m datasette data.db --root --reload

datasette/app.py

@@ -34,7 +34,12 @@
 from jinja2.exceptions import TemplateNotFound
 
 from .views.base import ureg
-from .views.database import DatabaseDownload, DatabaseView, TableCreateView
+from .views.database import (
+    DatabaseDownload,
+    DatabaseView,
+    TableCreateView,
+    database_view,
+)
 from .views.index import IndexView
 from .views.special import (
     JsonDataView,
@@ -1366,8 +1371,12 @@ def add_route(view, regex):
             r"/-/patterns$",
         )
         add_route(DatabaseDownload.as_view(self), r"/(?P<database>[^\/\.]+)\.db$")
+        # add_route(
+        #     DatabaseView.as_view(self), r"/(?P<database>[^\/\.]+)(\.(?P<format>\w+))?$"
+        # )
         add_route(
-            DatabaseView.as_view(self), r"/(?P<database>[^\/\.]+)(\.(?P<format>\w+))?$"
+            wrap_view(database_view, self),
+            r"/(?P<database>[^\/\.]+)(\.(?P<format>\w+))?$",
         )
         add_route(TableCreateView.as_view(self), r"/(?P<database>[^\/\.]+)/-/create$")
         add_route(

datasette/utils/testing.py

@@ -16,6 +16,9 @@ def __init__(self, httpx_response):
     def status(self):
         return self.httpx_response.status_code
 
+    def __repr__(self):
+        return "<TestResponse {} [{}]>".format(self.httpx_response.url, self.status)
+
     # Supports both for test-writing convenience
     @property
     def status_code(self):