zhongwen_tools 0.17.1 → 0.17.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5253f60895b1fcdea86c8f43061cd5f8c647f854
-  data.tar.gz: 75afec0bbf2e89ccbf22fbbffb76222496745805
+  metadata.gz: bacbcbd09a73bdd22d78e966029187c7e3dfc9a2
+  data.tar.gz: e259d86acb93bb114141d040c6ad2fd8a22293cd
 SHA512:
-  metadata.gz: bf20813d7c304375d47ba1a4555d69f14364339f26f0b7afa51bca059775a1816f9cc7af4d4f91115f60b8e467346d31f049248b1cd501890805cfedb7d41627
-  data.tar.gz: 9cc3eb9986dd62767e0d51a8257d1f0f2525956862c80a8f81debfcbf650a258f45315570f17f45c94195593e2ecb47752c777c05df2d0e85babcd5781d8fa62
+  metadata.gz: 93999ffd384d42b193873c9be87c94bd5784f4c49381a841fdfa2a4687ffab5f9747cfbcb4a641800fd271226ea4ef6ee1202aa849cbb5688268e73cffe2d19a
+  data.tar.gz: 63c7429d200a98628b00cd23db987d0b095f4d50819f8844a6855adddc4accee66a9243122ec4b54eea8b0f9305edbc2080bbd3b2f6929ea579783ad68ebd1aa

data/.travis.yml

@@ -3,4 +3,5 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
-  - 2.1.1
+  - 2.1.5
+  - 2.2.0

data/lib/zhongwen_tools/regex.rb

@@ -3,13 +3,13 @@
 module ZhongwenTools
   module Regex
     def self.pyn
-      /(#{pyn_regexes.values.join('|')}|r)([1-5])([\s\-]+)?/
+      @pyn ||= /(#{pyn_regexes.values.join('|')}|r)([1-5])([\s\-]+)?/
     end
 
     def self.py
       # FIXME: need to detect Ālābó
       # ([ĀÁǍÀA][io]?|[io]?|[][āáǎàaēéěèeūúǔùu]?o?|[ĒÉĚÈE]i?|[]i?|[ŌÓǑÒO]u?|[]u?|u[āáǎàaēoēéěèe]?i?|[]e?)(n?g?r?)){1,}
-      /(#{pyn_regexes.map{|k,v| v.to_s[7..-2].gsub(/[aeiouv]/,py_tones)}.join('|')}([\s\-])?)/
+      @py ||= /(#{pyn_regexes.map{|k,v| v.to_s[7..-2].gsub(/[aeiouv]/,py_tones)}.join('|')}([\s\-])?)/
     end
 
     def self.pinyin_num
@@ -17,7 +17,7 @@ module ZhongwenTools
     end
 
     def self.pinyin_toneless
-      /(#{pyn_regexes.values.join('|')}|r)([\s\-]+)?/
+      @pynt ||= /(#{pyn_regexes.values.join('|')}|r)([\s\-]+)?/
     end
 
     def self.fullwidth

data/lib/zhongwen_tools/romanization/pinyin.rb

@@ -38,8 +38,8 @@ module ZhongwenTools
       def self.split_pyn(str)
         # FIXME: ignore punctuation
         regex = str[/[1-5]/].nil? ?  /(#{ZhongwenTools::Regex.pinyin_toneless})/ : /(#{ZhongwenTools::Regex.pyn}|#{ZhongwenTools::Regex.pinyin_toneless})/
-
-        str.scan(regex).map{ |arr| arr[0].strip.gsub('-', '') }.flatten
+        # NOTE: p[/[^\-]*/].to_s is 25% faster thang gsub('-', '')
+        str.scan(regex).map{ |arr| arr[0].strip[/[^\-]*/].to_s }.flatten
       end
 
       def self.split_py(str)
@@ -132,7 +132,7 @@ module ZhongwenTools
       end
 
       def self.find_py(str)
-        str.scan(ZhongwenTools::Regex.py).map{ |x| (x - [nil])[0] }
+        str.scan(ZhongwenTools::Regex.py).map{ |x| x.compact[0] }
       end
 
       def self.recapitalize(obj, capitalized)

data/lib/zhongwen_tools/romanization.rb

@@ -174,7 +174,9 @@ module ZhongwenTools
     #
     # Returns a Regexp.
     def self.detect_regex(type)
-      /#{romanization_values(type).sort{|x,y| x.size <=> y.size}.reverse.join('|')}/
+      # TODO: memoize
+      @memoized_detect_regex ||= {}
+      @memoized_detect_regex[type] ||= /#{romanization_values(type).sort{|x,y| x.size <=> y.size}.reverse.join('|')}/
     end
 
     # Internal: Selects the romanization values for a particular romanization type.
@@ -188,11 +190,13 @@ module ZhongwenTools
     #
     # Returns an Array that contains the romanization's values.
     def self.romanization_values(type)
-      results = ZhongwenTools::Romanization::ROMANIZATIONS_TABLE.map do |r|
+      # TODO: memoize
+      @memoized_romanization_values = {}
+      @memoized_romanization_values[type] = ZhongwenTools::Romanization::ROMANIZATIONS_TABLE.map do |r|
         "[#{r[type][0]}#{r[type][0].upcase}]#{r[type][1..-1]}" || r[:pyn]
-      end
+      end.flatten
 
-      results.flatten
+      @memoized_romanization_values[type]
     end
 
     def self.romanization_module(type)

data/lib/zhongwen_tools/version.rb

@@ -1,3 +1,3 @@
 module ZhongwenTools
-  VERSION = '0.17.1'
+  VERSION = '0.17.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zhongwen_tools
 version: !ruby/object:Gem::Version
-  version: 0.17.1
+  version: 0.17.3
 platform: ruby
 authors:
 - Steven Daniels
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-31 00:00:00.000000000 Z
+date: 2015-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake