Merge pull request #1 from stevendaniels/improve-performance-speed

Performance improvements
stevendaniels · Dec 31, 2015 · d63e4a7 · d63e4a7
2 parents e645bf8 + 3f2f794
commit d63e4a7
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 8 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,3 +1,3 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 # gem dependencies are in zhongwen_tools.gemspec
 gemspec
diff --git a/lib/zhongwen_tools/caps.rb b/lib/zhongwen_tools/caps.rb
@@ -3,18 +3,17 @@ module ZhongwenTools
   # Public: Module for pinyin/fullwidth capitalization
   module Caps
     def self.downcase(str)
-      regex = /(#{ZhongwenTools::Caps::CAPS.keys.join('|')})/
-      str.gsub(regex, ZhongwenTools::Caps::CAPS).downcase
+      str.gsub(ZhongwenTools::Regex.capital_letters, ZhongwenTools::Caps::CAPS).downcase
     end
 
     def self.upcase(str)
-      str.gsub(/(#{ZhongwenTools::Caps::CAPS.values.join('|')})/) do
+      str.gsub(ZhongwenTools::Regex.lowercase_letters) do
         ZhongwenTools::Caps::CAPS.find { |_, v| v == Regexp.last_match[0] }[0]
       end.upcase
     end
 
     def self.capitalize(str)
-      first_letter = str[/#{Regex.py}|[ĀÁǍÀĒÉĚÈĪÍǏÌŌÓǑÒ]|[a-zA-Z]/][0]
+      first_letter = str[ZhongwenTools::Regex.capitalize][0]
       str.sub(first_letter, ZhongwenTools::Caps.upcase(first_letter))
     end
 

diff --git a/lib/zhongwen_tools/regex.rb b/lib/zhongwen_tools/regex.rb
@@ -36,13 +36,21 @@ def self.fullwidth
     end
 
     def self.capital_letters
-      @capital_letters ||=  /(#{Regexp.union(ZhongwenTools::Caps::CAPS.keys)})/
+      @capital_letters ||= /(#{Regexp.union(ZhongwenTools::Caps::CAPS.keys)})/
     end
 
     def self.lowercase_letters
       @lowercase_letters ||= /(#{Regexp.union(ZhongwenTools::Caps::CAPS.values)})/
     end
 
+    def self.capitalize
+      @capitalize ||= /#{Regex.py}|[ĀÁǍÀĒÉĚÈĪÍǏÌŌÓǑÒ]|[a-zA-Z]/
+    end
+
+    def self.find_py_regex
+      @find_py_regex ||= /(#{Regex.py}|#{Regex.py_syllabic_nasals})/
+    end
+
     def self.zh
       /\p{Han}/
     end

diff --git a/lib/zhongwen_tools/romanization/pinyin.rb b/lib/zhongwen_tools/romanization/pinyin.rb
@@ -164,7 +164,7 @@ def self.normalize_pinyin(pinyin)
       end
 
       def self.find_py(str)
-        regex = /(#{ Regex.py }|#{ Regex.py_syllabic_nasals })/
+        regex = ZhongwenTools::Regex.find_py_regex
         str.scan(regex).map { |x| x.compact[0] }
       end
 

diff --git a/lib/zhongwen_tools/version.rb b/lib/zhongwen_tools/version.rb
@@ -1,3 +1,3 @@
 module ZhongwenTools
-  VERSION = '0.19.1'
+  VERSION = '0.19.2'
 end