@@ -3,6 +3,16 @@ Object.extend(Object, (function() { return object && Object.isFunction(object[property]); } + return { + hasMethod: hasMethod + }; +})()); + +Object.extend(Object, (function() { + function hasMethod(object, property) { + return object && Object.isFunction(object[property]); + } + function equal(object, other) { if (object === other) return true; if (hasMethod(object, "equals")) return object.equals(other); @@ -82,7 +92,7 @@ var Comparable = (function() { (function() { function nativelyComparable(constructor) { function equals(other) { - return this === other; + return !!other && other.valueOf() === this.valueOf(); } function compareTo(other) { @@ -108,12 +118,12 @@ var Comparable = (function() { Object.extend(Array.prototype, (function() { function equals(other) { if (this === other) return true; - if (!Object.isArray(other) || this.length !== other.length) { - return false; + if (Object.isArray(other) && this.length === other.length) { + return this.all(function(value, index) { + return Object.equal(value, other[index]); + }); } - return this.all(function(value, index) { - return Object.equal(value, other[index]); - }); + return false; } return { @@ -121,8 +131,8 @@ Object.extend(Array.prototype, (function() { }; })()); -Object.extend(Enumerable, function() { +Object.extend(Enumerable, { sort: function() { return this.toArray().sort(Object.compare); } -}); \ No newline at end of file +}); src/comparable.js @@ -31,5 +31,9 @@ new Test.Unit.Runner({ }, testArrayComparison: function() { this.assert([1,2,3].equals([1,2,3])); + }, + testNativesWrappersComparison: function() { + this.assert("salut".equals(new String("salut"))); + this.assert(new String("salut").equals("salut")); } }); test/comparable_test.js 7340552687c11d6007fd6a36f0a1517d28082fbc Samuel Lebeau samuel.lebeau@gmail.com http://github.com/samleb/prototype-fruits/commit/f1032a859f0f54318d1c04c9683e7c5b6a3322b1 f1032a859f0f54318d1c04c9683e7c5b6a3322b1 2009-05-23T12:44:43-07:00 2009-05-23T12:44:43-07:00 Ensure `equals` behaves correctly with native/wrapper types 11204f0bb2f6fcf2a80d20b1719ac87fb88df4ab Samuel Lebeau samuel.lebeau@gmail.com