rmb_chinese_yuan 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 360863d5103d53600a46d4002b0d018815bce409
-  data.tar.gz: 7ada7fa235b4c07692c683fdc84b0eccb0225069
+  metadata.gz: b59417b31ca04031e25a0beeede5e5f7d42a14cf
+  data.tar.gz: fff437f17f0c20dc43e37ecf1a17b2aee75fc20e
 SHA512:
-  metadata.gz: 51d1464431aef9acfb5c57eed724b7916c43970fc8d99003c18a011a535b368ee0ca8461eb801c0daf639cc6cb7324e7a38c64999957469aa254bca84329ed90
-  data.tar.gz: d7ca2d6d2f749a13f02629d5d8e0bf1c126157aa2547782b1b07860c3f91038c1404ac1730af0033f1a0f962570269c4c45f575a39481da86729bc55c2be2b11
+  metadata.gz: c2406cc374e5599d3785cf6c83a107258a1b57e9cf446b7c10a6fc1dcf68e2024c180b390f81f04b9e44ac0eb971c4b36879b6f0fc243f0493a5661c990d08f9
+  data.tar.gz: 41f319719d0bf7f9f083f0ca3b75d8875d8ce3a86a8ee9bd5a4c2d7e95b935762e7269b65f2701481a4f86d3b74971328d8dcc2b8644f65d8a3dc5989bf50e34

data/.travis.yml

@@ -2,3 +2,4 @@ language: ruby
 rvm:
   - 2.2.2
 before_install: gem install bundler -v 1.10.5
+cache: bundler

data/Gemfile

@@ -2,3 +2,9 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in rmb.gemspec
 gemspec
+
+gem 'bundler', '~> 1.10'
+gem 'rake', '~> 10.0'
+gem 'minitest'
+gem 'pry-byebug'
+gem 'codeclimate-test-reporter'

data/README.md

@@ -1,5 +1,10 @@
 # RMB
 
+[![Gem Version](https://badge.fury.io/rb/rmb_chinese_yuan.svg)](https://badge.fury.io/rb/rmb_chinese_yuan)
+[![Build Status](https://travis-ci.org/ifyouseewendy/rmb.svg?branch=master)](https://travis-ci.org/ifyouseewendy/rmb)
+[![Code Climate](https://codeclimate.com/github/ifyouseewendy/rmb/badges/gpa.svg)](https://codeclimate.com/github/ifyouseewendy/rmb)
+[![Test Coverage](https://codeclimate.com/github/ifyouseewendy/rmb/badges/coverage.svg)](https://codeclimate.com/github/ifyouseewendy/rmb/coverage)
+
 RMB is a gem helps you generate money in Chinese Yuan.
 
 ## Installation

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "rmb_chinese_yuan"
+require 'bundler/setup'
+require 'rmb_chinese_yuan'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -12,9 +12,9 @@ require "rmb_chinese_yuan"
 
 
 begin
-  require "pry"
+  require 'pry'
   Pry.start
 rescue LoadError
-  require "irb"
+  require 'irb'
   IRB.start
 end

data/lib/rmb_chinese_yuan.rb

@@ -1,7 +1,7 @@
-require "rmb_chinese_yuan/version"
+require 'rmb_chinese_yuan/version'
 
 begin
-  require "pry"
+  require 'pry'
 rescue LoadError
 end
 
@@ -11,7 +11,7 @@ class RMB
   INTEGER_UNIT  = %w(亿 万 元)
   DECIMAL_UNIT  = %w(整 角 分)
 
-  attr_reader :integer, :decimal
+  attr_reader :integer, :decimal, :parts, :words
 
   def initialize(money)
     @integer, @decimal = preprocess(money)
@@ -27,19 +27,19 @@ class RMB
     def preprocess(money)
       money = money.to_s
 
-      raise ArgumentError, "Not a valid money<#{money}>" \
+      fail ArgumentError, "Not a valid money<#{money}>" \
         unless money.match(/^[\d|,|\.]+/)
 
-      integer, decimal = money.gsub(',', '').split('.')
-      decimal = decimal ? decimal[0,2] : ''
+      integer, decimal = money.delete(',').split('.')
+      decimal = decimal ? decimal[0, 2] : ''
 
-      raise ArgumentError, "Integer part of money<#{money}> is invalid" \
+      fail ArgumentError, "Integer part of money<#{money}> is invalid" \
         unless integer.match(/^\d*$/)
 
-      raise ArgumentError, "Decimal part of money<#{money}> is invalid" \
+      fail ArgumentError, "Decimal part of money<#{money}> is invalid" \
         unless decimal.match(/^\d*$/)
 
-      raise ArgumentError, "Integer part of money<#{money}> is longer than 12" \
+      fail ArgumentError, "Integer part of money<#{money}> is longer than 12" \
         if integer.length > 12
 
       [integer, decimal]
@@ -52,20 +52,17 @@ class RMB
     end
 
     def convert_decimal
-      return DECIMAL_UNIT[0] if @decimal.to_i.zero?
+      return DECIMAL_UNIT[0] if decimal.to_i.zero?
 
-      jiao, fen = @decimal.chars.map(&:to_i)
-      res = ''
+      jiao, fen = split_into_digits(decimal, direction: :tail, count: 2)
 
-      if jiao.zero? && fen.to_i.nonzero?
-        res << NUMBERS[jiao]
-        res << [ NUMBERS[fen], DECIMAL_UNIT[2] ].join
+      if jiao.zero? && fen.nonzero?
+        [NUMBERS[0], NUMBERS[fen], DECIMAL_UNIT[2]].join
       else
-        res << [ NUMBERS[jiao], DECIMAL_UNIT[1] ].join
-        res << [ NUMBERS[fen],  DECIMAL_UNIT[2] ].join if fen && fen.nonzero?
+        res = [NUMBERS[jiao], DECIMAL_UNIT[1]].join
+        res << [NUMBERS[fen],  DECIMAL_UNIT[2]].join if fen.nonzero?
+        res
       end
-
-      res
     end
 
     def join(integer_words, decimal_words)
@@ -88,19 +85,18 @@ class RMB
     end
 
     def read_into_words
-      @words = @parts.reduce([]){|ar, part| ar << read_integer(part) }
+      @words = parts.reduce([]){ |ar, part| ar << read_integer(part) }
     end
 
     def read_integer(number)
       return NUMBERS[0] if number.zero?
 
-      numbers = number.to_s.chars.map(&:to_i)
-      numbers.unshift 0 while numbers.count < 4
+      numbers = split_into_digits(number)
 
       numbers.each_with_index.reduce('') do |str, (n, i)|
         if n.nonzero?
-          str << [ NUMBERS[n], PART_UNIT[i] ].join
-        elsif !str.empty? && i+1 < 4 && numbers[i+1].nonzero?
+          str << [NUMBERS[n], PART_UNIT[i]].join
+        elsif !str.empty? && i + 1 < 4 && numbers[i+1].nonzero?
           str << NUMBERS[0]
         else
           str
@@ -108,35 +104,51 @@ class RMB
       end
     end
 
+    def split_into_digits(number, direction: :head, count: 4)
+      digits = number.to_s.chars.map(&:to_i)
+      if direction == :head
+        digits.unshift 0 while digits.count < count
+      else
+        digits.push 0 while digits.count < count
+      end
+      digits
+    end
+
     def join_words
-      res = ''
+      res = [part_yi, part_wan, part_ge].join
+      res << INTEGER_UNIT[2]
+    end
 
-      yi, wan, ge = @parts
+    def part_yi
+      [words[0], INTEGER_UNIT[0]].join unless parts[0].zero?
+    end
 
-      res << [ @words[0], INTEGER_UNIT[0] ].join if yi.nonzero?
+    def part_wan
+      yi, wan, ge = parts
 
       if wan.zero?
         if yi.nonzero? && ge.nonzero?
-          res << NUMBERS[0]
+          NUMBERS[0]
         end
       else
-        if yi.nonzero? && (wan/1000).zero?
-          res << NUMBERS[0]
-        end
-        res << [ @words[1], INTEGER_UNIT[1] ].join
+        res = [words[1], INTEGER_UNIT[1]]
+        res.unshift NUMBERS[0] if yi.nonzero? && (wan / 1000).zero?
+        res.join
       end
+    end
+
+    def part_ge
+      yi, wan, ge = parts
 
       if ge.zero?
         if yi.zero? && wan.zero?
-          res << @words[2]
+          words[2]
         end
       else
-        if wan.nonzero? && (ge/1000).zero?
-          res << NUMBERS[0]
-        end
-        res << @words[2]
+        res = [words[2]]
+        res.unshift NUMBERS[0] if wan.nonzero? && (ge / 1000).zero?
+        res.join
       end
 
-      res << INTEGER_UNIT[2]
     end
 end

data/lib/rmb_chinese_yuan/version.rb

@@ -1,3 +1,3 @@
 module RmbChineseYuan
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/rmb_chinese_yuan.gemspec

@@ -4,23 +4,20 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'rmb_chinese_yuan/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "rmb_chinese_yuan"
+  spec.name          = 'rmb_chinese_yuan'
   spec.version       = RmbChineseYuan::VERSION
-  spec.authors       = ["Di Wen"]
-  spec.email         = ["ifyouseewendy@gmail.com"]
+  spec.authors       = ['Di Wen']
+  spec.email         = ['ifyouseewendy@gmail.com']
 
   spec.summary       = %q{RMB is a gem helps you generate money in Chinese Yuan.}
   spec.description   = %q{RMB is a gem helps you generate money in Chinese Yuan.}
-  spec.homepage      = "http://github.com/ifyouseewendy/rmb"
-  spec.license       = "MIT"
+  spec.homepage      = 'http://github.com/ifyouseewendy/rmb'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", "~> 1.10"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest"
-  spec.add_development_dependency "pry-byebug"
+  spec.required_ruby_version = '>= 2.0.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rmb_chinese_yuan
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Di Wen
@@ -9,63 +9,7 @@ autorequire:
 bindir: exe
 cert_chain: []
 date: 2015-11-14 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.10'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+dependencies: []
 description: RMB is a gem helps you generate money in Chinese Yuan.
 email:
 - ifyouseewendy@gmail.com
@@ -97,7 +41,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="