Merge pull request #271 from hjwp/upgrade-18

Update Ch. 18 (spiking auth) listings for django4

Author: hjwp

.github/workflows/tests.yml

@@ -30,6 +30,7 @@ jobs:
           test_chapter_14_simple_form,
           test_chapter_15_advanced_forms,
           test_chapter_16_javascript,
+          test_chapter_18_spiking_custom_auth,
           unit-test
         ]
 
@@ -89,6 +90,20 @@ jobs:
         run: |
           make  ${{ matrix.test_chapter }}
 
+      - name: Save tempdir path to an env var
+        if: always()
+        shell: bash
+        run: |
+          TMPDIR_PATH=$(cat .tmpdir.${{ matrix.test_chapter }})
+          echo "TMPDIR_PATH=$TMPDIR_PATH" >> $GITHUB_ENV
+
+      - name: Archive the temp dir
+        uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          name: test-source-${{ matrix.test_chapter }}
+          path: ${{ env.TMPDIR_PATH }}
+
       - name: Archive the built html files
         uses: actions/upload-artifact@v4
         if: always()
@@ -97,3 +112,5 @@ jobs:
           path: |
             *.html
             *.css
+
+

.gitignore

@@ -42,3 +42,4 @@
 /tech review/
 .vagrant.d
 *.egg-info
+.tmpdir.*

Makefile

@@ -165,6 +165,8 @@ silent_test_%: %.html $(TMPDIR) $(VENV)/bin
 unit-test: chapter_01.html $(VENV)/bin
 	SKIP_CHAPTER_SUBMODULES=1 ./tests/update_source_repo.py
 	source $(VENV)/bin/activate && ./run_test_tests.sh
+	# this is a hack to make 'Archive the temp dir' step work in CI
+	echo "tests" > .tmpdir.unit-test
 
 .PHONY: clean
 clean:

chapter_16_javascript.asciidoc

@@ -177,8 +177,13 @@ TIP: I like to keep helper methods in the FT class that's using them,
     It stops the base class from getting too cluttered. YAGNI.
 
 
+[[js-spike]]
 === A Quick "Spike"
 
+((("spike")))
+((("exploratory coding", see="also spiking and de-spiking")))
+((("spiking and de-spiking", "defined")))
+((("prototyping", see="spiking and de-spiking")))
 This will be our first bit of JavaScript.
 We're also interacting with the Bootstrap CSS framework,
 which we maybe don't know very well.
@@ -198,9 +203,14 @@ The goat doesn't mind looking the other way for a bit.
 This kind of prototyping activity is often called a "spike",
 for http://stackoverflow.com/questions/249969/why-are-tdd-spikes-called-spikes[
 reasons that aren't entirely clear],
-but it's a nice memorable name.
-
-TIP: Always do a commit before embarking on a spike.
+but it's a nice memorable name.footnote:[
+This chapter shows a very small spike.
+We'll come back and look at the spiking process again,
+with a weightier Python/Django example,
+in <<chapter_18_spiking_custom_auth>>.
+]
+
+TIP: Always do a commit before embarking on a Spike.
 
 
 ==== A Simple Inline Script

chapter_17_second_deploy.asciidoc

@@ -14,6 +14,17 @@ NOTE: At this point I want to say a huge thanks to Andrew Godwin and the whole
     drop it altogether.  Thanks for all the great work, gang!
 
 
+.🚧 Warning, Content not updated
+*******************************************************************************
+
+This chapter has not been rewritten as part of the third edition.
+
+By all means refer back to <<chapter_11_ansible>>
+and try and do a deployment,
+but otherwise, go ahead and check out <<chapter_18_spiking_custom_au,the next chapter>>, which has been (mostly) updated.
+
+*******************************************************************************
+
 
 Staging Deploy
 ~~~~~~~~~~~~~~