zhongwen_tools 0.19.6 → 0.19.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b3c5036ea0e880cf565743282efa08945cfe60b1d9ea407177145a384a580f3
-  data.tar.gz: 50087ae0cb60509dfe7413b8ef48e2ca18de4fb1192f36fd93b4c008dd4d113e
+  metadata.gz: f4d7c61e8713c8779ee3429d1b8964d3781e3fc17f12948c3d7a670e1b1d83fa
+  data.tar.gz: e3558aabdc6803f2a7e3b85d6393c89395cf5b4ed12264e2fb8ec8cdcaa356e4
 SHA512:
-  metadata.gz: 2935bec3f50088ff3b4defbe611d147cb97303dd8d353d4ec870e75005e047c4a64cfe6291b2df4c788683243d967b120a37a135e258d68cc0194df26517f6dd
-  data.tar.gz: be1335fde0f93bf057d206fa5b7440aac3e356ae61a72dce04b3951704c6fbb8ea1ed083606d661fae951cecfa806a4c7815dc0879910a03d8f1da3fc5ffc10e
+  metadata.gz: 6c1d7051f6577c8d08db9f6eea25bb842ebec0f28983ad43753dd169d8d8f32ad2e94f1e4518c802b590805df9bc00757678f5146366aba2524462a75ea068c5
+  data.tar.gz: d168dc6a0ac5d52a7c420d2822fe94c1c8bd8602d6a4f70393aff7ee0a9e30553ea79ee401019251029516ad1599f689ccbe87747250accb691832467489be3e

data/.travis.yml

@@ -2,13 +2,15 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1
-  - 2.2.0
+  - 2.4
+  - 2.6
+  - 2.7.0
   - ruby-head
   - jruby-19mode
-  - rbx-2
+  - rbx-4
 matrix:
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-19mode
-    - rvm: rbx-2
+    - rvm: rbx-4
+    - rvm: 2.4

data/README.md

@@ -1,8 +1,9 @@
 #Zhongwen Tools:
 Methods for dealing with Chinese.
 
