find controller as key

Author: wbuchwalter

examples/counter/package.json

@@ -4,7 +4,7 @@
   "description": "ng-redux counter example",
   "main": "index.js",
   "scripts": {
-    "start": "webpack && webpack-dev-server --content-base build/ --hot"
+    "start": "webpack && webpack-dev-server --content-base dist/ --hot"
   },
   "repository": {
     "type": "git",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ng-redux",
-  "version": "1.0.0-rc.2",
+  "version": "1.0.0-rc.4",
   "description": "Redux bindings for Angular.js",
   "main": "./lib/index.js",
   "scripts": {

src/components/connector.js

@@ -1,10 +1,11 @@
 import shallowEqual from '../utils/shallowEqual';
 import wrapActionCreators from '../utils/wrapActionCreators';
+import findControllerAsKey from '../utils/findControllerAsKey';
 import invariant from 'invariant';
 import _ from 'lodash';
 
 export default function Connector(store) {
-  return (scope, mapStateToScope, mapDispatchToScope = {}, propertyKey) => {
+  return (scope, mapStateToScope, mapDispatchToScope = {}) => {
 
     invariant(
       scope && _.isFunction(scope.$on) && _.isFunction(scope.$destroy),
@@ -19,11 +20,10 @@ export default function Connector(store) {
       'mapDispatchToScope must be a plain Object or a Function. Instead received $s.', mapDispatchToScope
       );
 
+    const propertyKey = findControllerAsKey(scope);
+
     let slice = getStateSlice(store.getState(), mapStateToScope);
     let target = propertyKey ? scope[propertyKey] : scope;
-     if(!target) {
-      target = scope[propertyKey] = {};
-     }
 
     const finalMapDispatchToScope = _.isPlainObject(mapDispatchToScope) ?
       wrapActionCreators(mapDispatchToScope) :
@@ -39,7 +39,6 @@ export default function Connector(store) {
         _.assign(target, slice);
       }
     });
-  
   }
 }
 

src/utils/findControllerAsKey.js

@@ -0,0 +1,11 @@
+import _ from 'lodash';
+
+export default function findControllerAsKey(scope) {
+  let propertyKey;
+  _.forOwn(scope, (v, k) => {
+    if (scope[k] && scope[k].constructor && scope[k].constructor.$inject) {
+      propertyKey = k;
+    }
+  });
+  return propertyKey;
+}

test/components/connector.spec.js

@@ -14,8 +14,8 @@ describe('Connector', () => {
       baz: action.payload
     }));
     scopeStub = {
-      $on: () => { },
-      $destroy: () => { }
+      $on: () => {},
+      $destroy: () => {}
     };
     connect = Connector(store);
   });
@@ -43,17 +43,6 @@ describe('Connector', () => {
     expect(scopeStub.vm).toEqual({ test: 1 });
   });
 
-  it('Should extend scope[propertyKey] if propertyKey is passed', () => {
-    connect(
-      scopeStub,
-      () => ({ test: 1 }),
-      () => { },
-      'vm'
-      );
-
-    expect(scopeStub.vm).toEqual({ test: 1 });
-  });
-
   it('Should update the scope passed to connect when the store updates', () => {
     connect(scopeStub, state => state);
     store.dispatch({ type: 'ACTION', payload: 0 });

test/utils/findControllerAs.spec.js

@@ -0,0 +1,21 @@
+import expect from 'expect';
+import findControllerAsKey from '../../src/utils/findControllerAsKey';
+
+describe('Utils', () => {
+  describe('findControllerAsKey', () => {
+    it('Should return the property key of the controller', () => {
+
+      let controllerStub = () => {};
+      controllerStub.constructor.$inject = ['$scope', '$ngRedux'];
+
+      let propertyKey = findControllerAsKey({
+        $apply: () => {},
+        $on: () => {},
+        $$id: 2,
+        vm: controllerStub
+      });
+
+      expect(propertyKey).toBe('vm');
+    });
+  });
+});