qasa-url 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15c6031d5e90337cc47cfdd900ff9a6329b9e1da4b1233292383a9cc5fbe60b1
-  data.tar.gz: dfcf70b764fd7b28a3c1411cb8229cb588d788c266b3881118366602cbd63bd5
+  metadata.gz: 70e637380f87112da94c4baabe3f72d117175fcf151978501057034cddee03bd
+  data.tar.gz: e93986b23ed44518830a92af7ce6c7da5c7c096bf4a0f3de30b70dbf696e79d7
 SHA512:
-  metadata.gz: 213ea1a16224606b1372b1f15bf5653f0951e977bc18f844f57b0f3b94c79de95c6d66decceda0c7ddc5a9c5a4e94fa8b0ae6042fcfabc5dc26ba25006f043ca
-  data.tar.gz: df2d08fa816ca7ee3eb0a7ea5f9260541e99a786c64f29d8c38cf94cecc06ebcb1256e14dfc1977fb3d8ea3a7c3b4951741f26abe11ee8e04af6fd57d0e48aa8
+  metadata.gz: edfaad59c0df751e0b3da3420322d5d9b7be56bb0cc68b095b58fd22ade71af2ce0edfe34c351412d2ccaf640535de5bcb2c0036413c05bb8979384f438cd876
+  data.tar.gz: b5b65f227aad9869a2c7430a90b52743b54c06ff9aeb73ad60aa2043ede1b9c4155655c8b6f6684802387fb16c919256cac4439b4f3666d3f0bc298413713190

data/lib/qasa/url/version.rb

@@ -2,6 +2,6 @@
 
 module Qasa
   module Url
-    VERSION = "0.1.0"
+    VERSION = "0.1.2"
   end
 end

data/lib/url.rb

@@ -12,6 +12,7 @@ class URL
   PORT_SEPARATOR = ":"
   QUERY_STRING_SEPARATOR = "?"
   SEPARATOR = "://"
+  PROTOCOL_MATCHER = /\A[a-z0-9.+-]*#{Regexp.escape(SEPARATOR)}/io
   SLASH = "/"
   SPACE = " "
 
@@ -59,6 +60,8 @@ class URL
     #   URL.parse("https://www.example.com:3000/path?query=string")
     #   # => #<URL:0x00007f9b9c0b3b20 https://www.example.com:3000/path?query=string>
     def parse(string)
+      return nil if string.nil?
+
       string
         .to_str
         .dup
@@ -80,8 +83,8 @@ class URL
     private
 
     def extract_protocol(string)
-      if string.include?(SEPARATOR)
-        string.split(SEPARATOR)
+      if string.match?(PROTOCOL_MATCHER)
+        string.split(SEPARATOR, 2)
       else
         [nil, string]
       end
@@ -141,12 +144,21 @@ class URL
   #   url = URL.parse("https://www.example.com")
   #   url.join("path").path("to", "nowhere")
   #   url.to_s # => "https://www.example.com/path/to/nowhere"
+  # @example
+  #  url = URL.parse("https://www.example.com/")
+  #  url.join("/path", "/to/", "nowhere/")
+  #  url.to_s # => "https://www.example.com/path/to/nowhere/"
   def join(*paths)
-    paths.map do |path|
-      path.start_with?(SLASH) ? path.sub(SLASH, NOTHING) : path.dup
-    end.then do |paths|
-      self.path = Array(path).concat(paths).join(SLASH)
-    end
+    parts = Array(path).concat(paths)
+    size = parts.size
+
+    parts
+      .map
+      .with_index(1) { |part, index| sanitize_path(part, last: index == size) }
+      .compact
+      .then do |parts|
+        self.path = Array(NOTHING).concat(parts).join(SLASH)
+      end
 
     self
   end
@@ -293,4 +305,11 @@ class URL
   def domain_parts
     host.split(DOT)
   end
+
+  def sanitize_path(path, last:)
+    path = path.start_with?(SLASH) ? path[1..] : path.dup
+    path = path.end_with?(SLASH) ? path[..-2] : path unless last
+
+    path.empty? ? nil : path
+  end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: qasa-url
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - ingemar
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-25 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -53,7 +52,6 @@ metadata:
   homepage_uri: https://github.com/qasase/qasa-url
   source_code_uri: https://github.com/qasase/qasa-url
   changelog_uri: https://github.com/qasase/qasa-url/blob/main/CHANGELOG.md
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -68,8 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.2
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: A simple URL parser and construction tool
 test_files: []