unicode-display_width 1.6.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10ca31e7ad272c1de317efe8f06084454ab6c6237420a4b53ca7a3d971f97795
-  data.tar.gz: 36040f82af948c1ff176fd7bbb5fe69573ca9964f2a67b792adea6781d7ae034
+  metadata.gz: c3945bec5d99b8d50f0cc813980a8b7e37c8f08c1d12fed49081f1b852714d91
+  data.tar.gz: 063dc046d0bb0f6b0cd5adba3aa62a67f0e0c561c8dbce24b532d5c9a961fa58
 SHA512:
-  metadata.gz: e3301a45f349a743af722cdd4c75dbef7d34422b9f20618bc0c573a556866f6186c93673bc1ad55ef9c9be8a50f5f003456e87ddaa5b903f82bafb96f745ea71
-  data.tar.gz: c1f3255554f9a14f913c8009222ca4064173bbc608b20c4132806b374d2215114d46e0b27e569027f2f9dd66f1c3afba04cb8565f78c2849495eca36ca4e12bb
+  metadata.gz: 37865fa1e94b4423cdbb276f3c9b9fb7c53012df5db61248c779316e038b581bb69513161ff27a708b796cffff3658dc98b29efb4de817b50e1ae0725e2c6396
+  data.tar.gz: deaebc021969062929c203c95bda9c4b23510b4153f78805729eefc7b3ce0444da3aba0d748a430b64786842c5a80bef5fad6778df03b35669cfcd10dd84495d

data/CHANGELOG.md

@@ -1,5 +1,38 @@
 # CHANGELOG
 
+## 2.0.0
+
+- Release 2.0.0
+- Supports Ruby 3.0
+
+## 2.0.0.pre2
+
+- Update 2.0 branch to Unicode 13
+
+## 2.0.0.pre1
+
+Will be published as non-pre version on rubygems.org when Ruby 3.0 is released (December 2020)
+
+- Introduce new class-based API, which remembers your string-width configuration. See README for details.
+- Remove auto-loading of string extension
+  - You can: `require "unicode/display_width/string_ext"` to continue to use the string extension
+  - The manual opt-out `require "unicode/display_width/no_string_ext"` is not needed anymore and will
+    issue a warning in the future
+- Remove (already deprecated) String#display_size and String#display_width aliases
+
+Refactorings / Internal Changes:
+
+- Freeze string literals
+- The Unicode::DisplayWidth now is class, instead of a module, this enables the new config-object API
+
+## 1.7.0
+
+- Unicode 13
+
+## 1.6.1
+
+- Fix that ambiguous and overwrite options where ignored for emoji-measuring
+
 ## 1.6.0
 
 - Unicode 12.1

data/MIT-LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT LICENSE
 
-Copyright (c) 2011, 2015-2019 Jan Lelis
+Copyright (c) 2011, 2015-2020 Jan Lelis
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,12 +1,31 @@
-## Unicode::DisplayWidth [![[version]](https://badge.fury.io/rb/unicode-display_width.svg)](https://badge.fury.io/rb/unicode-display_width) [<img src="https://travis-ci.org/janlelis/unicode-display_width.png" />](https://travis-ci.org/janlelis/unicode-display_width)
+## 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. Other than [wcwidth()](https://github.com/janlelis/wcswidth-ruby), which fulfills a similar purpose, it does not rely on the OS vendor to provide an up-to-date method for measuring string width.
+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.
 
-Unicode version: **12.1.0** (May 2019)
+Unicode version: **13.0.0** (March 2020)
 
-Supported Rubies: **2.6**, **2.5**, **2.4**
+Supported Rubies:  **3.0**, **2.7**, **2.6**, **2.5**
 
-Old Rubies that might still work: **2.3**, **2.2**, **2.1**, **2.0**, **1.9**
+Old Rubies which might still work: **2.4**, **2.3**, **2.2**, **2.1**, **2.0**, **1.9**
+
+## Version 2.0 — Breaking Changes
+
+Some features of this library were marked deprecated for a long time and have been removed with Version 2.0:
+
+- Aliases of display_width (…\_size, …\_length) have been removed
+- Auto-loading of string core extension has been removed:
+
+If you are relying on the `String#display_width` string extension to be automatically loaded (old behavior), please load it explicitly now:
+
+```ruby
+require "unicode/display_width/string_ext"
+```
+
+You could also change your `Gemfile` line to achieve this:
+
+```ruby
+gem "unicode-display_width", require: "unicode/display_width/string_ext"
+```
 
 ## Introduction to Character Widths
 
