Split into two modules, add require.def support

Author: kriszyp

lib/links.js

@@ -0,0 +1,52 @@
+/** 
+ * JSON Schema link handler
+ * Copyright (c) 2007 Kris Zyp SitePen (www.sitepen.com)
+ * Licensed under the MIT (MIT-LICENSE.txt) license.
+ */
+require.def||(require.def=function(deps, factory){module.exports = factory();});
+require.def([], function(){
+var exports = {};
+exports.cacheLinks = true;
+exports.getLink = function(relation, instance, schema){
+	// gets the URI of the link for the given relation based on the instance and schema
+	// for example:
+	// getLink(
+	// 		"brother", 
+	// 		{"brother_id":33}, 
+	// 		{links:[{rel:"brother", href:"Brother/{brother_id}"}]}) ->
+	//	"Brother/33"
+	var links = schema.__linkTemplates; 
+	if(!links){
+		links = {};
+		var schemaLinks = schema.links;
+		if(schemaLinks && schemaLinks instanceof Array){
+			schemaLinks.forEach(function(link){
+	/*			// TODO: allow for multiple same-name relations
+				if(links[link.rel]){
+					if(!(links[link.rel] instanceof Array)){
+						links[link.rel] = [links[link.rel]];
+					}
+				}*/
+				links[link.rel] = link.href;
+			});
+		}
+		if(exports.cacheLinks){
+			schema.__linkTemplates = links;
+		}
+	}
+	var linkTemplate = links[relation];
+	return linkTemplate && exports.substitute(linkTemplate, instance);
+};
+
+exports.substitute = function(linkTemplate, instance){
+	return linkTemplate.replace(/\{([^\}]*)\}/g, function(t, property){
+			var value = instance[decodeURIComponent(property)];
+			if(value instanceof Array){
+				// the value is an array, it should produce a URI like /Table/(4,5,8) and store.get() should handle that as an array of values
+				return '(' + value.join(',') + ')';
+			}
+			return value;
+		});
+};
+return exports;
+});

lib/json-schema.js renamed to lib/validate.js

@@ -4,7 +4,7 @@
  *
  * Copyright (c) 2007 Kris Zyp SitePen (www.sitepen.com)
  * Licensed under the MIT (MIT-LICENSE.txt) license.
-To use the validator call JSONSchema.validate with an instance object and an optional schema object.
+To use the validator call the validate function with an instance object and an optional schema object.
 If a schema is provided, it will be used to validate. If the instance object refers to a schema (self-validating), 
 that schema will be used to validate and the schema parameter is not necessary (if both exist, 
 both validations will occur). 
@@ -13,6 +13,8 @@ empty list will be returned. A validation error will have two properties:
 "property" which indicates which property had the error
 "message" which indicates what the error was
  */
+require.def||(require.def=function(deps, factory){module.exports = factory();});
+require.def([], function(){
 
 // setup primitive classes to be JSON Schema types
 String.type = "string";
@@ -22,8 +24,8 @@ exports.Integer = {type:"integer"};
 Object.type = "object";
 Array.type = "array";
 Date.type = "date";
-
-exports.validate = function(/*Any*/instance,/*Object*/schema) {
+var exports = validate;
+exports.validate = function validate(/*Any*/instance,/*Object*/schema) {
 		// Summary:
 		//  	To use the validator call JSONSchema.validate with an instance object and an optional schema object.
 		// 		If a schema is provided, it will be used to validate. If the instance object refers to a schema (self-validating), 
@@ -237,50 +239,6 @@ exports.mustBeValid = function(result){
 		throw new TypeError(result.errors.map(function(error){return "for property " + error.property + ': ' + error.message;}).join(", \n"));
 	}	
 }
-	/* will add this later
-	newFromSchema : function() {
-	}
-*/
 
-exports.cacheLinks = true;
-exports.getLink = function(relation, instance, schema){
-	// gets the URI of the link for the given relation based on the instance and schema
-	// for example:
-	// getLink(
-	// 		"brother", 
-	// 		{"brother_id":33}, 
-	// 		{links:[{rel:"brother", href:"Brother/{brother_id}"}]}) ->
-	//	"Brother/33"
-	var links = schema.__linkTemplates; 
-	if(!links){
-		links = {};
-		var schemaLinks = schema.links;
-		if(schemaLinks && schemaLinks instanceof Array){
-			schemaLinks.forEach(function(link){
-	/*			// TODO: allow for multiple same-name relations
-				if(links[link.rel]){
-					if(!(links[link.rel] instanceof Array)){
-						links[link.rel] = [links[link.rel]];
-					}
-				}*/
-				links[link.rel] = link.href;
-			});
-		}
-		if(exports.cacheLinks){
-			schema.__linkTemplates = links;
-		}
-	}
-	var linkTemplate = links[relation];
-	return linkTemplate && exports.substitute(linkTemplate, instance);
-};
-
-exports.substitute = function(linkTemplate, instance){
-	return linkTemplate.replace(/\{([^\}]*)\}/g, function(t, property){
-			var value = instance[decodeURIComponent(property)];
-			if(value instanceof Array){
-				// the value is an array, it should produce a URI like /Table/(4,5,8) and store.get() should handle that as an array of values
-				return '(' + value.join(',') + ')';
-			}
-			return value;
-		});
-};
+return exports;
+});