uri-idna 0.2.0 → 0.2.1

data/lib/uri/idna/idna2008/processing.rb

@@ -45,12 +45,6 @@ module URI
           Validation::Bidi.call(label) if check_bidi?
         end
 
-        def check_bidi?
-          return @check_bidi if instance_variable_defined?(:@check_bidi)
-
-          @check_bidi = options.check_bidi? && Validation::Bidi.check?(domain_name)
-        end
-
         def punycode_decode(label)
           return label unless label.start_with?(ACE_PREFIX)
 
@@ -72,8 +66,8 @@ module URI
         end
 
         def call
-          alabels, alabel_trailing_dot = split_domain(alabel.encode("UTF-8").unicode_normalize(:nfc)) if alabel
-          ulabels, ulabel_trailing_dot = split_domain(ulabel.encode("UTF-8").unicode_normalize(:nfc)) if ulabel
+          alabels, alabel_trailing_dot = split_domain(alabel.encode("UTF-8").unicode_normalize!(:nfc)) if alabel
+          ulabels, ulabel_trailing_dot = split_domain(ulabel.encode("UTF-8").unicode_normalize!(:nfc)) if ulabel
 
           if alabels && ulabels && (alabels.size != ulabels.size || alabel_trailing_dot != ulabel_trailing_dot)
             raise Error, "alabel doesn't match ulabel"
@@ -128,7 +122,7 @@ module URI
       # # https://datatracker.ietf.org/doc/html/rfc5891#section-5
       class Lookup < Processing
         def call
-          domain = domain_name.encode("UTF-8").unicode_normalize(:nfc)
+          domain = domain_name.encode("UTF-8").unicode_normalize!(:nfc)
 
           result = process_labels(domain) do |label|
             orig_label = label

data/lib/uri/idna/uts46/mapping.rb

@@ -9,31 +9,35 @@ module URI
       module Mapping
         class << self
           def call(domain_name, transitional_processing: false, use_std3_ascii_rules: true)
-            output = +""
+            output = []
             domain_name.each_codepoint do |codepoint|
               _, status, replacement = status(codepoint)
               case status
               when "V", "X" # valid, disallowed
-                output << codepoint.chr(Encoding::UTF_8)
+                output << codepoint
               when "M" # mapped
-                output << if transitional_processing && codepoint == 7838
-                            "ss"
+                output += if transitional_processing && codepoint == 7838
+                            [115, 115]
                           else
                             replacement
                           end
               when "D" # deviation
-                output << (transitional_processing ? replacement : codepoint.chr(Encoding::UTF_8))
+                if transitional_processing
+                  output += replacement
+                else
+                  output << codepoint
+                end
               when "3" # disallowed_STD3_valid, disallowed_STD3_mapped
-                output << if use_std3_ascii_rules
-                            codepoint.chr(Encoding::UTF_8)
-                          else
-                            (replacement || codepoint.chr(Encoding::UTF_8))
-                          end
+                if use_std3_ascii_rules || !replacement
+                  output << codepoint
+                else
+                  output += replacement
+                end
               when "I" # ignored
                 next
               end
             end
-            output.unicode_normalize(:nfc)
+            output.pack("U*").unicode_normalize!(:nfc)
           end
 
           def validate_status(label, cp, pos, transitional_processing:, use_std3_ascii_rules:)
@@ -46,12 +50,9 @@ module URI
           end
 
           def status(codepoint)
-            index =
-              if codepoint < 256
-                codepoint
-              else
-                (UTS46_DATA.bsearch_index { |x| x[0] > codepoint } || UTS46_DATA.length) - 1
-              end
+            return UTS46_DATA[codepoint] if codepoint < 256
+
+            index = (UTS46_DATA.bsearch_index { |x| x[0] > codepoint } || UTS46_DATA.length) - 1
             UTS46_DATA[index] || []
           end
         end

data/lib/uri/idna/uts46/processing.rb

@@ -8,14 +8,17 @@ module URI
     module UTS46
       # https://www.unicode.org/reports/tr46/#Processing
       class Processing < BaseProcessing
