furi 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7f6ef143c746b142b2ff9e1a87660e81d050667
-  data.tar.gz: 365aa57947465c284cdfa26059d1ed8df526c14b
+  metadata.gz: 208063d16947ce85a4d80a12bd3834cb26c0f6ab
+  data.tar.gz: ab3eff6b787f0df3e04781908477bb69d3924333
 SHA512:
-  metadata.gz: f2f8320051bfe74de4a4e396d20bd1aa464aa6e14fd7a02595b8145e0294e19759d7e829003d08c7c5213c685cd289cb508dacbb74101f45515bd533631e6064
-  data.tar.gz: 0c803b1a0de4e96a55be9ccdeac092f868eea3a56058144b29224b6b10d2538902ba0d9910da1f5eee2bb55d7693dd301526f986f9820e5d1533626fb1a59245
+  metadata.gz: 500c3e4bb3ed0866c0cef1ca68794d9d82e9d2b679bb1590f69e14428bb1020a64d5c357c166e25b0c522902b670e5138269e649f395455f48acc4bca50785eb
+  data.tar.gz: bae87908fe1a04c26d1073d569199adda1645bc25f561ec0aa9b2e05943e55d0993223c3d329335c07afcac8c814e87c2a738573a2837be2996cb38339e3078f

data/lib/furi.rb

@@ -42,8 +42,12 @@ module Furi
     Expressions.new
   end
 
-  def self.parse(string)
-    Uri.new(string)
+  def self.parse(argument)
+    Uri.new(argument)
+  end
+
+  def self.build(argument)
+    Uri.new(argument).to_s
   end
 
   class << self
@@ -201,26 +205,20 @@ module Furi
         define_method(aliaz) do
           send(origin)
         end
-      end
-    end
 
-    def initialize(string)
-      string, *@anchor = string.split("#")
-      @anchor = @anchor.empty? ? nil : @anchor.join("#")
-      if string.include?("?")
-        string, query_string = string.split("?", 2)
-        @query_string = query_string
+        define_method(:"#{aliaz}=") do |*args|
+          send(:"#{origin}=", *args)
+        end
       end
+    end
 
-      if string.include?("://")
-        @protocol, string = string.split(":", 2)
-        @protocol = '' if @protocol.empty?
-      end
-      if string.start_with?("//")
-        @protocol ||= ''
-        string = string[2..-1]
+    def initialize(argument)
+      case argument
+      when String
+        parse_uri_string(argument)
+      when Hash
+        update(argument)
       end
-      parse_authority(string)
     end
 
     def update(parts)
@@ -256,6 +254,15 @@ module Furi
       end
     end
 
+    def host=(string)
+      @port = nil
+      if string.include?(":")
+        string, @port = string.split(":", 2)
+        @port = @port.to_i
+      end
+      @hostname = string.empty? ? nil : string
+    end
+
     def to_s
       result = []
       if protocol
@@ -275,27 +282,6 @@ module Furi
       result.join
     end
 
-    def parse_authority(string)
-      if string.include?("/")
-        string, @path = string.split("/", 2)
-        @path = "/" + @path
-      end
-
-      if string.include?("@")
-        userinfo, string = string.split("@", 2)
-        @username, @password = userinfo.split(":", 2)
-      end
-      if string.include?(":")
-        string, @port = string.split(":", 2)
-        @port = @port.to_i
-      end
-      if string.empty?
-        @hostname = nil
-      else
-        @hostname = string
-      end
-    end
-
     def query
       return @query if query_level?
       @query = Furi.parse_nested_query(@query_string)
@@ -358,23 +344,48 @@ module Furi
       protocol ? PORT_MAPPING[protocol] : nil
     end
     
-    def default_port?
-      default_port && (!port || port == default_port)
-    end
+    protected
 
-    def custom_port?
-      !default_port
+    def query_level?
+      !!@query
     end
 
     def explicit_port
       port == default_port ? nil : port
     end
 
-    protected
+    def parse_uri_string(string)
+      string, *@anchor = string.split("#")
+      @anchor = @anchor.empty? ? nil : @anchor.join("#")
+      if string.include?("?")
+        string, query_string = string.split("?", 2)
+        @query_string = query_string
+      end
 
-    def query_level?
-      !!@query
+      if string.include?("://")
+        @protocol, string = string.split(":", 2)
+        @protocol = '' if @protocol.empty?
+      end
+      if string.start_with?("//")
+        @protocol ||= ''
+        string = string[2..-1]
+      end
+      parse_authority(string)
+    end
+
+    def parse_authority(string)
+      if string.include?("/")
+        string, @path = string.split("/", 2)
+        @path = "/" + @path
+      end
+
+      if string.include?("@")
+        userinfo, string = string.split("@", 2)
+        @username, @password = userinfo.split(":", 2)
+      end
+      self.host = string
     end
+
   end
 
   class FormattingError < StandardError

data/lib/furi/version.rb

@@ -1,3 +1,3 @@
 module Furi
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/furi_spec.rb

@@ -180,6 +180,16 @@ describe Furi do
 
   end
 
+  describe ".build" do
+    it "should work correctly" do
+      expect(Furi.build(hostname: 'hello.com')).to eq('hello.com')
+      expect(Furi.build(hostname: 'hello.com', port: 88)).to eq('hello.com:88')
+      expect(Furi.build(hostname: 'hello.com', port: 88)).to eq('hello.com:88')
+      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')
+    end
+  end
+
 
   describe "serialize" do
     it "should work" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: furi
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Bogdan Gusiev