Merge branch 'master' into develop

Author: cwacek

.travis.yml

@@ -2,7 +2,6 @@ language: python
 python:
 - '2.7'
 install:
-- pip install -r requirements.txt
 - pip install tox
 script: tox
 deploy:

python_jsonschema_objects/__init__.py

@@ -3,6 +3,7 @@
 from jsonschema.compat import iteritems
 import json
 import codecs
+import copy
 import os.path
 import inflection
 import six
@@ -28,7 +29,7 @@ def __init__(self, schema_uri, resolved={}):
         if isinstance(schema_uri, six.string_types):
             uri = os.path.normpath(schema_uri)
             self.basedir = os.path.dirname(uri)
-            with open(uri) as fin:
+            with codecs.open(uri, 'r', 'utf-8') as fin:
                 self.schema = json.loads(fin.read())
         else:
             self.schema = schema_uri
@@ -52,6 +53,17 @@ def __init__(self, schema_uri, resolved={}):
         self._classes = None
         self._resolved = None
 
+    @property
+    def schema(self):
+        try:
+            return copy.deepcopy(self._schema)
+        except AttributeError:
+            raise ValidationError("No schema provided")
+
+    @schema.setter
+    def schema(self, val):
+        setattr(self, '_schema', val)
+
     @property
     def classes(self):
         if self._classes is None:

python_jsonschema_objects/classbuilder.py

@@ -8,6 +8,9 @@
 import sys
 
 import logging
+
+import python_jsonschema_objects.wrapper_types
+
 logger = logging.getLogger(__name__)
 
 logger.addHandler(logging.NullHandler())
@@ -64,6 +67,9 @@ def for_json(self):
         return self.as_dict()
 
     def __eq__(self, other):
+        if not isinstance(other, ProtocolBase):
+            return False
+          
         return self.as_dict() == other.as_dict()
 
     def __str__(self):
@@ -153,7 +159,6 @@ def __init__(self, **props):
                                      six.moves.xrange(len(self.__prop_names__))]))
 
         for prop in props:
-
             try:
               logger.debug(util.lazy_format("Setting value for '{0}' to {1}", prop, props[prop]))
               setattr(self, prop, props[prop])