-        def call
-          domain = Mapping.call(
+        def initialize(domain_name, **options)
+          super
+          @domain_name = Mapping.call(
             domain_name,
-            transitional_processing: options.transitional_processing?,
-            use_std3_ascii_rules: options.use_std3_ascii_rules?,
+            transitional_processing: @options.transitional_processing?,
+            use_std3_ascii_rules: @options.use_std3_ascii_rules?,
           )
+        end
 
-          process_labels(domain) do |label|
+        def call
+          process_labels(domain_name) do |label|
             if label.start_with?(ACE_PREFIX)
               begin
                 label = punycode_decode(label)
@@ -41,12 +44,6 @@ module URI
           Options
         end
 
-        def check_bidi?
-          return @check_bidi if instance_variable_defined?(:@check_bidi)
-
-          @check_bidi = options.check_bidi? && Validation::Bidi.check?(domain_name)
-        end
-
         # https://www.unicode.org/reports/tr46/#Validity_Criteria
         def validate(label, transitional_processing: options.transitional_processing?)
           return if label.empty?

data/lib/uri/idna/validation/bidi.rb

@@ -61,22 +61,22 @@ module URI
 
           # https://www.rfc-editor.org/rfc/rfc5891.html#section-4.2.3.4
           def check?(domain)
-            labels = domain.split(".", -1)
-            domain = labels.map do |label|
+            domain.split(".").each do |label|
               if label.start_with?(ACE_PREFIX)
                 begin
-                  Punycode.decode(label[ACE_PREFIX.length..])
+                  label = Punycode.decode(label[ACE_PREFIX.length..])
                 rescue PunycodeError
-                  ""
+                  next
                 end
-              else
-                label
               end
-            end.join(".")
+              next if label.ascii_only?
 
-            domain.each_codepoint do |cp|
-              return true if bidi_class(cp, "RTL") || bidi_class(cp, "AN")
+              label.each_codepoint do |cp|
+                next if cp < 256
+                return true if bidi_class(cp, "RTL") || bidi_class(cp, "AN")
+              end
             end
+
             false
           end
 

data/lib/uri/idna/validation/codepoint.rb

@@ -17,6 +17,7 @@ module URI
 
           # https://datatracker.ietf.org/doc/html/rfc5892
           def check_contextj(label, cp, pos)
+            return false if cp < 256
             return false unless codepoint?(cp, "CONTEXTJ")
             return true if valid_contextj?(label, cp, pos)
 
@@ -25,6 +26,7 @@ module URI
 
           # https://datatracker.ietf.org/doc/html/rfc5892
           def check_contexto(label, cp, pos)
+            return false if cp < 183
             return false unless codepoint?(cp, "CONTEXTO")
             return true if valid_contexto?(label, cp, pos)
 
@@ -105,10 +107,14 @@ module URI
           end
 
           def script?(cp, script)
+            return false if cp < 256
+
             Intranges.contain?(cp, SCRIPTS[script])
           end
 
           def virama_combining_class?(cp)
+            return false if cp < 256
+
             Intranges.contain?(cp, VIRAMA_COMBINING_CLASSES)
           end
 

data/lib/uri/idna/validation/label.rb

@@ -27,7 +27,7 @@ module URI
           # 4.2.3.1. Hyphen Restrictions
           # https://datatracker.ietf.org/doc/html/rfc5891#section-4.2.3.1
           def check_hyphen_sides(label)
-            return unless label[0] == "-" || label[-1] == "-"
+            return unless label.start_with?("-") || label.end_with?("-")
 
             raise Error, "Label must neither begin nor end with a U+002D HYPHEN-MINUS character"
           end
@@ -41,7 +41,9 @@ module URI
           # 4.2.3.2. Leading Combining Marks
           # https://datatracker.ietf.org/doc/html/rfc5891#section-4.2.3.2
           def check_leading_combining(label)
-            return unless Intranges.contain?(label[0].ord, INITIAL_COMBINERS)
+            cp = label[0].ord
+            return if cp < 256
+            return unless Intranges.contain?(cp, INITIAL_COMBINERS)
 
             raise Error, "Label begins with an illegal combining character"
           end

data/lib/uri/idna/version.rb

@@ -2,6 +2,6 @@
 
 module URI
   module IDNA
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uri-idna
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Svyatoslav Kryukov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-14 00:00:00.000000000 Z
+date: 2023-11-15 00:00:00.000000000 Z
 dependencies: []
 description: Internationalized Domain Names in Applications (IDNA)
 email: