furi 0.1.0 → 0.2.0

data/lib/furi/utils.rb

@@ -0,0 +1,16 @@
+
+module Furi
+  class Utils
+    class << self
+      def stringify_keys(hash)
+        result = {}
+        hash.each_key do |key|
+          value = hash[key]
+          result[key.to_s] = value.is_a?(Hash) ? stringify_keys(value) : value
+        end
+        result
+      end
+    end
+  end
+end
+ 

data/lib/furi/version.rb

@@ -1,3 +1,3 @@
 module Furi
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/spec/furi_spec.rb

@@ -65,20 +65,62 @@ describe Furi do
 
 
   describe "#parse" do
+
+    it "parses URL with everything" do
+      expect("http://user:pass@www.gusiev.com:8080/articles/index.html?a=1&b=2#header").to have_parts(
+        location: 'http://user:pass@www.gusiev.com:8080',
+        protocol: 'http',
+        schema: 'http',
+        authority: 'user:pass@www.gusiev.com:8080',
+        hostinfo: 'www.gusiev.com:8080',
+        host: 'www.gusiev.com',
+        subdomain: 'www',
+        domain: 'gusiev.com',
+        domainzone: 'com',
+        port: 8080,
+        userinfo: 'user:pass',
+        username: 'user',
+        password: 'pass',
+
+        resource: '/articles/index.html?a=1&b=2#header',
+        path: "/articles/index.html",
+        filename: 'index.html',
+        extension: 'html',
+        query_string: "a=1&b=2",
+        query_tokens: [['a', '1'], ['b', '2']],
+        query: {'a' => '1', 'b' => '2'},
+        request: '/articles/index.html?a=1&b=2',
+        anchor: 'header',
+        fragment: 'header',
+        home_page?: false,
+      )
+
+    end
     it "parses URL without path" do
       expect("http://gusiev.com").to have_parts(
         protocol: 'http',
         hostname: 'gusiev.com',
-        query_string: "",
+        query_string: nil,
         query: {},
         path: nil,
         path!: '/',
         port: nil,
         request: '/',
         resource: '/',
+        location: 'http://gusiev.com',
+        home_page?: true,
       )
     end
 
+    it "parses URL with root path" do
+      expect("http://gusiev.com/?a=b").to have_parts(
+        hostname: 'gusiev.com',
+        path: '/',
+        path!: '/',
+        request: '/?a=b',
+        home_page?: true,
+      )
+    end
     it "extracts anchor" do
       expect("http://gusiev.com/posts/index.html?a=b#zz").to have_parts(
         anchor: 'zz',
@@ -88,6 +130,9 @@ describe Furi do
         protocol: 'http',
         resource: '/posts/index.html?a=b#zz',
         request: '/posts/index.html?a=b',
+        location: 'http://gusiev.com',
+        filename: 'index.html',
+        extension: 'html',
       )
     end
 
@@ -97,6 +142,21 @@ describe Furi do
         hostname: nil,
         port: nil,
         protocol: nil,
+        location: nil,
+        extension: 'html',
+        home_page?: false,
+      )
+    end
+
+    it "works with path ending at slash" do
+
+      expect("/posts/").to have_parts(
+        path: '/posts/',
+        directory: '/posts',
+        filename: nil,
+        'filename!' =>  '',
+        extension: nil,
+        home_page?: false,
       )
     end
 
@@ -105,8 +165,9 @@ describe Furi do
         username: 'user',
         password: 'pass',
         hostname: 'gusiev.com',
-        query_string: "",
+        query_string: nil,
         anchor: nil,
+        location: 'http://user:pass@gusiev.com',
       )
     end
 
@@ -115,16 +176,16 @@ describe Furi do
         username: 'user',
         password: nil,
         hostname: 'gusiev.com',
-        query_string: "",
+        query_string: nil,
         anchor: nil,
+        location: 'http://user@gusiev.com',
       )
     end
 
 
     it "supports aliases" do
       expect("http://gusiev.com#zz").to have_parts(
-        schema: 'http',
-        fragment: 'zz',
+        location: 'http://gusiev.com',
       )
     end
 
@@ -135,9 +196,19 @@ describe Furi do
         userinfo: 'user:pass',
         protocol: 'http',
         port: 80,
-        query_string: "",
+        query_string: nil,
       )
     end
+
+    it "parses custom port" do
+      expect("http://gusiev.com:8080").to have_parts(
+        hostname: 'gusiev.com',
+        hostinfo: 'gusiev.com:8080',
+        protocol: 'http',
+        port: 8080,
+      )
+
+    end
     it "parses url with query" do
       expect("/index.html?a=b&c=d").to have_parts(
         host: nil,
@@ -145,6 +216,7 @@ describe Furi do
         query_string: 'a=b&c=d',
         query: {'a' => 'b', 'c' => 'd'},
         request: '/index.html?a=b&c=d',
+        home_page?: true,
       )
     end
 
@@ -172,9 +244,98 @@ describe Furi do
         :"ssl" => true
       )
     end
+
+    it "parses host into parts" do
+      expect("http://www.gusiev.com.ua").to have_parts(
+        domain: 'gusiev.com.ua',
+        subdomain: 'www',
+        domainname: 'gusiev',
+        domainzone: 'com.ua'
+      )
+      expect("http://www.com.ua").to have_parts(
+        domain: 'www.com.ua',
+        subdomain: nil,
+        domainname: 'www',
+        domainzone: 'com.ua'
+      )
+      expect("http://com.ua").to have_parts(
+        domain: 'com.ua',
+        subdomain: nil,
+        domainname: 'com',
+        domainzone: 'ua'
+      )
+      expect("http://www.blog.gusiev.com.ua").to have_parts(
+        domain: 'gusiev.com.ua',
+        subdomain: 'www.blog',
+        domainname: 'gusiev',
+        domainzone: 'com.ua'
+      )
+    end
+
+    it "parses double # in anchor" do
+      expect("/index?a=1#c#d").to have_parts(
+        anchor: 'c#d',
+        query_string: "a=1",
+        path: '/index',
+      )
+    end
+    it "parses blank port with protocol" do
+      expect("http://gusiev.com:/hello").to have_parts(
+        path: '/hello',
+        port: nil,
+        host: 'gusiev.com',
+        protocol: 'http',
+      )
+    end
+    it "parses blank port without protocol" do
+      expect("gusiev.com:/hello").to have_parts(
+        path: '/hello',
+        port: nil,
+        host: 'gusiev.com',
+        protocol: nil,
+      )
+    end
+
+    it "parses 0 port as blank port" do
+      expect("http://gusiev.com:0/hello").to have_parts(
+        path: '/hello',
+        port: 0,
+        host: 'gusiev.com',
+        protocol: 'http',
+      )
+    end
+
+    describe "ipv6 host" do
+      it "parses host and port" do
+        expect("http://[2406:da00:ff00::6b14:8d43]:8080/").to have_parts(
+          path: '/',
+          port: 8080,
+          host: '[2406:da00:ff00::6b14:8d43]',
+          protocol: 'http',
+        )
+      end
+      it "parses host and nil port" do
+
+        expect("http://[2406:da00:ff00::6b14:8d43]:/hello").to have_parts(
+          path: '/hello',
+          port: nil,
+          host: '[2406:da00:ff00::6b14:8d43]',
+          protocol: 'http',
+        )
+      end
+
+      it "parses host without protocol and port" do
+        expect("[2406:da00:ff00::6b14:8d43]/hello").to have_parts(
+          path: '/hello',
+          port: nil,
+          host: '[2406:da00:ff00::6b14:8d43]',
+          protocol: nil,
+        )
+      end
+    end
   end
   describe ".update" do
-    
+
     it "support update for query" do
       expect(Furi.update("/index.html?a=b", query: {c: 'd'})).to eq('/index.html?c=d')
     end
@@ -193,6 +354,47 @@ describe Furi do
       expect(Furi.update("gusiev.com/index.html", port: 33)).to eq('gusiev.com:33/index.html')
       expect(Furi.update("gusiev.com:33/index.html", port: 80)).to eq('gusiev.com:80/index.html')
       expect(Furi.update("http://gusiev.com:33/index.html", port: 80)).to eq('http://gusiev.com/index.html')
+      expect(Furi.update("http://gusiev.com:33/index.html", port: nil)).to eq('http://gusiev.com/index.html')
+      expect(Furi.update("http://gusiev.com:33/index.html", port: 0)).to eq('http://gusiev.com:0/index.html')
+      expect(Furi.update("http://gusiev.com:33/index.html", port: '')).to eq('http://gusiev.com/index.html')
+    end
+    it "updates directory" do
+      expect(Furi.update("gusiev.com", directory: 'articles')).to eq('gusiev.com/articles')
+      expect(Furi.update("gusiev.com/", directory: 'articles')).to eq('gusiev.com/articles')
+      expect(Furi.update("gusiev.com/index#header", directory: '/posts')).to eq('gusiev.com/posts/index#header')
+      expect(Furi.update("gusiev.com/articles/#header", directory: nil)).to eq('gusiev.com/#header')
+      expect(Furi.update("gusiev.com/articles/index?a=b", directory: 'posts')).to eq('gusiev.com/posts/index?a=b')
+      expect(Furi.update("/articles/index?a=b", directory: '/posts')).to eq('/posts/index?a=b')
+      expect(Furi.update("/articles/index.html?a=b", directory: '/posts/')).to eq('/posts/index.html?a=b')
+    end
+    it "updates filename" do
+      expect(Furi.update("gusiev.com", filename: 'article')).to eq('gusiev.com/article')
+      expect(Furi.update("gusiev.com/", filename: 'article')).to eq('gusiev.com/article')
+      expect(Furi.update("gusiev.com/article1#header", filename: '/article2')).to eq('gusiev.com/article2#header')
+      expect(Furi.update("gusiev.com/article#header", filename: nil)).to eq('gusiev.com/#header')
+      expect(Furi.update("gusiev.com/articles/article1?a=b", filename: 'article2')).to eq('gusiev.com/articles/article2?a=b')
+      expect(Furi.update("/articles/article1?a=b", filename: '/article2')).to eq('/articles/article2?a=b')
+      expect(Furi.update("/articles/article1.xml?a=b", filename: 'article2.html')).to eq('/articles/article2.html?a=b')
+    end
+    it "updates extension" do
+      expect(->{
+       Furi.update("gusiev.com/", extension: 'xml')
+      }).to raise_error(Furi::FormattingError)
+      expect(Furi.update("gusiev.com/article#header", extension: 'html')).to eq('gusiev.com/article.html#header')
+      expect(Furi.update("gusiev.com/article.html?header", extension: nil)).to eq('gusiev.com/article?header')
+      expect(Furi.update("gusiev.com/article.xml?a=b", extension: 'html')).to eq('gusiev.com/article.html?a=b')
+    end
+    it "updates resource" do
+      expect(Furi.update("gusiev.com", resource: '/article?a=1#hello')).to eq('gusiev.com/article?a=1#hello')
+      expect(Furi.update("gusiev.com/article1#header", resource: '/article2')).to eq('gusiev.com/article2')
+      expect(Furi.update("gusiev.com/article#header", resource: nil)).to eq('gusiev.com')
+      expect(Furi.update("gusiev.com/article1?a=b", resource: 'article2')).to eq('gusiev.com/article2')
+    end
+    it "updates path" do
+      expect(Furi.update("gusiev.com", path: '/article')).to eq('gusiev.com/article')
+      expect(Furi.update("gusiev.com/article1#header", path: '/article2')).to eq('gusiev.com/article2#header')
+      expect(Furi.update("gusiev.com/article#header", path: nil)).to eq('gusiev.com#header')
+      expect(Furi.update("gusiev.com/article1?a=b", path: 'article2')).to eq('gusiev.com/article2?a=b')
     end
 
     it "updates ssl" do
@@ -201,6 +403,7 @@ describe Furi do
       expect(Furi.update("https://gusiev.com", ssl: false)).to eq('http://gusiev.com')
       expect(Furi.update("http://gusiev.com", ssl: false)).to eq('http://gusiev.com')
     end
+
     it "updates protocol" do
       expect(Furi.update("http://gusiev.com", protocol: '')).to eq('//gusiev.com')
       expect(Furi.update("http://gusiev.com", protocol: nil)).to eq('gusiev.com')
@@ -211,6 +414,44 @@ describe Furi do
       expect(Furi.update("gusiev.com", protocol: 'http://')).to eq('http://gusiev.com')
     end
 
+    it "updates userinfo" do
+      expect(Furi.update("http://gusiev.com", userinfo: 'hello:world')).to eq('http://hello:world@gusiev.com')
+      expect(Furi.update("http://aa:bb@gusiev.com", userinfo: 'hello:world')).to eq('http://hello:world@gusiev.com')
+      expect(Furi.update("http://aa:bb@gusiev.com", userinfo: nil)).to eq('http://gusiev.com')
+      expect(Furi.update("http://aa@gusiev.com", userinfo: 'hello:world')).to eq('http://hello:world@gusiev.com')
+    end
+
+    it "updates authority" do
+      expect(Furi.update("http://user:pass@gusiev.com:8080/index.html", authority: 'gusiev.com')).to eq('http://gusiev.com/index.html')
+    end
+
+    it "updates request" do
+      expect(Furi.update("http://gusiev.com:8080/index.html?c=d", request: '/blog.html?a=b')).to eq('http://gusiev.com:8080/blog.html?a=b')
+    end
+
+    it "updates domainzone" do
+      expect(Furi.update("http://gusiev.com:8080", domainzone: 'com.ua')).to eq('http://gusiev.com.ua:8080')
+      expect(Furi.update("http://gusiev.com.ua:8080", domainzone: 'com')).to eq('http://gusiev.com:8080')
+      expect(Furi.update("http://gusiev.com.ua:8080", domainzone: nil)).to eq('http://gusiev:8080')
+    end
+
+    it "updates domainname" do
+      expect(Furi.update("http://gusiev.com", domainname: 'google')).to eq('http://google.com')
+      expect(Furi.update("http://gusiev.com", domainname: nil)).to eq('http://com')
+    end
+    it "updates subdomain" do
+      expect(Furi.update("http://gusiev.com", subdomain: 'blog')).to eq('http://blog.gusiev.com')
+      expect(Furi.update("http://blog.gusiev.com", subdomain: nil)).to eq('http://gusiev.com')
+    end
+
+    it "updates location" do
+      expect(Furi.update("/index.html", location: 'http://gusiev.com')).to eq('http://gusiev.com/index.html')
+      expect(Furi.update("/index.html", location: 'http://gusiev.com/')).to eq('http://gusiev.com/index.html')
+      expect(Furi.update("gusiev.com:433/index.html", location: 'gusiev.com:80')).to eq('gusiev.com:80/index.html')
+      expect(Furi.update("gusiev.com:433/index.html", location: nil)).to eq('/index.html')
+      expect(Furi.update("http://gusiev.com:433/index.html", location: nil)).to eq('/index.html')
+    end
+
   end
 
   describe ".build" do
@@ -221,6 +462,18 @@ describe Furi do
       expect(Furi.build(schema: 'https', hostname: 'hello.com', port: 88)).to eq('https://hello.com:88')
       expect(Furi.build(schema: 'http', hostname: 'hello.com', port: 80)).to eq('http://hello.com')
       expect(Furi.build(path: '/index.html', query: {a: 1, b: 2})).to eq('/index.html?a=1&b=2')
+      expect(Furi.build(path: '/', host: 'gusiev.com', query: {a: 1})).to eq('gusiev.com/?a=1')
+      expect(Furi.build(path: '/articles/', host: 'gusiev.com', query: {a: 1})).to eq('gusiev.com/articles/?a=1')
+      expect(Furi.build(user: 'user', hostname: 'hello.com')).to eq('user@hello.com')
+      expect(Furi.build(protocol: 'http', host: 'hello.com', port: 80)).to eq('http://hello.com')
+      expect(Furi.build(query: 'a=b')).to eq('/?a=b')
+
+      expect(->{
+        Furi.build(host: nil, port: 80)
+      }).to raise_error(Furi::FormattingError)
+      expect(->{
+        Furi.build(host: 'localhost', password: 'pass')
+      }).to raise_error(Furi::FormattingError)
     end
   end
 
