complex_queries updated to support recent libraries

complex_queries.js

@@ -10,15 +10,18 @@
  * @module complex_queries
  */
 // define([module_name], [dependencies], module);
-(function (module) {
+(function (dependencies, module) {
   "use strict";
   if (typeof define === 'function' && define.amd) {
-    return define(module);
+    return define(dependencies, module);
   }
-  window.complex_queries = module();
-}(function () {
+  if (typeof exports === 'object') {
+    return module(exports);
+  }
+  window.complex_queries = {};
+  module(window.complex_queries);
+}(['exports'], function (to_export) {
   "use strict";
-  var to_export = {};
 
   /**
    * Add a secured (write permission denied) property to an object.

src/queries/begin.js

@@ -10,15 +10,18 @@
  * @module complex_queries
  */
 // define([module_name], [dependencies], module);
-(function (module) {
+(function (dependencies, module) {
   "use strict";
   if (typeof define === 'function' && define.amd) {
-    return define(module);
+    return define(dependencies, module);
   }
-  window.complex_queries = module();
-}(function () {
+  if (typeof exports === 'object') {
+    return module(exports);
+  }
+  window.complex_queries = {};
+  module(window.complex_queries);
+}(['exports'], function (to_export) {
   "use strict";
-  var to_export = {};
 
   /**
    * Add a secured (write permission denied) property to an object.

test/queries/tests.js

@@ -7,8 +7,11 @@
   if (typeof define === 'function' && define.amd) {
     return define(dependencies, module);
   }
+  if (typeof exports === 'object') {
+    return module(require('complex_queries'));
+  }
   module(complex_queries);
-}(['complex_queries'], function (complex_queries) {
+}(['complex_queries', 'sinon_qunit'], function (complex_queries) {
   "use strict";
 
   module('Complex Queries');