fix(toArrayFilter): handle non-objects

Closes #6
Closes #7

Author: petebacondarwin

README.md

@@ -58,6 +58,7 @@ The filter iterates over the object's keys and creates an array containing the v
 property. By default, the filter also attaches a new property `$key` to the value containing
 the original key that was used in the object we are iterating over to reference the property.
 
+
 ## Not adding the `$key` property
 
 If you don't want the `$key` property to be attached to each of the property values, you simply
@@ -69,17 +70,24 @@ put an additional parameter on the `toArray` filter:
 </div>
 ```
 
+## Using `$key` with non-objects
+
+Non-objects such as strings and numbers cannot have a new `$key` property attached to them.
+If the object properties you are iterating over are not objects then you must either disable
+the `$key` property or the filter will replace the non-object with a new object of the form:
+`{ $key: key, $value: value }`.
+
+
 ## Caveats
 
 There are always issues when trying to iterate over properties in JavaScript and the `toArray`
 filter has its own set of things to be aware of when using it:
 
 * It only works with plain Objects - don't try to filter arrays and strings with it.
 * If you don't disable it, the filter will modify each property value with a new `$key` property.
-* If the object you are iterating over contains values that are not objects then you must disable
-the `$key` property or it will error - non-objects cannot have properties attached to them.
 * This filter is not compatible with IE8. (It uses `Object.keys` and `Object.defineProperty` which
-don't work well or at all in Internet Explorer 8 (IE8).
+  don't work well or at all in Internet Explorer 8 (IE8).
+
 
 ## Example
 

test/toArrayFilter.spec.js

@@ -46,6 +46,20 @@ describe("toArrayFilter", function() {
   }));
 
 
+  it("should create new objects ({$key:...,$value:...}) from non-object properties if `addKey` is not false", inject(function(toArrayFilter) {
+    var obj = {
+      a: 'A',
+      b: 'B',
+      c: 'C'
+    };
+    expect(toArrayFilter(obj)).toEqual([
+      { $key: 'a', $value: 'A' },
+      { $key: 'b', $value: 'B' },
+      { $key: 'c', $value: 'C' }
+    ]);
+  }));
+
+
   it("should work with an array", inject(function(toArrayFilter) {
     var obj = [
       { name: 'A' },
@@ -62,17 +76,8 @@ describe("toArrayFilter", function() {
   it("should handle invalid inputs", inject(function(toArrayFilter) {
     expect(toArrayFilter(undefined)).toBeUndefined();
     expect(toArrayFilter(null)).toBe(null);
+    expect(toArrayFilter('some string')).toBe('some string');
+    expect(toArrayFilter(12345)).toBe(12345);
   }));
 
-  it("should not work with non-objects", inject(function(toArrayFilter) {
-    var obj = 'some string';
-    expect(function() {
-      toArrayFilter(obj);
-    }).toThrow();
-
-    obj = 12345;
-    expect(function() {
-      toArrayFilter(obj);
-    }).toThrow();
-  }));
 });

toArrayFilter.js

@@ -2,14 +2,17 @@ angular.module('angular-toArrayFilter', [])
 
 .filter('toArray', function () {
   return function (obj, addKey) {
-    if (!obj) return obj;
+    if (!angular.isObject(obj)) return obj;
     if ( addKey === false ) {
       return Object.keys(obj).map(function(key) {
         return obj[key];
       });
     } else {
       return Object.keys(obj).map(function (key) {
-        return Object.defineProperty(obj[key], '$key', { enumerable: false, value: key});
+        var value = obj[key];
+        return angular.isObject(value) ?
+          Object.defineProperty(value, '$key', { enumerable: false, value: key}) :
+          { $key: key, $value: value };
       });
     }
   };