Skip to content

ensure content type is set in RiakObject.set_data #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
argv0 merged 2 commits into from
Apr 12, 2011
Merged

ensure content type is set in RiakObject.set_data #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82e58d5
ensure content type is set in RiakObject.set_data
argv0 Apr 11, 2011
f83292f
handle binary data properly
argv0 Apr 11, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions riak/riak_object.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,11 @@ def set_data(self, data):
:rtype: data
"""
self._data = data
if MD_CTYPE not in self._metadata:
if self._encode_data:
self.set_content_type("application/json")
else:
self.set_content_type("application/octet-stream")
return self

def get_encoded_data(self):
Expand Down
20 changes: 20 additions & 0 deletions riak/tests/test_all.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,26 @@ def test_link_walking(self):
results = obj.link("bucket", "tag").run()
self.assertEqual(len(results), 1)

def test_store_of_missing_object(self):
bucket = self.client.bucket("bucket")
# for json objects
o = bucket.get("nonexistent_key_json")
self.assertEqual(o.exists(), False)
o.set_data({"foo" : "bar"})
o = o.store()
self.assertEqual(o.get_data(), {"foo" : "bar"})
self.assertEqual(o.get_content_type(), "application/json")
o.delete()
# for binary objects
o = bucket.get_binary("nonexistent_key_binary")
self.assertEqual(o.exists(), False)
o.set_data("1234567890")
o = o.store()
self.assertEqual(o.get_data(), "1234567890")
self.assertEqual(o.get_content_type(), "application/octet-stream")
o.delete()


def test_search_integration(self):
if SKIP_SEARCH:
return True
Expand Down