unicode 0.4.4.1-java → 0.4.4.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d049f7fe938ddcd91b252faa94765bf62b0b8ca8
-  data.tar.gz: 55bf8652c415a9f707d1a68b5696e8cc50d485b7
+  metadata.gz: 8e618ea0568276001d073d0c485e7a9f61b22e28
+  data.tar.gz: 57e8fd345eceeaa7a2bf5a9f50f89b335a3dfd4f
 SHA512:
-  metadata.gz: c08d4b381e421e322ac5d6ba65fc636fdef3dac8dfaf5ee3d5714e207c13f610bc234d82923481b1a794b836c8ce7d2a7df0fca34c3838db7acf81bf7b285e05
-  data.tar.gz: 28a6d32de00650904048f8d93c23cfbde62d1027804b0eb457d19c5e3346d63dbde21265e71c611b9400395b5c372a8a882774f9e12780836dd270387dd22db0
+  metadata.gz: a0734b8c7980d0372dabfafda11476204d951e21e129cc16a7d851bc660f6f8b65a181274235794c8da089e903bf356a17bceda1d9b87268bdf2e5225043a4e9
+  data.tar.gz: e5c80957ea4a1c137a3d6d685cce658b26a86db1df8ee4a5abd0f580e71cf33fc684dc17976bfcbb2ccde67c135c98d04190dce958e1ab0e376497177f777c39

data/Rakefile

@@ -1,20 +1,20 @@
-require "rake/clean"
-require "rake/extensiontask"
-require "rubygems/package_task"
+require 'rake/clean'
+require 'rake/extensiontask'
+require 'rubygems/package_task'
 
-CLEAN << "pkg" << "tmp" << "lib/unicode"
+CLEAN << 'pkg' << 'tmp' << 'lib/unicode'
 
 UPSTREAM_URL = 'http://www.yoshidam.net/unicode-%s.tar.gz'
 
-gem_spec = eval(File.read(File.expand_path("../unicode.gemspec", __FILE__)))
+gem_spec = eval(File.read(File.expand_path('../unicode.gemspec', __FILE__)))
 
 gem_task = Gem::PackageTask.new(gem_spec) {|pkg|}
 
 Rake::ExtensionTask.new('unicode_native', gem_spec) do |ext|
   ext.cross_compile = true
   ext.cross_platform = ['x86-mingw32', 'x86-mswin32-60']
-  ext.ext_dir = "ext/unicode"
-  ext.lib_dir = "lib/unicode"
+  ext.ext_dir = 'ext/unicode'
+  ext.lib_dir = 'lib/unicode'
 end
 
 namespace :gem do
@@ -38,25 +38,11 @@ namespace :gem do
   file java_gem_path => [java_gem_dir] + java_gem_spec.files do
     lib_file = 'lib/unicode.rb'
     tmp_file = "#{lib_file}.tmp-#{$$}"
+    jrb_file = lib_file.sub('.', '-java.')
 
     begin
       mv lib_file, tmp_file
-
-      File.write(lib_file, <<-EOT)
-  module Unicode
-
-    extend self
-
-    def upcase(str)
-      str.to_java.to_upper_case
-    end
-
-    def downcase(str)
-      str.to_java.to_lower_case
-    end
-
-  end
-      EOT
+      ln jrb_file, lib_file
 
       Gem::Package.build(java_gem_spec)
 
@@ -66,16 +52,16 @@ namespace :gem do
     end
   end
 
-  desc "Build native gems for Windows"
+  desc 'Build native gems for Windows'
   task :windows do
-    ENV["RUBY_CC_VERSION"] = "1.8.7:1.9.3"
-    sh "rake cross compile"
-    sh "rake cross native gem"
+    ENV['RUBY_CC_VERSION'] = '1.9.3:2.0.0:2.1.5'
+    sh 'rake cross compile'
+    sh 'rake cross native gem'
   end
 
 end
 
