Allow shorthand setting of options across all plugins. Closes #42.

Author: davej

angular-classy.coffee

@@ -12,6 +12,7 @@ availablePlugins = {}
 alreadyRegisteredModules = {};
 
 getActiveClassyPlugins = (name, origModule) ->
+  # TODO: Write a test to ensure that this method gets called the correct amount of times
   obj = {}
   alreadyRegisteredModules[name] = true
   do getNextRequires = (name) ->
@@ -62,7 +63,7 @@ angular.module = (name, reqs, configFn) ->
     if name is 'classy.core' then availablePlugins[name] = {}
 
     activeClassyPlugins = getActiveClassyPlugins(name, module)
-        
+
     if activeClassyPlugins['classy.core']
       module.classy =
         plugin:
@@ -115,11 +116,16 @@ classFns =
         classObj.__options
       )
 
+    shorthandOptions = {}
+    for optionName, option of options
+      if !angular.isObject(option)
+        shorthandOptions[optionName] = option
+
     classConstructor::__plugins = {}
     for pluginName, plugin of module.classy.activePlugins
       classConstructor::__plugins[pluginName] = angular.copy(plugin)
       classConstructor::__plugins[pluginName].classyOptions = options
-      classConstructor::__plugins[pluginName].options = options[plugin.name] or {}
+      classConstructor::__plugins[pluginName].options = angular.extend(options[plugin.name] or {}, shorthandOptions);
 
     pluginDo 'preInitBefore', [classConstructor, classObj, module]
     pluginDo 'preInit', [classConstructor, classObj, module]
@@ -176,6 +182,7 @@ classFns =
     return
 
 angular.module('classy.core', [])
+
 angular.module('classy.bindData', ['classy.core']).classy.plugin.controller
   # Based on @wuxiaoying's classy-initScope plugin
   localInject: ['$parse']

angular-classy.js

@@ -143,20 +143,27 @@ License: MIT
   classFns = {
     localInject: ['$q'],
     preInit: function(classConstructor, classObj, module) {
-      var key, options, plugin, pluginName, value, _ref;
+      var key, option, optionName, options, plugin, pluginName, shorthandOptions, value, _ref;
       for (key in classObj) {
         if (!__hasProp.call(classObj, key)) continue;
         value = classObj[key];
         classConstructor.prototype[key] = value;
       }
       options = copyAndExtendDeep({}, module.__classyDefaults, module.classy.options.controller, classObj.__options);
+      shorthandOptions = {};
+      for (optionName in options) {
+        option = options[optionName];
+        if (!angular.isObject(option)) {
+          shorthandOptions[optionName] = option;
+        }
+      }
       classConstructor.prototype.__plugins = {};
       _ref = module.classy.activePlugins;
       for (pluginName in _ref) {
         plugin = _ref[pluginName];
         classConstructor.prototype.__plugins[pluginName] = angular.copy(plugin);
         classConstructor.prototype.__plugins[pluginName].classyOptions = options;
-        classConstructor.prototype.__plugins[pluginName].options = options[plugin.name] || {};
+        classConstructor.prototype.__plugins[pluginName].options = angular.extend(options[plugin.name] || {}, shorthandOptions);
       }
       pluginDo('preInitBefore', [classConstructor, classObj, module]);
       pluginDo('preInit', [classConstructor, classObj, module]);

angular-classy.min.js

@@ -12,12 +12,14 @@ todomvc.classy.controller({
 	name: 'TodoAsControllerCtrl',
 	inject: ['$scope', '$location', 'todoStorage'],
 	__options: {
-		'bindData': {
-			addToScope: false
-		},
-		'bindMethods': {
-			addToScope: false
-		}
+		addToScope: false // shorthand for commented out code below
+
+		// 'bindData': {
+		// 	addToScope: false
+		// },
+		// 'bindMethods': {
+		// 	addToScope: false
+		// }
 	},
 
 	data: function() {
@@ -26,7 +28,7 @@ todomvc.classy.controller({
 			newTodo: '',
 			editedTodo: null,
 			location: this.$location
-		}
+		};
 	},
 
 	init: function() {

examples/todomvc/js/controllers/todoCtrl-asController.js

@@ -12,6 +12,7 @@ availablePlugins = {}
 alreadyRegisteredModules = {};
 
 getActiveClassyPlugins = (name, origModule) ->
+  # TODO: Write a test to ensure that this method gets called the correct amount of times
   obj = {}
   alreadyRegisteredModules[name] = true
   do getNextRequires = (name) ->
@@ -62,7 +63,7 @@ angular.module = (name, reqs, configFn) ->
     if name is 'classy.core' then availablePlugins[name] = {}
 
     activeClassyPlugins = getActiveClassyPlugins(name, module)
-        
+
     if activeClassyPlugins['classy.core']
       module.classy =
         plugin:
@@ -115,11 +116,16 @@ classFns =
         classObj.__options
       )
 
+    shorthandOptions = {}
+    for optionName, option of options
+      if !angular.isObject(option)
+        shorthandOptions[optionName] = option
+
     classConstructor::__plugins = {}
     for pluginName, plugin of module.classy.activePlugins
       classConstructor::__plugins[pluginName] = angular.copy(plugin)
       classConstructor::__plugins[pluginName].classyOptions = options
-      classConstructor::__plugins[pluginName].options = options[plugin.name] or {}
+      classConstructor::__plugins[pluginName].options = angular.extend(options[plugin.name] or {}, shorthandOptions);
 
     pluginDo 'preInitBefore', [classConstructor, classObj, module]
     pluginDo 'preInit', [classConstructor, classObj, module]
@@ -175,4 +181,4 @@ classFns =
     pluginDo 'postInitAfter', [klass, deps, module]
     return
 
-angular.module('classy.core', [])
+angular.module('classy.core', [])