Merge branch 'hotfix/0.2.2'

docs/release_notes.rst

@@ -1,6 +1,11 @@
 Release notes
 =============
 
+0.2.2 (2014-06-28)
+------------------
+
+* Address common DynamoDB exceptions (`#17 <https://github.com/sebdah/dynamodb-config-store/issues/17>`_)
+
 0.2.1 (2014-06-28)
 ------------------
 

dynamodb_config_store/__init__.py

@@ -35,6 +35,12 @@
 import time
 from ConfigParser import SafeConfigParser
 
+from boto.dynamodb2.exceptions import (
+    LimitExceededException,
+    ProvisionedThroughputExceededException,
+    ResourceInUseException,
+    ResourceNotFoundException,
+    ValidationException)
 from boto.dynamodb2.fields import HashKey, RangeKey
 from boto.dynamodb2.table import Table
 from boto.exception import JSONResponseError
@@ -236,4 +242,17 @@ def set(self, option, data):
         data[self.store_key] = self.store_name
         data[self.option_key] = option
 
-        return self.table.put_item(data, overwrite=True)
+        try:
+            return self.table.put_item(data, overwrite=True)
+        except LimitExceededException:
+            raise
+        except ProvisionedThroughputExceededException:
+            raise
+        except ResourceInUseException:
+            raise
+        except ResourceNotFoundException:
+            raise
+        except ValidationException:
+            raise
+        except Exception:
+            raise

dynamodb_config_store/settings.conf

@@ -1,2 +1,2 @@
 [general]
-version: 0.2.1
+version: 0.2.2

test.py

@@ -1,9 +1,10 @@
 """ Unit tests for DynamoDB Config Store """
 import time
 import unittest
+from random import random
 
 from boto.dynamodb2.layer1 import DynamoDBConnection
-from boto.dynamodb2.exceptions import ItemNotFound
+from boto.dynamodb2.exceptions import ItemNotFound, ValidationException
 from boto.dynamodb2.table import Table
 
 from dynamodb_config_store import DynamoDBConfigStore
@@ -413,6 +414,13 @@ def test_update_with_new_keys(self):
         self.assertNotIn('username', option)
         self.assertNotIn('password', option)
 
+    def test_instert_too_large_object(self):
+        """ Test of inserting an object larger than 64 kb """
+        with self.assertRaises(ValidationException):
+            self.store.set(
+                'large',
+                {x: int(random()*100000000000000) for x in xrange(1, 9999)})
+
     def tearDown(self):
         """ Tear down the test case """
         self.table.delete()