fixes for breaking changes:

* rebuilt dependencies to get consistent version of includes?
* changed snippet to use with-query-results instead of query-results
* fixed various tests that no longer worked with changed to test-is/is

./bin/snippet-solution.sh is still borked

Author: stuarthalloway

README

@@ -4,16 +4,23 @@ http://www.pragprog.com/titles/shcloj/programming-clojure
 Copyright 2008 Stuart Halloway. 
 All rights reserved. 
 
+-------------------------------------------------------------------------------
+API CHANGES SINCE BETA 5 OF THE BOOK:
+
+clojure.contrib.sql:
+* with-query is now with-query-results, query passed as vector
+
 -------------------------------------------------------------------------------
 DEPENDENCIES
 
 This version of the sample code has been tested with:
 
-Clojure SVN revision 1205
-svn co -r 1205 http://clojure.googlecode.com/svn/trunk/ clojure    
+Clojure SVN revision 1215
+svn co -r 1215 http://clojure.googlecode.com/svn/trunk/ clojure    
 
-Clojure-Contrib SVN revision 368:
-svn co -r 368 http://clojure-contrib.googlecode.com/svn/trunk/ clojure-contrib     
+Clojure-Contrib SVN revision 374:
+svn co -r 374 http://clojure-contrib.googlecode.com/svn/trunk/ clojure-contrib     
+Compojure GIT commit dd74dbb6ac4aa2ff4bc516e99666a70d2abf2b0e
 
 -------------------------------------------------------------------------------
 You can run the completed Compojure example with

Rakefile

@@ -1,18 +1,34 @@
 # here is a task that is not (yet) easy to write in Clojure...
-desc "Build latest Clojure, Clojure-Contrib, and Compojure"
-task :book_deps do
+task :build_compojure do
+  Dir.chdir ENV["COMPOJURE_HOME"] do
+    system "git pull"
+    system "ant"
+  end
+end
+
+task :build_clojure do
   Dir.chdir ENV["CLOJURE_HOME"] do
     system "git svn rebase"
     system "ant jar"
   end
+end
+
+task :build_clojure_contrib do
   Dir.chdir ENV["CLOJURE_CONTRIB_HOME"] do
     system "git svn rebase"
     system "ant"
   end
-  Dir.chdir ENV["COMPOJURE_HOME"] do
-    system "git pull"
-    system "ant"
-  end
+end
+
+desc "Get Clojure, Clojure-Contrib, and Compojure from Compojure"
+task :deps_from_compojure => [:build_compojure] do
+  cp "#{ENV['COMPOJURE_HOME']}/deps/clojure.jar", "lib/" 
+  cp "#{ENV['COMPOJURE_HOME']}/deps/clojure-contrib.jar", "lib/" 
+  cp "#{ENV['COMPOJURE_HOME']}/compojure.jar", "lib/" 
+end
+
+desc "Get all deps from their own projects"
+task :deps => [:build_clojure, :build_clojure_contrib, :build_compojure] do
   cp "#{ENV['CLOJURE_HOME']}/clojure.jar", "lib/" 
   cp "#{ENV['CLOJURE_CONTRIB_HOME']}/clojure-contrib.jar", "lib/" 
   cp "#{ENV['COMPOJURE_HOME']}/compojure.jar", "lib/" 

examples/lazy_index_of_any.clj

@@ -2,7 +2,7 @@
 
 (defn logging-seq [s]
   (if s
-    (do (println "Iterating over " (first s))
+    (do (println "Iterating over" (first s))
 	(lazy-cons (first s) (logging-seq (rest s))))))
 
 (defn indexed [s] (map vector (iterate inc 0) s (logging-seq s)))

examples/snippet.clj

@@ -34,33 +34,31 @@
 
 (defn sample-snippets []
   (with-connection db
-    (transaction
      (drop-snippets)
      (create-snippets)
-     (insert-snippets))))
+     (insert-snippets)))
 
 (defn reset-snippets []
   (with-connection db
-    (transaction
      (drop-snippets)
-     (create-snippets))))
+     (create-snippets)))
 
 (defn ensure-snippets-table-exists []
   (try
    (with-connection db (create-snippets))
-   (catch java.sql.BatchUpdateException _)))
+   (catch Exception _)))
 
 
 ; START: print-snippets
 (defn print-snippets []
-  (with-results res "select * from snippets"
+  (with-query-results res ["select * from snippets"]
     (println res)))
 ; END: print-snippets
 
 ; START: broken-select-snippets
 ; Broken!
 (defn select-snippets []
-  (with-results res "select * from snippets" res))
+  (with-query-results res ["select * from snippets"] res))
 ; END: broken-select-snippets
 (def broken-select-snippets select-snippets)
 
@@ -71,12 +69,12 @@
 ; START: select-snippets
 (defn select-snippets []
   (with-connection db
-    (with-results res "select * from snippets" (doall res))))
+    (with-query-results res ["select * from snippets"] (doall res))))
 ; END: select-snippets
 
 ; START: sql-query
 (defn sql-query [q]
-  (with-results res q (doall res)))
+  (with-query-results res [q] (doall res)))
 ; END: sql-query
 
 (defn select-snippet [id]

examples/test/lazy_index_of_any.clj

@@ -2,10 +2,10 @@
     (:use examples.lazy-index-of-any clojure.contrib.test-is))
 
 (deftest test-lazy-index-of-any-with-match
-  (is (with-out-str (is (zero? (index-of-any "zzabyycdxx" #{\z \a}))))
-      "Iterating overz\n")
-  (is (with-out-str (is (= 3 (index-of-any "zzabyycdxx" #{\b \y}))))
-      "Iterating overz\nIterating over z\nIterating over a\n"))
+  (is (= (with-out-str (is (zero? (index-of-any "zzabyycdxx" #{\z \a}))))
+	 "Iterating over z\n"))
+  (is (= (with-out-str (is (= 3 (index-of-any "zzabyycdxx" #{\b \y}))))
+	 "Iterating over z\nIterating over z\nIterating over a\nIterating over b\n")))
 
 
 

lancet/test/deftarget_1.clj

@@ -2,7 +2,13 @@
   (:use clojure.contrib.test-is))
 
 (deftest test-deftarget-1-refers-to-nonexistent-vars
-  (let [e (is (thrown? Exception (use :reload 'lancet.deftarget-1)))]
-    (is (.startsWith (.getMessage e) "java.lang.Exception: Unable to resolve symbol: "))))
+  (let [e (is (thrown? Exception (use :reload 'lancet.deftarget-1)))
+	msg-prefix "java.lang.Exception: Unable to resolve symbol: "]
+    (is
+     (= 
+      (.substring (.getMessage e) 0 (count msg-prefix))
+      msg-prefix))))
+
+