webstub 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40544713a0826d109fcb02e4783588517437b435
-  data.tar.gz: 46b02687ec96a9a3f46cb59695964e8285de78ee
+  metadata.gz: 417c4590e0317c76435c058817bf99abf978ed1d
+  data.tar.gz: b4bdc1d2000e39c50545b09e08ca84ecc869c047
 SHA512:
-  metadata.gz: 93aab16995e60f7dc7ac17b35063ea5b7418558f50d9bbb1483e52c7ea02cadcfb4d84362b7e858f182f5d183f325c453ba6e0db12ca0c43b895acc99a45a1ce
-  data.tar.gz: 822c71d00fca97e051b6a112ea4221540f364d775b8517ee6ea2afdb39ca2b7825672e8668c55820ad075d56006d4485d5f526eb8ebfe7469206c2ba08327651
+  metadata.gz: c510ac76a7fffb353a52e2c0090bac01b92a5940fdd74c94bf3d66e5647b1fa4449aad9a99b7a5d36d7ab692b9e3ecb08075f99ebe6ce200827ee8841f8d2253
+  data.tar.gz: 844d47d28fdcf93b6700297623da1177b631bdf1fe236c752a1eec4cddaf33b5c44cb6f9e1e739c013f11f7157bf5a248ec04c52629925a6d38051c6a91a1111

data/lib/webstub/patch/session_configuration.rb

@@ -6,9 +6,9 @@ if Kernel.const_defined?(:NSURLSessionConfiguration)
       def defaultSessionConfiguration
         config = originalDefaultSessionConfiguration
 
-        protocols = config.protocolClasses.clone || []
+        protocols = (config.protocolClasses && config.protocolClasses.clone) || []
         unless protocols.include?(WebStub::Protocol)
-          protocols << WebStub::Protocol
+          protocols.unshift WebStub::Protocol
           config.protocolClasses = protocols
         end
 
@@ -20,9 +20,9 @@ if Kernel.const_defined?(:NSURLSessionConfiguration)
       def ephemeralSessionConfiguration
         config = originalEphemeralSessionConfiguration
 
-        protocols = config.protocolClasses.clone || []
+        protocols = (config.protocolClasses && config.protocolClasses.clone) || []
         unless protocols.include?(WebStub::Protocol)
-          protocols << WebStub::Protocol
+          protocols.unshift WebStub::Protocol
           config.protocolClasses = protocols
         end
 

data/lib/webstub/stub.rb

@@ -7,7 +7,7 @@ module WebStub
       raise ArgumentError, "invalid method name" unless METHODS.include? @request_method
 
       @requests = 0
-      
+
       @request_url = canonicalize_url(url)
       @request_headers = nil
       @request_body = nil
@@ -75,7 +75,7 @@ module WebStub
       elsif code = options.delete(:code)
         @response_error = NSError.errorWithDomain(NSURLErrorDomain, code: code, userInfo: nil)
       else
-        raise ArgumentError, "to_fail requires either the code or error option" 
+        raise ArgumentError, "to_fail requires either the code or error option"
       end
 
       self
@@ -180,11 +180,11 @@ module WebStub
         parts << path
       end
 
-      if query
+      if query && !query.empty?
         parts << "?#{query}"
       end
 
-      if fragment
+      if fragment && !fragment.empty?
         parts << "##{fragment}"
       end
 

data/lib/webstub/version.rb

@@ -1,3 +1,3 @@
 module WebStub
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

data/spec/stub_spec.rb

@@ -47,7 +47,7 @@ describe WebStub::Stub do
       end
     end
     it "calls the callback method" do
-      @stub.callback.should.not.be.nil 
+      @stub.callback.should.not.be.nil
     end
     it "should call the callback" do
       @stub.do_callback("headers", "body")
@@ -90,6 +90,14 @@ describe WebStub::Stub do
       it "ignores a path with \"/\"" do
         @stub.matches?(:get, "http://www.yahoo.com:80/").should.be.true
       end
+
+      it 'strips any trailing ?' do
+        @stub.matches?(:get, "http://www.yahoo.com/?").should.be.true
+      end
+
+      it 'strips any trailing #' do
+        @stub.matches?(:get, "http://www.yahoo.com/#").should.be.true
+      end
     end
 
     describe "body" do
@@ -100,7 +108,7 @@ describe WebStub::Stub do
         end
 
         it "returns false when the body does not match" do
-          @stub.matches?(:post, "http://www.yahoo.com/search", { :body => {}}).should.be.false          
+          @stub.matches?(:post, "http://www.yahoo.com/search", { :body => {}}).should.be.false
         end
 
         it "returns true when the body matches (with string keys)" do
@@ -135,12 +143,12 @@ describe WebStub::Stub do
       end
 
       it "returns true when the headers are included" do
-        @stub.matches?(:get, "http://www.yahoo.com/search", 
+        @stub.matches?(:get, "http://www.yahoo.com/search",
                        headers: { "X-Extra" => "42", "Authorization" => "secret" }).should.be.true
       end
 
       it "returns false when any of the headers are absent" do
-        @stub.matches?(:get, "http://www.yahoo.com/search", 
+        @stub.matches?(:get, "http://www.yahoo.com/search",
                        headers: { "X-Extra" => "42" }).should.be.false
       end
     end
@@ -166,7 +174,7 @@ describe WebStub::Stub do
 
   describe "#response_body" do
     it "returns the response body" do
-      @stub.response_body.should == "" 
+      @stub.response_body.should == ""
     end
   end
 
@@ -247,7 +255,7 @@ describe WebStub::Stub do
 
     it "sets response headers" do
       @stub.to_return(body: "{}", headers: { "Content-Type" => "application/json" })
-      @stub.response_headers.should.be == { "Content-Type" => "application/json" } 
+      @stub.response_headers.should.be == { "Content-Type" => "application/json" }
     end
 
     it "sets the response status code" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webstub
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Matt Green
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-18 00:00:00.000000000 Z
+date: 2014-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake