unicode-display_width 2.2.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ffaa48384e0e104eeaa7b4ddd92c77c014c42670fd34b9b53c484328cfd6101
-  data.tar.gz: aca8e2e11f726baf9ef0dcbf7d7c6e49aa1e9e521b8daef737e043afe695f201
+  metadata.gz: e64e9230d9a0df4076a18bb935b6f1aeac16e079544aa65097b1ddb967b4960c
+  data.tar.gz: 17d5cf547c89859318bc578e3e15a63ce0ab94d8801f2928097bb29d27cb6da0
 SHA512:
-  metadata.gz: bef56545861c63ac28714e9f83e31b2e37791c4695def8d8a470caec8edfbc5d04c2d09b28f478928969966f7d48d47c41a01dd9db3b7655a5926731da9292bd
-  data.tar.gz: 3bcdb857803a71186d5de93cebee4343b16ffddf09177dd5312013c245eb4beac5cf50c4ebdd866a13ee85004ed05a8c4a104f213ba7f5b0397ab74cf175cd10
+  metadata.gz: 1ea3ee4075d687ac1708a095ffe82e833389db1ec613ef43c9f8aa3aeeb5983d585cf6ad22e7d00d1020378344d9e9450096d6b7a04f27358d5418466b7fdf41
+  data.tar.gz: 00a75b4f46daa89186bde97d5e2da86d197e5ef8704876c16085dd9a503620dc2aaf6e6e9030b9a438417f54d48070d0df06ca2b3e1530bc6d2d1be761f21054

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## 2.4.0
+- Improve performance for ASCII-only strings, by @fatkodima
+- Require Ruby 2.4
+
+## 2.3.0
+
+- Unicode 15.0
+
 ## 2.2.0
 
 - Add *Hangul Jamo Extended-B* block to zero-width chars, thanks @ninjalj #22

data/README.md

@@ -1,12 +1,14 @@
 ## Unicode::DisplayWidth [![[version]](https://badge.fury.io/rb/unicode-display_width.svg)](https://badge.fury.io/rb/unicode-display_width) [<img src="https://github.com/janlelis/unicode-display_width/workflows/Test/badge.svg" />](https://github.com/janlelis/unicode-display_width/actions?query=workflow%3ATest)
 
-Determines the monospace display width of a string in Ruby. Implementation based on [EastAsianWidth.txt](https://www.unicode.org/Public/UNIDATA/EastAsianWidth.txt) and other data, 100% in Ruby. It does not rely on the OS vendor (like [wcwidth()](https://github.com/janlelis/wcswidth-ruby)) to provide an up-to-date method for measuring string width.
+Determines the monospace display width of a string in Ruby. Useful for all kinds of terminal-based applications. Implementation based on [EastAsianWidth.txt](https://www.unicode.org/Public/UNIDATA/EastAsianWidth.txt) and other data, 100% in Ruby. It does not rely on the OS vendor (like [wcwidth()](https://github.com/janlelis/wcswidth-ruby)) to provide an up-to-date method for measuring string width.
 
-Unicode version: **14.0.0** (September 2021)
+Unicode version: **15.0.0** (September 2022)
 
 Supported Rubies: **3.1**, **3.0**, **2.7**
 
-Old Rubies which might still work: **2.6**, **2.5**, **2.4**, **2.3**, **2.2**, **2.1**, **2.0**, **1.9**
+Old Rubies which might still work: **2.6**, **2.5**, **2.4**
+
+For even older Rubies, use version 2.3.0 of this gem: **2.3**, **2.2**, **2.1**, **2.0**, **1.9**
 
 ## Version 2.0 — Breaking Changes
 
@@ -39,7 +41,7 @@ Width  | Characters                   | Comment
 -------|------------------------------|--------------------------------------------------
 X      | (user defined)               | Overwrites any other values
 -1     | `"\b"`                       | Backspace (total width never below 0)
-0      | `"\0"`, `"\x05"`, `"\a"`, `"\n"`, `"\v"`, `"\f"`, `"\r"`, `"\x0E"`, `"\x0F"` | [C0 control codes](https://en.wikipedia.org/wiki/C0_and_C1_control_codes#C0_.28ASCII_and_derivatives.29) that do not change horizontal width
+0      | `"\0"`, `"\x05"`, `"\a"`, `"\n"`, `"\v"`, `"\f"`, `"\r"`, `"\x0E"`, `"\x0F"` | [C0 control codes](https://en.wikipedia.org/wiki/C0_and_C1_control_codes#C0_.28ASCII_and_derivatives.29) which do not change horizontal width
 1      | `"\u{00AD}"`                 | SOFT HYPHEN
 2      | `"\u{2E3A}"`                 | TWO-EM DASH
 3      | `"\u{2E3B}"`                 | THREE-EM DASH
@@ -148,6 +150,7 @@ Replace "一" with the actual string to measure
 - JavaScript: https://github.com/mycoboco/wcwidth.js
 - C: https://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c
 - C for Julia: https://github.com/JuliaLang/utf8proc/issues/2
+- Golang: https://github.com/rivo/uniseg
 
 See [unicode-x](https://github.com/janlelis/unicode-x) for more Unicode related micro libraries.
 

data/lib/unicode/display_width/constants.rb

@@ -2,8 +2,8 @@
 
 module Unicode
   class DisplayWidth
-    VERSION = "2.2.0"
-    UNICODE_VERSION = "14.0.0"
+    VERSION = "2.4.0"
+    UNICODE_VERSION = "15.0.0"
     DATA_DIRECTORY = File.expand_path(File.dirname(__FILE__) + "/../../../data/")
     INDEX_FILENAME = DATA_DIRECTORY + "/display_width.marshal.gz"
   end

data/lib/unicode/display_width.rb

@@ -6,8 +6,15 @@ require_relative "display_width/index"
 module Unicode
   class DisplayWidth
     DEPTHS = [0x10000, 0x1000, 0x100, 0x10].freeze
+    ASCII_NON_ZERO_REGEX = /[\0\x05\a\b\n\v\f\r\x0E\x0F]/
 
     def self.of(string, ambiguous = 1, overwrite = {}, options = {})
+      # Optimization for ASCII-only strings without control symbols.
+      if overwrite.empty? && string.ascii_only? && !string.match?(ASCII_NON_ZERO_REGEX)
+        return string.size
+      end
+
+      # Add width of each char
       res = string.codepoints.inject(0){ |total_width, codepoint|
         index_or_value = INDEX
         codepoint_depth_offset = codepoint
@@ -21,7 +28,10 @@ module Unicode
         total_width + (overwrite[codepoint] || width || 1)
       }
 
+      # Substract emoji error
       res -= emoji_extra_width_of(string, ambiguous, overwrite) if options[:emoji]
+
+      # Return result + prevent negative lengths
       res < 0 ? 0 : res
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unicode-display_width
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Jan Lelis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-24 00:00:00.000000000 Z
+date: 2023-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -38,7 +38,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
-description: "[Unicode 14.0.0] Determines the monospace display width of a string
+description: "[Unicode 15.0.0] Determines the monospace display width of a string
   using EastAsianWidth.txt, Unicode general category, and other data."
 email:
 - hi@ruby.consulting
@@ -62,7 +62,7 @@ homepage: https://github.com/janlelis/unicode-display_width
 licenses:
 - MIT
 metadata:
-  changelog_uri: https://github.com/janlelis/unicode-display_width/blob/master/CHANGELOG.md
+  changelog_uri: https://github.com/janlelis/unicode-display_width/blob/main/CHANGELOG.md
   source_code_uri: https://github.com/janlelis/unicode-display_width
   bug_tracker_uri: https://github.com/janlelis/unicode-display_width/issues
   rubygems_mfa_required: 'true'
@@ -74,14 +74,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Determines the monospace display width of a string in Ruby.