Merge branch 'master' into lyonlai-group-by-getter

Author: jordangarcia

CHANGELOG.md

@@ -1,3 +1,11 @@
+## 1.2.0 (November 1, 2015)
+
+- **[NEW]** Exposed new API methods: `batchStart` and `batchStop`.
+- **[NEW]** Changed the transpiler to Babel.
+- **[FIXED]** Completely refactored `Reactor`, `Evaluator` and `ChangeObserver`.
+- **[FIXED]** Fixed all issues related to hash code collisions.
+- **[FIXED]** Refactored how change observation works to be much more efficient.
+
 ## 1.1.2 (October 5, 2015)
 
 - **[FIXED]** Fix for observer iteration when removed during notify. [Issue #151](https://github.com/optimizely/nuclear-js/issues/151)

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "nuclear-js",
-  "version": "1.1.2",
+  "version": "1.2.0",
   "homepage": "https://github.com/optimizely/nuclear-js",
   "authors": [
     "Jordan Garcia"

dist/nuclear.js

@@ -1,6 +1,6 @@
 {
   "name": "nuclear-js",
-  "version": "1.1.2",
+  "version": "1.2.0",
   "description": "Immutable, reactive Flux architecture. UI Agnostic.",
   "main": "dist/nuclear.js",
   "scripts": {

dist/nuclear.min.js

@@ -0,0 +1,11 @@
+try {
+  if (!(window.console && console.log)) {
+    console = {
+      log: function(){},
+      debug: function(){},
+      info: function(){},
+      warn: function(){},
+      error: function(){}
+    };
+  }
+} catch(e) {}

package.json

@@ -1,3 +1,4 @@
+import './console-polyfill'
 import Store from './store'
 import Reactor from './reactor'
 import Immutable from 'immutable'

src/console-polyfill.js

@@ -482,6 +482,28 @@ describe('Reactor', () => {
         expect(mockFn1.calls.count()).toEqual(2)
         expect(mockFn2.calls.count()).toEqual(1)
       })
+      it('should allow a notify() after an unobserve during a handler', () => {
+        var mockFn1 = jasmine.createSpy()
+        var mockFn2 = jasmine.createSpy()
+        var unwatchFn2
+        var unwatchFn1 = reactor.observe(subtotalGetter, (val) => {
+          console.log('hanlder1', unwatchFn2)
+          unwatchFn2()
+          mockFn1(val)
+        })
+
+        unwatchFn2 = reactor.observe(subtotalGetter, (val) => {
+          console.log('handler2')
+          mockFn2(val)
+        })
+
+        expect(function() {
+          checkoutActions.addItem('foo', 5)
+          expect(mockFn1.calls.count()).toEqual(1)
+          expect(mockFn2.calls.count()).toEqual(0)
+          expect(mockFn1.calls.argsFor(0)).toEqual([5])
+        }).not.toThrow()
+      })
     })
   }) // Reactor with no initial state
 
@@ -551,6 +573,16 @@ describe('Reactor', () => {
 
       expect(reactor.evaluateToJS(['persistent'])).toEqual([item])
     })
+
+    it('should be able to reset and call an unwatch() function without erroring', () => {
+      const spy = jasmine.createSpy()
+      const unobserve = reactor.observe(['standard'], () => spy())
+
+      reactor.reset()
+      expect(function() {
+        unobserve()
+      }).not.toThrow()
+    })
   })
 
   describe('when a reactor is observing mutable values', () => {

src/main.js

@@ -20,7 +20,7 @@ module.exports = [
     },
     module: {
       loaders: [
-        { test: /\.js$/, loader: 'babel-loader' },
+        { test: /\.js$/, exclude: /node_modules/, loader: 'babel-loader' },
       ],
     },
   },
@@ -33,7 +33,7 @@ module.exports = [
     },
     module: {
       loaders: [
-        { test: /\.js$/, loader: 'babel-loader' },
+        { test: /\.js$/, exclude: /node_modules/, loader: 'babel-loader' },
       ],
     },
     plugins: [uglifyJsPlugin],