webstub 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b1fadc30394c28a2c70f47cdf1b3bb00fd53b25
-  data.tar.gz: 7a378b835765d1bc94256aac54c28ddb83692d9e
+  metadata.gz: 5a5ee428399a0214cd16a8d72651cf34d6d07497
+  data.tar.gz: e55c492aca59216cf5b245286e8ba9859d2b9abb
 SHA512:
-  metadata.gz: 8c6e61d19d442611bf3ba6d94c20eff7aa50264073e6d5b4ca95f2f655b9e920dc87ddacdaea6f1a3f039c11a753dfd9f7cf8f1a3114028568c766d20ae282f5
-  data.tar.gz: 4b15563577dff7e90410f4709a30c098825425bbf21fe39bf2618cf8d6819d87bbcd228d76c1a61e9bbb417eb911ed99a4e12c596c03bc1a3f2628a0de888cf0
+  metadata.gz: 58f0a1305f0d7a7b0f6dceea41696210694991f88ddc36c20007a0312fe32f76e77c6087a12f96b7f89a9e67e37b41cb0074b31a13c7055c00b105a61b7213db
+  data.tar.gz: 20330658e51a988deada8bfec184c32a699c8437eb635a0073a13ad6c4840788e9cba1e7cc4287c01895c1d2b862d6c3feaa993b1f9f8dd663e907f54df8a5e6

data/.gitignore

@@ -1,6 +1,7 @@
 .rvmrc
 .repl_history
 build