@@ -318,7 +323,11 @@ def __init__(self, value, typ=None):
       :value: @todo
 
       """
-      self._value = value
+      if isinstance(value, LiteralValue):
+          self._value = value._value
+      else:
+          self._value = value
+
       self.validate()
 
   def as_dict(self):
@@ -456,7 +465,7 @@ def _construct(self, uri, clsdata, parent=(ProtocolBase,),**kw):
         elif clsdata.get('type') == 'array' and 'items' in clsdata:
             clsdata_copy = {}
             clsdata_copy.update(clsdata)
-            self.resolved[uri] = validators.ArrayValidator.create(
+            self.resolved[uri] = python_jsonschema_objects.wrapper_types.ArrayWrapper.create(
                 uri,
                 item_constraint=clsdata_copy.pop('items'),
                 classbuilder=self,
@@ -530,6 +539,7 @@ def _build_object(self, nm, clsdata, parents,**kw):
         name_translation = {}
 
         for prop, detail in properties.items():
+            logger.debug(util.lazy_format("Handling property {0}.{1}",nm, prop))
             properties[prop]['raw_name'] = prop
             name_translation[prop] = prop.replace('@', '')
             prop = name_translation[prop]
@@ -550,6 +560,9 @@ def _build_object(self, nm, clsdata, parents,**kw):
             elif 'type' not in detail and '$ref' in detail:
                 ref = detail['$ref']
                 uri = util.resolve_ref_uri(self.resolver.resolution_scope, ref)
+                logger.debug(util.lazy_format("Resolving reference {0} for {1}.{2}",
+                    ref, nm, prop
+                    ))
                 if uri not in self.resolved:
                     with self.resolver.resolving(ref) as resolved:
                         self.resolved[uri] = self.construct(
@@ -581,7 +594,7 @@ def _build_object(self, nm, clsdata, parents,**kw):
                         typ = self.construct(uri, detail['items'])
                         propdata = {
                             'type': 'array',
-                            'validator': validators.ArrayValidator.create(
+                            'validator': python_jsonschema_objects.wrapper_types.ArrayWrapper.create(
                                 uri,
                                 item_constraint=typ)}
                     else:
@@ -602,14 +615,14 @@ def _build_object(self, nm, clsdata, parents,**kw):
                             else:
                                 typ = self.construct(uri, detail['items'])
                             propdata = {'type': 'array',
-                                        'validator': validators.ArrayValidator.create(uri, item_constraint=typ,
-                                                                                addl_constraints=detail)}
+                                        'validator': python_jsonschema_objects.wrapper_types.ArrayWrapper.create(uri, item_constraint=typ,
+                                                                                                                 addl_constraints=detail)}
                         except NotImplementedError:
                             typ = detail['items']
                             propdata = {'type': 'array',
-                                        'validator': validators.ArrayValidator.create(uri,
-                                                                                item_constraint=typ,
-                                                                                addl_constraints=detail)}
+                                        'validator': python_jsonschema_objects.wrapper_types.ArrayWrapper.create(uri,
+                                                                                                                 item_constraint=typ,
+                                                                                                                 addl_constraints=detail)}
 
                     props[prop] = make_property(prop,
                                                 propdata,
@@ -725,7 +738,7 @@ def setprop(self, val):
                         val.validate()
                         ok = True
                         break
-                elif util.safe_issubclass(typ, validators.ArrayValidator):
+                elif util.safe_issubclass(typ, python_jsonschema_objects.wrapper_types.ArrayWrapper):
                     try:
                         val = typ(val)
                     except Exception as e:
@@ -743,13 +756,14 @@ def setprop(self, val):
                     "Object must be one of {0}: \n{1}".format(info['type'], errstr))
 
         elif info['type'] == 'array':
-            instance = info['validator'](val)
-            val = instance.validate()
+            val = info['validator'](val)
+            val.validate()
 
-        elif util.safe_issubclass(info['type'], validators.ArrayValidator):
+        elif util.safe_issubclass(info['type'],
+                                  python_jsonschema_objects.wrapper_types.ArrayWrapper):
             # An array type may have already been converted into an ArrayValidator
-            instance = info['type'](val)
-            val = instance.validate()
+            val = info['type'](val)
+            val.validate()
 
         elif getattr(info['type'], 'isLiteralClass', False) is True:
             if not isinstance(val, info['type']):

python_jsonschema_objects/pattern_properties.py

@@ -6,6 +6,9 @@
 import collections
 
 import logging
+
+import python_jsonschema_objects.wrapper_types
+
 logger = logging.getLogger(__name__)
 
 PatternDef = collections.namedtuple('PatternDef', 'pattern schema_type')
@@ -70,7 +73,7 @@ def _make_type(self, typ, val):
         if util.safe_issubclass(typ, cb.ProtocolBase):
             return typ(**util.coerce_for_expansion(val))
 
-        if util.safe_issubclass(typ, validators.ArrayValidator):
+        if util.safe_issubclass(typ, python_jsonschema_objects.wrapper_types.ArrayWrapper):
             return typ(val)
 
         raise validators.ValidationError(

python_jsonschema_objects/util.py

@@ -44,11 +44,11 @@ class ProtocolJSONEncoder(json.JSONEncoder):
 
     def default(self, obj):
         from python_jsonschema_objects import classbuilder
-        from python_jsonschema_objects import validators
+        from python_jsonschema_objects import wrapper_types
 
         if isinstance(obj, classbuilder.LiteralValue):
             return obj._value
-        if isinstance(obj, validators.ArrayValidator):
+        if isinstance(obj, wrapper_types.ArrayWrapper):
             return obj.for_json()
         if isinstance(obj, classbuilder.ProtocolBase):
             props = {}