furi 0.2.3 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37ea1203ca474e34d99624eb7e7cf43935197a4cec1a0a49e110b8674f5a1cec
-  data.tar.gz: 5ef6f167bd64ac72f6a8b78324c871a88734f06e39faecd4e7aaee1abe5a2f0a
+  metadata.gz: 60584a8bc9851e0f203430c73a18b5b4c4d22c25484134caf8f256279203ed7e
+  data.tar.gz: ee1258bc6788c8d11bf8f5c7a48dced7c5338ad36409de0a3eb049c194cd3347
 SHA512:
-  metadata.gz: db8b15ea5e9d25852df4be4e83a67bf60d8ed85d703fba1fa7a1ee28fbe7d2e547dc4ea182d52ef396316f92ef3634264750b4d76d0016c51c6a9afe78b19e11
-  data.tar.gz: 9617142f8e989e885c8bd17a874fa221b6df1f2bea1398a786e9291f4d87d9d6ae4913f8904c3273902b8c0a1d008b0ec3f0aa8918aef34d9d5538fca93a0861
+  metadata.gz: 161c291815412a22f32a2c6e6e8b32fc74241eba6e44442197f1a04d2c934522898014e8e7c6b0cc53c396f0a95076a193e23dd41a8abf38ea0b976058b76d00
+  data.tar.gz: ac25ee7829104064cde493e5310a7302d08593808f56674bc4cce7af4e1d6e5be3504300cd396d79276abe5a6153be52084613af8a7679d30fbc1afa2f007912

data/CHANGELOG.md

@@ -1,3 +1,27 @@
+# v0.2.4
+
+* Improved `Furi.update` behavior for `path:` overrides:
+
+  * Supports **relative path resolution** (`..` and subpaths)
+  * Leading slashes in `path` now **replace** the original path
+  * `nil` path removes the path portion entirely, leaving only the host
+
+  **Examples:**
+
+  ```ruby
+  Furi.update("https://www.google.com/maps", path: "place/1.23,3.28")
+  # => "https://www.google.com/maps/place/1.23,3.28"
+
+  Furi.update("https://www.google.com/maps", path: "/account")
+  # => "https://www.google.com/account"
+
+  Furi.update("https://www.google.com/maps", path: "..")
+  # => "https://www.google.com/"
+
+  Furi.update("https://www.google.com/maps", path: nil)
+  # => "https://www.google.com"
+  ```
+
 # v0.2.3
 
 * Ruby 3.0 support #2

data/README.md

@@ -58,6 +58,20 @@ Building an URI from initial parts:
 ``` ruby
 Furi.build(protocol: '//', host: 'gusiev.com', path: '/assets/application.js')
     # => "//gusiev.com/assets/application.js"
+
+Furi.build(
+  location: 'https://calendar.google.com',
+  path: '/calendar/render',
+  query: {
+    action: 'TEMPLATE',
+    text: 'Seven Figure Club Meeting',
+    dates: [Time.now + 2.hours, Time.now + 3.hours].map do |t|
+      t.strftime("%Y%m%dT%H%M%SZ")
+    end.join('/'),
+    details: 'Seven Figure Club invites to the discussion with other founders to one of the topics you have expressed your interest to.',
+    add: ["bogdan@example.com", "brad@example.com"].join(',')
+  }
+)
 ```
 
 ### Working with Object

data/lib/furi/uri.rb

@@ -1,3 +1,5 @@
+require 'pathname'
+
 module Furi
   class Uri
 
@@ -44,6 +46,12 @@ module Furi
         case part.to_sym
         when :query, :query_tokens, :query_string
           merge_query(value)
+        when :path
+          if value && self[part]
+            self[part] = Pathname.new(self[part]).join(value).to_s
+          else
+            self[part] = value
+          end
         else
           self[part] = value
         end
@@ -72,7 +80,10 @@ module Furi
     def merge_query(query)
       case query
       when Hash
-        self.query = self.query.merge(Furi::Utils.stringify_keys(query))
+        self.query = Furi::Utils.deep_merge(
+          self.query,
+          Furi::Utils.stringify_keys(query)
+        )
       when String, Array
         self.query_tokens += Furi.query_tokens(query)
       when nil
@@ -238,10 +249,8 @@ module Furi
         query
       when String, Array
         self.query_tokens = value
-        @query = nil
       when Hash
         self.query_tokens = value
-        @query = value
       when nil
       else
         raise QueryParseError, 'Query can only be Hash or String'
@@ -273,7 +282,7 @@ module Furi
     end
 
     def query_tokens=(tokens)
-      @query = nil
+      @query = tokens.is_a?(Hash) ? tokens : nil
       @query_tokens = Furi.query_tokens(tokens)
     end
 

data/lib/furi/utils.rb

@@ -10,7 +10,17 @@ module Furi
         end
         result
       end
+
+      def deep_merge(current_hash, other_hash)
+        current_hash.merge(other_hash) do |key, this_val, other_val|
+         if this_val.is_a?(Hash) && other_val.is_a?(Hash)
+           deep_merge(this_val, other_val)
+         else
+           other_val
+         end
+       end
+      end
     end
   end
 end
- 
+

data/lib/furi/version.rb

@@ -1,3 +1,3 @@
 module Furi
-  VERSION = "0.2.3"
+  VERSION = "0.2.5"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: furi
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.5
 platform: ruby
 authors:
 - Bogdan Gusiev
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-05 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies: []
 description: The philosophy of this gem is to make any URI modification or parsing
   operation to take only one line of code and never more
@@ -39,7 +38,6 @@ metadata:
   allowed_push_host: https://rubygems.org
   homepage_uri: https://github.com/bogdan/furi
   source_code_uri: https://github.com/bogdan/furi
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -54,8 +52,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.0
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Make URI processing as easy as it should be
 test_files: []