Adding some tests

Author: mattpodwysocki

Gruntfile.js

@@ -51,6 +51,6 @@ module.exports = function (grunt) {
     grunt.loadNpmTasks('grunt-contrib-qunit');
 
     // Default task(s).
-    grunt.registerTask('default', ['concat:basic', 'uglify:basic']);
+    grunt.registerTask('default', ['concat:basic', 'uglify:basic', 'qunit']);
 
 };

build_core.bat

@@ -1,8 +1,8 @@
 {
-  "name": "rxjs-jquery",
+  "name": "rx-jquery",
   "title": "Reactive Extensions for JavaScript bindings for jQuery",
   "description": "Library for composing asynchronous and event-based operations in JavaScript extending the jQuery library",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "homepage": "https://github.com/Reactive-Extensions/rxjs-jquery",
   "author": {
     "name": "MS Open Tech",
@@ -18,12 +18,21 @@
       "url": "http://www.apache.org/licenses/LICENSE-2.0.html"
     }
   ],
-  "dependencies": {},
+  "jam": {
+    "main": "rx.jquery.js"
+  },  
+  "dependencies": {
+    "rx": "*",
+    "jquery": "*"
+  },
   "devDependencies": {
-    "grunt": "~0.4.0",
-    "grunt-contrib-uglify": "~0.1.2",
-    "grunt-contrib-concat": "~0.1.3",
-    "grunt-contrib-qunit": "~0.2.0"
+    "grunt-cli": "*",
+    "grunt": "~0.4.1",
+    "grunt-contrib-jshint": "*",
+    "grunt-contrib-uglify": "*",
+    "grunt-contrib-concat": "*",
+    "grunt-contrib-qunit": "*",
+    "grunt-contrib-watch": "*"
   },
   "keywords": [
     "Reactive",
@@ -33,5 +42,8 @@
     "RxJS",
     "Rx"
   ],
-  "main": "rx.jquery.js"
+  "main": "rx.jquery.js",
+  "scripts": {
+    "test": "grunt"
+  }  
 }

package.json

@@ -10,22 +10,25 @@
             return root.Rx;
         });
     } else if (typeof module == 'object' && module && module.exports == freeExports) {
-        module.exports = factory(root, module.exports, require('./rx'), require('./jQuery'));
+        module.exports = factory(root, module.exports, require('rx'), require('jquery'));
     } else {
         root.Rx = factory(root, {}, root.Rx, jQuery);
     }
-}(this, function (global, exp, root, $, undefined) {
+}(this, function (global, exp, Rx, $, undefined) {
         // Headers
-    var root = global.Rx,
-        observable = root.Observable,
+    var observable = Rx.Observable,
         observableProto = observable.prototype,
-        AsyncSubject = root.AsyncSubject,
+        AsyncSubject = Rx.AsyncSubject,
         observableCreate = observable.create,
         observableCreateWithDisposable = observable.createWithDisposable,
-        disposableEmpty = root.Disposable.empty,
+        disposableEmpty = Rx.Disposable.empty,
         slice = Array.prototype.slice,
         proto = $.fn;
-        
+    
+    /**
+     * Converts the jQuery Deferred to an Observable sequence
+     * @returns {Observable} An Observable sequence created from a jQuery Deferred object.
+     */    
     $.Deferred.prototype.toObservable = function () {
         var subject = new AsyncSubject();
         this.done(function () {
@@ -37,6 +40,10 @@
         return subject;
     };
 
+    /**
+     * Converts an existing Observable sequence to a jQuery Deferred object.
+     * @returns {Deferred} A jQuery Deferred object wrapping the Observable sequence.
+     */
     observableProto.toDeferred = function () {
         var deferred = $.Deferred();
         this.subscribe(function (value) {
@@ -49,6 +56,11 @@
 
     //in order to support jQuery 1.6.*
     if ($.Callbacks) {
+
+        /**
+         * Converts an existing Callbacks object to an Observable sequence
+         * @returns {Observable} An Observable sequence created from a jQuery Callbacks object.
+         */
         $.Callbacks.prototype.toObservable = function () {
                 var parent = this;
                 return observableCreate(function (observer) {
@@ -65,6 +77,14 @@
             };
     }
 
+    /**
+     * Attach an event handler function for one or more events to the selected elements as an Observable sequence.
+     *
+     * @param {String} events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
+     * @param {String} [selector] A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param {Any} [data] Data to be passed to the handler in event.data when an event is triggered.
+     * @returns {Observable} An Observable sequence which wraps the jQuery on method.
+     */
     proto.onAsObservable = function () {
         var parent = this, args = slice.call(arguments, 0);
         return observableCreate(function(observer) {
@@ -84,6 +104,13 @@
         });          
     };
 
+    /** 
+     * Attach a handler to an event for the elements as an Observable sequence.
+     *
+     * @param {String} eventType A string containing one or more DOM event types, such as "click" or "submit," or custom event names.
+     * @param {Object} eventData An object containing data that will be passed to the event handler.
+     * @returns {Observable} An Observable sequence which wraps the jQuery bind method.
+     */
     proto.bindAsObservable = function(eventType, eventData) {
         var parent = this;
         return observableCreate(function(observer) {
@@ -422,5 +449,5 @@
     $.postAsObservable = function(url, data, dataType) {
         return ajaxAsObservable({ url: url, dataType: dataType, data: data, type: 'POST'});	
     };
-    return root;
+    return Rx;
 }));

rx.jquery.js

@@ -1,11 +1,10 @@
     // Headers
-    var root = global.Rx,
-        observable = root.Observable,
+    var observable = Rx.Observable,
         observableProto = observable.prototype,
-        AsyncSubject = root.AsyncSubject,
+        AsyncSubject = Rx.AsyncSubject,
         observableCreate = observable.create,
         observableCreateWithDisposable = observable.createWithDisposable,
-        disposableEmpty = root.Disposable.empty,
+        disposableEmpty = Rx.Disposable.empty,
         slice = Array.prototype.slice,
         proto = $.fn;
 

rx.jquery.min.js

@@ -9,9 +9,9 @@
             return root.Rx;
         });
     } else if (typeof module == 'object' && module && module.exports == freeExports) {
-        module.exports = factory(root, module.exports, require('./rx'), require('./jQuery'));
+        module.exports = factory(root, module.exports, require('rx'), require('jquery'));
     } else {
         root.Rx = factory(root, {}, root.Rx, jQuery);
     }
-}(this, function (global, exp, root, $, undefined) {
+}(this, function (global, exp, Rx, $, undefined) {
 

src/basicheader.js

@@ -1,2 +1,2 @@
-    return root;
+    return Rx;
 }));