bangou 1.0 → 1.1

data/Gemfile

@@ -1,5 +1,4 @@
 source :rubygems
 
-group :development, :test do
-	gem "bacon"
-end
+gem "rake"
+gem "bacon"

data/Rakefile

@@ -1,6 +1,6 @@
 
 task :spec do
-	sh "bacon spec/bangou_spec.rb"
+	sh "bacon spec/*_spec.rb"
 end
 
 task :default => :spec

data/lib/bangou.rb

@@ -1,5 +1,7 @@
 # encoding: UTF-8
 
+require 'extensions/integer.rb'
+
 class Bangou
   class OutOfRangeException < Exception; end
 
@@ -50,7 +52,7 @@ class Bangou
   EXCEPTIONS = {}
 
   ZEROES = {
-    :text    => "ぜろ",
+    :text    => "ゼロ",
     :numeral => "０"
   }
 
@@ -71,23 +73,32 @@ class Bangou
     return ZEROES[format] if int == 0
     digits = int.to_s.split(//).reverse
 		digits.each_with_index.map do |digit, power|
-			num  = digit.to_i
-			base = 10 ** power
-			if value = exceptions(num * base, format)
-				value
-			else
-				if num > 0
-					if power > 4
-						text = exceptions(num * base/10000, format) || numerals(num, format) + bases(base/10000, format)
-						text += bases(10000, format) unless digits.size > 1 and (digits[0..power - 1] & ("1".."9").to_a).size > 0
-					else
-						text = numerals(num, format) + bases(base, format)
-					end
-				end
-        text = text[1..-1] if text =~ /^(一).+/
-        text = text[2..-1] if text =~ /^(いち).+/
-				text
-			end
+			hide_base_from_value = has_more_digits_before_index?(digits, power)
+			characters_for_digit_in_base(digit.to_i, 10 ** power, format, hide_base_from_value)
 		end.reverse.join
   end
+
+  def self.strip_unneeded_characters text
+		text = text[1..-1] if text =~ /^(一).+/
+		text = text[2..-1] if text =~ /^(いち).+/
+		text
+	end
+
+	def self.has_more_digits_before_index?(digits, index)
+		digits.size > 1 and (digits[0..index - 1] & ("1".."9").to_a).size > 0
+	end
+
+  def self.characters_for_digit_in_base(num, base, format, hide_base_from_value)
+		if text = exceptions(num * base, format)
+			text
+		else
+			if num > 0 and base > 10000
+				text = exceptions(num * base/10000, format) || characters_for_digit_in_base(num, base/10000, format, hide_base_from_value)
+				text += bases(10000, format) unless hide_base_from_value
+			elsif num > 0
+				text = numerals(num, format) + bases(base, format)
+			end
+			strip_unneeded_characters(text)
+		end
+	end
 end

data/lib/extensions/integer.rb

@@ -0,0 +1,11 @@
+
+class Integer
+
+	def to_j
+		Bangou.integer_to_japanese_numerals(self)
+	end
+
+	def to_jtext
+		Bangou.integer_to_japanese_text(self)
+	end
+end

data/readme.md

@@ -2,11 +2,20 @@
 
 A Ruby library for converting between positive integers and Sino-Japanese numbers or text.
 
+[![Build Status](https://travis-ci.org/kattrali/bangou.png?branch=master)](Build Status)
+
 ## Usage
 
 ```
 require 'bangou'
 
+
+89.to_j
+# => "八十九"
+
+289.to_jtext
+# => "二百八十九"
+
 Bangou.integer_to_japanese_numerals(2305)
 # => "二千三百五"
 

data/spec/bangou_spec.rb

@@ -60,7 +60,7 @@ describe "Bangou" do
 
 		it "ignores zeroes, unless the number is just zero" do
 			compare(7509,  "ななせんごひゃくきゅう")
-      compare(0,     "ぜろ")
+      compare(0,     "ゼロ")
 			compare(80000, "はちまん")
 			compare(80001, "はちまんいち")
 			compare(80020, "はちまんにじゅう")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bangou
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: '1.1'
   prerelease: 
 platform: ruby
 authors:
@@ -40,6 +40,7 @@ files:
 - LICENSE
 - readme.md
 - lib/bangou.rb
+- lib/extensions/integer.rb
 - spec/bangou_spec.rb
 homepage: http://kattrali.github.com/bangou
 licenses: []