unicode-display_width 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b600c9e8b63a894f3949dbc550fcc36f9954d9e
-  data.tar.gz: 7a91242b996b77192f59da5ca4bcce96f3d15d7e
+  metadata.gz: 7d30235f9e772a7cb8bd87db9e46ccfda2486562
+  data.tar.gz: ee3e35d0979b120a900b5d02c115db8541ff2786
 SHA512:
-  metadata.gz: dee920064581a08e71a0bf4867096191f8f9c6811b6e3616836c19715d899748c4c7f180df1ae09a699fa537b440f30f32d294d44621e9628706bc06c9ad6fcc
-  data.tar.gz: 5160acd691a9bd65f05915f3f4a051baa2d1457d8d2b3f1d1ce2cedfa41cf3eeddddf3ee85e80abe93ddaeba0e86c519ecc4279a614cce2e788b69021d4645c4
+  metadata.gz: 31322009d863f9b2d83997d0c27ea60fd43a6522beee58a08d719bd2d51f7fb0186c140e5b17b0fb313be59a16fee2e679b704498311456dc1a60a6c230a7d9f
+  data.tar.gz: 7c49daaf067fdf97869e3dac8e143dd116e34ecb5d9f88e358a26f1d58b206e9add60262864b7875971dfe74cf3636b70d47ae541d91f38f0ecf436fbcd1a428

data/CHANGELOG.txt

@@ -1,4 +1,11 @@
+## 0.3.1
+
+* Faster than 0.3.0
+* Deprecate usage of aliases: String#display_size and String#display_width
+* Eliminate Ruby warnings (@amatsuda)
+
 ## 0.3.0
+
 * Update EastAsianWidth from 7.0 to 8.0
 * Add rake task to update EastAsianWidth.txt
 * Move code to generate index from library to Rakefile

data/Rakefile

@@ -56,7 +56,7 @@ namespace :update do
       if $1 && $2
         cps, width = $1, $2
         if cps['..']
-          range = Range.new *cps.split('..').map{ |cp| cp.to_i(16) }
+          range = Range.new(*cps.split('..').map{ |cp| cp.to_i(16) })
           range.each{ |cp| table[ cp ] = width.to_sym }
         else
           table[ cps.to_i(16) ] = width.to_sym

data/lib/unicode/display_width.rb

@@ -2,14 +2,14 @@
 
 module Unicode
   module DisplayWidth
-    VERSION = '0.3.0'.freeze
+    VERSION = '0.3.1'.freeze
     DATA_DIR = File.join(File.dirname(__FILE__), '../../data/').freeze
     TABLE_FILE = (DATA_DIR + 'EastAsianWidth.index').freeze
     DATA_FILE  = (DATA_DIR + 'EastAsianWidth.txt').freeze
 
     class << self
       def table
-        if @table
+        if defined?(@table) && @table
           @table
         else
           @table = Marshal.load File.respond_to?(:binread) ? File.binread(TABLE_FILE) : File.read(TABLE_FILE)
@@ -28,22 +28,29 @@ end
 
 class String
   def display_width(ambiguous = 1)
-    unpack('U*').inject(0){ |a,c|
-      width = case Unicode::DisplayWidth.codepoint(c).to_s
-              when *%w[F W]
-                2
-              when *%w[N Na H]
-                1
-              when *%w[A]
-                ambiguous
-              else
-                1
-              end
-      a + width
+    unpack('U*').inject(0){ |total_width, char|
+      total_width + case Unicode::DisplayWidth.codepoint(char).to_s
+      when 'F', 'W'
+        2
+      when 'N', 'Na', 'H'
+        1
+      when 'A'
+        ambiguous
+      else
+        1
+      end
     }
   end
-  alias display_size   display_width
-  alias display_length display_width
+
+  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
 
 # J-_-L

data/unicode-display_width.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.email       = "mail@janlelis.de"
   s.homepage    = "http://github.com/janlelis/unicode-display_width"
   s.summary = "Support for east_asian_width string widths."
-  s.description =  "This gem adds String#display_size to get the display size of a string using EastAsianWidth.txt."
+  s.description =  "This gem adds String#display_width to get the display size of a string using EastAsianWidth.txt."
   s.required_rubygems_version = ">= 1.3.6"
   s.files = Dir.glob(%w[{lib,test}/**/*.rb bin/* [A-Z]*.{txt,rdoc} data/EastAsianWidth.index ext/**/*.{rb,c} **/deps.rip]) + %w{Rakefile unicode-display_width.gemspec}
   s.extra_rdoc_files = ["README.rdoc", "MIT-LICENSE.txt", "CHANGELOG.txt"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unicode-display_width
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Jan Lelis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-04 00:00:00.000000000 Z
+date: 2016-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -38,7 +38,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.4'
-description: This gem adds String#display_size to get the display size of a string
+description: This gem adds String#display_width to get the display size of a string
   using EastAsianWidth.txt.
 email: mail@janlelis.de
 executables: []
@@ -76,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Support for east_asian_width string widths.