[Close #10] Fix where, findWhere, and similar by unwrapping observabl…

…es in matching functions

package.json

@@ -1,7 +1,7 @@
 {
   "name": "underscore-ko",
   "description": "Dead simple utility that attaches Underscore.js array and collection functions (and mutators) to Knockout.js observable arrays.",
-  "version": "1.8.0",
+  "version": "1.8.1",
   "author": "Kamran Ayub <http://kamranicus.com>",
   "homepage": "https://github.com/kamranayub/UnderscoreKO",
   "repository": {

spec/spec.js

@@ -151,9 +151,25 @@ describe("UnderscoreKO", function () {
     expect(vm.objs.where({b:1})).toEqual([vm.objs()[0],vm.objs()[2]]);
   });
 
+  it("supports where with observable values", function () {
+    var obsa = ko.observable({ b: 1 }),
+        obsb = ko.observable({ b: 0 }),
+        arr  = ko.observableArray([obsa, obsb]);
+
+    expect(arr.where({b:1})).toEqual([obsa]);
+  });
+
   it("supports findWhere", function () {
     expect(vm.objs.findWhere({b:1})).toEqual(vm.objs()[0]);
   });
+
+  it("supports findWhere with observable values", function () {
+    var obsa = ko.observable({ b: 1 }),
+        obsb = ko.observable({ b: 0 }),
+        arr  = ko.observableArray([obsa, obsb]);
+
+    expect(arr.findWhere({b:1})).toEqual(obsa);
+  });
 
   it("supports invoke", function () {
     expect(vm.arr.invoke("toString")).toEqual(["0", "1", "2", "3", "4"]);

src/underscore-ko.ts

@@ -66,6 +66,32 @@
     "intersection", "intersection_",    
     "zip", "zip_"
   ];
+
+  // replaces _.property with support for KO observable values
+  _.property = function(key) {
+    return function(obj) {
+      return obj == null ? void 0 : ko.utils.unwrapObservable(obj)[key];
+    };
+  };
+
+  // replaces _.propertyOf with support for KO observable values
+  _.propertyOf = function(obj) {
+    return obj == null ? function(){} : function(key) {
+      return ko.utils.unwrapObservable(obj)[key];
+    };
+  };
+
+  // replaces _.isMatch with support for KO observable values
+  _.isMatch = function(object, attrs) {
+    var keys = _.keys(attrs), length = keys.length;
+    if (object == null) return !length;
+    var obj = Object(ko.utils.unwrapObservable(object));
+    for (var i = 0; i < length; i++) {
+      var key = keys[i];
+      if (attrs[key] !== obj[key] || !(key in obj)) return false;
+    }
+    return true;
+  };
 
   _.each(_.union(methods, arrayMethods), function (fn) {
     // Let's be good and safe Javascript citizens!