number_to_cn 0.0.3 → 0.0.4

data/.gitignore

@@ -8,6 +8,8 @@ InstalledFiles
 _yardoc
 coverage
 doc/
+coverage
+InstalledFiles
 lib/bundler/man
 pkg
 rdoc
@@ -15,3 +17,8 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+
+# YARD artifacts
+.yardoc
+_yardoc
+doc/

data/README.md

@@ -18,7 +18,17 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+so simple to use:
+
+require 'number_to_cn'
+
+123.to_cn_words #=>
+
+123.to_cn_clearly #=>
+
+0.1.to_cn_words #=>
+
+0.to_cn_words #=>
 
 ## Contributing
 
@@ -27,3 +37,9 @@ TODO: Write usage instructions here
 3. Commit your changes (`git commit -am 'Added some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+=======
+number_to_cn
+============
+
+transfer number into chinese characters
+>>>>>>> 6447d6a2f58a576d6d94a6ed5896b33cf1a43204

data/lib/ext/float_ext.rb

@@ -0,0 +1,5 @@
+require 'number_to_cn/methods.rb'
+
+class Float
+  include NumberToCn
+end

data/lib/ext/integer_ext.rb

@@ -2,4 +2,4 @@ require 'number_to_cn/methods.rb'
 
 class Integer
   include NumberToCn
-end
+end

data/lib/number_to_cn/methods.rb

@@ -1,43 +1,59 @@
 #encoding:utf-8
 module NumberToCn 
-
   CN_T_TRANS = [ "", "壹", "贰", "叁", "肆", "伍", "陆", "柒", "捌", "玖", "拾" ]
+  CN_T_TRANS_WITH_ZERO = [ "零", "壹", "贰", "叁", "肆", "伍", "陆", "柒", "捌", "玖", "拾" ]
   CN_T_POSITION = [ "", "拾", "佰", "仟" ]
-  CN_T_BIG = [ "", "萬", "亿"]
+  CN_T_BIG = [ "", "萬", "亿", "萬"]
 
   def to_cn_words
-    num_arr = self.to_s.split("").reverse
-    rst_arr = []
-
-    writable = -1 
-    #1：0是需要写的。
-    #0：0不需要写； 
-    #-1：全不需要写；
-
-    num_arr.each_with_index do |value, index|
-      writable = -1 if index%4 == 0
-
-      cc = (index % 4 == 0) ? CN_T_BIG[index/4] : ""
-      aa = CN_T_TRANS[value.to_i]
-
-      if value.to_i == 0
-        writable = (writable == 1) ? 0 : -1
-      else
-        writable = 1
+    if self.class == Fixnum
+      return "零" if self == 0
+      num_arr = self.to_s.split("").reverse
+      rst_arr = []
+
+      writable = -1 
+      #1：0是需要写的。
+      #0：0不需要写； 
+      #-1：全不需要写；
+
+      num_arr.each_with_index do |value, index|
+        writable = -1 if index%4 == 0
+
+        cc = (index % 4 == 0) ? CN_T_BIG[index/4] : ""
+        aa = CN_T_TRANS[value.to_i]
+
+        if value.to_i == 0
+          writable = (writable == 1) ? 0 : -1
+        else
+          writable = 1
+        end
+
+        if writable == 1
+          bb = CN_T_POSITION[index%4]
+        elsif writable == -1
+          bb = ""
+        else
+          bb = "零"
+        end
+
+        rst_arr << aa + bb + cc
       end
 
-      if writable == 1
-        bb = CN_T_POSITION[index%4]
-      elsif writable == -1
-        bb = ""
-      else
-        bb = "零"
-      end
-
-      rst_arr << aa + bb + cc
+      rst_arr.reverse.join
+    elsif self.class == Float
+      before_point = self.to_s.split(".")[0]
+      after_point = self.to_s.split(".")[1]
+      "#{before_point.to_i.to_cn_words}点#{after_point.to_i.to_cn_clearly}"
     end
-
-    rst_arr.reverse.join
   end
   
+  def to_cn_clearly
+    digits_arr = self.to_s.split('')
+    rst = ""
+    digits_arr.map do |d|
+      rst << CN_T_TRANS_WITH_ZERO[d.to_i]
+    end
+    rst
+  end
+
 end

data/lib/number_to_cn/version.rb

@@ -1,3 +1,3 @@
 module NumberToCn
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/number_to_cn.rb

@@ -1,3 +1,4 @@
 #encoding: utf-8
 require "number_to_cn/version"
-require "ext/integer_ext"
+require "ext/integer_ext"
+require "ext/float_ext"

data/spec/number_to_cn_spec.rb

@@ -3,7 +3,18 @@ require 'spec_helper'
 
 describe NumberToCn do
   it "should go works" do
-    (2203.to_cn_words).should == "贰仟贰佰零叁"
+    (2203.to_cn_words).should eq("贰仟贰佰零叁")
   end
+
+  it "worked for zero" do
+    (0.to_cn_words).should eq("零")
+  end
+
+  it "worked for float" do
+    ((33.0).to_cn_words).should eq("叁拾叁点零")
+  end 
   
+  it "works in clear transfer" do 
+    (203.to_cn_clearly).should eq("贰零叁")
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: number_to_cn
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-23 00:00:00.000000000 Z
+date: 2012-07-19 00:00:00.000000000 Z
 dependencies: []
 description: simply gem for put digits number into cn.
 email:
@@ -18,11 +18,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .DS_Store
 - .gitignore
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
+- lib/.DS_Store
+- lib/ext/float_ext.rb
 - lib/ext/integer_ext.rb
 - lib/number_to_cn.rb
 - lib/number_to_cn/methods.rb
@@ -50,7 +53,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: ! '123.to_cn_words #'