Package update.

cl-neo4j.asd

@@ -23,4 +23,5 @@
              (:file "globals")
              (:file "utilities")
              (:file "conditions")
-             (:file "restapi")))))
+             (:file "restapi")
+             (:file "wrapper")))))

src/package.lisp

@@ -7,18 +7,17 @@
 	#:json
 	#:json-rpc
 	#:drakma)
-  (:export #:do-neo4j-query
-	   #:get-node
-	   #:extract-node-id
-	   #:create-node
+  (:export #:get-node
+           #:create-node
+           #:delete-node
 	   #:set-node-properties
 	   #:get-node-properties
 	   #:del-node-properties
 	   #:set-node-property
 	   #:get-node-property
 	   #:del-node-property
-	   #:delete-node
-	   #:create-relationship
+           #:get-relationship
+           #:create-relationship
 	   #:set-relationship-properties
 	   #:get-relationship-properties
 	   #:del-relationship-properties
@@ -27,17 +26,22 @@
 	   #:del-relationship-property
 	   #:delete-relationship
 	   #:get-node-relationships
-	   #:list-indices
-	   #:add-to-index
-	   #:remove-from-index
-	   #:query-index
-	   #:traverse
+           #:get-relationships-types
+	   #:create-index
+           #:delete-index
+           #:add-to-index
+           #:remove-from-index
+           #:lookup-index
+           #:query-index
+           #:traverse
+           #:get-path
+           #:get-paths
 	   ;; Vars
 	   #:*neo4j-host*
-	   #:*neo4j-port*
-	   #:*use-structs*
-	   ;; Node struct
-	   #:neo-node?
-	   #:neo-node-self-url
-	   #:neo-node-id
-	   ))
+	   #:*neo4j-port*))
+
+(defpackage #:cl-neo4j-wrapper
+  (:use #:cl
+        #:alexandria
+        #:anaphora
+        #:cl-neo4j))

src/restapi.lisp

@@ -98,6 +98,13 @@
    (400 (error 'invalid-data-sent-error :uri uri :json json))
    (404 (error 'node-not-found-error :uri to-node-id))))
 
+(def-neo4j-fun delete-relationship (relationship-id)
+  :delete
+  (:uri-spec (format nil "relationship/~A" relationship-id))
+  (:status-handlers
+   (204 (values t body))
+   (404 (error 'relationship-not-found-error :uri uri))))
+
 (def-neo4j-fun set-relationship-properties (relationship-id properties)
   :put
   (:uri-spec (format nil "relationship/~A/properties" relationship-id))
@@ -149,13 +156,6 @@
    (204 (values t body))
    (404 (error 'relationship-not-found-error :uri uri))))
 
-(def-neo4j-fun delete-relationship (relationship-id)
-  :delete
-  (:uri-spec (format nil "relationship/~A" relationship-id))
-  (:status-handlers
-   (204 (values t body))
-   (404 (error 'relationship-not-found-error :uri uri))))
-
 (def-neo4j-fun get-node-relationships (node-id direction types)
   :get
   (:uri-spec (format nil "node/~A/relationships/~A/~{~A~^\\&~}"