Deleted 'validate_body' behaviour

copitux · copitux · commit cd7e1b88c9df · 2012-05-12T17:45:07.000+02:00
'clean_body' had been developed to that functionality
diff --git a/pygithub3/requests/base.py b/pygithub3/requests/base.py
@@ -12,25 +12,25 @@
 
 
 class Body(object):
+    """ Input's request handler """
 
-    def __init__(self, content, valid_body, validate_body=None):
+    def __init__(self, content, schema, required):
         self.content = content
-        self.schema = valid_body['schema']
-        self.required = valid_body['required']
-        self.validate_body = validate_body or (lambda x: None)
+        self.schema = schema
+        self.required = required
 
     def dumps(self):
         if not self.schema:
             return self.content or None
         return json.dumps(self.parse())
 
     def parse(self):
+        """ Parse body with schema-required rules """
         if not hasattr(self.content, 'items'):
             raise ValidationError("'%s' needs a content dictionary"
                                    % self.__class__.__name__)
         parsed = dict([(key, self.content[key]) for key in self.schema
                       if key in self.content])
-        self.validate_body(parsed)
         for attr_required in self.required:
             if attr_required not in parsed:
                 raise ValidationError("'%s' attribute is required" %
@@ -42,30 +42,42 @@ def parse(self):
 
 
 class Request(object):
-    """ """
 
     uri = ''
     resource = Raw
     body_schema = {}
 
     def __init__(self, **kwargs):
-        """ """
-        self.body = kwargs.pop('body', None)
+        self.body = kwargs.pop('body', {})
         self.args = kwargs
         self.clean()
 
+    def __getattr__(self, name):
+        return self.args.get(name)
+
+    def __str__(self):
+        return self.populate_uri()
+
+    def populate_uri(self):
+        try:
+            populated_uri = self.uri.format(**self.args)
+        except KeyError:
+            raise ValidationError(
+                "'%s' request wasn't be able to populate the uri '%s' with "
+                "'%s' args" % (self.__class__.__name__, self.uri, self.args))
+        return str(populated_uri).strip('/')
+
     def clean(self):
         self.uri = self.clean_uri() or self.uri
-        self.body = Body(self.clean_body(), self.clean_valid_body(),
-                         self.validate_body)
+        self.body = Body(self.clean_body(), **self._clean_valid_body())
 
     def clean_body(self):
         return self.body
 
     def clean_uri(self):
         return None
 
-    def clean_valid_body(self):
+    def _clean_valid_body(self):
         schema = set(self.body_schema.get('schema', ()))
         required = set(self.body_schema.get('required', ()))
         if not required.issubset(schema):
@@ -75,27 +87,9 @@ def clean_valid_body(self):
                 self.__class__.__name__, required, schema))
         return dict(schema=schema, required=required)
 
-    def __getattr__(self, name):
-        return self.args.get(name)
-
-    def __str__(self):
-        return self.populate_uri()
-
-    def populate_uri(self):
-        try:
-            populated_uri = self.uri.format(**self.args)
-        except KeyError:
-            raise ValidationError(
-                "'%s' request wasn't be able to populate the uri '%s' with "
-                "'%s' args" % (self.__class__.__name__, self.uri, self.args))
-        return str(populated_uri).strip('/')
-
     def get_body(self):
         return self.body.dumps()
 
-    def validate_body(self, *args):
-        pass
-
 
 class Factory(object):
     """ Request builder """
diff --git a/pygithub3/tests/requests/test_core.py b/pygithub3/tests/requests/test_core.py
@@ -2,14 +2,12 @@
 # -*- encoding: utf-8 -*-
 
 from mock import Mock
-from nose.tools import raises
 
 from pygithub3.tests.utils.core import TestCase
 from pygithub3.requests.base import Factory, Body, json, Request
 from pygithub3.exceptions import (UriInvalid, RequestDoesNotExist,
                                   ValidationError, InvalidBodySchema)
-from pygithub3.tests.utils.base import (mock_json, DummyRequest,
-                                        DummyRequestValidation)
+from pygithub3.tests.utils.base import mock_json, DummyRequest
 from pygithub3.tests.utils.requests import (
     RequestWithArgs, RequestCleanedUri, RequestBodyInvalidSchema,
     RequestCleanedBody)
@@ -76,7 +74,7 @@ class TestRequestBodyWithSchema(TestCase):
 
     def setUp(self):
         valid_body = dict(schema=('arg1', 'arg2'), required=('arg1', ))
-        self.b = Body({}, valid_body)
+        self.b = Body({}, **valid_body)
 
     def test_with_body_empty_and_schema_permissive(self):
         self.b.schema = ('arg1', 'arg2', '...')
@@ -102,14 +100,3 @@ def test_with_body_as_None(self):
     def test_only_valid_keys(self):
         self.b.content = dict(arg1='arg1', arg2='arg2', fake='test')
         self.assertEqual(self.b.dumps(), dict(arg1='arg1', arg2='arg2'))
-
-
-class TestBodyValidation(TestCase):
-    @raises(ValidationError)
-    def test_with_error(self):
-        req = DummyRequestValidation(
-            body={'foo': 'bar', 'error': 'yes'},
-        )
-        req.body_schema = {'schema': ('foo',),
-                           'required': ('foo',)}
-        req.get_body()
diff --git a/pygithub3/tests/utils/base.py b/pygithub3/tests/utils/base.py
@@ -4,7 +4,7 @@
 from mock import Mock
 
 from pygithub3.resources.base import Resource
-from pygithub3.requests.base import Request, ValidationError
+from pygithub3.requests.base import Request
 
 
 def mock_json(content):
@@ -37,14 +37,3 @@ def loads_mock(content):
 class DummyRequest(Request):
     uri = 'dummyrequest'
     resource = DummyResource
-
-
-class DummyRequestValidation(DummyRequest):
-    body_schema = {
-        'schema': ('foo', 'error'),
-        'required': ('foo',)
-    }
-
-    def validate_body(self, body):
-        if body.get('error') == 'yes':
-            raise ValidationError('yes')
