Merge branch 'master' into master

michaelklishin · Jan 18, 2018 · 30f30e9 · 30f30e9
2 parents 4c6ae4d + acac284
commit 30f30e9
Show file tree

Hide file tree

Showing 24 changed files with 34 additions and 26 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,3 +11,4 @@ target/*
 .nrepl-*
 .idea
 *.iml
+.DS_Store
diff --git a/README.md b/README.md
@@ -75,7 +75,7 @@ definition to your `pom.xml`:
 
 With Leiningen:
 
-    [clojurewerkz/neocons "3.2.0"]
+    [tuddman/neocons "3.2.1-SNAPSHOT"]
 
 With Maven:
 
@@ -97,8 +97,8 @@ CI is hosted by [travis-ci.org](http://travis-ci.org)
 
 ## Supported Clojure Versions
 
-Neocons requires Clojure 1.7+.
+Neocons requires Clojure 1.8+.
-The most recent stable Clojure release is highly recommended.
+The most recent stable Clojure release (1.9) is highly recommended.
 
 
 ## Supported Neo4J Server Versions

diff --git a/project.clj b/project.clj
@@ -43,7 +43,9 @@
   :codox {:src-dir-uri "https://github.com/michaelklishin/neocons/blob/master/"
           :src-linenum-anchor-prefix "L"}
 
+
   :aliases        {"all" ["with-profile" "dev:dev,1.8:dev,master"]}
+
   :repositories {"sonatype" {:url "http://oss.sonatype.org/content/repositories/releases"
                              :snapshots false
                              :releases {:checksum :fail :update :always}}

diff --git a/src/clojure/clojurewerkz/neocons/bolt.clj b/src/clojure/clojurewerkz/neocons/bolt.clj
@@ -1,4 +1,4 @@
-;; Copyright (c) 2011-2015 Michael S. Klishin, Alex Petrov, and The ClojureWerkz
+;; Copyright (c) 2011-2018 Michael S. Klishin, Alex Petrov, and The ClojureWerkz
 ;; Team
 ;;
 ;; The use and distribution terms for this software are covered by the
@@ -14,7 +14,7 @@
            (org.neo4j.driver.v1 AuthTokens Config Driver
                                 GraphDatabase Record Session
                                 StatementResult StatementRunner
-                                Transaction Values)))
+                                Transaction TransactionWork Values)))
 
 (defn- env-var
   [^String s]
@@ -49,6 +49,11 @@
   ^Transaction [^Session session]
   (.beginTransaction session))
 
+(defn run-tx
+  [^Transaction transaction ^String qry ^Map params]
+  (map (fn [^Record r] (into {} (.asMap r)))
+     (iterator-seq (.run transaction qry params))))
+
 (defn tx-successful
   [^Transaction transaction]
   (.success transaction))

diff --git a/src/clojure/clojurewerkz/neocons/rest.clj b/src/clojure/clojurewerkz/neocons/rest.clj
@@ -1,4 +1,4 @@
-;; Copyright (c) 2011-2015 Michael S. Klishin, Alex Petrov, and The ClojureWerkz
+;; Copyright (c) 2011-2018 Michael S. Klishin, Alex Petrov, and The ClojureWerkz
 ;; Team
 ;;
 ;; The use and distribution terms for this software are covered by the

diff --git a/test/clojurewerkz/neocons/bolt/test/bolt_test.clj b/test/clojurewerkz/neocons/bolt/test/bolt_test.clj
@@ -1,4 +1,4 @@
-;; Copyright (c) 2011-2015 Michael S. Klishin, Alex Petrov, and The ClojureWerkz
+;; Copyright (c) 2011-2018 Michael S. Klishin, Alex Petrov, and The ClojureWerkz
 ;; Team
 ;;
 ;; The use and distribution terms for this software are covered by the
@@ -43,7 +43,7 @@
                                   {"name" n})]
           (is (pos? (count res))))))))
 
-(deftest test-transaction-successful
+(deftest test-transaction-failure
   (with-open [driver (neobolt/connect "bolt://localhost")]
     (with-open [session (neobolt/create-session driver)]
       (let [n  (str (gensym "bobfail"))]

diff --git a/test/clojurewerkz/neocons/rest/test/basic_http_authentication_test.clj b/test/clojurewerkz/neocons/rest/test/basic_http_authentication_test.clj
@@ -1,4 +1,4 @@
-;; Copyright (c) 2011-2015 Michael S. Klishin, Alex Petrov, and The ClojureWerkz
+;; Copyright (c) 2011-2018 Michael S. Klishin, Alex Petrov, and The ClojureWerkz
 ;; Team
 ;;
 ;; The use and distribution terms for this software are covered by the

diff --git a/test/clojurewerkz/neocons/rest/test/batch_operations_test.clj b/test/clojurewerkz/neocons/rest/test/batch_operations_test.clj
@@ -1,4 +1,4 @@
-;; Copyright (c) 2011-2015 Michael S. Klishin, Alex Petrov, and The ClojureWerkz
+;; Copyright (c) 2011-2018 Michael S. Klishin, Alex Petrov, and The ClojureWerkz
 ;; Team
 ;;
 ;; The use and distribution terms for this software are covered by the

diff --git a/test/clojurewerkz/neocons/rest/test/connection_test.clj b/test/clojurewerkz/neocons/rest/test/connection_test.clj
@@ -1,4 +1,4 @@
-;; Copyright (c) 2011-2015 Michael S. Klishin, Alex Petrov, and The ClojureWerkz
+;; Copyright (c) 2011-2018 Michael S. Klishin, Alex Petrov, and The ClojureWerkz
 ;; Team
 ;;
 ;; The use and distribution terms for this software are covered by the

diff --git a/test/clojurewerkz/neocons/rest/test/constraints_test.clj b/test/clojurewerkz/neocons/rest/test/constraints_test.clj
@@ -1,4 +1,4 @@
-;; Copyright (c) 2011-2015 Michael S. Klishin, Alex Petrov, and The ClojureWerkz
+;; Copyright (c) 2011-2018 Michael S. Klishin, Alex Petrov, and The ClojureWerkz
 ;; Team
 ;;
 ;; The use and distribution terms for this software are covered by the

diff --git a/test/clojurewerkz/neocons/rest/test/cypher_test.clj b/test/clojurewerkz/neocons/rest/test/cypher_test.clj
@@ -1,4 +1,4 @@
-;; Copyright (c) 2011-2015 Michael S. Klishin, Alex Petrov, and The ClojureWerkz
+;; Copyright (c) 2011-2018 Michael S. Klishin, Alex Petrov, and The ClojureWerkz
 ;; Team
 ;;
 ;; The use and distribution terms for this software are covered by the

diff --git a/test/clojurewerkz/neocons/rest/test/graphene_test.clj b/test/clojurewerkz/neocons/rest/test/graphene_test.clj
@@ -1,4 +1,4 @@
-;; Copyright (c) 2011-2015 Michael S. Klishin, Alex Petrov, and The ClojureWerkz
+;; Copyright (c) 2011-2018 Michael S. Klishin, Alex Petrov, and The ClojureWerkz
 ;; Team
 ;;
 ;; The use and distribution terms for this software are covered by the

diff --git a/test/clojurewerkz/neocons/rest/test/helpers_test.clj b/test/clojurewerkz/neocons/rest/test/helpers_test.clj
@@ -1,4 +1,4 @@
-;; Copyright (c) 2011-2015 Michael S. Klishin, Alex Petrov, and The ClojureWerkz
+;; Copyright (c) 2011-2018 Michael S. Klishin, Alex Petrov, and The ClojureWerkz
 ;; Team
 ;;
 ;; The use and distribution terms for this software are covered by the

diff --git a/test/clojurewerkz/neocons/rest/test/index_test.clj b/test/clojurewerkz/neocons/rest/test/index_test.clj
@@ -1,4 +1,4 @@
-;; Copyright (c) 2011-2015 Michael S. Klishin, Alex Petrov, and The ClojureWerkz
+;; Copyright (c) 2011-2018 Michael S. Klishin, Alex Petrov, and The ClojureWerkz
 ;; Team
 ;;
 ;; The use and distribution terms for this software are covered by the

diff --git a/test/clojurewerkz/neocons/rest/test/indexing_test.clj b/test/clojurewerkz/neocons/rest/test/indexing_test.clj
@@ -1,4 +1,4 @@
-;; Copyright (c) 2011-2015 Michael S. Klishin, Alex Petrov, and The ClojureWerkz
+;; Copyright (c) 2011-2018 Michael S. Klishin, Alex Petrov, and The ClojureWerkz
 ;; Team
 ;;
 ;; The use and distribution terms for this software are covered by the

diff --git a/test/clojurewerkz/neocons/rest/test/integration_test.clj b/test/clojurewerkz/neocons/rest/test/integration_test.clj
@@ -1,4 +1,4 @@
-;; Copyright (c) 2011-2015 Michael S. Klishin, Alex Petrov, and The ClojureWerkz
+;; Copyright (c) 2011-2018 Michael S. Klishin, Alex Petrov, and The ClojureWerkz
 ;; Team
 ;;
 ;; The use and distribution terms for this software are covered by the

diff --git a/test/clojurewerkz/neocons/rest/test/labels_test.clj b/test/clojurewerkz/neocons/rest/test/labels_test.clj
@@ -1,4 +1,4 @@
-;; Copyright (c) 2011-2015 Michael S. Klishin, Alex Petrov, and The ClojureWerkz
+;; Copyright (c) 2011-2018 Michael S. Klishin, Alex Petrov, and The ClojureWerkz
 ;; Team
 ;;
 ;; The use and distribution terms for this software are covered by the

diff --git a/test/clojurewerkz/neocons/rest/test/mutating_cypher_test.clj b/test/clojurewerkz/neocons/rest/test/mutating_cypher_test.clj
@@ -1,4 +1,4 @@
-;; Copyright (c) 2011-2015 Michael S. Klishin, Alex Petrov, and The ClojureWerkz
+;; Copyright (c) 2011-2018 Michael S. Klishin, Alex Petrov, and The ClojureWerkz
 ;; Team
 ;;
 ;; The use and distribution terms for this software are covered by the

diff --git a/test/clojurewerkz/neocons/rest/test/nodes_test.clj b/test/clojurewerkz/neocons/rest/test/nodes_test.clj
@@ -1,4 +1,4 @@
-;; Copyright (c) 2011-2015 Michael S. Klishin, Alex Petrov, and The ClojureWerkz
+;; Copyright (c) 2011-2018 Michael S. Klishin, Alex Petrov, and The ClojureWerkz
 ;; Team
 ;;
 ;; The use and distribution terms for this software are covered by the

diff --git a/test/clojurewerkz/neocons/rest/test/records_test.clj b/test/clojurewerkz/neocons/rest/test/records_test.clj
@@ -1,4 +1,4 @@
-;; Copyright (c) 2011-2015 Michael S. Klishin, Alex Petrov, and The ClojureWerkz
+;; Copyright (c) 2011-2018 Michael S. Klishin, Alex Petrov, and The ClojureWerkz
 ;; Team
 ;;
 ;; The use and distribution terms for this software are covered by the

diff --git a/test/clojurewerkz/neocons/rest/test/relationships_test.clj b/test/clojurewerkz/neocons/rest/test/relationships_test.clj
@@ -1,4 +1,4 @@
-;; Copyright (c) 2011-2015 Michael S. Klishin, Alex Petrov, and The ClojureWerkz
+;; Copyright (c) 2011-2018 Michael S. Klishin, Alex Petrov, and The ClojureWerkz
 ;; Team
 ;;
 ;; The use and distribution terms for this software are covered by the

diff --git a/test/clojurewerkz/neocons/rest/test/spatial_test.clj b/test/clojurewerkz/neocons/rest/test/spatial_test.clj
@@ -1,4 +1,4 @@
-;; Copyright (c) 2011-2015 Michael S. Klishin, Alex Petrov, and The ClojureWerkz
+;; Copyright (c) 2011-2018 Michael S. Klishin, Alex Petrov, and The ClojureWerkz
 ;; Team
 ;;
 ;; The use and distribution terms for this software are covered by the

diff --git a/test/clojurewerkz/neocons/rest/test/transaction_test.clj b/test/clojurewerkz/neocons/rest/test/transaction_test.clj
@@ -1,4 +1,4 @@
-;; Copyright (c) 2011-2015 Michael S. Klishin, Alex Petrov, and The ClojureWerkz
+;; Copyright (c) 2011-2018 Michael S. Klishin, Alex Petrov, and The ClojureWerkz
 ;; Team
 ;;
 ;; The use and distribution terms for this software are covered by the

diff --git a/test/clojurewerkz/neocons/rest/test/traversal_test.clj b/test/clojurewerkz/neocons/rest/test/traversal_test.clj
@@ -1,4 +1,4 @@
-;; Copyright (c) 2011-2015! Michael S. Klishin, Alex Petrov, and The ClojureWerkz
+;; Copyright (c) 2011-2018 Michael S. Klishin, Alex Petrov, and The ClojureWerkz
 ;; Team
 ;;
 ;; The use and distribution terms for this software are covered by the