jnum_to_anum 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 557fdda463643973beb6a606bdbd29d2268a1296
-  data.tar.gz: 05ba98f8f190f888485ca7dbf7adca9fc56990a0
+  metadata.gz: 482cd56f8abdcda4a1df36f21643f72c1f865260
+  data.tar.gz: ee5d29e7130d2247607f7135816c4294132dbeea
 SHA512:
-  metadata.gz: 726f34153832a6149aab726af640a3f289fca36451ff890eea7c2d7221c1e69b3e509fb0cc4524a232a68e8c461afca0dada62b864baefc57de20a03f32755a7
-  data.tar.gz: 253f95b0e61460113b3d55f65fc32033bf13d09e029b1dde373351ddac379193be5abb1f4633487b433fced2a84d29d2ab0680a666bd5d21d9e81f67fbca68e5
+  metadata.gz: 9692df476ddb7d9807464ba604627c31db5f656ce93122facd2e67f74d266e4c2359505a073d2b71bf0a59026468e74d449ca0d5ae3cc7b82ade6abd04882abc
+  data.tar.gz: f52812ef4f6550c97e4d158445f3362e281d8bbc7aa8cfb9c23cada28153c9459d3bb0d85bf3562d617b0e50bb79a68c999df58c67ce5f3a680b2a4f4895ade1

data/lib/jnum_to_anum.rb

@@ -1,63 +1,58 @@
 require "jnum_to_anum/version"
-class String
+require "jnum_to_anum/constant"
 
-  TRANSMANS = {'兆': 1000000000000,
-               '億': 100000000,
-               '万': 10000}
-  TRANSUNIT = {'千': 1000,
-               '百': 100,
-               '拾': 10,
-               '十': 10}
-  
-  def kansuji_to_num
-    s = self.tr('一二三四五六七八九〇壱弐参０-９ａ-ｚＡ-Ｚ','12345678901230-9a-zA-Z').gsub(/[,.]+/,"")
-    exception = s.match(/^([0-9]+)(百万|千)\z/)
-    if exception #例外  売り上げなどは1,700百万円などと表記することがある
-      unit = exception[2] == "千" ? 1000 : 1000000
-      return  exception[1].to_i * unit
-    end
-    partial_arr = []
-    TRANSMANS.each do |key , value|
-      index = s.index(key.to_s)
-      next unless index
-      partial_arr << s.slice(0..index-1)
-      partial_arr << s[index]
-      s = s.slice(index + 1..-1 )
-    end
-    partial_arr << s unless s.empty?
-    filtered_arr = []
-    partial_arr.each do |partial|
-      unless partial =~ /十|百|千|拾/
-        if partial =~ /兆|億|万/
-          filtered_arr << filtered_arr.pop * TRANSMANS[partial.to_sym]
-        else
-          filtered_arr << partial.to_i
-        end
-        next
+class String
+  module JnumToAnum
+    def kansuji_to_num
+      s = self.tr('一二三四五六七八九〇壱弐参０-９ａ-ｚＡ-Ｚ','12345678901230-9a-zA-Z').gsub(/[,.]+/,"")
+      exception = s.match(/^([0-9]+)(百万|千)\z/)
+      if exception #例外  売り上げなどは1,700百万円などと表記することがある
+        unit = exception[2] == "千" ? 1000 : 1000000
+        return  exception[1].to_i * unit
       end
-      ar = []
-      TRANSUNIT.each do |key,value|
-        p_index = partial.index(key.to_s)
-        next unless p_index
-        ar << partial.slice(0..p_index)
-        partial = partial.slice(p_index + 1..-1 )
+      partial_arr = []
+      TRANSMANS.each do |key , value|
+        index = s.index(key.to_s)
+        next unless index
+        partial_arr << s.slice(0..index-1)
+        partial_arr << s[index]
+        s = s.slice(index + 1..-1 )
       end
-      ar << partial unless partial.empty?
-      sum = 0
-      ar.each do |wo|
-        m_w = wo.match(/([0-9]+)([^0-9]+)/)
-        if m_w
-          return_num = m_w[1].to_i * TRANSUNIT[m_w[2].to_sym]
-        elsif wo.match(/([0-9]+)/)
-          return_num = wo.match(/([0-9]+)/)[1].to_i
-        else
-          return_num = TRANSUNIT[wo.match(/([^0-9]+)/)[1].to_sym]
+      partial_arr << s unless s.empty?
+      filtered_arr = []
+      partial_arr.each do |partial|
+        unless partial =~ /十|百|千|拾/
+          if partial =~ /兆|億|万/
+            filtered_arr << filtered_arr.pop * TRANSMANS[partial.to_sym]
+          else
+            filtered_arr << partial.to_i
+          end
+          next
+        end
+        ar = []
+        TRANSUNIT.each do |key,value|
+          p_index = partial.index(key.to_s)
+          next unless p_index
+          ar << partial.slice(0..p_index)
+          partial = partial.slice(p_index + 1..-1 )
+        end
+        ar << partial unless partial.empty?
+        sum = 0
+        ar.each do |wo|
+          m_w = wo.match(/([0-9]+)([^0-9]+)/)
+          if m_w
+            return_num = m_w[1].to_i * TRANSUNIT[m_w[2].to_sym]
+          elsif wo.match(/([0-9]+)/)
+            return_num = wo.match(/([0-9]+)/)[1].to_i
+          else
+            return_num = TRANSUNIT[wo.match(/([^0-9]+)/)[1].to_sym]
+          end
+          sum += return_num
         end
-        sum += return_num
+        filtered_arr << sum
       end
-      filtered_arr << sum
+      return_num = filtered_arr.inject {|sum, n| sum + n }
+      return return_num
     end
-    return_num = filtered_arr.inject {|sum, n| sum + n }
-    return return_num
   end
 end

data/lib/jnum_to_anum/constant.rb

@@ -0,0 +1,11 @@
+class String
+  module JnumToAnum
+    TRANSMANS = {'兆': 1000000000000,
+                 '億': 100000000,
+                 '万': 10000}
+    TRANSUNIT = {'千': 1000,
+                 '百': 100,
+                 '拾': 10,
+                 '十': 10}
+  end
+end

data/lib/jnum_to_anum/version.rb

@@ -1,3 +1,3 @@
 module JnumToAnum
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jnum_to_anum
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - NishinoTakuma
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-21 00:00:00.000000000 Z
+date: 2017-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -71,6 +71,7 @@ files:
 - bin/setup
 - jnum_to_anum.gemspec
 - lib/jnum_to_anum.rb
+- lib/jnum_to_anum/constant.rb
 - lib/jnum_to_anum/version.rb
 homepage: https://github.com/nishinotakuma/jnum_to_anum
 licenses: