Major refactoring of object creation and initialization using an init…

… queue. Better reference resolution. Experimental rest plugin that can resolve references to rest resources
briancavalier · Dec 27, 2010 · 55bc3c8 · 55bc3c8
1 parent a1dac98
commit 55bc3c8
Show file tree

Hide file tree

Showing 10 changed files with 320 additions and 141 deletions.
diff --git a/index.html b/index.html
@@ -25,7 +25,7 @@
 			// Pick either the AlertLogger or SilentLogger and reload.
 			// Can inject concrete dependencies without having to modify Controller.
 			logger: {
-				module: 'test/test1/AlertLogger'
+				module: 'test/test1/ConsoleLogger'
 			},
 
 			// Silly, but shows that native values can be declared as usual, and can be wired in
@@ -55,7 +55,8 @@
 						number: { "$ref": "number" },
 						// logger: { "$ref": "logger" },
 						messageNode: { "$ref" : "dom!node1" }, // inject reference to dom node by id
-						foo: { "$ref": "foo" }
+						foo: { "$ref": "foo" },
+						logger: { $ref: "logger" }
 					},
 					// Init function (named "ready") will be called after on DomReady
 					// Allows > 1 function to be called
@@ -67,7 +68,7 @@
 				}
 			},
 			function(context2) {
-				console.log(context2.get("controller").foo);
+				console.log(context2.get("controller"));
 			});
 		});
 	</script>

diff --git a/rest1.html b/rest1.html
@@ -0,0 +1,22 @@
+<!DOCTYPE HTML>
+<html lang="en-US">
+<head>
+	<meta charset="UTF-8">
+	<title>Launcher test</title>
+	<script type="text/javascript">
+		djConfig = {
+			baseUrl: './',
+			modulePaths:  {
+				'dojo': 'dojo',
+				'dijit': 'dijit',
+				'test': 'test'
+			}
+		};
+	</script>
+	<script src="require.js" type="text/javascript" charset="utf-8"></script>
+	<script type="text/javascript" src="wire.js" data-wire-spec="rest1.js"></script>
+</head>
+<body>
+
+</body>
+</html>
diff --git a/rest1.js b/rest1.js
@@ -0,0 +1,28 @@
+wire({
+	wire$plugins: [
+		{ module: 'wire/rest' }
+	],
+	controller: {
+		module: 'test/rest1/Controller',
+		create: [],
+		properties: {
+			store: { '$ref': 'rest!test/rest1/person.json' }
+		},
+		init: 'ready'
+	},
+	controller2: {
+		module: 'test/rest1/Controller',
+		create: [],
+		properties: {
+			store: {
+				module: 'dojo/store/JsonRest',
+				create: [{ target: 'test/rest1/person.json' }]
+			}
+		},
+		init: 'ready'
+	}
+},
+function(context) {
+	console.log(context.get('controller'));
+	console.log(context.get('controller2'));
+});
diff --git a/test/rest1/Controller.js b/test/rest1/Controller.js
@@ -0,0 +1,13 @@
+define([], function() {
+
+	var Controller = function() {
+	};
+
+	Controller.prototype.ready = function() {
+		this.store.query({}).forEach(function(person) {
+			console.log(person);
+		});
+	};
+
+	return Controller;
+});
diff --git a/test/rest1/person.json b/test/rest1/person.json
@@ -0,0 +1,10 @@
+[
+	{
+		"id": 1,
+		"name": "Sergei Rachmaninoff" 
+	},
+	{
+		"id": 2,
+		"name": "Dmitri Bortnianski"
+	}
+]
diff --git a/test/test1/Controller.js b/test/test1/Controller.js
@@ -1,4 +1,4 @@
-define(['test/test1/ConsoleLogger'], function(defaultLogger) {
+define(['test/test1/AlertLogger'], function(defaultLogger) {
 
 	var Controller = function(name) {
 		// Defaults, these will get rewired

diff --git a/test2.js b/test2.js
@@ -5,7 +5,6 @@ wire({
 	// dom: { module: 'wire/dom' }
 	// This seems like it could end up being a reasonable convention, tho.
 	wire$plugins: [
-		{ module: 'dojo' },
 		{ module: 'dijit/form/TextBox' },
 		{ module: 'wire/dijit' }, // Calls dojo.parser.parse
 		{ module: 'wire/dom' }
@@ -16,16 +15,21 @@ wire({
 		module: 'test/test2/Controller',
 		create: [],
 		properties: {
-			name: "controller1",
+			name: { '$ref': 'name' },
-			widget: { 
+			widget: { '$ref': 'widget1' }
-				module: 'dijit/form/TextBox',
-				create: [{}, { $ref: 'dom!widgetNode' }]
-			}
 		},
 		init: {
 			ready: []
 		}
 	},
+	name: 'controller1',
+	widget1: { 
+		module: 'dijit/form/TextBox',
+		create: [{}, { $ref: 'dom!widgetNode' }],
+		properties: {
+			value: "Initial Value!"
+		}
+	},
 	// Create a controller, and inject a dijit.form.TextBox that is simply
 	// referenced using the dijit resolver
 	controller2: {