digit_delim 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 499bd98b3a7f8d5ecfe21007c4aeb977a3bbd5eb
-  data.tar.gz: 2cb6119fe67c908c10f739ef907e0959fac6d037
+  metadata.gz: 625afdfd364ac8456d5ec626b34f4ab708445617
+  data.tar.gz: de8a149c6432e687a48dc0bae53aad19d40cf6b2
 SHA512:
-  metadata.gz: 663574b84a12f6293f6c4278f2173f74bc3dfa401455789c00393019d945fb38dec53b0af41e57ba10ed6dc431a170e711ce477dd813ba2b833b7a9e3346b30d
-  data.tar.gz: 7f47fa71920b86271dfe5e1d97ada2228b2bf31fde8440d09bc31e96afb0343c7475170e58f2a182743af8318d9f2203090946bad35ccbefc47a2960b95ceea8
+  metadata.gz: f49c625cdc792c4ec22653be8a941562fb9e692a77ecd54fbb0904fbc2b9f03be1c4abf795b4f7711772e6b4099af834344f03ba52e991e7c7c017b762ffa532
+  data.tar.gz: 5fcecaf3132427733fac8a825b1b04e97f981f379547a60e3837dc240f7db78de6b815be77cff427e583c4d0660009566cce2f945dd71f301c13d0fe10a1e3f8

data/Rakefile

@@ -27,8 +27,8 @@ Jeweler::RubygemsDotOrgTasks.new
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
+  test.libs << 'test'
+  test.pattern = 'test/**/test*.rb'
   test.verbose = true
 end
 

data/ReadMe.md

@@ -13,7 +13,32 @@ provides the methods to separate a number with the delimiter for each 3 digits.
 
 ## Usage
 
-See the test code.
+```
+# 漢数字 (String) を数値 (Fixnum) に変換
+>> "百億".str_to_num
+=> 10000000000
+
+>> "12億3400万".str_to_num
+=> 1234000000
+
+# 数値を、漢数字に変換
+>> "12億3400万".str_to_num.num_to_str
+=> "12億3400万"
+
+# 数字文字列に3桁区切りのカンマを入れる
+>> "12億3400万".str_to_num.to_s.w_dm
+=> "1,234,000,000"
+
+# 4桁区切り
+>> "12億3400万".str_to_num.to_s.w_dm(-1,4)
+=> "12,3400,0000"
+
+# 区切り付きの数字文字列を数値 (Float) に変換
+>> "12億3400万".str_to_num.to_s.w_dm(-1,4).to_wof
+=> 1234000000.0
+```
+
+See the test code in `test/` for more detail.
 
 ## Lisence
 

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/digit_delim.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: digit_delim 0.1.0 ruby lib
+# stub: digit_delim 0.2.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "digit_delim"
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["YAMAMOTO, Masayuki"]
-  s.date = "2016-07-28"
+  s.date = "2016-07-30"
   s.description = "methods of num-string formatter, converter which extends String class"
   s.email = "martin.route66.blues+github@gmail.com"
   s.extra_rdoc_files = [

data/lib/kannum.rb

@@ -112,6 +112,10 @@ module KanNum
     tmp_str
   end
 
+  RE_NUM_O = "-.0-9"
+  RE_NUM = "[#{RE_NUM_O}]+"
+  RE_NONNUM = "[^#{RE_NUM_O} ]"
+
   # create parse tree for str:
   #   [ [[ num, Num, ... ], UnitNum], ... ]
   #
@@ -128,11 +132,14 @@ module KanNum
       if units.include?(c)
         tmp = tmp_ary.join
         # $stderr.puts "#{__method__} tmp: #{tmp}"
-        tmp = tmp.gsub(/([0-9]+)([^ 0-9])/, '\1 \2')
+        #tmp = tmp.gsub(/([0-9]+)([^ 0-9])/, '\1 \2')
+        tmp = tmp.gsub(/(#{RE_NUM})(#{RE_NONNUM})/, '\1 \2')
         # $stderr.puts "#{__method__} tmp: #{tmp}"
-        tmp = tmp.gsub(/([^ 0-9])([0-9]+)/, '\1 \2')
+        #tmp = tmp.gsub(/([^ 0-9])([0-9]+)/, '\1 \2')
+        tmp = tmp.gsub(/(#{RE_NONNUM})(#{RE_NUM})/, '\1 \2')
 
-        tmp = tmp.gsub(/([^ 0-9])([^ 0-9])/, '\1 \2')
+        #tmp = tmp.gsub(/([^ 0-9])([^ 0-9])/, '\1 \2')
+        tmp = tmp.gsub(/(#{RE_NONNUM})(#{RE_NONNUM})/, '\1 \2')
         # $stderr.puts "#{__method__} tmp: #{tmp}"
         tmp = tmp.split(/\s+/)
         # $stderr.puts "#{__method__} tmp: #{tmp}"
@@ -175,14 +182,16 @@ module KanNum
           # $stderr.puts "#{__method__} tmp_ary: #{tmp_ary}"
           a = 1
           b = N_倍数[tmp_ary[-1]]
-          a = tmp_ary[0].to_i if tmp_ary.size > 1
+          #a = tmp_ary[0].to_i if tmp_ary.size > 1
+          a = tmp_ary[0].to_f if tmp_ary.size > 1
 
           tmp += a*b
           tmp_ary = []
         end
       end
       # $stderr.puts "#{__method__} tmp_ary: #{tmp_ary}"
-      tmp += tmp_ary[0].to_i if tmp_ary.size != 0
+      #tmp += tmp_ary[0].to_i if tmp_ary.size != 0
+      tmp += tmp_ary[0].to_f if tmp_ary.size != 0
 
       tmp_u = N_単位数[u]
       if tmp_u.nil?
@@ -193,6 +202,11 @@ module KanNum
 
     end
 
+    if ret - ret.to_i > 0.0
+    else
+      ret = ret.to_i
+    end
+
     ret
   end
 
@@ -207,11 +221,71 @@ module KanNum
     ret
   end
 
+
+  #
+  #
+  #
+  def self.convert_helper( num )
+
+    tmp = nil
+    N_単位数.each_pair do |k,v|
+      # $stderr.puts "#{__method__} #{k} #{v}"
+      if num >= v
+        tmp ||= k
+        tmp = k if not(tmp.nil?) and v > N_単位数[tmp]
+        # $stderr.puts "#{__method__} tmp: #{tmp}"
+        next
+      else
+        break
+      end
+    end
+
+    tmp
+  end
+
+  def self.convert_phase0( num )
+    ret = []
+
+    tmp_num = num
+    while tmp = convert_helper(tmp_num)
+
+    u = N_単位数[tmp]
+    r = tmp_num/u
+    ret << [r.to_i, tmp]
+    tmp_num -= r*u
+    end
+
+    ret << tmp_num if tmp_num != 0
+    ret
+  end
+
+  def self.convert_phase1( ary )
+    ary.flatten.join
+  end
+
+  def self.num_to_str( num )
+
+    tmp = convert_phase0(num)
+    # $stderr.puts "{#{__method__}}result0: #{tmp}"
+    ret = convert_phase1(tmp)
+    # $stderr.puts "result1: #{ret}"
+
+    ret
+  end
+
 end
 
+
+#
+#
+#
 class String
   def str_to_num; KanNum.str_to_num self; end
 end
 
+class Fixnum
+  def num_to_str; KanNum.num_to_str self; end
+end
+
 
 #### endof filename: .rb

data/test/test_kannum.rb

@@ -1,6 +1,14 @@
 #
 # filename: test_kannum.rb
-# To do this test case, ``rake test``.
+# To do this test case,
+# ```
+# rake test
+# rake test TESTOPTS="--testcase=/KanNum/"
+# rake test TESTOPTS="--name=/basic/"
+# rake test TESTOPTS="--help"
+#
+# ```
+#
 #
 require "helper"
 require 'test/unit'
@@ -14,18 +22,28 @@ class TestKanNum < Test::Unit::TestCase
   def setup
 
     @pattern_t1 = "12億3456万"
+    @pattern_n1 = 12_3456_0000
+
     @pattern_t2 = "100億"
+    @pattern_n2 = 100_0000_0000
     @pattern_t21 = "百億"
     @pattern_t22 = "１００億"
 
     @pattern_t3 = "2千億3千4百十万"
+    @pattern_n3 = 2000_3410_0000
     @pattern_t31 = "2千億3千十万"
+    @pattern_n31 = 2000_3010_0000
     @pattern_t32 = "2千億千十万"
+    @pattern_n32 = 2000_1010_0000
 
     @pattern_t4 = "千百3十万"
+    @pattern_n4 = 1030_0000
     @pattern_t5 = "参拾"
-    @pattern_t51 = "参"
-    @pattern_t52 = "拾"
+    @pattern_n5 = 30
+    @pattern_t6 = "参"
+    @pattern_n6 = 3
+    @pattern_t7 = "拾"
+    @pattern_n7 = 10
 
   end
 
@@ -39,31 +57,31 @@ class TestKanNum < Test::Unit::TestCase
     assert_equal( exp, ret )
 
     ret = @pattern_t1.str_to_num
-    exp = 12_3456_0000
+    exp = @pattern_n1
     assert_equal( exp, ret )
 
     ret = KanNum.str_to_num @pattern_t2
-    exp = 100_0000_0000
+    exp = @pattern_n2
     assert_equal( exp, ret )
 
     ret = KanNum.str_to_num @pattern_t21
-    exp = 100_0000_0000
+    exp = @pattern_n2
     assert_equal( exp, ret )
 
     ret = KanNum.str_to_num @pattern_t22
-    exp = 100_0000_0000
+    exp = @pattern_n2
     assert_equal( exp, ret )
 
     ret = KanNum.str_to_num @pattern_t3
-    exp = 2000_3410_0000
+    exp = @pattern_n3
     assert_equal( exp, ret )
 
     ret = KanNum.str_to_num @pattern_t31
-    exp = 2000_3010_0000
+    exp = @pattern_n31
     assert_equal( exp, ret )
 
     ret = KanNum.str_to_num @pattern_t32
-    exp = 2000_1010_0000
+    exp = @pattern_n32
     assert_equal( exp, ret )
 
     ret = KanNum.str_to_num @pattern_t4
@@ -74,16 +92,28 @@ class TestKanNum < Test::Unit::TestCase
     exp = 30
     assert_equal( exp, ret )
 
-    ret = KanNum.str_to_num @pattern_t51
+    ret = KanNum.str_to_num @pattern_t6
     exp = 3
     assert_equal( exp, ret )
 
-    ret = KanNum.str_to_num @pattern_t52
+    ret = KanNum.str_to_num @pattern_t7
     exp = 10
     assert_equal( exp, ret )
 
   end
 
+  def test_str_to_num
+
+    ret = "0.7億".str_to_num
+    exp = 7000_0000
+    assert_equal( exp, ret )
+
+    ret = "-5.2億".str_to_num
+    exp = -5_2000_0000
+    assert_equal( exp, ret )
+
+  end
+
   def test_numable?
 
     ret = KanNum.numable? @pattern_t1
@@ -96,6 +126,51 @@ class TestKanNum < Test::Unit::TestCase
 
   end
 
+  def test_num_to_str
+
+    #
+    ret = 1_3200.num_to_str
+    exp = "1万3200"
+    assert_equal( exp, ret )
+
+    ret = @pattern_n1.num_to_str
+    exp = @pattern_t1
+    assert_equal( exp, ret )
+
+    ret = KanNum.num_to_str @pattern_n2
+    exp = @pattern_t2
+    assert_equal( exp, ret )
+
+    ret = KanNum.num_to_str @pattern_n3
+    exp = "2000億3410万"
+    assert_equal( exp, ret )
+
+    ret = @pattern_n31.num_to_str
+    exp = "2000億3010万"
+    assert_equal( exp, ret )
+
+    ret = @pattern_n32.num_to_str
+    exp = "2000億1010万"
+    assert_equal( exp, ret )
+
+    ret = @pattern_n4.num_to_str
+    exp = "1030万"
+    assert_equal( exp, ret )
+
+    ret = @pattern_n5.num_to_str
+    exp = "30"
+    assert_equal( exp, ret )
+
+    ret = @pattern_n6.num_to_str
+    exp = "3"
+    assert_equal( exp, ret )
+
+    ret = @pattern_n7.num_to_str
+    exp = "10"
+    assert_equal( exp, ret )
+
+  end
+
 end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: digit_delim
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - YAMAMOTO, Masayuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-28 00:00:00.000000000 Z
+date: 2016-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler