zhongwen_tools 0.12.4 → 0.15.1

data/test/{test_conversion.rb → test_script.rb}

@@ -1,16 +1,10 @@
-#encoding: utf-8
+# encoding: utf-8
 $:.unshift File.join(File.dirname(__FILE__),'..','lib')
 
 require './test/test_helper'
-require 'zhongwen_tools/conversion'
-class String
-  include ZhongwenTools::Conversion
-  include ZhongwenTools::String
-end
-
-class TestConversion < Minitest::Test
-
+class TestScript < Minitest::Test
   def setup
+    load 'zhongwen_tools/script.rb'
     @strings = [
       {
         :zhs => '干部一干人等干事不干不净',
@@ -48,76 +42,79 @@ class TestConversion < Minitest::Test
         :zhcn => '旧金山台球冠军是笑星'
       }
     ]
-
   end
 
   def test_to_zht
     type = :zht
-    @strings.each do |zh_hash|
-      zh_hash.each do |k, str|
-        assert_equal zh_hash[type], ZhongwenTools::Conversion.to_zht(str) , k unless [:zhcn, :zhhk, :zhtw].include? k
-      end
+    @strings.each do |hash|
+      result = ZhongwenTools::Script.to_zht(hash[:zhs], type)
+      message = "#{ hash[type] } should equal #{ result }"
+      assert_equal hash[type],result, message
     end
   end
 
   def test_to_zhs
     type = :zhs
-    @strings.each do |zh_hash|
-      zh_hash.each do |k, str|
-        assert_equal zh_hash[type], str.to_zhs , k unless [:zhcn, :zhhk, :zhtw].include? k
-      end
+    @strings.each do |hash|
+      result = ZhongwenTools::Script.to_zhs(hash[:zht], type)
+      message = "#{ hash[type] } should equal #{ result }"
+      assert_equal hash[type], result, message
     end
 
   end
 
   def test_to_zhtw
     type = :zhtw
-    @strings.each do |zh_hash|
-      zh_hash.each do |k, str|
-        assert_equal zh_hash[type], str.to_zhtw , k unless [:zht].include? k
+    @strings.each do |hash|
+      hash.each do |k, str|
+        result = ZhongwenTools::Script.to_zht(str, type)
+        message = "#{ hash[type] } should equal #{ result }"
+        assert_equal hash[type], result, message unless [:zht].include? k
       end
     end
-
   end
 
   def test_to_zhhk
     type = :zhhk
 
-    #can only convert tw to hk
-    @strings.each do |zh_hash|
-      zh_hash.each do |k, str|
-        assert_equal zh_hash[type], ZhongwenTools::Conversion.to_zhhk(str) , k unless [:zht, :zhcn].include? k
+    # NOTE: Can only convert tw to hk
+    @strings.each do |hash|
+      hash.each do |k, str|
+        result = ZhongwenTools::Script.to_zht(str, type)
+        message = "#{ hash[type] } should equal #{ result }"
+        assert_equal hash[type], result, message unless [:zht, :zhcn].include? k
       end
     end
   end
 
   def test_to_zhcn
     type = :zhcn
-    @strings.each do |zh_hash|
-      zh_hash.each do |k, str|
-        assert_equal zh_hash[type], ZhongwenTools::Conversion.to_zhcn(str) , k unless [:zhs ].include? k
+    @strings.each do |hash|
+      hash.each do |k, str|
+        result = ZhongwenTools::Script.to_zhs(str, type)
+        message = "#{ hash[type] } should equal #{ result }"
+        assert_equal hash[type], result, message unless [:zhs].include? k
       end
     end
   end
 
   def test_zhs?