+pkg
 resources/*.nib
 resources/*.momd
 resources/*.storyboardc

data/README.md

@@ -15,7 +15,7 @@ Installation
 ------------
 Update your Gemfile:
 
-    gem "webstub", "~> 0.4.0"
+    gem "webstub"
 
 Bundle:
 
@@ -105,6 +105,9 @@ Conventions
   - `body`: accepts a String, and returns it as-is
   - `content_type`: sets the Content-Type when using the `body` parameter
   - `status_code`: sets the integer Status Code of the response. Defaults to `200`.
+- The `to_redirect` method accepts:
+  - `url`: String of the URL to redirect to (*required*)
+  - All options supported by `to_return` except for `status_code`
 
 Expectations
 -----------------

data/lib/webstub/protocol.rb

@@ -49,6 +49,24 @@ module WebStub
                                                      statusCode:@stub.response_status_code,
                                                      HTTPVersion:"HTTP/1.1",
                                                      headerFields:@stub.response_headers)
+      @stub.requests += 1
+
+      if @stub.redirects?
+        url = NSURL.URLWithString(@stub.response_headers["Location"])
+        redirect_request = NSURLRequest.requestWithURL(url)
+
+        client.URLProtocol(self, wasRedirectedToRequest: redirect_request, redirectResponse: response)
+
+        unless @stub = self.class.stub_for(redirect_request)
+          error = NSError.errorWithDomain("WebStub", code:0, userInfo:{ NSLocalizedDescriptionKey: "network access is not permitted!"})
+          client.URLProtocol(self, didFailWithError:error)
+
+          return
+        end
+
+        @timer = NSTimer.scheduledTimerWithTimeInterval(@stub.response_delay, target:self, selector: :completeLoading, userInfo:nil, repeats:false)
+        return
+      end
 
       client.URLProtocol(self, didReceiveResponse:response, cacheStoragePolicy:NSURLCacheStorageNotAllowed)
       client.URLProtocol(self, didLoadData:@stub.response_body.dataUsingEncoding(NSUTF8StringEncoding))
@@ -66,8 +84,6 @@ module WebStub
         return
       end
 
-      @stub.requests += 1
-
       @timer = NSTimer.scheduledTimerWithTimeInterval(@stub.response_delay, target:self, selector: :completeLoading, userInfo:nil, repeats:false)
     end
 

data/lib/webstub/stub.rb

@@ -48,6 +48,10 @@ module WebStub
 
     attr_accessor :requests
 
+    def redirects?
+      @response_status_code.between?(300, 399) && @response_headers["Location"] != nil
+    end
+
     def requested?
       @requests > 0
     end
@@ -62,6 +66,10 @@ module WebStub
         @response_status_code = status_code
       end
 
+      if headers = options[:headers]
+        @response_headers.merge!(headers)
+      end
+
       if json = options[:json]
         @response_body = json
         @response_headers["Content-Type"] = "application/json"
@@ -71,7 +79,6 @@ module WebStub
         end
       else
         @response_body = options[:body] || ""
-        @response_headers = options[:headers] || {}
 
         if content_type = options[:content_type]
           @response_headers["Content-Type"] = content_type
@@ -85,6 +92,18 @@ module WebStub
       self
     end
 
+    def to_redirect(options)
+      unless url = options.delete(:url)
+        raise ArgumentError, "to_redirect requires the :url option"
+      end
+
+      options[:headers] ||= {}
+      options[:headers]["Location"] = url
+      options[:status_code] = 301
+
+      to_return(options)
+    end
+
     def with(options)
       if body = options[:body]
         @request_body = body

data/lib/webstub/version.rb

@@ -1,3 +1,3 @@
 module WebStub
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/spec/api_spec.rb

@@ -2,7 +2,7 @@ describe WebStub::API do
   before do
     WebStub::API.reset_stubs
     
-    @url = "http://www.google.com/search"
+    @url = "http://www.example.com/"
     @request = NSURLRequest.requestWithURL(NSURL.URLWithString(@url))
   end
 
@@ -157,6 +157,21 @@ describe WebStub::API do
         response.body.should == '{}'
       end
     end
+
+    describe "when a stub redirects" do
+      it "redirects the request" do
+        @redirect_url = @url + "redirect"
+
+        WebStub::API.stub_request(:get, @url).
+          to_redirect(url: @redirect_url)
+        WebStub::API.stub_request(:get, @redirect_url).
+          to_return(json: {})
+
+        response = get(@url)
+
+        response.body.should == '{}'
+      end
+    end
   end
 
   describe ".reset_stubs" do

data/spec/helpers/request_helper.rb

@@ -20,11 +20,7 @@ def get(url, headers={})
     request.setValue(value, forHTTPHeaderField: key.to_s)
   end
 
-  response = Pointer.new(:object)
-  error = Pointer.new(:object)
-  body = NSURLConnection.sendSynchronousRequest(request, returningResponse:response, error:error)
-
-  Response.new(body, response[0], error[0])
+  issue_request(request)
 end
 
 def post(url, body)
@@ -44,10 +40,25 @@ def post(url, body)
 
   request.HTTPBody = body.dataUsingEncoding(NSUTF8StringEncoding)
 
-  response = Pointer.new(:object)
-  error = Pointer.new(:object)
-  body = NSURLConnection.sendSynchronousRequest(request, returningResponse:response, error:error)
-
-  Response.new(body, response[0], error[0])
+  issue_request(request)
 end
 
+def issue_request(request)
+  result = {}
+  queue = NSOperationQueue.alloc.init
+  lock = NSConditionLock.alloc.initWithCondition(0)
+
+  NSURLConnection.sendAsynchronousRequest(request,
+                                          queue: queue,
+                                          completionHandler: lambda do |response, data, error|
+                                            lock.lockWhenCondition(0)
+                                            result[:data] = data
+                                            result[:response] = response
+                                            result[:error] = error
+                                            lock.unlockWithCondition(1)
+                                          end)
+
+  lock.lockWhenCondition(1)
+
+  Response.new(result[:data], result[:response], result[:error])
+end

data/spec/stub_spec.rb

@@ -108,6 +108,28 @@ describe WebStub::Stub do
     end
   end
 
+  describe "#to_redirect" do
+    it "requires the :url option" do
+      lambda { @stub.to_redirect }.should.raise(ArgumentError)
+    end
+
+    it "sets the Location header to the specified URL" do
+      @stub.to_redirect(url: "http://example.org/")
+
+      @stub.response_headers.should.include("Location")
+    end
+
+    it "sets the status code to 301" do
+      @stub.to_redirect(url: "http://example.org/")
+
+      @stub.response_status_code.should == 301
+    end
+
+    it "returns the stub" do
+      @stub.to_redirect(url: "http://example.org/").should == @stub
+    end
+  end
+
   describe "#to_return" do
     it "sets the response body" do
       @stub.to_return(body: "hello")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webstub
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Matt Green
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-24 00:00:00.000000000 Z
+date: 2013-06-26 00:00:00.000000000 Z
 dependencies: []
 description: Easily stub out HTTP responses in RubyMotion specs
 email: