X-Git-Url: http://nitlanguage.org

diff --git a/lib/neo4j/neo4j.nit b/lib/neo4j/neo4j.nit
index 9f96118..d512462 100644
--- a/lib/neo4j/neo4j.nit
+++ b/lib/neo4j/neo4j.nit
@@ -124,7 +124,7 @@ class Neo4jClient
 		self.cypher_url = root["cypher"].to_s
 	end
 
-	fun service_root: Jsonable do return get(base_url / "db/data")
+	fun service_root: Serializable do return get(base_url / "db/data")
 
 	# Is the connection with the Neo4j server ok?
 	fun is_ok: Bool do return service_root isa JsonObject
@@ -289,7 +289,7 @@ class Neo4jClient
 		assert not labels.is_empty
 
 		# Build the query.
-		var buffer = new RopeBuffer
+		var buffer = new Buffer
 		buffer.append "match n where \{label_0\} in labels(n)"
 		for i in [1..labels.length[ do
 			buffer.append " and \{label_{i}\} in labels(n)"
@@ -314,42 +314,42 @@ class Neo4jClient
 
 	# Perform a `CypherQuery`
 	# see: CypherQuery
-	fun cypher(query: CypherQuery): Jsonable do
+	fun cypher(query: CypherQuery): Serializable do
 		return post("{cypher_url}", query.to_rest)
 	end
 
 	# GET JSON data from `url`
-	fun get(url: String): Jsonable do
+	fun get(url: String): Serializable do
 		var request = new JsonGET(url)
 		var response = request.execute
 		return parse_response(response)
 	end
 
 	# POST `params` to `url`
-	fun post(url: String, params: Jsonable): Jsonable do
+	fun post(url: String, params: Serializable): Serializable do
 		var request = new JsonPOST(url)
-		request.data = params
+		request.json_data = params
 		var response = request.execute
 		return parse_response(response)
 	end
 
 	# PUT `params` at `url`
-	fun put(url: String, params: Jsonable): Jsonable do
+	fun put(url: String, params: Serializable): Serializable do
 		var request = new JsonPUT(url)
-		request.data = params
+		request.json_data = params
 		var response = request.execute
 		return parse_response(response)
 	end
 
 	# DELETE `url`
-	fun delete(url: String): Jsonable do
+	fun delete(url: String): Serializable do
 		var request = new JsonDELETE(url)
 		var response = request.execute
 		return parse_response(response)
 	end
 
 	# Parse the cURL `response` as a JSON string
-	private fun parse_response(response: CurlResponse): Jsonable do
+	private fun parse_response(response: CurlResponse): Serializable do
 		if response isa CurlResponseSuccess then
 			var str = response.body_str
 			if str.is_empty then return new JsonObject
@@ -415,6 +415,13 @@ class CypherQuery
 		self.params = params
 	end
 
+	# Pass the argument `value` as the parameter `key`.
+	#
+	# SEE: `set`
+	fun []=(key: String, value: nullable Serializable) do
+		params[key] = value
+	end
+
 	# Add a `CREATE` statement to the query
 	fun ncreate(query: String): CypherQuery do
 		self.query = "{self.query}CREATE {query} "
@@ -451,6 +458,25 @@ class CypherQuery
 		return self
 	end
 
+	# Pass the argument `value` as the parameter `key`.
+	#
+	# Return `self`.
+	#
+	# ```
+	# var query = (new CypherQuery).
+	# 		nmatch("(n)").
+	# 		nwhere("n.key = \{key\}").
+	#		set("key", "foo")
+	#
+	# assert query.params["key"] == "foo"
+	# ```
+	#
+	# SEE: `[]=`
+	fun set(key: String, value: nullable Serializable): SELF do
+		self[key] = value
+		return self
+	end
+
 	# Translate the query to the body of a corresponding Neo4j REST request.
 	fun to_rest: JsonObject do
 		var obj = new JsonObject
@@ -551,13 +577,13 @@ abstract class NeoEntity
 	end
 
 	# Get the entity property at `key`
-	fun [](key: String): nullable Jsonable do
+	fun [](key: String): nullable Serializable do
 		if not properties.has_key(key) then return null
 		return properties[key]
 	end
 
 	# Set the entity property `value` at `key`
-	fun []=(key: String, value: nullable Jsonable) do properties[key] = value
+	fun []=(key: String, value: nullable Serializable) do properties[key] = value
 
 	# Is the property `key` set?
 	fun has_key(key: String): Bool do return properties.has_key(key)
@@ -916,14 +942,14 @@ class NeoBatch
 		# request.headers["X-Stream"] = "true"
 		var json_jobs = new JsonArray
 		for job in jobs.values do json_jobs.add job.to_rest
-		request.data = json_jobs
+		request.json_data = json_jobs
 		var response = request.execute
 		var res = client.parse_response(response)
 		return finalize_batch(res)
 	end
 
 	# Associate data from response in original nodes and edges
-	private fun finalize_batch(response: Jsonable): List[NeoError] do
+	private fun finalize_batch(response: Serializable): List[NeoError] do
 		var errors = new List[NeoError]
 		if not response isa JsonArray then
 			errors.add(new NeoError("Unexpected batch response format.", "Neo4jError"))
@@ -1013,7 +1039,7 @@ class NeoJob
 	# Job service target: `/node`, `/labels` etc...
 	var to: String
 	# Body to send with the job service request
-	var body: nullable Jsonable = null
+	var body: nullable Serializable = null
 
 	# JSON formated job
 	fun to_rest: JsonObject do