webstub 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83ff338cdc8626be04a4ca16d8a72f4fa015e5ae
-  data.tar.gz: 32edcc1fb2dc10c867ce83ad0c8bfbd4860959dd
+  metadata.gz: 9f498c840e10f87af4e242bf40649b85c6e5f554
+  data.tar.gz: 6f73bdb65fd0884065a5aa35a75b5196ebb3a326
 SHA512:
-  metadata.gz: f94be75dca1cacf1f27d03282ab04f98f791bc8f7e3ec6e4080a759914169a3b73ed4d9a83c4ad01ae5a71d6fec3152ae371c3c9f246c60034f9da5a8720a7fd
-  data.tar.gz: 28b5ea6be60a257bfb17a3e517dde84b2fb9a231eb4e245dd200fd5be0d5e17f9d99d2bc2dd0e91bcb36a34b122b5c54d103f98f0fa7c5dab65ed2b315ca8ba9
+  metadata.gz: 89d90b6d50d6ead629cd3817d5ed730f61f33263bdab2db6bc5adc563cd7642bd464bc20c64d6affcf22f4f1a0489b2b2434e8ca1591a60fad1ed203906ed0a4
+  data.tar.gz: 6c7c9d832871faa3ad313c4606d18c12cdc8f8893465e189b97f0a4ea381af7ed356ef97efc45d9c3cf927f9aeaefa942c8300f92ce1e394e5fc42bab36ada34

data/README.md

@@ -152,5 +152,4 @@ end
 TODO
 ---------
 * Handle query params similarly to form data
-* URI canonicalization
 

data/lib/webstub/stub.rb

@@ -145,7 +145,38 @@ module WebStub
     end
 
     def canonicalize_url(url)
-      url
+      scheme, authority, hostname, port, path, query, fragment = URI.split(url)
+
+      parts = scheme.downcase
+      parts << "://"
+
+      if authority
+        parts << authority
+        parts << "@"
+      end
+
+      parts << hostname.downcase
+
+      if port
+        well_known_ports = { "http" => 80, "https" => 443 }
+        if well_known_ports[scheme] != port
+          parts << ":#{port}"
+        end
+      end
+
+      if path != "/"
+        parts << path
+      end
+
+      if query
+        parts << "?#{query}"
+      end
+
+      if fragment
+        parts << "##{fragment}"
+      end
+
+      parts
     end
   end
 end

data/lib/webstub/uri.rb

@@ -12,5 +12,25 @@ module WebStub
     def self.decode_www_form_component(str)
       str.gsub("+", " ").stringByReplacingPercentEscapesUsingEncoding(NSUTF8StringEncoding)
     end
+
+    def self.split(str)
+      url = NSURL.URLWithString(str)
+
+      scheme = url.scheme
+      user = url.user
+      password = url.password
+      hostname = url.host
+      port = url.port
+      path = url.path
+      query = url.query
+      fragment = url.fragment
+
+      user_info = nil
+      if user || password
+        user_info = "#{user}:#{password}"
+      end
+
+      [scheme, user_info, hostname, port, path, query, fragment]
+    end
   end
 end

data/lib/webstub/version.rb

@@ -1,3 +1,3 @@
 module WebStub
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

data/spec/stub_spec.rb

@@ -50,6 +50,30 @@ describe WebStub::Stub do
       @stub.matches?(:post, "http://www.yahoo.com/").should.be.false
     end
 
+    describe "canonicalizing URLs" do
+      it "lowercases the scheme" do
+        @stub.matches?(:get, "HTTP://www.yahoo.com/").should.be.true
+      end
+
+      it "lowercases the hostname" do
+        @stub.matches?(:get, "http://WWW.YAHOo.COM/").should.be.true
+      end
+
+      it "ignores default HTTP port" do
+        @stub.matches?(:get, "http://www.yahoo.com:80/").should.be.true
+      end
+
+      it "ignores default HTTPS port" do
+        stub = WebStub::Stub.new(:get, "https://www.yahoo.com/")
+
+        stub.matches?(:get, "https://www.yahoo.com:443/").should.be.true
+      end
+
+      it "ignores a path with \"/\"" do
+        @stub.matches?(:get, "http://www.yahoo.com:80/").should.be.true
+      end
+    end
+
     describe "body" do
       describe "with a dictionary" do
         before do

data/spec/uri_spec.rb

@@ -13,4 +13,19 @@ describe WebStub::URI do
       WebStub::URI.decode_www_form("a=42&b=hello").should == WebStub::URI.decode_www_form("b=hello&a=42")
     end
   end
+
+  describe ".split" do
+    it "splits a URL into its constituent parts" do
+      parts = WebStub::URI.split("http://user:password@hostname:9000/path/to/file?query=true#fragment")
+
+      parts.should ==
+        ["http", "user:password", "hostname", 9000, "/path/to/file", "query=true", "fragment"]
+    end
+
+    it "returns nil for elements not present" do
+      parts = WebStub::URI.split("http://www.yahoo.com")
+
+      parts.should == ["http", nil, "www.yahoo.com", nil, "", nil, nil]
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webstub
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Matt Green
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-27 00:00:00.000000000 Z
+date: 2013-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake