furi 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b454ab79a6ac9b95fc85b8b8b2381c8e93715af
-  data.tar.gz: d84272345cd55a7aad224ce2b124423806f38301
+  metadata.gz: e9c81dc7acc1ab6c12a180cf8722a10e4bad93b8
+  data.tar.gz: 88787eb5df40194b9373c14375e94523cb9a0191
 SHA512:
-  metadata.gz: cc4227555a121e3c25d7c4ba32765659fa78678ff7aa2b500f0f6cbe384f9507e11bac3828bfd9eae097879e786395ac9b8113049447b5d1a1aff6a834a91108
-  data.tar.gz: 4b8d902ab961bff2d68a369da05c96f1cc142e6d71980a3cd24691de930807057b65016aa9ec16e8d7e52e2cdd5173068d108ac2d0128ced4ac9d497e671adbb
+  metadata.gz: 92ae36c027f8f38d9c9617595b6aedade9db5b7f652021660a3502813e63ba6b4062669fed3b1ba7c7d01846a0ab0251ff77752ca7f47a15e3d8482353743ad2
+  data.tar.gz: 8e756624ec091e58981ed3c1d8c0e998b22168fef6c1a1b0e41cf31a3d39037efad32fb9a62fe725322c7efa65600fcff8824efbc321b0bd79d7af95ca327b13

data/README.md

@@ -36,9 +36,9 @@ Furi.port!("http://gusiev.com") # => 80
 
 Furi.update("http://gusiev.com", protocol: '') # => "//gusiev.com"
 Furi.update("http://gusiev.com?source=google", query: {email: "a@b.com"}) 
-    # => "http://gusiev.com?email=a@b.com"
-Furi.merge("http://gusiev.com?source=google", query: {email: "a@b.com"}) 
     # => "http://gusiev.com?source=google&email=a@b.com"
+Furi.replace("http://gusiev.com?source=google", query: {email: "a@b.com"}) 
+    # => "http://gusiev.com?email=a@b.com"
 
 Furi.build(protocol: '//', host: 'gusiev.com', path: '/assets/application.js') 
     # => "//gusiev.com/assets/application.js"
@@ -113,14 +113,6 @@ Giving credit...
 * rfc3986 validation
 * mailto protocol
 * escaping in path
-* case insensetivity:
-  * domain
-  * protocol
-* case sensitivity:
-  * path
-  * query
-  * anchor
-  * basic auth data ?
 
 ## Contributing
 

data/furi.gemspec

@@ -21,5 +21,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
-  spec.add_development_dependency "byebug"
+  spec.add_development_dependency "pry-byebug"
 end

data/lib/furi.rb

@@ -35,6 +35,7 @@ module Furi
     "tftp" => {port: 69},
     "sftp" => {port: 22},
     "ssh" => {port: 22, ssl: true},
+    "svn" => {port: 3690},
     "svn+ssh" => {port: 22, ssl: true},
     "telnet" => {port: 23},
     "nntp" => {port: 119},
@@ -42,6 +43,10 @@ module Furi
     "wais" => {port: 210},
     "ldap" => {port: 389},
     "prospero" => {port: 1525},
+    "file" => {port: nil},
+    "postgres" => {port: 5432},
+    "mysql" => {port: 3306},
+    "mailto" => {port: nil}
   }
 
 
@@ -56,8 +61,9 @@ module Furi
   ROOT = '/'
 
   # Parses a given string and return an URL object
-  def self.parse(argument)
-    Uri.new(argument)
+  # Optionally accepts parts to update the parsed URL object
+  def self.parse(argument, parts = nil)
+    Uri.new(argument).update(parts)
   end
 
   # Builds an URL from given parts
@@ -83,6 +89,9 @@ module Furi
   def self.update(string, parts)
     parse(string).update(parts).to_s
   end
+  class << self
+    alias :merge :update
+  end
 
   # Puts the default values for given URL that are not defined
   #
@@ -94,16 +103,17 @@ module Furi
 
   # Replaces a given URL string with given parts.
   # Same as update but works different for URL query parameter:
-  # merges newly specified parameters instead of replacing existing ones
+  # replaces newly specified parameters instead of merging to existing ones
   #
-  #   Furi.merge("/hello.html?a=1", host: 'gusiev.com', query: {b: 2})
+  #   Furi.update("/hello.html?a=1", host: 'gusiev.com', query: {b: 2})
   #     # => "gusiev.com/hello.html?a=1&b=2"
   #
-  def self.merge(string, parts)
-    parse(string).merge(parts).to_s
+  def self.replace(string, parts)
+    parse(string).replace(parts).to_s
   end
 
 
+
   # Parses a query into nested paramters hash using a rack convension with square brackets.
   #
   #   Furi.parse_query("a[]=1&a[]=2")       # => {a: [1,2]}
@@ -159,6 +169,12 @@ module Furi
     serialize_tokens(query, namespace).join("&")
   end
 
+  def self.join(*uris)
+    uris.map do |uri|
+      Furi.parse(uri)
+    end.reduce(:join)
+  end
+
   class FormattingError < StandardError
   end
 

data/lib/furi/uri.rb

@@ -21,21 +21,28 @@ module Furi
       when String
         parse_uri_string(argument)
       when Hash
-        update(argument)
+        replace(argument)
+      when ::URI::Generic
+        parse_uri_string(argument.to_s)
+      else
+        raise ArgumentError, "wrong Uri argument"
       end
     end
 
-    def update(parts)
-      parts.each do |part, value|
-        self[part] = value
+    def replace(parts)
+      if parts
+        parts.each do |part, value|
+          self[part] = value
+        end
       end
       self
     end
 
-    def merge(parts)
+    def update(parts)
+      return self unless parts
       parts.each do |part, value|
         case part.to_sym
-        when :query, :query_tokens
+        when :query, :query_tokens, :query_string
           merge_query(value)
         else
           self[part] = value
@@ -91,7 +98,7 @@ module Furi
               when "", nil
                 nil
               else
-                host.to_s
+                host.to_s.downcase
               end
     end
 
@@ -166,7 +173,7 @@ module Furi
     def to_s
       result = []
       result << location
-      result << (host ? path : path!)
+      result << (host || mailto? ? path : path!)
       if query_tokens.any?
         result << "?" << query_string
       end
@@ -178,10 +185,12 @@ module Furi
 
     def location
       if protocol
-        unless host
+        if !host && !mailto?
           raise Furi::FormattingError, "can not build URI with protocol but without host"
         end
-        [protocol.empty? ? "" : "#{protocol}:", authority].join("//")
+        [
+          protocol.empty? ? "" : "#{protocol}:", authority
+        ].join(mailto? ? "" : "//")
       else
         authority
       end
@@ -196,12 +205,17 @@ module Furi
     end
 
     def request
+      return nil if !path && query_tokens.empty?
       result = []
       result << path!
       result << "?" << query_string if query_tokens.any?
       result.join
     end
 
+    def request!
+      request || path!
+    end
+
     def request=(string)
       string = parse_anchor_and_query(string)
       self.path = string
@@ -218,11 +232,13 @@ module Furi
 
 
     def query=(value)
-      @query = nil
-      @query_tokens = []
       case value
+      when true
+        # Assuming that current query needs to be parsed to Hash
+        query
       when String, Array
         self.query_tokens = value
+        @query = nil
       when Hash
         self.query_tokens = value
         @query = value
@@ -283,9 +299,12 @@ module Furi
     end
 
     def protocol=(protocol)
-      @protocol = protocol ? protocol.gsub(%r{:?/?/?\Z}, "") : nil
+      @protocol = protocol ? protocol.gsub(%r{:?/?/?\Z}, "").downcase : nil
     end
 
+    def protocol!
+      protocol || default_protocol_for_port || 'http' # Web Rules Them All!
+    end
 
     def directory
       path_tokens[0..-2].join("/")
@@ -361,11 +380,11 @@ module Furi
     end
 
     def default_port
-      protocol && Furi::PROTOCOLS[protocol] ? Furi::PROTOCOLS[protocol][:port] : nil
+      Furi::PROTOCOLS.fetch(protocol, {})[:port]
     end
 
     def ssl?
-      !!(protocol && Furi::PROTOCOLS[protocol][:ssl])
+      !!(Furi::PROTOCOLS.fetch(protocol, {})[:ssl])
     end
 
     def ssl
@@ -395,7 +414,12 @@ module Furi
       Furi::WEB_PROTOCOL.include?(protocol)
     end
 
+    def abstract_protocol?
+      protocol == ""
+    end
+
     def resource
+      return nil unless request
       [request, anchor].compact.join("#")
     end
 
@@ -412,7 +436,7 @@ module Furi
     end
 
     def resource!
-      [request]
+      resource || request!
     end
 
     def host!
@@ -440,12 +464,25 @@ module Furi
       send(:"#{part}=", value)
     end
 
+    def rfc?
+      rfc3986?
+    end
+
     def rfc3986?
       uri = to_s
-      !!(uri.match(URI::RFC3986_Parser::RFC3986_Parser) ||
+      !!(uri.match(URI::RFC3986_Parser::RFC3986_URI) ||
          uri.match(URI::RFC3986_Parser::RFC3986_relative_ref))
     end
 
+    def email=(email)
+      self.protocol ||= "mailto"
+      self.authority = email
+    end
+
+    def email
+      authority
+    end
+
     protected
 
     def file_tokens
@@ -461,6 +498,9 @@ module Furi
     end
 
     def parse_uri_string(string)
+      if string.empty?
+        raise Furi::FormattingError, "can not be an empty string"
+      end
       string = parse_anchor_and_query(string)
 
       string = parse_protocol(string)
@@ -499,8 +539,12 @@ module Furi
       string
     end
 
+    def join(uri)
+      Uri.new(::URI.join(to_s, uri.to_s))
+    end
+
     def parse_protocol(string)
-      if string.include?("://")
+      if string.include?("://") || string.start_with?("mailto:")
         protocol, string = string.split(":", 2)
         self.protocol = protocol
       end
@@ -529,5 +573,18 @@ module Furi
     def host_tokens
       host.split(".")
     end
+
+    def default_protocol_for_port
+      return nil unless port
+      PROTOCOLS.each do |protocol, data|
+        if data[:port] == port
+          return protocol
+        end
+      end
+    end
+
+    def mailto?
+      protocol == "mailto"
+    end
   end
 end

data/lib/furi/version.rb

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

data/spec/furi/uri_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+describe Furi::Uri do
+
+  describe ".rfc3986?" do
+
+    it "works" do
+      expect(Furi.parse("http://goo gl.com") ).to_not be_rfc
+      expect(Furi.parse("http://googl.com") ).to be_rfc
+    end
+  end
+end

data/spec/furi_spec.rb

@@ -64,7 +64,13 @@ describe Furi do
 
 
 
-  describe "#parse" do
+  describe ".parse" do
+
+    it "raises on empty string" do
+      expect {
+        Furi.parse("")
+      }.to raise_error(Furi::FormattingError)
+    end
 
     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(
@@ -105,8 +111,10 @@ describe Furi do
         path: nil,
         path!: '/',
         port: nil,
-        request: '/',
-        resource: '/',
+        request: nil,
+        request!: '/',
+        resource: nil,
+        resource!: '/',
         location: 'http://gusiev.com',
         home_page?: true,
       )
@@ -305,6 +313,14 @@ describe Furi do
       )
     end
 
+    it "downcases only protocol and host" do
+      expect("HTTP://GUSIEV.cOM/About").to have_parts(
+        protocol: 'http',
+        host: 'gusiev.com',
+        path: "/About",
+      )
+    end
+
     describe "ipv6 host" do
       it "parses host and port" do
         expect("http://[2406:da00:ff00::6b14:8d43]:8080/").to have_parts(
@@ -333,123 +349,144 @@ describe Furi do
         )
       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
-
-    it "updates hostname" do
-      expect(Furi.update("www.gusiev.com/index.html", hostname: 'gusiev.com')).to eq('gusiev.com/index.html')
-      expect(Furi.update("/index.html", hostname: 'gusiev.com')).to eq('gusiev.com/index.html')
-      expect(Furi.update("http://www.gusiev.com/index.html", hostname: 'gusiev.com')).to eq('http://gusiev.com/index.html')
-      expect(Furi.update("/index.html", hostname: 'gusiev.com')).to eq('gusiev.com/index.html')
-      expect(Furi.update("gusiev.com/index.html?a=b", hostname: nil)).to eq('/index.html?a=b')
-      expect(Furi.update("gusiev.com?a=b", hostname: nil)).to eq('/?a=b')
-    end
-
-    it "updates port" do
-      expect(Furi.update("gusiev.com", port: 33)).to eq('gusiev.com:33')
-      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
+    describe "mailto" do
+      it "without email" do
+        expect("mailto:?subject=Talkable%20is%20Hiring&body=https%3A%2F%2Fwww.talkable.com%2Fjobs").to have_parts(
+          protocol: 'mailto',
+          email: nil,
+          query: {
+            "subject" => "Talkable is Hiring",
+            "body" => "https://www.talkable.com/jobs"
+          }
+        )
+      end
+    end
+  end
+  describe ".replace" do
+
+    it "support replace for query" do
+      expect(Furi.replace("/index.html?a=b", query: {c: 'd'})).to eq('/index.html?c=d')
+    end
+
+    it "replace hostname" do
+      expect(Furi.replace("www.gusiev.com/index.html", hostname: 'gusiev.com')).to eq('gusiev.com/index.html')
+      expect(Furi.replace("/index.html", hostname: 'gusiev.com')).to eq('gusiev.com/index.html')
+      expect(Furi.replace("http://www.gusiev.com/index.html", hostname: 'gusiev.com')).to eq('http://gusiev.com/index.html')
+      expect(Furi.replace("/index.html", hostname: 'gusiev.com')).to eq('gusiev.com/index.html')
+      expect(Furi.replace("gusiev.com/index.html?a=b", hostname: nil)).to eq('/index.html?a=b')
+      expect(Furi.replace("gusiev.com?a=b", hostname: nil)).to eq('/?a=b')
+    end
+
+    it "replace port" do
+      expect(Furi.replace("gusiev.com", port: 33)).to eq('gusiev.com:33')
+      expect(Furi.replace("gusiev.com/index.html", port: 33)).to eq('gusiev.com:33/index.html')
+      expect(Furi.replace("gusiev.com:33/index.html", port: 80)).to eq('gusiev.com:80/index.html')
+      expect(Furi.replace("http://gusiev.com:33/index.html", port: 80)).to eq('http://gusiev.com/index.html')
+      expect(Furi.replace("http://gusiev.com:33/index.html", port: nil)).to eq('http://gusiev.com/index.html')
+      expect(Furi.replace("http://gusiev.com:33/index.html", port: 0)).to eq('http://gusiev.com:0/index.html')
+      expect(Furi.replace("http://gusiev.com:33/index.html", port: '')).to eq('http://gusiev.com/index.html')
+    end
+    it "replace directory" do
+      expect(Furi.replace("gusiev.com", directory: 'articles')).to eq('gusiev.com/articles')
+      expect(Furi.replace("gusiev.com/", directory: 'articles')).to eq('gusiev.com/articles')
+      expect(Furi.replace("gusiev.com/index#header", directory: '/posts')).to eq('gusiev.com/posts/index#header')
+      expect(Furi.replace("gusiev.com/articles/#header", directory: nil)).to eq('gusiev.com/#header')
+      expect(Furi.replace("gusiev.com/articles/index?a=b", directory: 'posts')).to eq('gusiev.com/posts/index?a=b')
+      expect(Furi.replace("/articles/index?a=b", directory: '/posts')).to eq('/posts/index?a=b')
+      expect(Furi.replace("/articles/index.html?a=b", directory: '/posts/')).to eq('/posts/index.html?a=b')
+    end
+    it "replace filename" do
+      expect(Furi.replace("gusiev.com", filename: 'article')).to eq('gusiev.com/article')
+      expect(Furi.replace("gusiev.com/", filename: 'article')).to eq('gusiev.com/article')
+      expect(Furi.replace("gusiev.com/article1#header", filename: '/article2')).to eq('gusiev.com/article2#header')
+      expect(Furi.replace("gusiev.com/article#header", filename: nil)).to eq('gusiev.com/#header')
+      expect(Furi.replace("gusiev.com/articles/article1?a=b", filename: 'article2')).to eq('gusiev.com/articles/article2?a=b')
+      expect(Furi.replace("/articles/article1?a=b", filename: '/article2')).to eq('/articles/article2?a=b')
+      expect(Furi.replace("/articles/article1.xml?a=b", filename: 'article2.html')).to eq('/articles/article2.html?a=b')
+    end
+    it "replace extension" do
       expect(->{
-       Furi.update("gusiev.com/", extension: 'xml')
+       Furi.replace("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')
+      expect(Furi.replace("gusiev.com/article#header", extension: 'html')).to eq('gusiev.com/article.html#header')
+      expect(Furi.replace("gusiev.com/article.html?header", extension: nil)).to eq('gusiev.com/article?header')
+      expect(Furi.replace("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')
+    it "replace resource" do
+      expect(Furi.replace("gusiev.com", resource: '/article?a=1#hello')).to eq('gusiev.com/article?a=1#hello')
+      expect(Furi.replace("gusiev.com/article1#header", resource: '/article2')).to eq('gusiev.com/article2')
+      expect(Furi.replace("gusiev.com/article#header", resource: nil)).to eq('gusiev.com')
+      expect(Furi.replace("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')
+    it "replace path" do
+      expect(Furi.replace("gusiev.com", path: '/article')).to eq('gusiev.com/article')
+      expect(Furi.replace("gusiev.com/article1#header", path: '/article2')).to eq('gusiev.com/article2#header')
+      expect(Furi.replace("gusiev.com/article#header", path: nil)).to eq('gusiev.com#header')
+      expect(Furi.replace("gusiev.com/article1?a=b", path: 'article2')).to eq('gusiev.com/article2?a=b')
     end
 
-    it "updates ssl" do
-      expect(Furi.update("http://gusiev.com", ssl: true)).to eq('https://gusiev.com')
-      expect(Furi.update("https://gusiev.com", ssl: true)).to eq('https://gusiev.com')
-      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')
+    it "replace ssl" do
+      expect(Furi.replace("http://gusiev.com", ssl: true)).to eq('https://gusiev.com')
+      expect(Furi.replace("https://gusiev.com", ssl: true)).to eq('https://gusiev.com')
+      expect(Furi.replace("https://gusiev.com", ssl: false)).to eq('http://gusiev.com')
+      expect(Furi.replace("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')
-      expect(Furi.update("http://gusiev.com", protocol: 'https')).to eq('https://gusiev.com')
-      expect(Furi.update("gusiev.com", protocol: 'http')).to eq('http://gusiev.com')
-      expect(Furi.update("gusiev.com", protocol: 'http:')).to eq('http://gusiev.com')
-      expect(Furi.update("gusiev.com", protocol: 'http:/')).to eq('http://gusiev.com')
-      expect(Furi.update("gusiev.com", protocol: 'http://')).to eq('http://gusiev.com')
+    it "replace protocol" do
+      expect(Furi.replace("http://gusiev.com", protocol: '')).to eq('//gusiev.com')
+      expect(Furi.replace("http://gusiev.com", protocol: nil)).to eq('gusiev.com')
+      expect(Furi.replace("http://gusiev.com", protocol: 'https')).to eq('https://gusiev.com')
+      expect(Furi.replace("gusiev.com", protocol: 'http')).to eq('http://gusiev.com')
+      expect(Furi.replace("gusiev.com", protocol: 'http:')).to eq('http://gusiev.com')
+      expect(Furi.replace("gusiev.com", protocol: 'http:/')).to eq('http://gusiev.com')
+      expect(Furi.replace("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')
+    it "replace userinfo" do
+      expect(Furi.replace("http://gusiev.com", userinfo: 'hello:world')).to eq('http://hello:world@gusiev.com')
+      expect(Furi.replace("http://aa:bb@gusiev.com", userinfo: 'hello:world')).to eq('http://hello:world@gusiev.com')
+      expect(Furi.replace("http://aa:bb@gusiev.com", userinfo: nil)).to eq('http://gusiev.com')
+      expect(Furi.replace("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')
+    it "replace authority" do
+      expect(Furi.replace("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')
+    it "replace request" do
+      expect(Furi.replace("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')
+    it "replace domainzone" do
+      expect(Furi.replace("http://gusiev.com:8080", domainzone: 'com.ua')).to eq('http://gusiev.com.ua:8080')
+      expect(Furi.replace("http://gusiev.com.ua:8080", domainzone: 'com')).to eq('http://gusiev.com:8080')
+      expect(Furi.replace("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')
+    it "replace domainname" do
+      expect(Furi.replace("http://gusiev.com", domainname: 'google')).to eq('http://google.com')
+      expect(Furi.replace("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')
+    it "replace subdomain" do
+      expect(Furi.replace("http://gusiev.com", subdomain: 'blog')).to eq('http://blog.gusiev.com')
+      expect(Furi.replace("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')
+    it "replace location" do
+      expect(Furi.replace("/index.html", location: 'http://gusiev.com')).to eq('http://gusiev.com/index.html')
+      expect(Furi.replace("/index.html", location: 'http://gusiev.com/')).to eq('http://gusiev.com/index.html')
+      expect(Furi.replace("gusiev.com:433/index.html", location: 'gusiev.com:80')).to eq('gusiev.com:80/index.html')
+      expect(Furi.replace("gusiev.com:433/index.html", location: nil)).to eq('/index.html')
+      expect(Furi.replace("http://gusiev.com:433/index.html", location: nil)).to eq('/index.html')
+    end
+
+    it "replace query" do
+      expect(Furi.replace("/", query: {a: 1})).to eq('/?a=1')
+      expect(Furi.replace("/", query: {a: [1,2]})).to eq('/?a%5B%5D=1&a%5B%5D=2')
+      expect(Furi.replace("/", query: {a: 1, b: 2})).to eq('/?a=1&b=2')
+      expect(Furi.replace("/?a=1", query: {a: 2})).to eq('/?a=2')
+      expect(Furi.replace("/?a=1&a=1", query: true)).to eq('/?a=1')
     end
 
   end
@@ -475,15 +512,26 @@ describe Furi do
         Furi.build(host: 'localhost', password: 'pass')
       }).to raise_error(Furi::FormattingError)
     end
+
+    it "builds protocol" do
+      expect(Furi.build(protocol: 'http', host: 'hello.com', port: 80)).to eq('http://hello.com')
+      expect(Furi.build(protocol: 'mailto', username: "bogdan", host: 'gusiev.com')).to eq('mailto:bogdan@gusiev.com')
+      expect(Furi.build(email: "bogdan@gusiev.com")).to eq('mailto:bogdan@gusiev.com')
+      expect(Furi.build(protocol: 'mailto', query: {subject: 'Hello', body: "Welcome"})).to eq('mailto:?subject=Hello&body=Welcome')
+
+    end
   end
 
-  describe ".merge" do
-    it "should work" do
-      expect(Furi.merge("//gusiev.com", query: {a: 1})).to eq('//gusiev.com?a=1')
-      expect(Furi.merge("//gusiev.com?a=1", query: {b: 2})).to eq('//gusiev.com?a=1&b=2')
-      expect(Furi.merge("//gusiev.com?a=1", query: {a: 2})).to eq('//gusiev.com?a=2')
-      expect(Furi.merge("//gusiev.com?a=1", query: [['a', 2], ['b', 3]])).to eq('//gusiev.com?a=1&a=2&b=3')
-      expect(Furi.merge("//gusiev.com?a=1&b=2", query: '?a=3')).to eq('//gusiev.com?a=1&b=2&a=3')
+  describe ".update" do
+    it "updates query" do
+      expect(Furi.update("//gusiev.com", query: {a: 1})).to eq('//gusiev.com?a=1')
+      expect(Furi.update("//gusiev.com?a=1", query: {b: 2})).to eq('//gusiev.com?a=1&b=2')
+      expect(Furi.update("//gusiev.com?a=1", query: {a: 2})).to eq('//gusiev.com?a=2')
+      expect(Furi.update("//gusiev.com?a=1", query: [['a', 2], ['b', 3]])).to eq('//gusiev.com?a=1&a=2&b=3')
+      expect(Furi.update("//gusiev.com?a=1&b=2", query: '?a=3')).to eq('//gusiev.com?a=1&b=2&a=3')
+    end
+    it "updates query_string" do
+      expect(Furi.update("//gusiev.com?a=1&b=2", query_string: '?a=3')).to eq('//gusiev.com?a=1&b=2&a=3')
     end
   end
 
@@ -515,8 +563,32 @@ 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
+
+    it "works with query parameters" do
+      expect(Furi.parse('/?b=1&a=1') == Furi.parse('/?b=1&a=1')).to be_truthy
+      expect(Furi.parse('/?a=1&a=1') == Furi.parse('/?a=1')).to be_falsey
+      expect(Furi.parse('/') == Furi.parse('/?a=1')).to be_falsey
+      expect(Furi.parse('/') == Furi.parse('http://gusiev.com?a=1')).to be_falsey
+
+    end
+
+    it "ignores case only on protocol and host" do
+      expect(Furi.parse('hTTp://gUSiev.cOm') == Furi.parse('http://gusiev.com')).to be_truthy
+      expect(Furi.parse('/hello') == Furi.parse('/Hello')).to be_falsey
+      expect(Furi.parse('/hello?a=1') == Furi.parse('/hello?A=1')).to be_falsey
+      expect(Furi.parse('hTTp://gusiev.cOm') == Furi.parse('http://gusiev.com')).to be_truthy
+      expect(Furi.parse('/#h1') == Furi.parse('/#H1')).to be_falsey
+      expect(Furi.parse('hello@gusiev.com') == Furi.parse('Hello@gusiev.com')).to be_falsey
+      expect(Furi.parse('hello:psswd@gusiev.com') == Furi.parse('hello:Psswd@gusiev.com')).to be_falsey
+    end
+
+  end
+
+  describe "#abstract_protocol" do
+    it "works" do
+      expect(Furi.parse('http://gUSiev.cOm')).to_not be_abstract_protocol
+      expect(Furi.parse('//gUSiev.cOm')).to be_abstract_protocol
     end
   end
 
@@ -580,7 +652,7 @@ describe Furi do
     end
   end
 
-  describe "parse_query" do
+  describe ".parse_query" do
     it "should work" do
     Furi.parse_query("foo").
       should eq "foo" => nil
@@ -665,4 +737,10 @@ describe Furi do
     expect(Furi.parse('http://google.com').inspect).to eq("#<Furi::Uri \"http://google.com\">")
   end
 
+
+  describe ".join" do
+    it "works" do
+      expect(Furi.join("http://gusiev.com/slides", "../photos")).to eq("http://gusiev.com/photos")
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: furi
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Bogdan Gusiev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-30 00:00:00.000000000 Z
+date: 2016-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -86,6 +86,7 @@ files:
 - lib/furi/uri.rb
 - lib/furi/utils.rb
 - lib/furi/version.rb
+- spec/furi/uri_spec.rb
 - spec/furi_spec.rb
 - spec/spec_helper.rb
 homepage: ''
@@ -108,10 +109,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: Make URI processing as easy as it should be
 test_files:
+- spec/furi/uri_spec.rb
 - spec/furi_spec.rb
 - spec/spec_helper.rb