Small Fixes/Additions

frameworks/foundation/debug/base.js

@@ -19,11 +19,12 @@ Fictum = {
 
   registerUrl: function(url, response, options) {
     this._ensureServerIsSetup();
-    this.server.registerUrl(url, response, options);
+    this.server.registerUrl(url, response, options || {});
   },
 
   responseFor: function(url, options) {
     this._ensureServerIsSetup();
+    options.url = url;
     return this.server.responseFor(url, options);
   },
 
@@ -37,6 +38,11 @@ Fictum = {
     return this.server.addResource(type, attributes);
   },
 
+  removeResource: function(type, key, value) {
+    this._ensureServerIsSetup();
+    return this.server.removeResource(type, key, value);
+  },
+
   startInterceptingRequests: function() {
     if(Fictum.originalSendFunction != undefined)
       throw new Error('ERROR: Already intercepting requests');
@@ -45,11 +51,13 @@ Fictum = {
     SC.Request.reopen({
       send: function(original, context) {
         if(Fictum.isARegisteredUrl(this.get('address'))) {
-          var response = Fictum.responseFor(this.get('address'), {json: this.get('isJSON')});
+          var response = Fictum.responseFor(this.get('address'), {json: this.get('isJSON'), type: this.get('type'), body: context});
           response.set('request', this);
           setTimeout(function() {
-            response.set('status', 200);
-            response.notify();
+            SC.run(function() {
+              response.set('status', 200);
+              response.notify();
+            });
           }, 1);
           return response;
         } else {

frameworks/foundation/debug/resource_store.js

@@ -16,6 +16,14 @@ Fictum.ResourceStore = SC.Object.extend({
     return resourceType.addResource(attributes);
   },
 
+  removeResource: function(type, key, value) {
+    var resourceType = this._resourceTypeFor(type);
+    if (resourceType === null) {
+      throw new Error('ERROR: You requested to remove a resource of type "' + type + '", but that type has not been registered in the resource store');
+    }
+    return resourceType.removeResource(key, value);
+  },
+
   allOfType: function(type) {
     var resourceType = this._resourceTypeFor(type);
     if(! resourceType)

frameworks/foundation/debug/resource_type.js

@@ -19,11 +19,31 @@ Fictum.ResourceType = SC.Object.extend({
     return newResource;
   },
 
+  removeResource: function(key, value) {
+    var resourceIndex = this._resourceIndexFor(key, value);
+    if (resourceIndex > -1) { this.get('resources').removeAt(resourceIndex); }
+    return resourceIndex > -1;
+  },
+
   _attributeHashFor: function(attributes) {
     var defaultAttributes = this.get('defaultAttributes');
-    for( var key in attributes) {
-      defaultAttributes[key] = attributes[key];
+    for( var key in defaultAttributes) {
+      if (attributes[key] === undefined) { attributes[key] = defaultAttributes[key]; }
     }
-    return defaultAttributes;
+    return attributes;
+  },
+
+  _resourceIndexFor: function(key, value) {
+    var resources = this.get('resources'),
+        len = resources.get('length') || 0,
+        idx;
+
+    for (idx = 0; idx < len; idx++) {
+      if (resources[idx] && resources[idx][key] === value) {
+        return idx;
+      }
+    }
+
+    return -1;
   }
 });

frameworks/foundation/debug/response_types/dynamic_response.js

@@ -2,7 +2,7 @@ sc_require('debug/base');
 sc_require('debug/utils/json');
 
 Fictum.DynamicResponse = SC.Object.extend({
-  value: function(store) {
-    return JSON.stringify(this.get('response')(store));
+  value: function(store, options) {
+    return JSON.stringify(this.get('response')(store, options));
   }
 });

frameworks/foundation/debug/server.js

@@ -29,5 +29,9 @@ Fictum.Server = SC.Object.extend({
 
   addResourceType: function(type, defaultAttributes) {
     this.get('resourceStore').addResourceType(type, defaultAttributes);
+  },
+
+  removeResource: function(type, key, value) {
+    return this.get('resourceStore').removeResource(type, attributes);
   }
 });

frameworks/foundation/debug/url_stub.js

@@ -20,7 +20,7 @@ Fictum.UrlStub = SC.Object.extend({
   },
 
   getResponse: function(store, options) {
-    var response = this.get('response').value(store);
+    var response = this.get('response').value(store, options);
     if(options && options.json) response = jQuery.parseJSON(response);
     return SC.Response.create({body: response, status: this.get('status')});
   },

frameworks/foundation/debug/url_stub_collection.js

@@ -16,6 +16,7 @@ Fictum.UrlStubCollection = SC.Object.extend({
 
   responseFor: function(url, resourceStore, options) {
     var urlStub = this._findUrlStubByUrl(url);
+    options.matches = urlStub.matchesUrl(url);
     return urlStub === null ? undefined : urlStub.getResponse(resourceStore, options);
   },
 

frameworks/foundation/debug/url_types/regular_expression_url.js

@@ -2,6 +2,7 @@ sc_require('debug/url_types/base');
 
 Fictum.RegularExpressionUrl = Fictum.Url.extend({
   matches: function(url) {
-    return url.match(this.get('url')) !== null;
+    var match = url.match(this.get('url'));
+    return match || false;
   }
 });