@@ -44,6 +63,8 @@ Or add to your Gemfile:
 
 ## Usage
 
+### Classic API
+
 ```ruby
 require 'unicode/display_width'
 
@@ -51,7 +72,7 @@ Unicode::DisplayWidth.of("⚀") # => 1
 Unicode::DisplayWidth.of("一") # => 2
 ```
 
-### Ambiguous Characters
+#### Ambiguous Characters
 
 The second parameter defines the value returned by characters defined as ambiguous:
 
@@ -60,42 +81,56 @@ Unicode::DisplayWidth.of("·", 1) # => 1
 Unicode::DisplayWidth.of("·", 2) # => 2
 ```
 
-### Custom Overwrites
+#### Custom Overwrites
 
 You can overwrite how to handle specific code points by passing a hash (or even a proc) as third parameter:
 
 ```ruby
-Unicode::DisplayWidth.of("a\tb", 1, 0x09 => 10)) # => 12
+Unicode::DisplayWidth.of("a\tb", 1, "\t".ord => 10)) # => tab counted as 10, so result is 12
 ```
 
-### Emoji Support
+#### Emoji Support
 
-Experimental emoji support is included. It will adjust the string's size for modifier and zero-width joiner sequences. You will need to add the [unicode-emoji](https://github.com/janlelis/unicode-emoji) gem to your Gemfile:
+Emoji width support is included, but in must be activated manually. It will adjust the string's size for modifier and zero-width joiner sequences. You also need to add the [unicode-emoji](https://github.com/janlelis/unicode-emoji) gem to your Gemfile:
 
 ```ruby
 gem 'unicode-display_width'
 gem 'unicode-emoji'
 ```
 
-You can then activate the emoji string width adjustments by passing `emoji: true` as fourth parameter:
+Enable the emoji string width adjustments by passing `emoji: true` as fourth parameter:
 
 ```ruby
 Unicode::DisplayWidth.of "🤾🏽‍♀️" # => 5
 Unicode::DisplayWidth.of "🤾🏽‍♀️", 1, {}, emoji: true # => 2
 ```
 
-### Usage with String Extension
-
-Activated by default. Will be deactivated in version 2.0:
+#### Usage with String Extension
 
 ```ruby
 require 'unicode/display_width/string_ext'
 
