chinese_numerals 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c0390909dd344229b6cb2f2136213ff1fb55d49
-  data.tar.gz: f5c83024665d0d2c04519eb476d3a3c7b33e7c0c
+  metadata.gz: 824c680508fe9a51c6eb7faa7395f8845afd24e6
+  data.tar.gz: 9a6f26dbc6aee7a4197d1a0b496583eadfcc11fa
 SHA512:
-  metadata.gz: e454675c52fc8d54d9516fd88973a23fd3cdc879ff90f24d153d2808e3e0af13dd9b84ced5e728a29f04490eae4cf8b253d6a1739ee14f74eee6b4d63bdf12e4
-  data.tar.gz: 268cb2b703c7fcda17d13978647ef5ff24c906dcf0fa62eca6ef11a520b741a13dd6ccf64a8b2fc7638a021102c0bc3939800f7195c6d3cefaa8bcf114f8bdef
+  metadata.gz: 3ce7cf55503d82251ad7065832c9d54309e777c0ce5cf9ea871415eaeb50dd7f6fb96704fc60c825970cf73d0aa383089a12a00527a87c049aef46ce1e2cbe3a
+  data.tar.gz: 3f38015e8e77a3eb1202dcd23894e3f1351a1f4812db7a9435a5c477ed9e0f21d2462656711ebce00ddefc52ae692ee936dec321d76ebb5c3c0e34f59d444ff7

data/lib/chinese_numerals/version.rb

@@ -1,3 +1,3 @@
 module ChineseNumerals
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/chinese_numerals.rb

@@ -12,7 +12,8 @@ Integer.class_eval do
   def to_chinese(args = {})
     opts = {
       :simple => true,
-      :decimal => false
+      :decimal => false,
+      :shorten => false
     }.merge args
 
     chinese_numbers  = opts[:simple] ? SIMPLE_CHINESE_NUMBERS  : FORMAL_CHINESE_NUMBERS
@@ -28,6 +29,12 @@ Integer.class_eval do
 
       0.upto len - 1 do |i|
         digit = str[i].to_i
+
+        if (i == 0) && (digit == 1) && (len % 4 == 2) && opts[:shorten]
+          res << chinese_decimals[1]
+          next
+        end
+
         if digit == 0
           zeros += 1
         else
@@ -38,10 +45,10 @@ Integer.class_eval do
           res << chinese_numbers[digit] + chinese_decimals[(len - 1 - i) % 4]
         end
         # append group name unless 4 zeros met
-        if (len - 1 - i) % 4 == 0
-          res << CHINESE_GROUPS[(len - 1 - i) / 4] unless zeros == 4
-          # reset zeros for each group
-          zeros = 0
+        if ((len - 1 - i) % 4 == 0) && (zeros < 4)
+            res << CHINESE_GROUPS[(len - 1 - i) / 4]
+            # reset zeros for each group
+            zeros = 0
         end
       end
 

data/spec/chinese_number_spec.rb

@@ -34,8 +34,11 @@ describe Integer do
   end
 
   it "knows output and omit zeros in decimal mode" do
-    10000002000.to_chinese(:decimal => true).must_equal("一百億二千")
+    10000000200.to_chinese(:decimal => true).must_equal("一百億零二百")
   end
 
+  it "is able to shorten the leading 1 in decimal mode" do
+    108000.to_chinese(:decimal => true, :shorten => true).must_equal("十萬八千")
+  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chinese_numerals
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Fox Chao