-    @strings.each do |zh_hash|
-      assert zh_hash[:zhcn].zhs?
-      assert zh_hash[:zhs].zhs?
-      refute zh_hash[:zht].zhs?
-      refute zh_hash[:zhtw].zhs?
-      refute zh_hash[:zhhk].zhs?
+    @strings.each do |hash|
+      assert ZhongwenTools::Script.zhs?(hash[:zhcn])
+      assert ZhongwenTools::Script.zhs?(hash[:zhs])
+      refute ZhongwenTools::Script.zhs?(hash[:zht])
+      refute ZhongwenTools::Script.zhs?(hash[:zhtw])
+      refute ZhongwenTools::Script.zhs?(hash[:zhhk])
     end
   end
 
   def test_zht?
-    @strings.each do |zh_hash|
-      refute zh_hash[:zhcn].zht?
-      refute zh_hash[:zhs].zht?
-      assert zh_hash[:zht].zht?
-      assert zh_hash[:zhtw].zht?
-      assert zh_hash[:zhhk].zht?, zh_hash[:zhhk]
+    @strings.each do |hash|
+      refute ZhongwenTools::Script.zht?(hash[:zhcn])
+      refute ZhongwenTools::Script.zht?(hash[:zhs])
+      assert ZhongwenTools::Script.zht?(hash[:zht])
+      assert ZhongwenTools::Script.zht?(hash[:zhtw])
+      assert ZhongwenTools::Script.zht?(hash[:zhhk])
     end
-  end
-
-end
+  end  
+end 

data/test/test_string_extension.rb

@@ -0,0 +1,94 @@
+  # encoding: utf-8
+$:.unshift File.join(File.dirname(__FILE__),'..','lib')
+
+require './test/test_helper'
+require 'zhongwen_tools'
+
+if RUBY_VERSION < '2.0.0'
+  String.send(:include, ZhongwenTools::StringExtension)
+else
+  using ZhongwenTools
+end
+
+class TestStringExtention < Minitest::Test
+  def setup
+    @caps = { u: 'ĀLĀBÓ', d: 'ālābó', c: 'Ālābó' }
+    @fw = { hw: 'hello',fw: 'ｈeｌｌｏ', mixed: 'hellｏ' }
+
+    @rom =       {
+      pyn: 'ni3 hao3',
+      py: 'nǐ hǎo',
+      bpmf: 'ㄋㄧ3 ㄏㄠ3',
+      yale: 'ni3 hau3',
+      typy: 'ni3 hao3',
+      wg: 'ni3 hao3',
+      mps2: 'ni3 hau3'
+    }
+
+    @zh =       {
+      :zhs => '嘴里吃着鲔鱼三明治',
+      :zht => '嘴裡吃著鮪魚三明治',
+      :zhtw => '嘴裡吃著鮪魚三明治',
+      :zhhk => '嘴裏吃着吞拿魚三文治',
+      :zhcn => '嘴里吃着金枪鱼三明治'
+    }
+    @unicode = { codepoint:"\\u4e2d\\u6587", unicode: '中文' }
+  end
+
+  def test_methods
+    assert_kind_of Array, @caps[:u].chars
+    # caps.rb
+    assert_equal 'Hello', 'hello'.capitalize
+    assert_equal @caps[:d], @caps[:u].zh_downcase
+    assert_equal @caps[:u], @caps[:c].zh_upcase
+
+    # fullwidth.rb
+    assert_equal @fw[:hw], @fw[:fw].to_halfwidth
+    assert_equal @fw[:hw], @fw[:mixed].to_halfwidth
+    assert @fw[:hw].halfwidth?
+    assert @fw[:fw].fullwidth?
+    assert @fw[:mixed].fullwidth?
+    refute @fw[:mixed].halfwidth?
+
+    # romanization
+    # NOTE: MUST use eval because "Any indirect method access ... shall not honor refinements in the caller context during method lookup."
+    @rom.each do |from, str|
+      @rom.each do |to, expected_result|
+        if [:py, :pyn].include?(from)
+          assert_equal expected_result, eval("str.to_#{to}"), "'#{str}'.to_#{to} should equal #{expected_result}"
+        else
+          assert_equal expected_result, eval("str.to_#{to}(:#{from})"), "'#{str}'.to_#{to}(#{from}) should equal #{expected_result}"
+        end
+      end
+    end
+
+
+    # script.rb
+    load 'zhongwen_tools/script.rb'#  unless ZhongwenTools.const_defined?(:Script)
+    assert_equal @zh[:zht], @zh[:zhs].to_zht
+    assert_equal @zh[:zhs], @zh[:zht].to_zhs
+    assert_equal @zh[:zhcn], @zh[:zhhk].to_zhcn
+    assert_equal @zh[:zhcn], @zh[:zhtw].to_zhcn
+    assert_equal @zh[:zhhk], @zh[:zhhk].to_zhhk
+    assert_equal @zh[:zhhk], @zh[:zhcn].to_zhhk
+    assert_equal @zh[:zhtw], @zh[:zhhk].to_zhtw
+    assert_equal @zh[:zhtw], @zh[:zhcn].to_zhtw
+
+    # unicode.rb
+    assert_equal @unicode[:codepoint], @unicode[:unicode].to_codepoint
+    assert_equal @unicode[:unicode], @unicode[:codepoint].from_codepoint
+    refute @unicode[:unicode].ascii?
+    assert @unicode[:unicode].multibyte?
+
+    # uri.rb
+    # NOTE: refinements can't test for "respond_to"
+    assert ''.uri_escape
+    assert ''.uri_encode
+
+    # zhongwen.rb
+    assert @zh[:zhs].zh?
+    assert @zh[:zhs].has_zh?
+    assert '。'.has_zh_punctuation?
+    assert_equal '你好', '你好！'.strip_zh_punctuation
+  end
+end

