webstub 0.3.3 → 0.3.4

data/lib/webstub/protocol.rb

@@ -32,30 +32,44 @@ module WebStub
       registry.reset
     end
 
+    def initWithRequest(request, cachedResponse:response, client: client)
+      if super
+        @stub = nil
+        @timer = nil
+      end
+
+      self
+    end
+
+    def completeLoading
+      response = NSHTTPURLResponse.alloc.initWithURL(request.URL,
+                                                     statusCode:@stub.response_status_code,
+                                                     HTTPVersion:"HTTP/1.1",
+                                                     headerFields:@stub.response_headers)
+
+      client.URLProtocol(self, didReceiveResponse:response, cacheStoragePolicy:NSURLCacheStorageNotAllowed)
+      client.URLProtocol(self, didLoadData:@stub.response_body.dataUsingEncoding(NSUTF8StringEncoding))
+      client.URLProtocolDidFinishLoading(self)
+    end
+
     def startLoading
       request = self.request
       client = self.client
     
-      unless stub = self.class.stub_for(request)
+      unless @stub = self.class.stub_for(self.request)
         error = NSError.errorWithDomain("WebStub", code:0, userInfo:{ NSLocalizedDescriptionKey: "network access is not permitted!"})
         client.URLProtocol(self, didFailWithError:error)
 
         return
       end
 
-      response = NSHTTPURLResponse.alloc.initWithURL(request.URL,
-                                                     statusCode:stub.response_status_code,
-                                                     HTTPVersion:"HTTP/1.1",
-                                                     headerFields:stub.response_headers)
-
-      Dispatch::Queue.concurrent("webstub.response").after(stub.response_delay) do
-        client.URLProtocol(self, didReceiveResponse:response, cacheStoragePolicy:NSURLCacheStorageNotAllowed)
-        client.URLProtocol(self, didLoadData:stub.response_body.dataUsingEncoding(NSUTF8StringEncoding))
-        client.URLProtocolDidFinishLoading(self)
-      end
+      @timer = NSTimer.scheduledTimerWithTimeInterval(@stub.response_delay, target:self, selector: :completeLoading, userInfo:nil, repeats:false)
     end
 
     def stopLoading
+      if @timer
+        @timer.invalidate
+      end
     end
 
   private

data/lib/webstub/version.rb

@@ -1,3 +1,3 @@
 module WebStub
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webstub
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-04 00:00:00.000000000 Z
+date: 2013-01-05 00:00:00.000000000 Z
 dependencies: []
 description: Easily stub out HTTP responses in RubyMotion specs
 email: