digit_delim 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e50f4a154d5c40562dfebe807077312afc745822
-  data.tar.gz: 9bf8033451bba472ca8b84d282ab070348e7feae
+  metadata.gz: 4b88f14aaa23708b6d5871ddb0091dd254c2a8f8
+  data.tar.gz: 176900dcc5f5fb58536a68995a4d31ad6a9a012d
 SHA512:
-  metadata.gz: 6683d34ae966505dc8b27d786e6beb54ad9a637ea4c8e9e39fdecd0789679f24c0a7938d97521c398a2fc798f9dc9b1ea54d06db5a48aaa7145ac6f294e9cae4
-  data.tar.gz: 329f504f02f0683473a5e08e073f2e22bf2305a45a677685909a48de91fb3eec2c337ebf71436ea8325cd55f4e78dc5ef3215af3a235036fa4f340263c0012b4
+  metadata.gz: a37abc2c0762fb0971fb90d6493e2df862b24972e5dba747bfb26d45ffe07a9b19ca02ebcd93d40273b1bcfa5abc838ad3515cabfa608f8b2baa42df5bbcfaa5
+  data.tar.gz: 3dfede9e812655f7485256d3c0723651aec96759ef9ffe92ab4ebcbdbaa7684c93d444e965bfe77b2fa5393fb1ccb16443b715c4aaff17cb60ece0eab9e8d64f

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/digit_delim.rb

@@ -14,19 +14,31 @@ class String
   # with delimiters: separate digit-string into each n-digits
   # with delimiters.
   # ==== Args
-  # n :: the number of digits length of separated string.
+  # adp :: length of digits after the decimal point.
+  #        (-1 if you want all of digits after the decimal point)
+  # n :: the number of digits length of each separated string.
   # ==== Return
   # separated string.
-  def w_dm(n=3); self.gsub( /(\d+)?(\.\d*)?/ ) { \
-    s1="#{$1}".dup; s2="#{$2}".dup; \
-    s2="#{s2}00".slice(0,s2.size) if s2.size != 0
-    s1.reverse.gsub( /\d{#{n}}(?=\d)/ ){|r| r+","}.reverse+s2 }; end
+  def w_dm(adp=-1, n=3)
+    self.gsub( /(\d+)?(\.\d*)?/ ) {
+      s1="#{$1}".dup; s2="#{$2}".dup;
+
+      if s2.size != 0
+        if adp == -1
+          s2="#{s2}00".slice(0, s2.size)
+        else
+          s2="#{s2}00".slice(0, adp+1)
+        end
+      end
+      s1.reverse.gsub( /\d{#{n}}(?=\d)/ ){|r| r+","}.reverse+s2
+    }
+  end
   alias to_f_old to_f
   
   # :method: wo_dm
   # without delimiters: remove the delimiters in digit-string.
   # ==== Args
-  #
+  # none.
   # ==== Return
   # digit-string without the delimiters.
   def wo_dm; self.gsub(/,/, ""); end
@@ -34,21 +46,30 @@ class String
   # :method: to_wof
   # remove delimiters in digit-string and convert it to Float.
   # ==== Args
-  #
+  # none.
   # ==== Return
-  # number in Float
+  # A number in Float.
   def to_wof; self.wo_dm.to_f_old; end
   
   # :method: to_fu
-  # convert string to float concerning with unit.
+  # convert digit-string into float concerning with unit.
   # ==== Args
-  #
+  # none.
   # ==== Return
-  # number in Float. if the original string has '%', the number is
-  # divided by 100.
+  # A number in Float. If the original string has '%', the number is
+  # divided by 100.0.
   def to_fu
     ret = self.to_wof
-    if self =~ /%$/ then ret /= 100.0 else ret end
+    # if self =~ /%$/ then ret /= 100.0 else ret end
+    case self
+    when /%$/
+      ret /= 100.0
+
+    else
+      ret
+
+    end
+
   end
 
 end

data/test/test_digit_delim.rb

@@ -1,7 +1,7 @@
 #!/usr/local/bin/ruby -w
 
 # filename: test_digit_delim.rb
-#
+# To do this test case, ``rake test``.
 #
 #require "rubygems"
 #gem "test-unit"
@@ -9,7 +9,7 @@
 require "helper"
 require 'test/unit'
 
-
+# Testee.
 require "digit_delim"
 
 
@@ -19,8 +19,11 @@ class TestDigitDelim < Test::Unit::TestCase
     assert_equal( "123", "123".w_dm )
     assert_equal( "23,456,789", "23456789".w_dm )
     assert_equal( "23,456,789.0123", "23456789.0123".w_dm )
-    assert_equal( "23,456,789.0123", "23456789.0123".w_dm(3) )
-    assert_equal( "2345,6789.0123", "23456789.0123".w_dm(4) )
+    assert_equal( "23,456,789.0123", "23456789.0123".w_dm(-1, 3) )
+    assert_equal( "2345,6789.0123", "23456789.0123".w_dm(-1, 4) )
+    
+    assert_equal( "23,456,789.01", "23456789.0123".w_dm(2) )
+    assert_equal( "2345,6789.01", "23456789.0123".w_dm(2,4) )
   end
 
   def test_w_dm_2
@@ -34,21 +37,35 @@ class TestDigitDelim < Test::Unit::TestCase
     assert_equal( "12,345,678.01234", "12345678.01234".w_dm )
   end
 
+  def test_w_dm_3
+    t_pat = 23456789.0123
+
+    assert_equal( "2345,6789.01", t_pat.to_s.w_dm(2, 4) )
+    assert_equal( "2,3,4,5,6,7,8,9.01", t_pat.to_s.w_dm(2, 1) )
+  end
+
   def test_wo_dm
     assert_equal( "100000", "100,000".wo_dm )
     assert_equal( "100000.0123", "100,000.0123".wo_dm )
   end
 
   def test_to_wof
-    assert_equal( 100, "100,000".to_f )
-    assert_equal( 100000, "100,000".to_wof )
+    exp = 100_000
 
+    assert_not_equal( exp, "100,000".to_f )
     assert_equal( 100.0, "100,000".to_f )
+
+    assert_equal( exp, "100,000".to_wof )
+    assert_not_equal( exp.to_s, "100,000".to_wof.to_s )
+    assert_equal( exp.to_s + ".0", "100,000".to_wof.to_s )
+
   end
 
   def test_to_wof_stocks
     assert_equal( 1, "1株".to_wof )
     assert_equal( 1.05, "1.05株".to_wof )
+
+    assert_equal( 10, "10百万円".to_wof )
   end
 
   def test_to_fu

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: digit_delim
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - YAMAMOTO, Masayuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-31 00:00:00.000000000 Z
+date: 2013-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
@@ -118,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.1.9
 signing_key: 
 specification_version: 4
 summary: A little num-string formatter, converter.