unicode-display_width 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5058b7809dc89b3b1e3bdefa2e1841ea5b002756
-  data.tar.gz: 95846a31cad8bd25a2c3e4b59ff500b8872f27b3
+  metadata.gz: 0b600c9e8b63a894f3949dbc550fcc36f9954d9e
+  data.tar.gz: 7a91242b996b77192f59da5ca4bcce96f3d15d7e
 SHA512:
-  metadata.gz: f65fb25b23a4823c2227d95cd47b5d3d78839013c1ec007702a36ac7ac0c02e716292db08d295c9c706ed478e77254fce1224f2fb7132a7f5ae5af9750cc5993
-  data.tar.gz: da457ce61a13d12ca3aa753f87dcc0899a70589e24ecf50ec5385be3ee93bfbb39af37462635c09f63cbd82bf9fd0d5cc4aa29689560cd730e8641952d9242ed
+  metadata.gz: dee920064581a08e71a0bf4867096191f8f9c6811b6e3616836c19715d899748c4c7f180df1ae09a699fa537b440f30f32d294d44621e9628706bc06c9ad6fcc
+  data.tar.gz: 5160acd691a9bd65f05915f3f4a051baa2d1457d8d2b3f1d1ce2cedfa41cf3eeddddf3ee85e80abe93ddaeba0e86c519ecc4279a614cce2e788b69021d4645c4

data/CHANGELOG.txt

@@ -1,3 +1,10 @@
+## 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
+* Update project's meta files
+* Deprecate requiring 'unicode-display_size'
+
 ## 0.2.0
 
 * Update EastAsianWidth from 6.0 to 7.0

data/README.rdoc

@@ -4,24 +4,28 @@ An early draft of a way to determine the size of the characters using <tt>EastAs
 
 == Install
 
-Install the gem with
+Install the gem with:
 
   gem install unicode-display_width
 
+or add to your Gemfile:
+
+  gem 'unicode-display_width'
+
 == Usage
 
   require 'unicode/display_width'
 
-The easy way is to use the String#display_size method:
+The easy way is to use the <tt>String#display_width</tt> method:
   "⚀".display_width #=> 1
   '一'.display_width #=> 2
 
 To obtain more detailed character data, you can use the following syntax:
   Unicode::DisplayWidth.codepoint( c )
 
-=== Ambigous Characters
+=== Ambiguous Characters
 
-The display_width method takes an optional argument, which will be used as width for characters defined as "ambigious". The default value is 1.
+The <tt>display_width</tt> method takes an optional argument, which will be used as width for characters defined as "ambigious". The default value is 1.
 
 == Copyright
 
@@ -29,6 +33,6 @@ Copyright (c) 2011, 2015 Jan Lelis, http://rbjl.net, released under the MIT lice
 
 Contains code by runpaint:   Copyright (c) 2009 Run Paint Run Run
 
-Contains EastAsianWidth.txt: Copyright (c) 1991-2014 Unicode, Inc.
+Contains EastAsianWidth.txt: Copyright (c) 1991-2015 Unicode, Inc.
 
 J-_-L

data/Rakefile

@@ -1,35 +1,84 @@
-require 'rake'
-require 'fileutils'
+# # #
+# Get gemspec info
 
-def gemspec
-  @gemspec ||= eval(File.read('.gemspec'), binding, '.gemspec')
-end
+gemspec_file = Dir['*.gemspec'].first
+gemspec = eval File.read(gemspec_file), binding, gemspec_file
+info = "#{gemspec.name} | #{gemspec.version} | " \
+       "#{gemspec.runtime_dependencies.size} dependencies | " \
+       "#{gemspec.files.size} files"
+
+
+# # #
+# Gem build and install task
 
-desc "Build the gem"
-task :gem=>:gemspec do
-  sh "gem build .gemspec"
+desc info
+task :gem do
+  puts info + "\n\n"
+  print "  "; sh "gem build #{gemspec_file}"
   FileUtils.mkdir_p 'pkg'
   FileUtils.mv "#{gemspec.name}-#{gemspec.version}.gem", 'pkg'
+  puts; sh %{gem install --no-document pkg/#{gemspec.name}-#{gemspec.version}.gem}
 end
 
-desc "Install the gem locally"
-task :install => :gem do
-  sh %{gem install pkg/#{gemspec.name}-#{gemspec.version}.gem}
+
+# # #
+# Start an IRB session with the gem loaded
+
+desc "#{gemspec.name} | IRB"
+task :irb do
+  sh "irb -I ./lib -r #{gemspec.name.gsub '-','/'}"
 end
 
-desc "Generate the gemspec"
-task :generate do
-  puts gemspec.to_ruby
+# # #
+# Run all specs
+
+
+desc "#{gemspec.name} | Test"
+task :test do
+  sh "rspec spec"
 end
+task :default => :test
+
+# # #
+# Update index table
 
-desc "Validate the gemspec"
-task :gemspec do
-  gemspec.validate
+namespace :update do
+  desc "#{gemspec.name} | Update index"
+  task :index do
+    require File.dirname(__FILE__) + '/lib/unicode/display_width'
+    data = File.open Unicode::DisplayWidth::DATA_FILE
+    data.rewind
+    table = {}
+    dir = File.dirname Unicode::DisplayWidth::TABLE_FILE
+    Dir.mkdir(dir) unless Dir.exists?(dir)
+    data.each_line{ |line|
+      line =~ /^(\S+?);(\S+)\s+#.*$/
+      if $1 && $2
+        cps, width = $1, $2
+        if cps['..']
+          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
+        end
+      end
+
+    }
+    File.open(Unicode::DisplayWidth::TABLE_FILE, 'wb') { |f| Marshal.dump(table, f) }
+  end
 end
 
-desc 'Run tests'
-task :test do |t|
-  sh 'rspec'
+# # #
+# Update data file
+
+namespace :update do
+  desc "#{gemspec.name} | Update unicode data"
+  task :data do
+    require File.dirname(__FILE__) + '/lib/unicode/display_width'
+    require 'open-uri'
+    open("http://www.unicode.org/Public/UNIDATA/EastAsianWidth.txt") { |f|
+      File.write(Unicode::DisplayWidth::DATA_FILE, f.read)
+    }
+  end
 end
 
-task :default => :test

data/lib/unicode/display_size.rb

@@ -1 +1,2 @@
+warn "Deprecation warning: Please use require 'unicode/display_width' instead of require 'unicode/display_size'"
 require File.dirname(__FILE__) + "/display_width"

data/lib/unicode/display_width.rb

@@ -1,61 +1,31 @@
 # encoding: utf-8
-module Unicode; end
-module Unicode::DisplayWidth
-  VERSION = '0.2.0'
-end
-
-
-class << Unicode::DisplayWidth
-  DATA_DIR = File.join(File.dirname(__FILE__), '../../data/')
-  TABLE_FILE = DATA_DIR + 'EastAsianWidth.index'
-  DATA_FILE  = DATA_DIR + 'EastAsianWidth.txt'
-
-  # # # lookup
-
-  def table
-    if @table
-      @table
-    else
-      @table = Marshal.load File.respond_to?(:binread) ? File.binread(TABLE_FILE) : File.read(TABLE_FILE)
-    end
-  end
-
-  def codepoint(n)
-    n = n.to_s.unpack('U')[0] unless n.is_a? Integer
-    table[n] or raise ArgumentError, 'codepoint not found'
-  end
-  alias width codepoint
-  alias of    codepoint
-
 
-  # # # index
-
-  def build_table
-    data = File.open DATA_FILE
-    data.rewind
-    table = {}
-    dir = File.dirname TABLE_FILE
-    Dir.mkdir(dir) unless Dir.exists?(dir)
-    data.each_line{ |line|
-      line =~ /^(\S+?);(\S+)\s+#.*$/
-      if $1 && $2
-        cps, width = $1, $2
-        if cps['..']
-          range = Range.new *cps.split('..').map{ |cp| cp.to_i(16) }
-          range.each{ |cp| table[ cp ] = width.to_sym }
+module Unicode
+  module DisplayWidth
+    VERSION = '0.3.0'.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
+          @table
         else
-          table[ cps.to_i(16) ] = width.to_sym
+          @table = Marshal.load File.respond_to?(:binread) ? File.binread(TABLE_FILE) : File.read(TABLE_FILE)
         end
       end
 
-    }
-    File.open(TABLE_FILE, 'wb') { |f| Marshal.dump(table, f) }
+      def codepoint(n)
+        n = n.to_s.unpack('U')[0] unless n.is_a? Integer
+        table[n] or raise ArgumentError, 'codepoint not found'
+      end
+      alias width codepoint
+      alias of    codepoint
+    end
   end
 end
 
-
-# # # core ext
-
 class String
   def display_width(ambiguous = 1)
     unpack('U*').inject(0){ |a,c|

data/{.gemspec → unicode-display_width.gemspec}

@@ -11,8 +11,8 @@ Gem::Specification.new do |s|
   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.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 .gemspec}
-  s.extra_rdoc_files = ["README.rdoc", "LICENSE.txt", "CHANGELOG.txt"]
+  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"]
   s.license = 'MIT'
   s.add_development_dependency 'rspec', '~> 3.2'
   s.add_development_dependency 'rake', '~> 10.4'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unicode-display_width
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Jan Lelis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-05 00:00:00.000000000 Z
+date: 2015-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -45,17 +45,17 @@ executables: []
 extensions: []
 extra_rdoc_files:
 - README.rdoc
-- LICENSE.txt
+- MIT-LICENSE.txt
 - CHANGELOG.txt
 files:
-- ".gemspec"
 - CHANGELOG.txt
-- LICENSE.txt
+- MIT-LICENSE.txt
 - README.rdoc
 - Rakefile
 - data/EastAsianWidth.index
 - lib/unicode/display_size.rb
 - lib/unicode/display_width.rb
+- unicode-display_width.gemspec
 homepage: http://github.com/janlelis/unicode-display_width
 licenses:
 - MIT
@@ -76,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Support for east_asian_width string widths.