-desc "Update from upstream"
+desc 'Update from upstream'
 task :update, [:version] do |t, args|
   require 'zlib'
   require 'open-uri'

data/lib/unicode.rb

@@ -1,13 +1,118 @@
-  module Unicode
+module Unicode
 
-    extend self
+  extend self
 
-    def upcase(str)
-      str.to_java.to_upper_case
-    end
+  VERSION = '0.4.3'
 
-    def downcase(str)
-      str.to_java.to_lower_case
-    end
+  Normalizer = Java::JavaText::Normalizer
 
+  def strcmp(str1, str2)
+    decompose(str1).to_java.compare_to(decompose(str2))
   end
+
+  def strcmp_compat(str1, str2)
+    decompose_compat(str1).to_java.compare_to(decompose_compat(str2))
+  end
+
+  def decompose(str)
+    Normalizer.normalize(str, Normalizer::Form::NFD)
+  end
+
+  alias_method :normalize_D, :decompose
+  alias_method :nfd,         :decompose
+
+  # Decompose Unicode string with a non-standard mapping.
+  #
+  # It does not decompose the characters in CompositionExclusions.txt.
+  def decompose_safe(str)
+    raise NotImplementedError
+  end
+
+  alias_method :normalize_D_safe, :decompose_safe
+  alias_method :nfd_safe,         :decompose_safe
+
+  def decompose_compat(str)
+    Normalizer.normalize(str, Normalizer::Form::NFKD)
+  end
+
+  alias_method :normalize_KD, :decompose_compat
+  alias_method :nfkd,         :decompose_compat
+
+  # Compose Unicode string. Before composing, the trailing
+  # characters are sorted in canonical order.
+  #
+  # The parameter must be decomposed.
+  #
+  # The composition is based on the reverse of the
+  # character decomposition mapping in UnicodeData.txt,
+  # CompositionExclusions.txt and the Hangul composition
+  # algorithm.
+  def compose(str)
+    raise NotImplementedError
+  end
+
+  def normalize_C(str)
+    Normalizer.normalize(str, Normalizer::Form::NFC)
+  end
+
+  alias_method :nfc, :normalize_C
+
+  def normalize_KC(str)
+    Normalizer.normalize(str, Normalizer::Form::NFKC)
+  end
+
+  alias_method :nfkc, :normalize_KC
+
+  # Normalize Unicode string with #decompose_safe (#decompose_safe + #compose).
+  def normalize_C_safe(str)
+    raise NotImplementedError
+  end
+
+  alias_method :nfc_safe, :normalize_C_safe
+
+  def upcase(str)
+    str.to_java.to_upper_case
+  end
+
+  def downcase(str)
+    str.to_java.to_lower_case
+  end
+
+  def capitalize(str)
+    downcase(str).tap { |s| s[0] = upcase(s[0]) }
+  end
+
+  # Get an array of general category names of the string.
+  #
+  # Can be called with a block.
+  def categories(str)
+    raise NotImplementedError
+  end
+
+  # Get an array of abbreviated category names of the string.
+  #
+  # Can be called with a block.
+  def abbr_categories(str)
+    raise NotImplementedError
+  end
+
+  # Get an array of text elements.
+  #
+  # A text element is a unit that is displayed as a single character.
+  #
+  # Can be called with a block.
+  def text_elements(str)
+    raise NotImplementedError
+  end
+
+  # Estimate the display width on the fixed pitch text terminal.
+  #
+  # It based on Markus Kuhn's mk_wcwidth.
+  #
+  # If the optional argument 'cjk' is true, East Asian
+  # Ambiguous characters are treated as wide characters.
+  def width(str, cjk = false)
+    raise NotImplementedError
+  end
+
+end

data/unicode.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{unicode}
-  s.version = "0.4.4.1"
+  s.version = "0.4.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Yoshida Masato}]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: unicode
 version: !ruby/object:Gem::Version
-  version: 0.4.4.1
+  version: 0.4.4.2
 platform: java
 authors:
 - Yoshida Masato