-"⚀".display_width #=> 1
-'一'.display_width #=> 2
+"⚀".display_width # => 1
+'一'.display_width # => 2
 ```
 
-You can actively opt-out from the string extension with: `require 'unicode/display_width/no_string_ext'`
+### Modern API: Keyword-arguments Based Config Object
+
+Version 2.0 introduces a keyword-argument based API, which allows you to save your configuration for later-reuse. This requires an extra line of code, but has the advantage that you'll need to define your string-width options only once:
+
+```ruby
+require 'unicode/display_width'
+
+display_width = Unicode::DisplayWidth.new(
+  # ambiguous: 1,
+  overwrite: { "A".ord => 100 },
+  emoji: true,
+)
+
+display_width.of "⚀" # => 1
+display_width.of "🤾🏽‍♀️" # => 2
+display_width.of "A" # => 100
+```
 
 ### Usage From the CLI
 
@@ -118,7 +153,7 @@ See [unicode-x](https://github.com/janlelis/unicode-x) for more Unicode related
 
 ## Copyright & Info
 
-- Copyright (c) 2011, 2015-2019 Jan Lelis, https://janlelis.com, released under the MIT
+- Copyright (c) 2011, 2015-2020 Jan Lelis, https://janlelis.com, released under the MIT
 license
 - Early versions based on runpaint's unicode-data interface: Copyright (c) 2009 Run Paint Run Run
 - Unicode data: https://www.unicode.org/copyright.html#Exhibit1

data/lib/unicode/display_width.rb

@@ -1,8 +1,10 @@
-require_relative 'display_width/constants'
-require_relative 'display_width/index'
+# frozen_string_literal: true
+
+require_relative "display_width/constants"
+require_relative "display_width/index"
 
 module Unicode
-  module DisplayWidth
+  class DisplayWidth
     DEPTHS = [0x10000, 0x1000, 0x100, 0x10].freeze
 
     def self.of(string, ambiguous = 1, overwrite = {}, options = {})
@@ -19,7 +21,7 @@ module Unicode
         total_width + (overwrite[codepoint] || width || 1)
       }
 
-      res -= emoji_extra_width_of(string) if options[:emoji]
+      res -= emoji_extra_width_of(string, ambiguous, overwrite) if options[:emoji]
       res < 0 ? 0 : res
     end
 
@@ -40,12 +42,24 @@ module Unicode
 
       extra_width
     end
-  end
-end
 
-# Allows you to opt-out of the default string extension. Will eventually be removed,
-# so you must opt-in for the core extension by requiring 'display_width/string_ext'
-unless defined?(Unicode::DisplayWidth::NO_STRING_EXT) && Unicode::DisplayWidth::NO_STRING_EXT
-  require_relative 'display_width/string_ext'
+    def initialize(ambiguous: 1, overwrite: {}, emoji: false)
+      @ambiguous = ambiguous
+      @overwrite = overwrite
+      @emoji     = emoji
+    end
+
+    def get_config(**kwargs)
+      [
+        kwargs[:ambiguous] || @ambiguous,
+        kwargs[:overwrite] || @overwrite,
+        { emoji: kwargs[:emoji] || @emoji },
+      ]
+    end
+
+    def of(string, **kwargs)
+      self.class.of(string, *get_config(**kwargs))
+    end
+  end
 end
 

data/lib/unicode/display_width/constants.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module Unicode
-  module DisplayWidth
-    VERSION = '1.6.0'
-    UNICODE_VERSION = "12.1.0".freeze
-    DATA_DIRECTORY = File.expand_path(File.dirname(__FILE__) + '/../../../data/').freeze
-    INDEX_FILENAME = (DATA_DIRECTORY + '/display_width.marshal.gz').freeze
+  class DisplayWidth
+    VERSION = "2.0.0"
+    UNICODE_VERSION = "13.0.0"
+    DATA_DIRECTORY = File.expand_path(File.dirname(__FILE__) + "/../../../data/")
+    INDEX_FILENAME = DATA_DIRECTORY + "/display_width.marshal.gz"
   end
 end

data/lib/unicode/display_width/index.rb

@@ -1,8 +1,10 @@
-require 'zlib'
-require_relative 'constants'
+# frozen_string_literal: true
+
+require "zlib"
+require_relative "constants"
 
 module Unicode
-  module DisplayWidth
+  class DisplayWidth
     File.open(INDEX_FILENAME, "rb") do |file|
       serialized_data = Zlib::GzipReader.new(file).read
       serialized_data.force_encoding Encoding::BINARY

data/lib/unicode/display_width/no_string_ext.rb

@@ -1,7 +1,8 @@
-module Unicode
-  module DisplayWidth
-    NO_STRING_EXT = true
-  end
-end
+# frozen_string_literal: true
 
-require_relative '../display_width'
+warn "You are loading 'unicode-display_width/no_string_ext'\n" \
+     "Beginning with version 2.0, this is not necessary anymore\n"\
+     "You can just require 'unicode-display_width' now and no\n"\
+     "string extension will be loaded"
+
+require_relative "../display_width"

data/lib/unicode/display_width/string_ext.rb

@@ -1,17 +1,9 @@
-require_relative '../display_width' unless defined? Unicode::DisplayWidth
+# frozen_string_literal: true
+
+require_relative "../display_width" unless defined? Unicode::DisplayWidth
 
 class String
   def display_width(ambiguous = 1, overwrite = {}, options = {})
     Unicode::DisplayWidth.of(self, ambiguous, overwrite, options)
   end
-
-  def display_size(*args)
-    warn "Deprecation warning: Please use `String#display_width` instead of `String#display_size`"
-    display_width(*args)
-  end
-
-  def display_length(*args)
-    warn "Deprecation warning: Please use `String#display_width` instead of `String#display_length`"
-    display_width(*args)
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unicode-display_width
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Jan Lelis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-08 00:00:00.000000000 Z
+date: 2020-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -30,17 +30,18 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
-description: "[Unicode 12.1.0] Determines the monospace display width of a string
+        version: '13.0'
+description: "[Unicode 13.0.0] Determines the monospace display width of a string
   using EastAsianWidth.txt, Unicode general category, and other data."
-email: mail@janlelis.de
+email:
+- hi@ruby.consulting
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -79,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Determines the monospace display width of a string in Ruby.