Merge pull request cibernox#30 from cibernox/broccolify-all-the-things

Broccolify all the things

Author: cibernox

.gitignore

@@ -1,2 +1,3 @@
 /bower_components/
 /node_modules/
+/tmp/

.jshintrc

@@ -4,8 +4,16 @@
   "undef":  true,
 
   "predef":    [
-    "Handlebars", "Ember",
+    "Handlebars",
+    "Ember",
     "EmberCPM",
-    "describe", "it", "expect", "beforeEach", "afterEach"
+    "describe",
+    "it",
+    "expect",
+    "beforeEach",
+    "afterEach",
+    "require",
+    "module",
+    "process"
   ]
 }

.travis.yml

@@ -1,8 +1,8 @@
 language: "node_js"
 node_js:
   - "0.10"
-install: make install_dependencies
 before_script:
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
-script: make test
+install: "make install_dependencies"
+script: "make test-ci"

Brocfile.js

@@ -0,0 +1,48 @@
+var concat = require('broccoli-concat');
+var mergeTrees = require('broccoli-merge-trees');
+var findBowerTrees = require('broccoli-bower');
+var pickFiles = require('broccoli-static-compiler');
+var uglifyJavaScript = require('broccoli-uglify-js');
+
+var src = 'src';
+
+var emberCPM = concat(src, {
+  inputFiles: [
+    'preamble.js',
+    'concat.js',
+    'index.js'
+  ],
+  outputFile: '/ember-cpm.js'
+});
+
+var emberCPMmin = uglifyJavaScript(emberCPM, {compress: true});
+var minifiedFile = concat(emberCPMmin, {
+  inputFiles: ['*.js'],
+  outputFile: '/ember-cpm.min.js',
+});
+
+var outTrees = [emberCPM, minifiedFile];
+
+if (process.argv[2] !== 'build') {
+  var testDeps = pickFiles('node_modules/testem/public/testem/', {
+    srcDir: '/',
+    files: ['mocha.css', 'mocha.js', 'chai.js'],
+    destDir: '/'
+  });
+
+  var specs = concat('spec', {
+    inputFiles: ['**/*.js'],
+    outputFile: '/ember-cpm-specs.js'
+  });
+
+  var html = pickFiles('spec', {
+    srcDir: '/',
+    files: ['index.html'],
+    destDir: '/'
+  });
+
+  outTrees = outTrees.concat(findBowerTrees()).concat([testDeps, specs, html]);
+}
+
+
+module.exports = mergeTrees(outTrees);

Makefile

@@ -2,37 +2,28 @@ jshint_bin     = ./node_modules/jshint/bin/jshint
 testem_bin     = ./node_modules/testem/testem.js
 bower_bin      = ./node_modules/bower/bin/bower
 
-bower_libs = bower_components/ember/ember.js bower_components/jquery/jquery.js bower_components/handlebars/handlebars.runtime.js
-npm_libs   = $(jshint_bin) $(phantomjs_bin) $(bower_bin)
-src_files = src/preamble.js src/index.js src/concat.js
+build: jshint
+	rm -rf dist && broccoli build dist
 
-test: ensure_phantomjs jshint $(bower_libs)
+test-ci: ensure_phantomjs jshint
 	@$(testem_bin) ci -l phantomjs
 
-ensure_phantomjs:
-	@which phantomjs > /dev/null || (echo "Couldn't find phantomjs" && false)
+test: ensure_phantomjs jshint $(bower_libs)
+	@$(testem_bin)
 
-install_dependencies: npm_install bower_install
+install_dependencies:
+	@npm install
+	@bower install
 
-index.js: $(src_files)
-	cat $(src_files) > index.js
+ensure_phantomjs:
+	@which phantomjs > /dev/null || (echo "Couldn't find phantomjs" && false)
 
 jshint: $(jshint_bin)
