add support for swagger-ui (tests needed)

Author: laginha

example/store/books/resources.py

@@ -60,11 +60,11 @@ def list(self, request, params):
     def detail(self, request, book_id):
         return Book.objects.get( id=book_id )
 
-    @validate_form(CreateBook)    
+    # @validate_form(CreateBook)
     def create(self, *args, **kwargs):
         return 401
 
-    @validate_form(CreateBook)    
+    # @validate_form(CreateBook)
     def update(self, *args, **kwargs):
         return 405
 

example/store/books/tests/json_builder.py

@@ -6,15 +6,15 @@
 from yard.api import Api
 from yard import fields as FIELDS
 from books.tests.base import BaseTestCase
-from books.models  import *
+from books.models  import Book, Author
 
 
 class JSONBuilderTestCase( BaseTestCase ):
 
     def setUp(self):
         super(JSONBuilderTestCase, self).setUp()
         self.api = Api()
-        self.resource_class = type('TestResouce', (Resource,), {})
+        self.resource_class = type('TestResouce', (Resource,), {'model': Book})
         self.resource_class.preprocess(self.api)
         self.resource = self.resource_class({})
 

example/store/books/tests/params.py

@@ -152,7 +152,7 @@ def test_default(self):
         assert p.get_default(string)[0] == string
 
     def test_validate(self, param=CharParam):
-        p = RegexParam(r'[0-9]*')
+        p = RegexParam(r'^[0-9]*$')
         assert fail_validation(p, RANDOM.string())
         assert p.do_validate(RANDOM.char_number())
         assert fail_validation(p, RANDOM.string())

example/store/books/tests/resource_methods.py

@@ -43,7 +43,7 @@ class ResourceHttpMethodsTestCase( BaseTestCase ):
     def setUp(self):
         super(ResourceHttpMethodsTestCase, self).setUp()
         self.factory = RequestFactory()
-        TestResource = type('TestResource', (Resource,), {})
+        TestResource = type('TestResource', (Resource,), {'model': Book})
         TestResource.preprocess(Api())
         self.collection_resource = TestResource(
             TestResource.as_list_view()['routes'])

src/yard/api.py

@@ -52,8 +52,8 @@ def get_documentation(self):
         resource_class.preprocess(self)
         for info in resource_class.get_views():
             items = info['routes'].iteritems()
-            if not any(hasattr(resource_class, v) for k,v in items):
-                continue
+            # if not any(hasattr(resource_class, v) for k,v in items):
+            #     continue
             viewname = "%s.%s" %(name or resource_class.__name__, info['name'])
             self.list_of_urlpatterns.append(
                 url(

src/yard/fields.py

@@ -16,9 +16,9 @@ def get_documentation(self):
             json['items'] = {'type': 'string'}
         return json
 
-    def __call__(self, data):
+    def __call__(self, data, api=None):
         if data:
-            return self.converter(data)
+            return self.converter(data, api) if api else self.converter(data)
 
 
 Integer = JsonField('integer', lambda data: int(data))

src/yard/forms/params/__init__.py

@@ -55,17 +55,16 @@ class PositiveIntegerParam(IntegerParam):
     Parameter for positive integer values
     '''
     def __init__(self, description=None, alias=None, aliases=None, 
-                required=False, default=None, min_value=0, max_value=None):
-        self.max_value = max_value
-        self.min_value = 0
-        Parameter.__init__(self, 
+                required=False, default=None, max_value=None):
+        super(PositiveIntegerParam, self).__init__( 
             description=description, alias=alias, aliases=aliases, 
-            required=required, default=default, validate=validate)
+            required=required, default=default, min_value=0, 
+            max_value=max_value)
 
     def validate(self, value):
         if self.max_value != None:
-            return value <= self.max_value and value >= max(self.min_value, 0)
-        return value >= max(self.min_value, 0)
+            return value <= self.max_value and value >= self.min_value
+        return value >= self.min_value
 
 
 class CharParam(Parameter):

src/yard/resources/base/__init__.py

@@ -100,7 +100,7 @@ def get_views(cls):
 
     def __init__(self, routes):
         self.routes = routes
-    
+
     @property
     def tagname(self):
         return self.model.__name__.lower()