stduritemplate 0.0.49 → 0.0.50

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f74c3bfb52bab5f58e7bfa30e4a063c51a4c3d86c412eaf9e69c647d979256d0
-  data.tar.gz: f0c7dbef8bcc7b91af8e281c8bdee4399928ec78e5686d1a1be89499f95a2402
+  metadata.gz: d65f2f371fed1a3e81cd51126e8dc5530c6a79616e7f5690f1782628de3110bd
+  data.tar.gz: cee3b07fc8bd31290111736c4ca90704b540c643b7936373998b77c96a2783bc
 SHA512:
-  metadata.gz: 32b5c55e41e60eb7c86982c96145fbce95887c39be1beafe68bbdcf7d63278a2cf140c662a9a567222bd9efbab8499e77b196b878d3d35d6b179496bc635c2bc
-  data.tar.gz: b3c50bbe68341d4d2aa8a68fd12c5e8a0b40a6bbae5987949c6753f064f79b6843121db6b7319f638b3dc90e1c12c1920045e274dbd376146765c29643f9f092
+  metadata.gz: 4cc124c6f83821e76e620b418d59fff869e6b75738a075e67b01014c098385fe5fa76cde28147a6a60d1fdddc954e3cfc6ca2dc6ace5141041dcb21c154a63e2
+  data.tar.gz: 65f38acf64bfd852ebd0315928019fa4dcddde8a9fd7098e7959f31f1f373e13a6681cfa6afe67c323c19b1c139132b114e6597d9a301fead299e779e9058469

data/lib/stduritemplate.rb

@@ -188,6 +188,20 @@ module StdUriTemplate
     end
   end
 
+  def self.is_surrogate(cp)
+    cp.bytes.length > 1
+  end
+  
+  def self.is_iprivate(cp)
+    (0xE000..0xF8FF).include?(cp.ord)
+  end
+  
+  def self.is_ucschar(cp)
+    (0xA0..0xD7FF).include?(cp.ord) ||
+      (0xF900..0xFDCF).include?(cp.ord) ||
+      (0xFDF0..0xFFEF).include?(cp.ord)
+  end
+
   def self.add_expanded_value(prefix, value, result, max_char, replace_reserved)
     string_value = convert_native_types(value)
     max = (max_char != -1) ? [max_char, string_value.length].min : string_value.length
@@ -204,8 +218,13 @@ module StdUriTemplate
         reserved_buffer = ''
       end
 
+      to_append = character
+      if is_surrogate(character) || replace_reserved || is_ucschar(character) || is_iprivate(character)
+        to_append = URI.encode_www_form_component(character)
+      end
+
       if reserved_buffer
-        reserved_buffer << character
+        reserved_buffer << to_append
 
         if reserved_buffer.length == 3
           is_encoded = false
@@ -230,22 +249,14 @@ module StdUriTemplate
         elsif character == '%'
           result << "%25"
         else
-          if replace_reserved
-            result << URI.encode_www_form_component(character)
-          else
-            result << character
-          end
+          result << to_append
         end
       end
     end
 
     if reserved_buffer
       result << "%25"
-      if replace_reserved
-        result << URI.encode_www_form_component(reserved_buffer[1..-1])
-      else
-        result << reserved_buffer[1..-1]
-      end
+      result << reserved_buffer[1..-1]
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stduritemplate
 version: !ruby/object:Gem::Version
-  version: 0.0.49
+  version: 0.0.50
 platform: ruby
 authors:
 - Andrea Peruffo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-12 00:00:00.000000000 Z
+date: 2024-01-08 00:00:00.000000000 Z
 dependencies: []
 description: std-uritemplate implementation for Ruby
 email: andrea.peruffo1982@gmail.com