Feature/optimize

.gitignore

@@ -5,3 +5,5 @@ compiled/**/*.*
 app/lib/
 dist/
 example-widget/
+.cram/
+build/

Gruntfile.js

@@ -2,12 +2,29 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-contrib-clean');
   grunt.loadNpmTasks('grunt-contrib-watch');
   grunt.loadNpmTasks('grunt-contrib-connect');
+  grunt.loadNpmTasks('grunt-contrib-uglify');
+  grunt.loadNpmTasks('grunt-contrib-concat');
   grunt.loadNpmTasks('grunt-karma');
   grunt.loadNpmTasks('grunt-shell');
   grunt.initConfig({
+    bower: grunt.file.readJSON('bower.json'),
     clean: {
       all: {
-        src: ["compiled", "dist"]
+        src: ["build", "compiled", "dist"]
+      }
+    },
+    concat: {
+      sqwidget: {
+        files: {
+          'dist/sqwidget-<%= bower.version %>.min.js': ['app/lib/curl/dist/curl/curl.js', 'build/sqwidget-min.js']
+        }
+      }
+    },
+    uglify: {
+      sqwidget: {
+        files: {
+          'build/sqwidget-min.js': ['build/sqwidget.js']
+        }
       }
     },
     connect: {
@@ -32,6 +49,10 @@ module.exports = function(grunt) {
     shell: {
       build_example: {
         command: "./build_example.sh"
+      },
+      build_cram: {
+        options: { stdout: true, stderr: true },
+        command: "./node_modules/cram/bin/cram sqwidget.js --include curl/plugin/domReady build.json -o build/sqwidget.js"
       }
     },
     watch: {
@@ -44,4 +65,5 @@ module.exports = function(grunt) {
   grunt.registerTask("build", ["shell:build_example"]);
   grunt.registerTask("test", ["clean", "build", "karma"]);
   grunt.registerTask("default", ["clean", "build", "connect", "watch"]);
+  grunt.registerTask("dist", ["clean", "shell:build_cram", "uglify", "concat"]);
 };

app/main.js

@@ -1,100 +1,114 @@
-define(['./lib/bonzo/bonzo', './lib/qwery/qwery', './lib/eventEmitter/EventEmitter', 'domReady!'],
-function(bonzo, qwery, Emitter) {
+define(['require', './lib/bonzo/bonzo', './lib/qwery/qwery', 'bean', 'curl/plugin/domReady!'],
+function(require, bonzo, qwery, bean) {
 
   var SqwidgetCore = (function() {
 
     function SqwidgetCore() {}
 
-    for (var key in Emitter.prototype) {
-      SqwidgetCore.prototype[key] = Emitter.prototype[key];
-    }
-
     SqwidgetCore.prototype.packages = {};
 
     //convert data-sqwidget to dictionary
     SqwidgetCore.prototype.getWidgetParams = function($el) {
-      var data, key, val, _ref;
-      data = {};
-      _ref = $el.data();
-
-      for (key in _ref) {
-        val = _ref[key];
-        if (!(key.match("sqwidget"))) {
-          continue;
+      var key, val,
+          data = {},
+          elData = $el.data();
+
+      //for compatibility data-sqwidget gets renamed data-sqwidget-url
+      if(elData.sqwidget) {
+        elData.sqwidgetUrl = elData.sqwidget;
+        delete elData.sqwidget;
+      }
+
+      //convert list of names into a nested structure with val as the value
+      var nest = function( names, val, data ) {
+        for( var i = 0; i < names.length; i++ ) {
+          data = data[ names[i].toLowerCase() ] =
+            i === names.length - 1 ? val : data[ names[i] ] || {};
         }
-        key = key.replace("sqwidget", "").toLowerCase();
-        data[key || "url"] = val;
+      };
+
+      for (key in elData) {
+        val = elData[key];
+        if (!(key.match("^sqwidget"))) { continue; }
+        nest(key.match(/([A-Z]?[^A-Z]*)/g).slice(0,-1), val, data);
       }
-      return data;
+
+      return data.sqwidget;
     };
 
     SqwidgetCore.prototype.guid = function() {
-      return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
+      return 'sqwidget-xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
         var r = Math.random()*16|0, v = c == 'x' ? r : (r&0x3|0x8);
         return v.toString(16);
       });
     };
 
     SqwidgetCore.prototype.register = function(el) {
-      var opts, pkg, _this = this, id = this.guid();
-
-      pkg = new Emitter();
-      var $el = bonzo(el).addClass('sqwidget').addClass(id);
-      pkg.opts = opts = this.getWidgetParams($el);
-      opts.el = pkg.el = $el;
+      var opts,
+          _this = this,
+          id = this.guid(),
+          $el = bonzo(el).addClass('sqwidget').addClass(id);
+      opts = this.getWidgetParams($el);
+      opts.el = $el;
       opts.id = id;
 
       if (!opts.url) {
         throw new Error("No widget source defined (set data-sqwidget-url)");
       }
 
-      this.packages[id] = {
-        location: opts.url,
-        main: 'app/index',
-        config: opts
-      };
+      return this.packages[opts.url] = opts;
+    };
 
-      return pkg;
+    //when the promise is resolved initialise the bundle controller
+    SqwidgetCore.prototype.resolve = function(pkg, bundle) {
+      if(bundle.Controller) {
+        var widget = new bundle.Controller({
+          sqwidget: this,
+          config: pkg
+        });
+
+        //bus events
+        bean.fire(this, "rendered:" + pkg.location);
+        bean.fire(this, "rendered:" + pkg.id);
+        bean.fire(pkg, "rendered");
+      } else {
+        throw("controller not found for " + bundle.location);
+      }
     };
 
     SqwidgetCore.prototype.initialize = function() {
-      var names = [], pkg, _this = this;
+      var names = [],
+          _this = this;
 
       for(var k in _this.packages) names.push(k);
 
-      curl({
-        packages: _this.packages,
-      }, names, function() {
+      require(names, function() {
         var loaded = Array.prototype.slice.call(arguments);
         for (var i = 0; i < loaded.length; i++) {
-          var module = loaded[i];
-
-          if(module.Controller) {
-            var widget = new module.Controller({
-              sqwidget: _this
-            });
-
-            //bus events
-            _this.trigger("rendered:" + _this.packages[names[i]].location);
-            _this.trigger("rendered:" + _this.packages[names[i]].id);
+          var pkg =  _this.packages[names[i]];
+          //if the bundle is a promise, wait for it to resolve, otherwise handle
+          //immediately
+          if("then" in loaded[i]) {
+            var resolve = function(bundle) {
+              return _this.resolve(pkg, bundle); };
+            loaded[i].then(resolve);
           } else {
-            console.log("controller not found for " + module.location);
+            _this.resolve(pkg, loaded[i]);
           }
         }
-      });
+      }, function(err) { throw err; } );
     };
 
     return SqwidgetCore;
 
   })();
 
-  sqwidget = new SqwidgetCore();
+  var sqwidget = new SqwidgetCore();
 
   bonzo(qwery('div[data-sqwidget]')).each(function(el) {
     sqwidget.register(el);
   });
 
   sqwidget.initialize();
-
   return sqwidget;
 });

bower.json

@@ -21,13 +21,8 @@
     "tests"
   ],
   "dependencies": {
-    "backbone-amd": "~1.1.0",
     "bonzo": "~1.3.6",
     "curl": "~0.8.4",
-    "qwery": "~3.4.1",
-    "underscore-amd": "~1.5.2",
-    "eventEmitter": "[email protected]:Wolfy87/EventEmitter.git#master",
-    "jquery": "~2.0.3",
-    "momentjs": "~2.4.0"
+    "qwery": "~3.4.1"
   }
 }

build.json

@@ -0,0 +1,3 @@
+{
+  "baseUrl": "."
+}

grunt-scaffold/root/.gitignore

@@ -1,3 +1,5 @@
 app/nls
 app/lib
 app/compiled
+build/
+dist/

grunt-scaffold/root/Gruntfile.js

@@ -1,5 +1,11 @@
 module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-contrib-less');
+  grunt.loadNpmTasks('grunt-contrib-clean');
+  grunt.loadNpmTasks('grunt-contrib-connect');
+  grunt.loadNpmTasks('grunt-contrib-watch');
+  grunt.loadNpmTasks('grunt-contrib-uglify');
+  grunt.loadNpmTasks('grunt-shell');
+  grunt.loadNpmTasks('grunt-open');
   grunt.loadTasks('tasks');
   grunt.initConfig({
     jshint: {
@@ -20,21 +26,45 @@ module.exports = function(grunt) {
     },
     clean: {
       all: {
-        src: ["compiled", "dist"]
+        src: ["compiled", "build", "dist"]
       }
     },
     connect: {
       widget: {
         options: {
-          port: 8080,
+          port: 8082,
+          hostname: '*',
           base: '.'
         }
       }
     },
-    watch: {
+    uglify: {
       widget: {
-        files: ["app/src/**/*"],
-        tasks: ["build"]
+        files: {
+          'dist/{%= name %}.js': ['build/app/index.js']
+        }
+      }
+    },
+    shell: {
+      build_cram: {
+        options: { stdout: true, stderr: true },
+        command: "./node_modules/cram/bin/cram build.js build.json --exclude ractive -o build/app/index.js -l loader.js"
+      }
+    },
+    open: {
+      widget: {
+        path: "http://127.0.0.1:8082/",
+        app: "Google Chrome"
+      }
+    },
+    watch: {
+      less: {
+        files: ["app/less/**/*.less"],
+        tasks: ["less"]
+      },
+      translate: {
+        files: ["app/i18n.yml"],
+        tasks: ["requirejs-i18n:widget"]
       }
     },
     'requirejs-i18n': {
@@ -53,6 +83,7 @@ module.exports = function(grunt) {
       }
     }
   });
-  grunt.registerTask('default', ['build', 'connect', 'watch']);
+  grunt.registerTask('default', ['build', 'connect', 'open', 'watch']);
   grunt.registerTask('build', ['less:widget', 'requirejs-i18n:widget']);
+  grunt.registerTask('dist', ['clean', 'build', 'shell:build_cram', 'uglify']);
 };

grunt-scaffold/root/bower.json.tmpl

@@ -10,6 +10,7 @@
     "tests"
   ],
   "dependencies": {
-    "ractive": "~0.3.7"
+    "ractive": "~0.3.7",
+    "sqwidget": "~2.0.3"
   }
 }

grunt-scaffold/root/index.html

@@ -4,12 +4,9 @@
   <meta charset=utf-8>
 </head>
 <body>
-  <h1>Before</h1>
-  <div data-sqwidget="http://localhost:8081"></div>
-  <h1>After</h1>
+  <div data-sqwidget="http://localhost:8082"></div>
 </body>
-<script type="text/javascript" src="app/lib/curl/dist/curl/curl.js" </script>
-<script>curl.config({ baseUrl: '' });</script>
-<script data-curl-run src="sqwidget/sqwidget.js"></script>
+
+<script src="app/lib/sqwidget/dist/sqwidget.js"></script>
 
 </html>

package.json

@@ -7,7 +7,9 @@
     "Simon Elliott <[email protected]>"
   ],
   "main": "sqwidget.js",
-  "files": ["sqwidget.js"],
+  "files": [
+    "sqwidget.js"
+  ],
   "engines": {
     "node": ">= 0.8.0"
   },
@@ -18,7 +20,6 @@
   "bugs": {
     "url": "http://github.com/premagasar/sqwidget/issues"
   },
-  "dependencies": {},
   "devDependencies": {
     "grunt": "latest",
     "grunt-contrib-connect": "latest",
@@ -36,10 +37,14 @@
     "karma-mocha": "~0.1.0",
     "karma-sinon": "0.0.1",
     "karma-chai-plugins": "~0.1.3",
+    "grunt-contrib-uglify": "~0.2.5",
+    "grunt-contrib-concat": "~0.3.0",
+    "grunt-init": "# This is because of the yes option. PR raised",
     "grunt-init": "https://github.com/papercreatures/grunt-init/tarball/master"
   },
   "scripts": {
     "prepublish": "make dist",
+    "install": "pushd node_modules/cram && bower install && popd",
     "postinstall": "./grunt-scaffold/install.sh",
     "build": "make build",
     "test": "make test"