Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Improving Unicode support in properties keys and values and relations…
…hips types. Adding some tests.
  • Loading branch information
versae committed Jul 14, 2011
1 parent a705336 commit 0925ca1
Show file tree
Hide file tree
Showing 2 changed files with 59 additions and 6 deletions.
19 changes: 16 additions & 3 deletions neo4jrestclient/client.py
Expand Up @@ -362,13 +362,23 @@ def __init__(self, url, create=False, data={}, update_dict={}):
response, content = Request().post(url, data=data)
if response.status == 201:
self._dic.update(data.copy())
self._update_dict_data()
self.url = response.get("location")
else:
raise NotFoundError(response.status, "Invalid data sent")
if not self.url:
self.url = url
self.update()

def _update_dict_data(self):
if "data" in self._dic:
self._dic["data"] = dict((self._safe_string(k),
self._safe_string(v))
for k, v in self._dic["data"].items())

def _safe_string(self, s):
return unicode(s.decode("utf-8"))

def update(self, extensions=True):
response, content = Request().get(self.url)
if response.status == 200:
Expand Down Expand Up @@ -397,7 +407,8 @@ def delete(self, key=None, tx=None):
"relationships?)")

def __getitem__(self, key, tx=None):
property_url = self._dic["property"].replace("{key}", key)
property_url = self._dic["property"].replace("{key}",
urllib.quote_plus(key))
tx = Transaction.get_transaction(tx)
if tx:
return tx.subscribe(TX_GET, property_url, obj=self)
Expand Down Expand Up @@ -436,7 +447,8 @@ def __setitem__(self, key, value, tx=None):
if isinstance(value, Transaction):
tx = tx or value
value = value.get_value()
property_url = self._dic["property"].replace("{key}", key)
property_url = self._dic["property"].replace("{key}",
urllib.quote_plus(key))
tx = Transaction.get_transaction(tx)
if tx:
transaction_url = self._dic["property"].replace("{key}", "")
Expand Down Expand Up @@ -509,6 +521,7 @@ def _set_properties(self, props={}):
response, content = Request().put(properties_url, data=props)
if response.status == 204:
self._dic["data"] = props.copy()
self._update_dict_data()
return props
elif response.status == 400:
raise StatusException(response.status, "Invalid data sent")
Expand Down Expand Up @@ -1196,7 +1209,7 @@ def _get_end(self):
end = property(_get_end)

def _get_type(self):
return self._dic['type']
return self._dic['type'].encode("utf8")
type = property(_get_type)

def _get_id(self):
Expand Down
46 changes: 43 additions & 3 deletions neo4jrestclient/tests.py
Expand Up @@ -110,6 +110,19 @@ def test_set_node_properties(self):
n2 = self.gdb.node[n1.id]
self.assertEqual(n1.properties, n2.properties)

def test_set_node_property_safe(self):
n1 = self.gdb.node(language="Español antigüillo")
n1.set("Idioma de los subtítulos", "Español antigüillo")
self.assertEqual(n1.get("Idioma de los subtítulos"), n1.get("language"))

def test_set_node_properties_safe(self):
n1 = self.gdb.node()
n1.properties = {"Idioma de los subtítulos": "Español antigüillo"}
n1_properties = n1.properties
n2 = self.gdb.node[n1.id]
n2_properties = n2.properties
self.assertEqual(n1_properties, n2_properties)

def test_delete_node_property_dictionary(self):
n1 = self.gdb.node(name="John Doe", profession="Hacker")
del n1["name"]
Expand Down Expand Up @@ -150,6 +163,15 @@ def test_create_relationship_functional(self):
rel = n1.relationships.create("Knows", n2)
self.assertEqual(rel.properties, {})

def test_create_relationship_functional_safe(self):
n1 = self.gdb.nodes.create()
n2 = self.gdb.nodes.create()
r1 = n1.relationships.create("recommends ñapa motörhead", n2)
self.assertEqual(r1.properties, {})
self.assertEqual(r1.type, "recommends ñapa motörhead")
r2 = self.gdb.relationships.get(r1.id)
self.assertEqual(r1.type, r2.type)

def test_create_relationship_properties(self):
n1 = self.gdb.node()
n2 = self.gdb.node()
Expand All @@ -162,6 +184,25 @@ def test_create_relationship_functional_properties(self):
rel = n1.relationships.create("Knows", n2, since=1970)
self.assertEqual(rel.properties, {"since": 1970})

def test_set_relationship_property_safe(self):
n1 = self.gdb.nodes.create()
n2 = self.gdb.nodes.create()
rel = n1.relationships.create("Knows", n2,
language="Español antigüillo")
rel.set("Idioma de los subtítulos", "Español antigüillo")
self.assertEqual(rel.get("Idioma de los subtítulos"),
rel.get("language"))

def test_set_relationship_properties_safe(self):
n1 = self.gdb.nodes.create()
n2 = self.gdb.nodes.create()
r1 = n1.relationships.create("Knows", n2)
r1.properties = {"Idioma de los subtítulos": "Español antigüillo"}
r1_properties = r1.properties
r2 = self.gdb.relationships.get(r1.id)
r2_properties = r2.properties
self.assertEqual(r1_properties, r2_properties)

def test_delete_relationship(self):
n1 = self.gdb.nodes.create()
n2 = self.gdb.nodes.create()
Expand All @@ -173,10 +214,9 @@ def test_get_relationship(self):
n1 = self.gdb.nodes.create()
n2 = self.gdb.nodes.create()
rel = n1.relationships.create("Knows", n2, since=1970)
r = self.gdb.relationships.get(0)
self.assertIsInstance(r, client.Relationship)
self.assertIsInstance(rel, client.Relationship)

def test_delete_relationship(self):
def test_delete_relationship_not_found(self):
n1 = self.gdb.nodes.create()
n2 = self.gdb.nodes.create()
rel = n1.relationships.create("Knows", n2, since=1970)
Expand Down

0 comments on commit 0925ca1

Please sign in to comment.