-	@$(jshint_bin) index.js src/*.js spec/*Spec.js
+	@jshint Brocfile.js src/*.js spec/*Spec.js
 	@echo "JSHint OK"
 
-$(bower_libs): bower_install
-
-bower_install:
-	@$(bower_bin) install
-
-$(npm_libs): npm_install
-
-npm_install:
-	@npm install
-
-clobber:
+pristine:
 	@rm -rf ./node_modules/
 	@rm -rf ./bower_components/
 
-.PHONY: ensure_phantomjs install_dependencies test jshint bower_install npm_install clobber
+.PHONY: ensure_phantomjs install_dependencies test test-ci jshint pristine

README.md

@@ -13,7 +13,21 @@ has them.)
 
 ### Installation
 
-Just add `index.js` to your page after Ember but before your app.
+Just add `ember-cpm.js` to your page after Ember but before your app.
+
+### Build from source
+
+You will need to install the dependencies first. Run `make install_dependencies` to do it.
+
+Then run `make` to generate `ember-cpm.js` from source in the `dist` folder.
+
+### Run tests
+
+To run the rest suite in interactive mode execute `make test` and enter `http://localhost:4200`.
+
+To run the test suite just once and exit run `make test-ci`.
+
+You can also run the test suite in watch mode with `broccoli serve`.
 
 ### Run tests
 

bower.json

@@ -3,7 +3,7 @@
   "version": "1.1.0",
   "description": "Computed Propery Macros for Ember.js",
   "main": [
-    "index.js"
+    "dist/ember-cpm.js"
   ],
   "dependencies": {
     "ember": "1.2.0",

index.js dist/ember-cpm.jsindex.js renamed to dist/ember-cpm.js

@@ -20,6 +20,104 @@
   if (Ember.libraries) Ember.libraries.register('Ember-CPM', EmberCPM.VERSION);
 
 }).call(undefined, this, this.Ember, this.jQuery);
+
+(function(window, Ember, $, EmberCPM) {
+  var a_slice  = Array.prototype.slice,
+      a_forEach = Ember.ArrayPolyfills.forEach,
+      get = Ember.get;
+
+  /*
+     Returns the index where an item is to be removed from, or placed into, for
+     an EmberCPM.Macros.concat array.
+
+     This is the index of the item within its dependent array, offset by the
+     lengths of all prior dependent arrays.
+  */
+  function getIndex(changeMeta, instanceMeta, dependentArrayDelta) {
+    var dependentArrayGuid = Ember.guidFor(changeMeta.arrayChanged);
+
+    if (!(dependentArrayGuid in instanceMeta.dependentGuidToIndex)) {
+      recomputeGuidIndexes(instanceMeta, changeMeta.property._dependentKeys, this);
+    }
+
+    var dependentArrayLengths = instanceMeta.dependentArrayLengths,
+        dependentArrayIndex = instanceMeta.dependentGuidToIndex[dependentArrayGuid],
+        offset = 0,
+        arrayIndex;
+
+    // offset is the sum of the lengths of arrays to our left
+    for (var i = 0; i < dependentArrayIndex; ++i) {
+      offset += (dependentArrayLengths[i] || 0);
+    }
+
+    arrayIndex = offset + changeMeta.index;
+    dependentArrayLengths[dependentArrayIndex] = (get(changeMeta.arrayChanged, 'length') || 0) + dependentArrayDelta;
+
+    return arrayIndex;
+  }
+
+  function recomputeGuidIndexes(instanceMeta, keys, context) {
+    instanceMeta.dependentGuidToIndex = {};
+    a_forEach.call(keys, function (key, idx) {
+      instanceMeta.dependentGuidToIndex[Ember.guidFor(this.get(key))] = idx;
+    }, context);
+  }
+
+  /**
+    Keeps n arrays concatenated using `Ember.ArrayComputed`.
+
+    Example:
+    ```js
+    obj = Ember.Object.createWithMixins({
+      itemsA: [],
+      itemsB: [],
+      itemsC: [],
+      allItems: EmberCPM.Macros.concat('itemsA', 'itemsB', 'itemsC');
+    });
+
+    obj.get('itemsA').pushObjects(['a', 'b']);
+    obj.get('allItems') //=> ['a', 'b']
+
+    obj.get('itemsB').pushObjects(['c']);
+    obj.get('allItems') //=> ['a', 'b', 'c']
+
+    obj.get('itemsC').pushObjects(['d']);
+    obj.get('allItems') //=> ['a', 'b', 'c', 'd']
+
+    obj.get('itemsB').pushObjects(['e', 'f']);
+    obj.get('allItems') //=> ['a', 'b', 'c', 'e', 'f', 'd']
+    ```
+  */
+  EmberCPM.Macros.concat = function () {
+    var args = a_slice.call(arguments);
+    args.push({
+      initialize: function (array, changeMeta, instanceMeta) {
+        instanceMeta.dependentArrayLengths = new Array(changeMeta.property._dependentKeys.length);
+        // When items are added or removed, we have access to the array that was
+        // changed, but not its dependent key, so we use its guid as the key to
+        // determine its index in the array of dependent keys.
+        instanceMeta.dependentGuidToIndex = {};
+
+        return array;
+      },
+
+      addedItem: function (array, item, changeMeta, instanceMeta) {
+        var arrayIndex = getIndex.call(this, changeMeta, instanceMeta, 0);
+        array.insertAt(arrayIndex, item);
+        return array;
+      },
+
+      removedItem: function (array, item, changeMeta, instanceMeta) {
+        var arrayIndex = getIndex.call(this, changeMeta, instanceMeta, -1);
+        array.removeAt(arrayIndex);
+        return array;
+      }
+    });
+
+    return Ember.arrayComputed.apply(null, args);
+  };
+}).call(undefined, this, this.Ember, this.jQuery, this.EmberCPM);
+
 (function(window, Ember, $, EmberCPM) {
 
   function reverseMerge(dest, source) {
@@ -151,99 +249,3 @@
   };
 
 }).call(undefined, this, this.Ember, this.jQuery, this.EmberCPM);
