Updated license

Author: Chris Wacek

LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Chris Wacek
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

setup.py

@@ -2,19 +2,6 @@
 # -*- coding: utf-8 -*-
 # <python_jsonschema_objects - An object wrapper for JSON Schema definitions>
 # Copyright (C) <2014-2014>  Chris Wacek <[email protected]
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, see <http://www.gnu.org/licenses/>
 
 import ast
 import os
@@ -73,10 +60,11 @@ def parse_requirements(path):
         long_description = ''
 
     setup(name='python_jsonschema_objects',
-          version='0.0.10',
+          version='0.0.10.post1',
           description='An object wrapper for JSON Schema definitions',
           author='Chris Wacek',
           long_description=long_description,
+          license="LICENSE",
           author_email='[email protected]',
           include_package_data=True,
           url='http://github.com/cwacek/python-jsonschema-objects',

test/test.py

@@ -35,18 +35,43 @@
             builder.validate.when.called_with({'MyAddress': 1234}).should.throw(pjs.ValidationError)
             builder.validate.when.called_with({'MyAddress': '1234'}).should_not.throw(pjs.ValidationError)
 
-
         it 'should be able to read an object':
             for nm, ex in self.examples.iteritems():
                 builder = pjs.ObjectBuilder(ex, resolved=self.examples)
                 builder.should.be.ok
 
-        it 'should be able to build classes':
-            for nm, ex in self.examples.iteritems():
-                builder = pjs.ObjectBuilder(self.example, resolved=self.examples)
+        context "additionalProperties":
+
+            before_each:
+                builder = pjs.ObjectBuilder(self.examples['Example Schema'], resolved=self.examples)
+                builder.should.be.ok
+                self.Person = builder.classes['ExampleSchema']
+                builder = pjs.ObjectBuilder(self.examples['Other'], resolved=self.examples)
                 builder.should.be.ok
-                namespace = builder.build_classes()
-                this(namespace).should.be.ok
+                self.Other = builder.classes['Other']
+
+            it 'should allow additionalProperties by default':
+
+                def set_attribute(object):
+                    object.randomAttribute = 4
+
+                person = self.Person()
+                set_attribute.when.called_with(person).should_not.throw(Exception)
+
+                int(person.randomAttribute).should.equal(4)
+
+            it 'should still raise errors when accessing undefined attributes':
+
+                person = self.Person()
+                #person.should_not.have.property('randomAttribute')
+
+            it 'should not allow undefined attributes if false':
+
+                def set_attribute(object):
+                    object.randomAttribute = 4
+
+                other = self.Other()
+                set_attribute.when.called_with(other).should.throw(pjs.ValidationError)
 
         context 'PersonExample':
             before_each:
@@ -66,6 +91,11 @@
                 int(person.age).should.equal(35)
                 person.should.be.ok
 
+            it 'should validate when decoding from json':
+                self.Person.from_json.when.called_with(
+                        '{"firstName":"James"}'
+                        ).should.throw(pjs.ValidationError)
+
             it 'should validate enumerations':
                 person = self.Person()
 

tox.ini

@@ -4,10 +4,12 @@ envlist = py27
 
 [testenv]
 install_command = pip install --no-compile {opts} {packages}
-commands = nosetests --with-noy --rednose -s
+commands = coverage run {envbindir}/nosetests --with-noy --rednose -s
+           coverage html --omit=*test* --include=*python_jsonschema_objects*
 deps =
   -rrequirements.txt
   nose
+  coverage
   rednose
   https://github.com/cwacek/sure/tarball/master
   https://github.com/cwacek/nose-of-yeti/tarball/master