data/test/test_unicode.rb

@@ -0,0 +1,27 @@
+# encoding: utf-8
+$:.unshift File.join(File.dirname(__FILE__),'..','lib')
+
+require './test/test_helper'
+require 'zhongwen_tools/unicode'
+class TestUnicode < Minitest::Test
+  def test_to_codepoint
+    assert_equal "\\u4e2d\\u6587", ZhongwenTools::Unicode.to_codepoint('中文')
+    assert_equal "\\u4e2d", ZhongwenTools::Unicode.to_codepoint('中')
+  end
+
+  def test_from_codepoint
+    assert_equal  '中', ZhongwenTools::Unicode.from_codepoint("\\u4e2d")
+    assert_equal '中文', ZhongwenTools::Unicode.from_codepoint("\\u4e2d\\u6587")
+  end
+
+  def test_ascii
+    refute ZhongwenTools::Unicode.ascii?('中文')
+    assert ZhongwenTools::Unicode.ascii?('Chinese')
+  end
+
+  def test_multibyte
+    assert ZhongwenTools::Unicode.multibyte?('中文')
+    refute ZhongwenTools::Unicode.multibyte?('Chinese')
+  end
+end
+

data/test/test_uri.rb

@@ -0,0 +1,16 @@
+# encoding: utf-8
+$:.unshift File.join(File.dirname(__FILE__),'..','lib')
+
+require './test/test_helper'
+require 'zhongwen_tools/uri'
+class TestUri < Minitest::Test
+  def test_uri_encode
+    str = '你们'
+    assert_equal URI.encode(str), ZhongwenTools::URI.encode(str)
+  end
+
+  def test_uri_escape
+    str = '你们'
+    assert_equal URI.escape(str), ZhongwenTools::URI.escape(str)
+  end
+end

data/test/test_zhongwen.rb

@@ -0,0 +1,37 @@
+# encoding: utf-8
+$:.unshift File.join(File.dirname(__FILE__),'..','lib')
+
+require './test/test_helper'
+require 'zhongwen_tools/zhongwen'
+
+class TestZhongwen < Minitest::Test
+  def setup
+    @hw = 'hello'
+    @fw = 'ｈeｌｌｏ'
+    @mixed = '你好Kailin'
+    @zh = '你好'
+  end
+
+  def test_has_zh?
+    assert ZhongwenTools::Zhongwen.has_zh? @zh
+    assert ZhongwenTools::Zhongwen.has_zh? @mixed
+    refute ZhongwenTools::Zhongwen.has_zh? @hw
+    refute ZhongwenTools::Zhongwen.has_zh? @fw
+  end
+
+  def test_zh?
+    assert ZhongwenTools::Zhongwen.zh? @zh
+    refute ZhongwenTools::Zhongwen.zh? @mixed
+    refute ZhongwenTools::Zhongwen.zh? @hw
+    refute ZhongwenTools::Zhongwen.zh? @fw
+  end
+
+  def test_has_zh_punctuation
+    assert ZhongwenTools::Zhongwen.has_zh_punctuation?('你好！')
+    refute ZhongwenTools::Zhongwen.has_zh_punctuation?('你好')
+  end
+
+  def test_strip_zh_punctuation
+    assert_equal '你好', ZhongwenTools::Zhongwen.strip_zh_punctuation('你好！')
+  end
+end

data/zhongwen_tools.gemspec

@@ -11,7 +11,6 @@ Gem::Specification.new do |s|
   s.homepage    = "https://github.com/stevendaniels/zhongwen_tools"
   s.summary     = %q{Zhongwen Tools provide romanization conversions and helper methods for Chinese.}
   s.description = %q{Chinese tools for romanization conversions and other helpful string functions for Chinese.}
-
   s.rubyforge_project = "zhongwen_tools"
 
   s.files         = `git ls-files`.split("\n")
@@ -26,5 +25,6 @@ Gem::Specification.new do |s|
     s.add_development_dependency('coveralls', '~> 0.7', '>= 0.7.0')
     s.add_development_dependency('minitest', '~> 5.3', '>= 5.3.0')
     s.add_development_dependency('pry', '~> 0.9', '>= 0.9.12')
+    s.add_development_dependency('minitest-reporters', '~> 1.0', '>= 1.0.4')
   end
 end

metadata

@@ -1,129 +1,149 @@
 --- !ruby/object:Gem::Specification
 name: zhongwen_tools
 version: !ruby/object:Gem::Version
-  version: 0.12.4
+  version: 0.15.1
 platform: ruby
 authors:
 - Steven Daniels
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-30 00:00:00.000000000 Z
+date: 2014-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.1'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.7'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.7'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: simplecov-gem-adapter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.7'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.7'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '5.3'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 5.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '5.3'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 5.3.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.12
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.12
+- !ruby/object:Gem::Dependency
+  name: minitest-reporters
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.4
 description: Chinese tools for romanization conversions and other helpful string functions
   for Chinese.
 email:
@@ -132,36 +152,47 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".travis.yml"
+- .travis.yml
 - Gemfile
-- Gemfile.1.8.7
 - README.md
 - Rakefile
 - lib/zhongwen_tools.rb
-- lib/zhongwen_tools/conversion.rb
-- lib/zhongwen_tools/conversion/conversion_data
-- lib/zhongwen_tools/conversion/string.rb
-- lib/zhongwen_tools/integer.rb
-- lib/zhongwen_tools/numbers.rb
+- lib/zhongwen_tools/caps.rb
+- lib/zhongwen_tools/core.rb
+- lib/zhongwen_tools/core_ext/integer.rb
+- lib/zhongwen_tools/core_ext/string.rb
+- lib/zhongwen_tools/fullwidth.rb
+- lib/zhongwen_tools/integer_extension.rb
+- lib/zhongwen_tools/number.rb
+- lib/zhongwen_tools/number/number_table.rb
 - lib/zhongwen_tools/regex.rb
-- lib/zhongwen_tools/regex/ruby18.rb
 - lib/zhongwen_tools/romanization.rb
-- lib/zhongwen_tools/romanization/conversion_table.rb
-- lib/zhongwen_tools/romanization/detect.rb
-- lib/zhongwen_tools/romanization/pyn_to_py.rb
-- lib/zhongwen_tools/romanization/string.rb
-- lib/zhongwen_tools/string.rb
-- lib/zhongwen_tools/string/caps.rb
-- lib/zhongwen_tools/string/fullwidth.rb
-- lib/zhongwen_tools/string/ruby18.rb
-- lib/zhongwen_tools/string/ruby19.rb
+- lib/zhongwen_tools/romanization/pinyin.rb
+- lib/zhongwen_tools/romanization/pinyin_table.rb
+- lib/zhongwen_tools/romanization/romanization_table.rb
+- lib/zhongwen_tools/ruby_19.rb
+- lib/zhongwen_tools/script.rb
+- lib/zhongwen_tools/script/conversion_data
+- lib/zhongwen_tools/string_extension.rb
+- lib/zhongwen_tools/unicode.rb
+- lib/zhongwen_tools/uri.rb
 - lib/zhongwen_tools/version.rb
-- test/test_conversion.rb
+- lib/zhongwen_tools/zhongwen.rb
+- test/test_caps.rb
+- test/test_core.rb
+- test/test_fullwidth.rb
 - test/test_helper.rb
-- test/test_integer.rb
-- test/test_numbers.rb
+- test/test_helpers/unload_zhongwen_tools_script.rb
+- test/test_integer_extension.rb
+- test/test_number.rb
+- test/test_pinyin.rb
+- test/test_regex.rb
 - test/test_romanization.rb
-- test/test_string.rb
+- test/test_script.rb
+- test/test_string_extension.rb
+- test/test_unicode.rb
+- test/test_uri.rb
+- test/test_zhongwen.rb
 - zhongwen_tools.gemspec
 homepage: https://github.com/stevendaniels/zhongwen_tools
 licenses:
@@ -173,24 +204,34 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: zhongwen_tools
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Zhongwen Tools provide romanization conversions and helper methods for Chinese.
 test_files:
-- test/test_conversion.rb
+- test/test_caps.rb
+- test/test_core.rb
+- test/test_fullwidth.rb
 - test/test_helper.rb
-- test/test_integer.rb
-- test/test_numbers.rb
+- test/test_helpers/unload_zhongwen_tools_script.rb
+- test/test_integer_extension.rb
+- test/test_number.rb
+- test/test_pinyin.rb
+- test/test_regex.rb
 - test/test_romanization.rb
-- test/test_string.rb
+- test/test_script.rb
+- test/test_string_extension.rb
+- test/test_unicode.rb
+- test/test_uri.rb
+- test/test_zhongwen.rb
+has_rdoc: 

data/Gemfile.1.8.7

@@ -1,8 +0,0 @@
-source "https://rubygems.org"
-# Specify your gem's dependencies in zhongwen_tools.gemspec
-gemspec
-
-group :test do
-  gem 'minitest' if RUBY_VERSION < '1.9'
-  gem 'pry'
-end

data/lib/zhongwen_tools/conversion/string.rb

@@ -1,19 +0,0 @@
-# encoding: utf-8
-
-module ZhongwenTools
-  module String
-    include ZhongwenTools::Conversion
-
-    def zht?(str = nil)
-      str ||= self
-
-      str == convert(:zht, str) ||  str == convert(:zhhk, str)
-    end
-
-    def zhs?(str = nil)
-      str ||= self
-
-      str == convert(:zhs, str)
-    end
-  end
-end

data/lib/zhongwen_tools/integer.rb

@@ -1,28 +0,0 @@
-# encoding: utf-8
-require 'zhongwen_tools/numbers'
-
-module ZhongwenTools
-  module Integer
-    include ZhongwenTools::Numbers
-    extend self
-
-    def to_zh(type = nil)
-      type == :zht ? self.to_zht? : self.to_zhs
-    end
-
-    def to_zhs(int = nil)
-      int ||= self
-      number_to_zhs :num, int.to_s
-    end
-
-    def to_zht(int = nil)
-      int ||= self
-      number_to_zht :num, int.to_s
-    end
-
-    def to_pyn(int = nil)
-      int ||= self
-      number_to_pyn int.to_s, :num
-    end
-  end
-end