Merge pull request #4 from WLPhoenix/master

Bug fixes and new version scheme

Author: WLPhoenix

stackdio/client/__init__.py

@@ -1,5 +1,6 @@
-import os
+import json
 import logging
+import os
 
 from .http import HttpMixin, use_admin_auth, endpoint
 from .exceptions import StackException
@@ -54,7 +55,7 @@ def create_provider(self, **kwargs):
         for key in form_data.keys():
             form_data[key] = kwargs.get(key)
 
-        return self._post(endpoint, data=form_data, jsonify=True)
+        return self._post(endpoint, data=json.dumps(form_data), jsonify=True)
 
 
     @endpoint("providers/")
@@ -83,7 +84,7 @@ def create_profile(self, title, image_id, ssh_user, cloud_provider,
             "cloud_provider": cloud_provider,
             "default_instance_size": default_instance_size
         }
-        return self._post(endpoint, data=data, jsonify=True)
+        return self._post(endpoint, data=json.dumps(data), jsonify=True)
 
 
     @endpoint("profiles/")
@@ -107,7 +108,7 @@ def import_formula(self, formula_uri, public=True):
             "uri": formula_uri,
             "public": public,
         }
-        return self._post(endpoint, data=data, jsonify=True)
+        return self._post(endpoint, data=json.dumps(data), jsonify=True)
 
 
     @endpoint("blueprints/")
@@ -131,7 +132,7 @@ def create_blueprint(self, blueprint, provider="ec2"):
                         self.get_formula(component["id"][0]),
                         component["id"][1])
 
-        return self._post(endpoint, data=blueprint, jsonify=True)
+        return self._post(endpoint, data=json.dumps(blueprint), jsonify=True)
 
 
     @use_admin_auth
@@ -145,7 +146,7 @@ def create_security_group(self, name, description, cloud_provider, is_default=Tr
             "cloud_provider": cloud_provider,
             "is_default": is_default
         }
-        return self._post(endpoint, data=data, jsonify=True)
+        return self._post(endpoint, data=json.dumps(data), jsonify=True)
 
 
     @endpoint("settings/")
@@ -161,7 +162,7 @@ def set_public_key(self, public_key):
         data = {
             "public_key": public_key
         }
-        return self._put(endpoint, data=data, jsonify=True)
+        return self._put(endpoint, data=json.dumps(data), jsonify=True)
 
 
     @endpoint("formulas/")
@@ -336,7 +337,7 @@ def get_zone(self, title, type_name="ec2"):
     @endpoint("stacks/")
     def launch_stack(self, stack_data):
         """Launch a stack as described by stack_data"""
-        return self._post(endpoint, data=stack_data, jsonify=True)['results']
+        return self._post(endpoint, data=json.dumps(stack_data), jsonify=True)
 
 
     @endpoint("stacks/{stack_id}/hosts/")
@@ -389,4 +390,4 @@ def do_action(self, stack_id, action):
 
         data = {"action": action}
 
-        return self._post(endpoint, data=data, jsonify=True)
+        return self._post(endpoint, data=json.dumps(data), jsonify=True)

stackdio/client/http.py

@@ -50,8 +50,6 @@ def wrapper(*args, **kwargs):
     return wrapper
 
 
-
-
 def endpoint(path):
     """Takes a path extension and appends to the known API base url.
     The result of this is then added to the decorated functions global
@@ -60,21 +58,39 @@ def decorator(func):
         @wraps(func)
         def wrapper(obj, *args, **kwargs):
 
+            # Get what locals() would return directly after calling
+            # 'func' with the given args and kwargs
             future_locals = getcallargs(func, *((obj,) + args), **kwargs)
+
+            # Build the variable we'll inject
             url = "{url}{path}".format(
                 url=obj.url,
                 path=path.format(**future_locals))
 
+            # Grab the global context for the passed function
             g = func.__globals__
-            oldvalue = g.get('endpoint')
+
+            # Create a unique default object so we can accurately determine
+            # if we replaced a value
+            sentinel = object()
+            oldvalue = g.get('endpoint', sentinel)
+
+            # Inject our variable into the global scope
             g['endpoint'] = url
 
+            # Logging and function call
             if oldvalue:
-                logger.warn("Value %s for 'endpoint' replaced in global scope "
-                            "for function %s" % (oldvalue, func.__name__))
+                logger.debug("Value %s for 'endpoint' replaced in global scope "
+                             "for function %s" % (oldvalue, func.__name__))
             logger.debug("%s.__globals__['endpoint'] = %s" % (func.__name__, url))
 
-            return func(obj, *args, **kwargs)
+            result = func(obj, *args, **kwargs)
+
+            # Replace the previous value, if it existed
+            if oldvalue is not sentinel:
+                g['endpoint'] = oldvalue
+
+            return result
         return wrapper
     return decorator
 

stackdio/client/version.py

@@ -1 +1 @@
-__version__ = "0.0.3"
+__version__ = "0.0.6.client.1"