@@ -9,24 +9,24 @@
<script>
$(document).ready(function() {
jspec.describe("fn", function() {
- it("registers a function with a name on the object which can be invoked", function() {
+ it("registers and applies a function bound to a name", function() {
var element = $("<div></div>");
- element.fn('name', function() { return "function invoked" });
+ element.fn({ name: function() { return "function invoked" } });
element.fn('name').should("==", "function invoked");
});
- it("invokes functions of any arity", function() {
+ it("registers and applies a function of any arity", function() {
var element = $("<div></div>");
- element.fn('name', function(a, b, c) { return [a, b, c] });
- element.fn('name', 1, 2, 3).should("==", [1, 2, 3]);
+ element.fn({ name: function(a, b, c) { return [a, b, c] } });
+ element.fn('name', 1, 2, 3).should("eq", [1, 2, 3]);
});
- it("registers many functions when provided a hash", function() {
+ it("registers many functions", function() {
var element = $("<div></div>");
element.fn({
- name1: function() { return 'name1' },
- name2: function() { return 'name2' }
+ name1: function() { return 1 },
+ name2: function() { return 2 }
});
- element.fn('name1').should("==", 'name1');
- element.fn('name2').should("==", 'name2');
+ element.fn('name1').should("==", 1);
+ element.fn('name2').should("==", 2);
});
});
});
fn_spec.html
@@ -2,23 +2,26 @@
$.fn.fn = function() {
var self = this;
var extension = name = arguments[0];
- if ( typeof name == "string") {
- if ($.isFunction(arguments[1])) {
- var procedure = arguments[1];
- self.data('fn.' + name, procedure);
- return self;
- } else {
- var fn = self.data('fn.' + name);
- if (fn) {
- var args = Array.prototype.slice.call(arguments, 1, arguments.length);
- return fn.apply(self, args);
- } else
- throw(name + " is not defined");
- }
+ if (typeof name == "string") {
+ return apply(self, name, $.makeArray(arguments).slice(1, arguments.length));
} else {
$.each(extension, function(key, value) {
- self.fn(key, value);
+ define(self, key, value);
});
+ return self;
}
}
+ function define(self, name, fn) {
+ self.data(namespacedName(name), fn);
+ };
+ function apply(self, name, arguments) {
+ var fn = self.data(namespacedName(name));
+ if (fn)
+ return fn.apply(self, arguments);
+ else
+ throw(name + " is not defined");
+ };
+ function namespacedName(name) {
+ return 'fn.' + name;
+ }
})(jQuery);
\ No newline at end of file
jquery.fn.js
@@ -108,3 +108,26 @@ jspec.compress_lines = function(obj) {
return "Expected " + (not ? "not " : "") + "to exist, but was " + jspec.compress_lines(this);
}
}
+
+ jspec.matchers["eq"] = {
+ describe: function(target, not) {
+ return jspec.compress_lines(this) + " should " + (not ? "not " : "") + "equal " + jspec.compress_lines(target)
+ },
+ matches: function(target) {
+ if (this instanceof Array) {
+ if (this.length != target.length)
+ return false;
+ for (i=0; i<this.length; i++) {
+ if (this[i] != target[i])
+ return false;
+ }
+ return true;
+ }
+ },
+ failure_message: function(target, not) {
+ if (not)
+ return "Expected " + jspec.compress_lines(this) + " not to equal " + jspec.compress_lines(target);
+ else
+ return "Expected " + jspec.compress_lines(this) + ". Got " + jspec.compress_lines(target);
+ }
+ }
\ No newline at end of file
jspec.js
2d7adb437fc8393c19480fe4097c369467419f4b
Nick Kallen
nkallen@nick-kallens-computer-2.local
http://github.com/nkallen/effen/commit/2dc062288b68203704e15310d07390025ef476b8
2dc062288b68203704e15310d07390025ef476b8
2008-02-23T13:36:24-08:00
2008-02-23T13:36:24-08:00
polish
2ed24c35b50c55a044dad0999eed86bd14daa4c5
Nick Kallen
nkallen@nick-kallens-computer-2.local