@@ -234,6 +487,27 @@ describe Furi do
     end
   end
 
+  describe ".defaults" do
+    it "should set protocol" do
+      expect(Furi.defaults("gusiev.com", protocol: 'http')).to eq('http://gusiev.com')
+      expect(Furi.defaults("gusiev.com", protocol: '//')).to eq('//gusiev.com')
+      expect(Furi.defaults("//gusiev.com", protocol: 'http')).to eq('//gusiev.com')
+      expect(Furi.defaults("https://gusiev.com", protocol: 'http')).to eq('https://gusiev.com')
+    end
+    it "should set host" do
+      expect(Furi.defaults("https://gusiev.com", subdomain: 'www')).to eq('https://www.gusiev.com')
+      expect(Furi.defaults("https://blog.gusiev.com", subdomain: 'www')).to eq('https://blog.gusiev.com')
+      expect(Furi.defaults("/index.html", host: 'gusiev.com', protocol: 'http')).to eq('http://gusiev.com/index.html')
+    end
+    it "should set query" do
+      expect(Furi.defaults("gusiev.com?a=1", query: {a: 2})).to eq('gusiev.com?a=1')
+      expect(Furi.defaults("gusiev.com?a=1", query: {b: 2})).to eq('gusiev.com?a=1&b=2')
+      expect(Furi.defaults("//gusiev.com?a=1", query_string: 'b=2')).to eq('//gusiev.com?a=1')
+      expect(Furi.defaults("//gusiev.com", query_string: 'b=2')).to eq('//gusiev.com?b=2')
+      expect(Furi.defaults("//gusiev.com?a=1&b=2", query: '?a=3')).to eq('//gusiev.com?a=1&b=2')
+    end
+  end
+
   describe "#==" do
     it "should work" do
       expect(Furi.parse('http://gusiev.com:80') == Furi.parse('http://gusiev.com')).to be_truthy
@@ -241,6 +515,8 @@ describe Furi do
       expect(Furi.parse('http://gusiev.com') == Furi.parse('http://gusiev.com')).to be_truthy
       expect(Furi.parse('http://gusiev.com.ua') == Furi.parse('http://gusiev.com')).to be_falsey
       expect(Furi.parse('http://gusiev.com?a=1&a=1') == Furi.parse('http://gusiev.com?a=1')).to be_falsey
+      pending
+      expect(Furi.parse('http://gUSiev.cOm?A=1') == Furi.parse('http://gusiev.com?a=1')).to be_truthy
     end
   end
 
@@ -250,17 +526,13 @@ describe Furi do
       uri = Furi.parse('http://gusiev.com')
       expect(uri.clone == uri).to be_truthy
       expect(uri.clone.merge_query([[:a, 1]]) == uri).to be_falsey
-      expect(Furi.parse('http://gusiev.com') == Furi.parse('https://gusiev.com')).to be_falsey
-      expect(Furi.parse('http://gusiev.com') == Furi.parse('http://gusiev.com')).to be_truthy
-      expect(Furi.parse('http://gusiev.com.ua') == Furi.parse('http://gusiev.com')).to be_falsey
-      expect(Furi.parse('http://gusiev.com?a=1&a=1') == Furi.parse('http://gusiev.com?a=1')).to be_falsey
     end
   end
 
   describe "serialize" do
     it "should work" do
       expect({a: 'b'}).to serialize_as("a=b")
-      expect(a: nil).to serialize_as("a=")
+      expect(a: nil).to serialize_as("a")
       expect(nil).to serialize_as("")
       expect(b: 2, a: 1).to serialize_as("b=2&a=1")
       expect(a: {b: {c: []}}).to serialize_as("")
@@ -270,7 +542,7 @@ describe Furi do
       expect(q: "cowboy hat?").to serialize_as("q=cowboy+hat%3F")
       expect(a: true).to serialize_as("a=true")
       expect(a: false).to serialize_as("a=false")
-      expect(a: [nil, 0]).to serialize_as("a%5B%5D=&a%5B%5D=0")
+      expect(a: [nil, 0]).to serialize_as("a%5B%5D&a%5B%5D=0")
       expect({f: ["b", 42, "your base"] }).to serialize_as("f%5B%5D=b&f%5B%5D=42&f%5B%5D=your+base")
       expect({"a[]" => 1 }).to serialize_as("a%5B%5D=1")
       expect({"a[b]" => [1] }).to serialize_as(["a[b][]=1"])
@@ -291,85 +563,106 @@ describe Furi do
     end
   end
 
-  describe "parse_nested_query" do
+  describe ".query_tokens" do
     it "should work" do
-    Furi.parse_nested_query("foo").
+      Furi.query_tokens("a=1").should eq [['a', 1]]
+      Furi.query_tokens("a==").should eq [['a', '=']]
+      Furi.query_tokens("a==1").should eq [['a', '=1']]
+      Furi.query_tokens("a=1&").should eq [['a', 1], ["", nil]]
+      Furi.query_tokens("&a=1").should eq [["", nil], ['a', 1]]
+      Furi.query_tokens("=").should eq [["", ""], ]
+      Furi.query_tokens(" ").should eq [[" ", nil], ]
+      Furi.query_tokens(" =").should eq [[" ", ''], ]
+      Furi.query_tokens("= ").should eq [["", ' '], ]
+      Furi.query_tokens("a=1&b").should eq [['a', 1], ["b", nil]]
+      Furi.query_tokens("a=&b").should eq [['a', ''], ['b', nil]]
+      Furi.query_tokens("a=1&b=2").should eq [['a', 1], ['b', 2]]
+    end
+  end
+
+  describe "parse_query" do
+    it "should work" do
+    Furi.parse_query("foo").
       should eq "foo" => nil
-    Furi.parse_nested_query("foo=").
+    Furi.parse_query("foo=").
       should eq "foo" => ""
-    Furi.parse_nested_query("foo=bar").
+    Furi.parse_query("foo=bar").
       should eq "foo" => "bar"
-    Furi.parse_nested_query("foo=\"bar\"").
+    Furi.parse_query("foo=\"bar\"").
       should eq "foo" => "\"bar\""
 
-    Furi.parse_nested_query("foo=bar&foo=quux").
+    Furi.parse_query("foo=bar&foo=quux").
       should eq "foo" => "quux"
-    Furi.parse_nested_query("foo&foo=").
+    Furi.parse_query("foo&foo=").
       should eq "foo" => ""
-    Furi.parse_nested_query("foo=1&bar=2").
+    Furi.parse_query("foo=1&bar=2").
       should eq "foo" => "1", "bar" => "2"
-    Furi.parse_nested_query("&foo=1&&bar=2").
+    Furi.parse_query("&foo=1&&bar=2").
       should eq "foo" => "1", "bar" => "2"
-    Furi.parse_nested_query("foo&bar=").
+    Furi.parse_query("foo&bar=").
       should eq "foo" => nil, "bar" => ""
-    Furi.parse_nested_query("foo=bar&baz=").
+    Furi.parse_query("foo=bar&baz=").
       should eq "foo" => "bar", "baz" => ""
-    Furi.parse_nested_query("my+weird+field=q1%212%22%27w%245%267%2Fz8%29%3F").
+    Furi.parse_query("my+weird+field=q1%212%22%27w%245%267%2Fz8%29%3F").
       should eq "my weird field" => "q1!2\"'w$5&7/z8)?"
 
-    Furi.parse_nested_query("a=b&pid%3D1234=1023").
+    Furi.parse_query("a=b&pid%3D1234=1023").
       should eq "pid=1234" => "1023", "a" => "b"
 
-    Furi.parse_nested_query("foo[]").
+    Furi.parse_query("foo[]").
       should eq "foo" => [nil]
-    Furi.parse_nested_query("foo[]=").
+    Furi.parse_query("foo[]=").
       should eq "foo" => [""]
-    Furi.parse_nested_query("foo[]=bar").
+    Furi.parse_query("foo[]=bar").
       should eq "foo" => ["bar"]
 
-    Furi.parse_nested_query("foo[]=1&foo[]=2").
+    Furi.parse_query("foo[]=1&foo[]=2").
       should eq "foo" => ["1", "2"]
-    Furi.parse_nested_query("foo=bar&baz[]=1&baz[]=2&baz[]=3").
+    Furi.parse_query("foo=bar&baz[]=1&baz[]=2&baz[]=3").
       should eq "foo" => "bar", "baz" => ["1", "2", "3"]
-    Furi.parse_nested_query("foo[]=bar&baz[]=1&baz[]=2&baz[]=3").
+    Furi.parse_query("foo[]=bar&baz[]=1&baz[]=2&baz[]=3").
       should eq "foo" => ["bar"], "baz" => ["1", "2", "3"]
 
-    Furi.parse_nested_query("x[y][z]=1").
+    Furi.parse_query("x[y][z]=1").
       should eq "x" => {"y" => {"z" => "1"}}
-    Furi.parse_nested_query("x[y][z][]=1").
+    Furi.parse_query("x[y][z][]=1").
       should eq "x" => {"y" => {"z" => ["1"]}}
-    Furi.parse_nested_query("x[y][z]=1&x[y][z]=2").
+    Furi.parse_query("x[y][z]=1&x[y][z]=2").
       should eq "x" => {"y" => {"z" => "2"}}
-    Furi.parse_nested_query("x[y][z][]=1&x[y][z][]=2").
+    Furi.parse_query("x[y][z][]=1&x[y][z][]=2").
       should eq "x" => {"y" => {"z" => ["1", "2"]}}
 
-    Furi.parse_nested_query("x[y][][z]=1").
+    Furi.parse_query("x[y][][z]=1").
       should eq "x" => {"y" => [{"z" => "1"}]}
-    Furi.parse_nested_query("x[y][][z][]=1").
+    Furi.parse_query("x[y][][z][]=1").
       should eq "x" => {"y" => [{"z" => ["1"]}]}
-    Furi.parse_nested_query("x[y][][z]=1&x[y][][w]=2").
+    Furi.parse_query("x[y][][z]=1&x[y][][w]=2").
       should eq "x" => {"y" => [{"z" => "1", "w" => "2"}]}
 
-    Furi.parse_nested_query("x[y][][v][w]=1").
+    Furi.parse_query("x[y][][v][w]=1").
       should eq "x" => {"y" => [{"v" => {"w" => "1"}}]}
-    Furi.parse_nested_query("x[y][][z]=1&x[y][][v][w]=2").
+    Furi.parse_query("x[y][][z]=1&x[y][][v][w]=2").
       should eq "x" => {"y" => [{"z" => "1", "v" => {"w" => "2"}}]}
 
-    Furi.parse_nested_query("x[y][][z]=1&x[y][][z]=2").
+    Furi.parse_query("x[y][][z]=1&x[y][][z]=2").
       should eq "x" => {"y" => [{"z" => "1"}, {"z" => "2"}]}
-    Furi.parse_nested_query("x[y][][z]=1&x[y][][w]=a&x[y][][z]=2&x[y][][w]=3").
+    Furi.parse_query("x[y][][z]=1&x[y][][w]=a&x[y][][z]=2&x[y][][w]=3").
       should eq "x" => {"y" => [{"z" => "1", "w" => "a"}, {"z" => "2", "w" => "3"}]}
 
-    lambda { Furi.parse_nested_query("x[y]=1&x[y]z=2") }.
+    lambda { Furi.parse_query("x[y]=1&x[y]z=2") }.
       should raise_error(TypeError,  "expected Hash (got String) for param `y'")
 
-    lambda { Furi.parse_nested_query("x[y]=1&x[]=1") }.
+    lambda { Furi.parse_query("x[y]=1&x[]=1") }.
       should raise_error(TypeError, /expected Array \(got [^)]*\) for param `x'/)
 
-    lambda { Furi.parse_nested_query("x[y]=1&x[y][][w]=2") }.
+    lambda { Furi.parse_query("x[y]=1&x[y][][w]=2") }.
       should raise_error(TypeError, "expected Array (got String) for param `y'")
     end
 
   end
 
+  it "should support inspect" do
+    expect(Furi.parse('http://google.com').inspect).to eq("#<Furi::Uri \"http://google.com\">")
+  end
+
 end