From 3fba3648902bcd78eb2675fc244f7672957524fe Mon Sep 17 00:00:00 2001
From: Justin Rainbow <justin.rainbow@sheknows.com>
Date: Tue, 15 Mar 2011 18:10:32 -0700
Subject: [PATCH] Organizing files

---
 bootstrap.php                                          |  4 ++--
 JsonSchema.php => libs/JsonSchema.php                  |  0
 .../JsonSchemaUndefined.php                            |  0
 tests/cases/AdditionalPropertiesTest.php               |  9 ++++++++-
 interface.css => webroot/css/interface.css             |  0
 functions.js => webroot/js/functions.js                |  0
 interface.js => webroot/js/interface.js                |  0
 jquery.js => webroot/js/jquery.js                      |  0
 jsonschema.js => webroot/js/jsonschema.js              |  0
 validate.php => webroot/tests/validate.php             |  4 ++--
 validator.html => webroot/tests/validator.html         | 10 +++++-----
 11 files changed, 17 insertions(+), 10 deletions(-)
 rename JsonSchema.php => libs/JsonSchema.php (100%)
 rename JsonSchemaUndefined.php => libs/JsonSchemaUndefined.php (100%)
 rename interface.css => webroot/css/interface.css (100%)
 rename functions.js => webroot/js/functions.js (100%)
 rename interface.js => webroot/js/interface.js (100%)
 rename jquery.js => webroot/js/jquery.js (100%)
 rename jsonschema.js => webroot/js/jsonschema.js (100%)
 rename validate.php => webroot/tests/validate.php (82%)
 rename validator.html => webroot/tests/validator.html (66%)

diff --git a/bootstrap.php b/bootstrap.php
index aa28ace..d1a4a84 100644
--- a/bootstrap.php
+++ b/bootstrap.php
@@ -1,5 +1,5 @@
 <?php
 
-require 'JsonSchema.php';
-require 'JsonSchemaUndefined.php';
+require 'libs/JsonSchema.php';
+require 'libs/JsonSchemaUndefined.php';
 require 'tests/BaseTestCase.php';
diff --git a/JsonSchema.php b/libs/JsonSchema.php
similarity index 100%
rename from JsonSchema.php
rename to libs/JsonSchema.php
diff --git a/JsonSchemaUndefined.php b/libs/JsonSchemaUndefined.php
similarity index 100%
rename from JsonSchemaUndefined.php
rename to libs/JsonSchemaUndefined.php
diff --git a/tests/cases/AdditionalPropertiesTest.php b/tests/cases/AdditionalPropertiesTest.php
index 1c8374a..32397d7 100644
--- a/tests/cases/AdditionalPropertiesTest.php
+++ b/tests/cases/AdditionalPropertiesTest.php
@@ -16,7 +16,14 @@ class AdditionalPropertiesTest extends BaseTestCase
                     "prop":{"type":"string"}
                   },
                   "additionalProperties": false
-                }'
+                }',
+                null,
+                array(
+                    array(
+                        'property' => '',
+                        'message'  => 'The property additionalProp is not defined in the objTypeDef and the objTypeDef does not allow additional properties'
+                    )
+                )
             ),
             array(
                 '{
diff --git a/interface.css b/webroot/css/interface.css
similarity index 100%
rename from interface.css
rename to webroot/css/interface.css
diff --git a/functions.js b/webroot/js/functions.js
similarity index 100%
rename from functions.js
rename to webroot/js/functions.js
diff --git a/interface.js b/webroot/js/interface.js
similarity index 100%
rename from interface.js
rename to webroot/js/interface.js
diff --git a/jquery.js b/webroot/js/jquery.js
similarity index 100%
rename from jquery.js
rename to webroot/js/jquery.js
diff --git a/jsonschema.js b/webroot/js/jsonschema.js
similarity index 100%
rename from jsonschema.js
rename to webroot/js/jsonschema.js
diff --git a/validate.php b/webroot/tests/validate.php
similarity index 82%
rename from validate.php
rename to webroot/tests/validate.php
index 899f9ae..ea5b2e5 100644
--- a/validate.php
+++ b/webroot/tests/validate.php
@@ -1,6 +1,6 @@
 <?php
-require_once('JsonSchema.php');
-require_once('JsonSchemaUndefined.php');
+require_once('../../libs/JsonSchema.php');
+require_once('../../libs/JsonSchemaUndefined.php');
 Dbg::$quietMode = true;
 
 if($_REQUEST['schema']) {
diff --git a/validator.html b/webroot/tests/validator.html
similarity index 66%
rename from validator.html
rename to webroot/tests/validator.html
index 971f6ce..3f7f8b7 100644
--- a/validator.html
+++ b/webroot/tests/validator.html
@@ -1,10 +1,10 @@
 <html>
 <head>
-<script type="text/javascript" src="jsonschema.js"></script>
-<script type="text/javascript" src="functions.js"></script>
-<script type="text/javascript" src="jquery.js"></script>
-<script type="text/javascript" src="interface.js"></script>
-<link rel="stylesheet" type="text/css" href="interface.css" />
+<script type="text/javascript" src="../js/jsonschema.js"></script>
+<script type="text/javascript" src="../js/functions.js"></script>
+<script type="text/javascript" src="../js/jquery.js"></script>
+<script type="text/javascript" src="../js/interface.js"></script>
+<link rel="stylesheet" type="text/css" href="../css/interface.css" />
 
 </head>