-[![Build
-Status](https://img.shields.io/travis/stevendaniels/zhongwen_tools.svg?style=flat-square)](https://travis-ci.org/stevendaniels/zhongwen_tools) [![Dependency Status](https://img.shields.io/gemnasium/stevendaniels/zhongwen_tools.svg?style=flat-square)](https://gemnasium.com/stevendaniels/zhongwen_tools) [![Code Climate](https://img.shields.io/codeclimate/github/stevendaniels/zhongwen_tools.svg?style=flat-square)](https://codeclimate.com/github/stevendaniels/zhongwen_tools) [![Coverage Status](https://img.shields.io/coveralls/stevendaniels/zhongwen_tools.svg?style=flat-square)](https://coveralls.io/r/stevendaniels/zhongwen_tools)
+[![Build Status](https://img.shields.io/travis/stevendaniels/zhongwen_tools.svg?style=flat-square)](https://travis-ci.org/stevendaniels/zhongwen_tools) 
+[![Maintainability](https://api.codeclimate.com/v1/badges/90b5794e9cc3a3b4207d/maintainability)](https://codeclimate.com/github/stevendaniels/zhongwen_tools/maintainability)
+[![Coverage Status](https://img.shields.io/coveralls/stevendaniels/zhongwen_tools.svg?style=flat-square)](https://coveralls.io/r/stevendaniels/zhongwen_tools)
 [![Gem Version](https://img.shields.io/gem/v/zhongwen_tools.svg?style=flat-square)](http://badge.fury.io/rb/zhongwen_tools)
 
 ##INSTALLATION

data/lib/zhongwen_tools/number.rb

@@ -6,13 +6,20 @@ require 'zhongwen_tools/number/number_table'
 
 module ZhongwenTools
   # Number.to_pyn, to_i, to_zhs, etc.
+  if RUBY_VERSION >= "2.4.0"
+    CONVERTIBLE_OBJECTS = [String, Integer]
+    NUMBER_CLASSES = [Integer]
+  else
+    CONVERTIBLE_OBJECTS = [String, Integer, Fixnum, Bignum]
+    NUMBER_CLASSES = [Fixnum, Integer, Bignum]
+  end
   module Number
     def self.number?(obj)
       case obj
       when String
         regex = /([\d]|#{ZhongwenTools::Regex.zh_numbers}){1,}/
         "#{obj}".gsub(regex, '') == ''
-      when Integer, Fixnum, Float
+      when Integer, Float
         true
       end
     end
@@ -39,7 +46,7 @@ module ZhongwenTools
 
     def self.convert(obj, to, from, separator = '')
       fail ArgumentError unless [:zhs, :zht, :i, :pyn].include?(to.to_sym)
-      fail ArgumentError unless [String, Integer, Fixnum, Bignum].include?(obj.class)
+      fail ArgumentError unless CONVERTIBLE_OBJECTS.include?(obj.class)
 
       number =   convert_from from, to, obj
 
@@ -56,7 +63,7 @@ module ZhongwenTools
     def self.number_type(obj)
       klass = obj.class
 
-      if [Fixnum, Integer, Bignum].include?(klass)
+      if NUMBER_CLASSES.include?(klass)
         :i
       else
         if ZhongwenTools::Zhongwen.zh?(obj)
@@ -211,7 +218,7 @@ module ZhongwenTools
       # FIXME: is finalize_number the best name you can think of?
       # NOTE: Figuring out usage of "liang" vs. "er" is pretty
       #       difficult, so always use "er" instead.
-      number.join(separator).gsub(/零[#{ Regex.zh_number_multiple }]*/u, '')
+      number.join(separator).gsub(/零#{ Regex.zh_number_multiple }*/u, '')
     end
   end
 end

data/lib/zhongwen_tools/romanization/pinyin.rb

@@ -153,7 +153,7 @@ module ZhongwenTools
       def self.normalize_n(pinyin)
         #       Special Case split_py("yìnián")   # => ["yì" + "nián"]
         #                    split_py("Xīní")     # => ["Xī", "ní"]
-        regex = /([#{ Regex.only_tones }])(n(#{Regex.py_tones['v']}|#{Regex.py_tones['i']}|[iu]|#{Regex.py_tones['e']}|[#{Regex.py_tones['a']}]))/
+        regex = /#{Regex.only_tones}(n(#{Regex.py_tones['v']}|#{Regex.py_tones['i']}|[iu]|#{Regex.py_tones['e']}|[#{Regex.py_tones['a']}]))/
         pinyin.gsub(regex) { "#{$1}-#{$2}" }
       end
 

data/lib/zhongwen_tools/romanization/zhuyin_fuhao.rb

@@ -15,7 +15,7 @@ module ZhongwenTools
       end
 
       def self.split(str)
-        regex = /([#{ZhongwenTools::Regex.bopomofo}]*)/
+        regex = /(#{ZhongwenTools::Regex.bopomofo}*)/
 
         ZhongwenTools::Romanization.split_romanization(str, regex)
       end

data/lib/zhongwen_tools/version.rb

@@ -1,3 +1,3 @@
 module ZhongwenTools
-  VERSION = "0.19.6"
+  VERSION = "0.19.7"
 end

data/test/test_core.rb

@@ -4,10 +4,13 @@ $:.unshift File.join(File.dirname(__FILE__),'..','lib')
 require './test/test_helper'
 
 class TestCore < Minitest::Test
+
   def test_core_ext_does_not_have_script_functions
     load 'test_helpers/unload_zhongwen_tools_script.rb'
     require 'zhongwen_tools/core'
     require 'zhongwen_tools/core_ext/string'
     assert_raises(NoMethodError){ '你们'.to_zht }
+    # NOTE: restoring ZhongwenTools::Script
+    load 'zhongwen_tools/script.rb'
   end
 end

data/test/test_script.rb

@@ -2,9 +2,10 @@
 $:.unshift File.join(File.dirname(__FILE__),'..','lib')
 
 require './test/test_helper'
+require 'zhongwen_tools/script'
+
 class TestScript < Minitest::Test
   def setup
-    load 'zhongwen_tools/script.rb'
     @strings = [
       {
         :zhs => '干部一干人等干事不干不净',
@@ -116,5 +117,5 @@ class TestScript < Minitest::Test
       assert ZhongwenTools::Script.zht?(hash[:zhtw])
       assert ZhongwenTools::Script.zht?(hash[:zhhk])
     end
-  end  
-end 
+  end
+end

data/test/test_string_extension.rb

@@ -72,7 +72,6 @@ class TestStringExtention < Minitest::Test
     assert_equal @rom[:pyn].romanization?, :pyn
 
     # 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

data/zhongwen_tools.gemspec

@@ -11,24 +11,23 @@ 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")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ['lib']
+  s.required_ruby_version = '>= 1.9.3'
 
-  s.add_development_dependency('rake', '~> 10.1')
-  if RUBY_VERSION >= '1.9'
-    s.add_development_dependency('simplecov', '~> 0.16', '>= 0.16.0')
-    s.add_development_dependency('simplecov-gem-adapter', '~> 1.0', '>= 1.0.1')
-    s.add_development_dependency('coveralls', '~> 0.8', '>= 0.8.1')
-    s.add_development_dependency('minitest', '~> 5.5', '>= 5.5.1')
-    s.add_development_dependency('pry', '~> 0.10', '>= 0.10.1')
-    s.add_development_dependency('minitest-reporters', '~> 1.0', '>= 1.0.10')
-  end
-
+  s.add_development_dependency('simplecov', '~> 0.16', '>= 0.16.0')
+  s.add_development_dependency('simplecov-gem-adapter', '~> 1.0', '>= 1.0.1')
+  s.add_development_dependency('coveralls', '~> 0.8', '>= 0.8.1')
+  s.add_development_dependency('minitest', '~> 5.5', '>= 5.5.1')
+  s.add_development_dependency('minitest-reporters', '~> 1.0', '>= 1.0.10')
   if RUBY_VERSION >= '2.1'
+    s.add_development_dependency "rake", ">= 12.3.3"
+    s.add_development_dependency('pry', '~> 0.13', '>= 0.13.0')
     s.add_development_dependency('memory_profiler', '0.0.4')
+  else
+    s.add_development_dependency('json', '~> 2.2.0')
+    s.add_development_dependency('rake', '~> 10.1')
   end
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: zhongwen_tools
 version: !ruby/object:Gem::Version
-  version: 0.19.6
+  version: 0.19.7
 platform: ruby
 authors:
 - Steven Daniels
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-28 00:00:00.000000000 Z
+date: 2020-04-02 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
@@ -105,45 +91,59 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 5.5.1
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 1.0.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 1.0.10
 - !ruby/object:Gem::Dependency
-  name: minitest-reporters
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 12.3.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 12.3.3
+- !ruby/object:Gem::Dependency
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.13'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.10
+        version: 0.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.13'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.10
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: memory_profiler
   requirement: !ruby/object:Gem::Requirement
@@ -225,15 +225,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: zhongwen_tools
-rubygems_version: 2.7.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Zhongwen Tools provide romanization conversions and helper methods for Chinese.