-(function(window, Ember, $, EmberCPM) {
-  var a_slice  = Array.prototype.slice,
-      a_forEach = Ember.ArrayPolyfills.forEach,
-      get = Ember.get;
-
-  /*
-     Returns the index where an item is to be removed from, or placed into, for
-     an EmberCPM.Macros.concat array.
-
-     This is the index of the item within its dependent array, offset by the
-     lengths of all prior dependent arrays.
-  */
-  function getIndex(changeMeta, instanceMeta, dependentArrayDelta) {
-    var dependentArrayGuid = Ember.guidFor(changeMeta.arrayChanged);
-
-    if (!(dependentArrayGuid in instanceMeta.dependentGuidToIndex)) {
-      recomputeGuidIndexes(instanceMeta, changeMeta.property._dependentKeys, this);
-    }
-
-    var dependentArrayLengths = instanceMeta.dependentArrayLengths,
-        dependentArrayIndex = instanceMeta.dependentGuidToIndex[dependentArrayGuid],
-        offset = 0,
-        arrayIndex;
-
-    // offset is the sum of the lengths of arrays to our left
-    for (var i = 0; i < dependentArrayIndex; ++i) {
-      offset += (dependentArrayLengths[i] || 0);
-    }
-
-    arrayIndex = offset + changeMeta.index;
-    dependentArrayLengths[dependentArrayIndex] = (get(changeMeta.arrayChanged, 'length') || 0) + dependentArrayDelta;
-
-    return arrayIndex;
-  }
-
-  function recomputeGuidIndexes(instanceMeta, keys, context) {
-    instanceMeta.dependentGuidToIndex = {};
-    a_forEach.call(keys, function (key, idx) {
-      instanceMeta.dependentGuidToIndex[Ember.guidFor(this.get(key))] = idx;
-    }, context);
-  }
-
-  /**
-    Keeps n arrays concatenated using `Ember.ArrayComputed`.
-
-    Example:
-    ```js
-    obj = Ember.Object.createWithMixins({
-      itemsA: [],
-      itemsB: [],
-      itemsC: [],
-      allItems: EmberCPM.Macros.concat('itemsA', 'itemsB', 'itemsC');
-    });
-
-    obj.get('itemsA').pushObjects(['a', 'b']);
-    obj.get('allItems') //=> ['a', 'b']
-
-    obj.get('itemsB').pushObjects(['c']);
-    obj.get('allItems') //=> ['a', 'b', 'c']
-
-    obj.get('itemsC').pushObjects(['d']);
-    obj.get('allItems') //=> ['a', 'b', 'c', 'd']
-
-    obj.get('itemsB').pushObjects(['e', 'f']);
-    obj.get('allItems') //=> ['a', 'b', 'c', 'e', 'f', 'd']
-    ```
-  */
-  EmberCPM.Macros.concat = function () {
-    var args = a_slice.call(arguments);
-    args.push({
-      initialize: function (array, changeMeta, instanceMeta) {
-        instanceMeta.dependentArrayLengths = new Array(changeMeta.property._dependentKeys.length);
-        // When items are added or removed, we have access to the array that was
-        // changed, but not its dependent key, so we use its guid as the key to
-        // determine its index in the array of dependent keys.
-        instanceMeta.dependentGuidToIndex = {};
-
-        return array;
-      },
-
-      addedItem: function (array, item, changeMeta, instanceMeta) {
-        var arrayIndex = getIndex.call(this, changeMeta, instanceMeta, 0);
-        array.insertAt(arrayIndex, item);
-        return array;
-      },
-
-      removedItem: function (array, item, changeMeta, instanceMeta) {
-        var arrayIndex = getIndex.call(this, changeMeta, instanceMeta, -1);
-        array.removeAt(arrayIndex);
-        return array;
-      }
-    });
-
-    return Ember.arrayComputed.apply(null, args);
-  };
-}).call(undefined, this, this.Ember, this.jQuery, this.EmberCPM);

dist/ember-cpm.min.js

@@ -11,13 +11,19 @@
     "type": "git",
     "url": "git://github.com/jamesarosen/ember-cpm.git"
   },
-  "main": "index.js",
+  "main": "dist/ember-cpm.js",
   "scripts": {
-    "test": "make test"
+    "test": "make test-ci"
   },
   "devDependencies": {
     "testem": "~0.6.15",
-    "jshint": "~2.0.1",
-    "bower": "~1.2.6"
+    "jshint": "~2.5.0",
+    "bower": "~1.3.3",
+    "broccoli": "~0.9.0",
+    "broccoli-uglify-js": "~0.1.3",
+    "broccoli-concat": "0.0.6",
+    "broccoli-merge-trees": "~0.1.3",
+    "broccoli-bower": "~0.2.1",
+    "broccoli-static-compiler": "~0.1.4"
   }
 }