digit_delim 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 625afdfd364ac8456d5ec626b34f4ab708445617
-  data.tar.gz: de8a149c6432e687a48dc0bae53aad19d40cf6b2
+  metadata.gz: 482a179eb70f97b84a6dad8dbf8cf0c33934a755
+  data.tar.gz: 101b6f1f99854030ee3d326d45fa33327bad73af
 SHA512:
-  metadata.gz: f49c625cdc792c4ec22653be8a941562fb9e692a77ecd54fbb0904fbc2b9f03be1c4abf795b4f7711772e6b4099af834344f03ba52e991e7c7c017b762ffa532
-  data.tar.gz: 5fcecaf3132427733fac8a825b1b04e97f981f379547a60e3837dc240f7db78de6b815be77cff427e583c4d0660009566cce2f945dd71f301c13d0fe10a1e3f8
+  metadata.gz: bdd60ff0d7b2b78d1014205d6d312638a7224dee1d2e8ee22b2d234b63d832ea05e3d5645c935de2f00d716554db5ed7b500e6755f313bc1f5a22ee8038df12e
+  data.tar.gz: 31fae4990d428e93995febfa6d20390f2b58fc9b5dbcf5f9e71d218262badbe0291d5ea1bdced022ac186e8f47accf37e0cd8a4545e190bf27d0a8770e474197

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.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.2.0 ruby lib
+# stub: digit_delim 0.3.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "digit_delim"
-  s.version = "0.2.0"
+  s.version = "0.3.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-30"
+  s.date = "2016-08-07"
   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

@@ -27,6 +27,9 @@ module KanNum
     '７'=>7,
     '８'=>8,
     '９'=>9,
+
+    '−'=>'-',   # 全角マイナス => '-'
+    '-'=>'-',   # minus (dummy map)
   }
 
   N_数_ext = {
@@ -212,12 +215,20 @@ module KanNum
 
   def self.str_to_num( str )
 
+    minus_f = false
+    if str =~ /^-/
+      str = str.gsub(/^-/, '')
+      minus_f = true
+    end
+
     tmp = translate_phase0(str)
     # $stderr.puts "result0: #{tmp}"
     tmp = translate_phase1(tmp)
     # $stderr.puts "result1: #{tmp}"
     ret = translate_phase2(tmp)
 
+    ret *= -1 if minus_f
+
     ret
   end
 
@@ -265,11 +276,21 @@ module KanNum
 
   def self.num_to_str( num )
 
+    minus_f = false
+    if num < 0
+      num *= -1
+      minus_f = true
+    end
+
     tmp = convert_phase0(num)
     # $stderr.puts "{#{__method__}}result0: #{tmp}"
     ret = convert_phase1(tmp)
     # $stderr.puts "result1: #{ret}"
 
+    if minus_f
+      ret = "-"+ret
+    end
+
     ret
   end
 

data/test/test_kannum.rb

@@ -56,6 +56,10 @@ class TestKanNum < Test::Unit::TestCase
     exp = 1_3200
     assert_equal( exp, ret )
 
+    ret = "-3億900万".str_to_num
+    exp = -3_0900_0000
+    assert_equal( exp, ret )
+
     ret = @pattern_t1.str_to_num
     exp = @pattern_n1
     assert_equal( exp, ret )
@@ -133,6 +137,10 @@ class TestKanNum < Test::Unit::TestCase
     exp = "1万3200"
     assert_equal( exp, ret )
 
+    ret = -3_0900_0000.num_to_str
+    exp = "-3億900万"
+    assert_equal( exp, ret )
+
     ret = @pattern_n1.num_to_str
     exp = @pattern_t1
     assert_equal( exp, ret )

metadata

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