added browser compatibility

warmuuh · Feb 26, 2013 · 3a959e5 · 3a959e5
1 parent 4e9c5fa
commit 3a959e5
Show file tree

Hide file tree

Showing 21 changed files with 270 additions and 130 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
-node_modules
+node_modules
+components
diff --git a/.scripted b/.scripted
@@ -6,6 +6,6 @@
     }
   },
   "jshint" : {
-  	options: {node: true}
+  	options: {node: true, white:false}
   }
 }
diff --git a/browser-example/MyClass.js b/browser-example/MyClass.js
@@ -0,0 +1,36 @@
+define([], function(){
+function MyClass (val){
+	this.value = val;
+}
+
+
+MyClass.prototype = {
+
+	doSomething: function( /*@Default("Default Message")*/msg, /*@Autowired("message")*/msg2, /*@Autowired*/message) {
+		console.log("default: " +msg );
+		console.log("wired: " + this.value );
+		console.log("autowired: " +msg2 );
+		console.log("autowired(pname): " + message );
+
+	},
+
+
+  doSomethingElse: function( msg) /*@NotNull*/{
+		console.log(msg + " " +this.value);
+	},
+
+  doSomethingElseAgain: function( message) /*@Autowired*/{
+		console.log("autowired(fn): " + message );
+	},
+
+};
+
+
+
+
+
+
+return MyClass;
+});
+
+
diff --git a/browser-example/component.json b/browser-example/component.json
@@ -0,0 +1,13 @@
+{
+
+    "name": "browser-example",
+    "version": "0.0.2",
+    "dependencies": {
+      "curl": "0.7.3",
+      "meld": "1.2.0",
+      "underscore": "1.4.4",
+      "when": "1.8.1",
+      "wire": "0.9.1",
+      "yaap": "0.0.2"
+    }
+}
diff --git a/browser-example/index.html b/browser-example/index.html
@@ -0,0 +1,49 @@
+<html>
+<head>
+
+<!--<script src="components/underscore/underscore.js"></script>-->
+<script type="text/javascript">
+	curl = {
+
+			paths: {
+				curl: 'components/curl/src/curl/'
+			},
+			 packages: {
+		        wire: { path: 'components/wire', main: 'wire'},
+		        when: { path: 'components/when/', main: 'when'},
+		        yaap: { path: '../yaap/', main: 'yaap'},
+		        meld: { path: 'components/meld', main: 'meld' },
+		        underscore:{ path: 'components/underscore', main: 'underscore',
+		        		config: {moduleLoader: 'curl/loader/cjsm11'}
+		        }
+
+		    }
+		};
+
+
+</script>
+</head>
+<body>
+
+<script src="components/curl/src/curl.js"></script>
+<script type="text/javascript">
+
+curl(['wire!spec']).then(function(ctx){
+
+	console.log("----- initialized -----");
+	ctx.myComponent.doSomething();
+  	ctx.myComponent.doSomethingElseAgain();
+
+},function(err){
+	console.log("err: " + err);
+})
+
+
+</script>
+
+
+
+
+
+</body>
+</html>
diff --git a/browser-example/spec.js b/browser-example/spec.js
@@ -0,0 +1,21 @@
+define([], function(){
+
+
+return {
+  message: "autowired",
+  myComponent: {
+          create: {
+	            module: 'MyClass',
+	            args: "wired"
+	        }
+  },
+
+  plugins: [
+    //{module: "wire/debug", trace: true},
+     {module: "yaap/wire/wireplugin"}
+
+  ]
+
+}
+
+});
diff --git a/component.json b/component.json
@@ -0,0 +1,9 @@
+{
+  "name": "yaap",
+  "version": "0.0.2",
+  "main": "./yaap/yaap.js",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/warmuuh/yaap.git"
+  }
+}
diff --git a/example/MyClass.js → node-example/MyClass.js b/example/MyClass.js → node-example/MyClass.js
diff --git a/example/main.js → node-example/main.js b/example/main.js → node-example/main.js
@@ -18,15 +18,15 @@ wire({
 
         plugins: [
           //{module: "wire/debug", trace: true},
-           {module: "../yaap/wire", hookRequire: require}
+           {module: "../yaap/wire"}
 
         ]
 
 }, {require: require}).then(function(ctx){
 
 	console.log("----- initialized -----");
 	ctx.myComponent.doSomething();
-  ctx.myComponent.doSomethingElseAgain();
+  	ctx.myComponent.doSomethingElseAgain();
 
-}, console.error);
+}, function(err){console.error(err);});
 
diff --git a/example/package.json → node-example/package.json b/example/package.json → node-example/package.json
diff --git a/yaap/package.json b/yaap/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "yaap",
-	"version": "0.0.1",
+	"version": "0.0.2",
 	"description": "yaap",
 	"keywords": [ "javascript", "dependency injection", "AOP", "IOC"],
 	"repository": {

diff --git a/yaap/parser/ECMA5Parser.js b/yaap/parser/ECMA5Parser.js
diff --git a/yaap/parser/PanPG_util.js b/yaap/parser/PanPG_util.js
@@ -4,8 +4,10 @@
  * http://boshi.inimino.org/3box/PanPG/about.html
  * MIT Licensed
  */
+"use strict";
+(function(define) {
+define([],function() {
 
-;(function(exports){
 
 // (event array (can be partial), [name array], [input string], [state]) → [ascii-art tree, state]
 // -or-
@@ -154,7 +156,9 @@ function treeWalker(dict,result){var p,any,anon,other,fail,except,index,cb=[],st
  function warn(s){
   if(dict.warn)dict.warn(s)}}
 
-exports.showTree=showTree
-exports.treeWalker=treeWalker
+return {
+	showTree:showTree,
+	treeWalker:treeWalker
+}
 
-})(typeof exports=='object'?exports:PanPG_util={});
+});})(typeof define == 'function'? define: function(deps, factory) {module.exports = factory.apply(this, deps.map(function(x) {return require(x);}));});
diff --git a/yaap/parser/buildparser.js b/yaap/parser/buildparser.js
@@ -8,7 +8,7 @@
  *
  * @author Peter Mucha
  *
- * @version 0.0.1
+ * @version 0.0.2
  */
 "use strict";
 
@@ -19,7 +19,7 @@ var grammar = fs.readFileSync("ECMAScript_5.peg").toString();
 var parser = pg.generateParser(grammar);
 
 
-parser = parser + "\nexports.Program = Program;";
+parser = "(function(define) {\ndefine([],function(){\n\n" + parser + "return {Program:Program};\n\n});})(typeof define == 'function'? define: function(deps, factory) {module.exports = factory.apply(this, deps.map(function(x) {return require(x);}));});";
 
 
 fs.writeFileSync("ECMA5Parser.js", parser);
diff --git a/yaap/parser/walker.js b/yaap/parser/walker.js
@@ -8,14 +8,17 @@
  *
  * @author Peter Mucha
  *
- * @version 0.0.1
+ * @version 0.0.2
  */
 "use strict";
-
-var _ = require("underscore");
+ (function(define) {
+define(["underscore"], 
+function(_) {
 
 
-var treewalker = module.exports = {
+
+
+return  {
   Program: function(match, children){
     return children;
   },
@@ -94,4 +97,6 @@ var treewalker = module.exports = {
     //console.log("fn body annotations found: " + JSON.stringify(bodyObj));
   }
 
-};
+};
+
+});})(typeof define == 'function'? define: function(deps, factory) {module.exports = factory.apply(this, deps.map(function(x) {return require(x);}));});
diff --git a/yaap/plugins/DefaultProcessor.js b/yaap/plugins/DefaultProcessor.js
@@ -10,15 +10,15 @@
  *
  * @author Peter Mucha
  *
- * @version 0.0.1
+ * @version 0.0.2
  */
 "use strict";
-
-var meld = require("meld");
-var _ = require("underscore");
-    
+(function(define) {
+define(["underscore", "meld"], 
+function(_, meld) {
+
 
-module.exports = {
+return {
   annotation: "@Default",
 
   processParameter: function(obj, fnObj, param, annotationParams)  {
@@ -32,3 +32,4 @@ module.exports = {
   }
 };
 
+});})(typeof define == 'function'? define: function(deps, factory) {module.exports = factory.apply(this, deps.map(function(x) {return require(x);}));});
diff --git a/yaap/plugins/NotNullProcessor.js b/yaap/plugins/NotNullProcessor.js
@@ -10,15 +10,16 @@
  *
  * @author Peter Mucha
  *
- * @version 0.0.1
+ * @version 0.0.2
  */
 "use strict";
-
-var meld = require("meld");
-var _ = require("underscore");
+(function(define) {
+define(["underscore", "meld"], 
+function(_, meld) {
+
 
 
-module.exports = {
+return  {
   annotation: "@NotNull",
 
 
@@ -46,3 +47,4 @@ module.exports = {
   }
 };
 
+});})(typeof define == 'function'? define: function(deps, factory) {module.exports = factory.apply(this, deps.map(function(x) {return require(x);}));});
diff --git a/yaap/registry.js b/yaap/registry.js
@@ -8,23 +8,27 @@
  *
  * @author Peter Mucha
  *
- * @version 0.0.1
+ * @version 0.0.2
  */
 "use strict";
-
-var _ = require("underscore");
-
+(function(define) {
+define(["underscore"], function(_) {
 
 var registry = [];
 
-var register = exports.register = function(processors){
-	_(processors).each(function(proc){
-		registry.push(proc);
-	});
-};
 
 
 
-var getProcessors = exports.getProcessors = function(annotation){
-	return _(registry).where({annotation:annotation});
-};
+return {
+	getProcessors: function(annotation){
+		return _(registry).where({annotation:annotation});
+	},
+	register: function(processors){
+		_(processors).each(function(proc){
+			registry.push(proc);
+		})
+	}
+}
+
+
+});})(typeof define == 'function'? define: function(deps, factory) {module.exports = factory.apply(this, deps.map(function(x) {return require(x);}));});