wintr 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61ab5b7f12b66cddc01c68cf6ae80a291f647468
-  data.tar.gz: 94c81209b089347fa155a581983dc1ad875e7bdb
+  metadata.gz: c211ba5de98d2c20f5618d5113efec566fba93b6
+  data.tar.gz: ff40cda74a2495cf4c4f52a258dd704cf4bf7566
 SHA512:
-  metadata.gz: 3943a4886fd78ea55786cff45dab2cffc6792652dd986813d70143177d4ef8d500d38fa0c3a97084ebb6d8f505662bc449c399dca419c55676e5e30424b218ca
-  data.tar.gz: d1f58301a5e4780080b8554b70b432f02bfb69001f1916dc6dbc38518271295439ddfe4ea72decd140d2e6d210400a18f6b9f914abce5a3b92808c9dddeb4171
+  metadata.gz: fa8c452c75a9e2f15a3dde4c8dc90f783237eccff76c50531addd02fa955603ae8bbf5cc8a48ff4c0a5d0c14a109fdb22268195ac1c3914e70ff5c4d2083993b
+  data.tar.gz: a9b7757053821a864b574f768e385d950e3fc943a40bcf22ee09d1d9a80390315c666f1f45f90ba8572c01e2418f1a43459d1d80c9ab2f1aef744416e9e0c13c

data/lib/wintr.rb

@@ -1,2 +1,3 @@
 require 'wintr/version'
+require 'wintr/constants'
 require 'wintr/number'

data/lib/wintr/constants.rb

@@ -0,0 +1,75 @@
+module Wintr
+  UNITS = {
+    '0' => '',
+    '1' => 'one',
+    '2' => 'two',
+    '3' => 'three',
+    '4' => 'four',
+    '5' => 'five',
+    '6' => 'six',
+    '7' => 'seven',
+    '8' => 'eight',
+    '9' => 'nine'
+  }
+
+  TENS = {
+    '2' => 'twenty',
+    '3' => 'thirty',
+    '4' => 'forty',
+    '5' => 'fifty',
+    '6' => 'sixty',
+    '7' => 'seventy',
+    '8' => 'eighty',
+    '9' => 'ninety'
+  }
+
+  TEN_TO_NINETEEN = {
+    '10' => 'ten',
+    '11' => 'eleven',
+    '12' => 'twelve',
+    '13' => 'thirteen',
+    '14' => 'fourteen',
+    '15' => 'fifteen',
+    '16' => 'sixteen',
+    '17' => 'seventeen',
+    '18' => 'eighteen',
+    '19' => 'nineteen'
+  }
+
+  POWER_OF_THOUSAND = {
+    0 => '',
+    1 => 'thousand',
+    2 => 'million',
+    3 => 'billion',
+    4 => 'trillion',
+    5 => 'quadrillion',
+    6 => 'quintillion',
+    7 => 'sextillion',
+    8 => 'septillion',
+    9 => 'octillion',
+    10 => 'nonillion',
+    11 => 'decillion',
+    12 => 'undecillion',
+    13 => 'duodecillion',
+    14 => 'tredecillion',
+    15 => 'quattuordecillion',
+    16 => 'quindecillion',
+    17 => 'sexdecillion',
+    18 => 'septendecillion',
+    19 => 'octodecillion',
+    20 => 'novemdecillion',
+    21 => 'vigintillion',
+    22 => 'unvigintillion',
+    23 => 'duovigintillion',
+    24 => 'trevigintillion',
+    25 => 'quattuorvigintillion',
+    26 => 'quinvigintillion',
+    27 => 'sexvigintillion',
+    28 => 'septenvigintillion',
+    29 => 'octovigintillion',
+    30 => 'novemvigintillion',
+    31 => 'trigintillion',
+    32 => 'untrigintillion',
+    33 => 'duotrigintillion'
+  }
+end

data/lib/wintr/digit_array.rb

@@ -0,0 +1,22 @@
+require 'wintr/units'
+require 'wintr/tens_units'
+require 'wintr/hundreds_tens_units'
+
+module Wintr
+  class DigitArray
+    def initialize(digits)
+      @digits = digits
+    end
+
+    def to_s
+      case @digits.size
+      when 1
+        Units.new(*@digits)
+      when 2
+        TensUnits.new(*@digits)
+      when 3
+        HundredsTensUnits.new(*@digits)
+      end.to_s
+    end
+  end
+end

data/lib/wintr/hundreds_tens_units.rb

@@ -0,0 +1,24 @@
+module Wintr
+  class HundredsTensUnits
+    def initialize(hundreds, tens, units)
+      @hundreds, @tens, @units = hundreds, tens, units
+    end
+
+    def to_s
+      return '' if @hundreds == '0' && @tens == '0' && @units == '0'
+      "#{hundreds} #{and_join} #{tens_and_units}".strip
+    end
+
+    def hundreds
+      Units.new(@hundreds).to_s + ' hundred' if @hundreds != '0'
+    end
+
+    def and_join
+      'and' unless @tens == '0' && @units == '0'
+    end
+
+    def tens_and_units
+      TensUnits.new(@tens, @units).to_s
+    end
+  end
+end

data/lib/wintr/number.rb

@@ -1,5 +1,4 @@
-require 'wintr/weighted_digit_group'
-require 'wintr/word_array'
+require 'wintr/weighted_digit_array'
 
 module Wintr
   class Number
@@ -10,16 +9,16 @@ module Wintr
     def to_s
       return 'zero' if @number == 0
 
-      word_array = []
-      digit_array = @number.to_s.chars.to_a
-      power_of_thousand = 0
+      number_in_groups_of_three.each_with_index.inject([]) do |number_as_words_array, (digit_array, power_of_thousand)|
+        number_as_words_array.unshift(WeightedDigitArray.new(digit_array, power_of_thousand).to_s)
+      end.join(' ').squeeze(' ').strip
+    end
+
+    def number_in_groups_of_three
+      # 1,234,567 #=> [%w[5 6 7], %w[2 3 4], %w[1]]
 
-      until digit_array == [] do
-        digit_group = digit_array.pop(3)
-        word_array.unshift(WeightedDigitGroup.new(digit_group, power_of_thousand).to_s)
-        power_of_thousand += 1
-      end
-      WordArray.new(word_array).to_s
+      # TODO: Simplify!
+      @number.to_s.chars.to_a.reverse.each_slice(3).inject([]) {|number_as_words_array, three_digit_array| number_as_words_array << three_digit_array.reverse}
     end
   end
 end

data/lib/wintr/tens_units.rb

@@ -0,0 +1,13 @@
+module Wintr
+  class TensUnits
+    def initialize(tens, units)
+      @tens, @units = tens, units
+    end
+
+    def to_s
+      return '' if @tens == '0' && @units == '0'
+      return TEN_TO_NINETEEN[@tens + @units] if @tens == '1'
+      "#{TENS[@tens]} #{Units.new(@units)}".strip
+    end
+  end
+end

data/lib/wintr/units.rb

@@ -0,0 +1,11 @@
+module Wintr
+  class Units
+    def initialize(units)
+      @units = units
+    end
+
+    def to_s
+      UNITS[@units]
+    end
+  end
+end

data/lib/wintr/version.rb

@@ -1,3 +1,3 @@
 module Wintr
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/lib/wintr/weighted_digit_array.rb

@@ -0,0 +1,21 @@
+require 'wintr/digit_array'
+
+module Wintr
+  class WeightedDigitArray
+    def initialize(digit_array, power_of_thousand)
+      @digit_array, @power_of_thousand = digit_array, power_of_thousand
+    end
+
+    def to_s
+      [digit_array_in_words, power_of_thousand_in_words].join(' ').strip
+    end
+
+    def digit_array_in_words
+      DigitArray.new(@digit_array).to_s
+    end
+
+    def power_of_thousand_in_words
+      POWER_OF_THOUSAND[@power_of_thousand] if digit_array_in_words != ''
+    end
+  end
+end

data/spec/wintr/digit_array_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+RSpec.describe Wintr::DigitArray do
+  describe '#to_s' do
+    it 'converts 0 to an empty string' do
+      expect(Wintr::DigitArray.new(['0']).to_s).to eq('')
+    end
+
+    it 'converts 9' do
+      expect(Wintr::DigitArray.new(['9']).to_s).to eq('nine')
+    end
+
+    it 'converts 10' do
+      expect(Wintr::DigitArray.new(%w[1 0]).to_s).to eq('ten')
+    end
+
+    it 'converts 19' do
+      expect(Wintr::DigitArray.new(%w[1 9]).to_s).to eq('nineteen')
+    end
+
+    it 'converts 20' do
+      expect(Wintr::DigitArray.new(%w[2 0]).to_s).to eq('twenty')
+    end
+
+    it 'converts 702' do
+      expect(Wintr::DigitArray.new(%w[7 0 2]).to_s).to eq('seven hundred and two')
+    end
+  end
+end

data/spec/wintr/hundreds_tens_units_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+RSpec.describe Wintr::HundredsTensUnits do
+  describe '#to_s' do
+    it 'converts 000 to an empty string' do
+      expect(Wintr::HundredsTensUnits.new('0', '0', '0').to_s).to eq('')
+    end
+
+    it 'converts 101' do
+      expect(Wintr::HundredsTensUnits.new('1', '0', '1').to_s).to eq('one hundred and one')
+    end
+
+    it 'converts 900' do
+      expect(Wintr::HundredsTensUnits.new('9', '0', '0').to_s).to eq('nine hundred')
+    end
+
+    it 'converts 070' do
+      expect(Wintr::HundredsTensUnits.new('0', '7', '0').to_s).to eq('and seventy')
+    end
+
+    it 'converts 005' do
+      expect(Wintr::HundredsTensUnits.new('0', '0', '5').to_s).to eq('and five')
+    end
+  end
+end

data/spec/wintr/number_spec.rb

@@ -1,72 +1,106 @@
 require 'spec_helper'
 
-CONVERSIONS = {
-  1 => 'one',
-  27 => 'twenty seven',
-  115 => 'one hundred and fifteen',
-  3_700 => 'three thousand seven hundred',
-  56_945_781 => 'fifty six million nine hundred and forty five thousand seven hundred and eighty one',
-  126_000_010 => 'one hundred and twenty six million and ten',
-  999_999_999 => 'nine hundred and ninety nine million nine hundred and ninety nine thousand nine hundred and ninety nine',
+def conversions
+  {
+    0 => 'zero',
+    1 => 'one',
+    2 => 'two',
+    3 => 'three',
+    4 => 'four',
+    5 => 'five',
+    6 => 'six',
+    7 => 'seven',
+    8 => 'eight',
+    9 => 'nine',
+    10 => 'ten',
 
-  9 => 'nine',
-  10 => 'ten',
-  11 => 'eleven',
-  12 => 'twelve',
-  13 => 'thirteen',
-  14 => 'fourteen',
-  15 => 'fifteen',
-  16 => 'sixteen',
-  17 => 'seventeen',
-  18 => 'eighteen',
-  19 => 'nineteen',
-  20 => 'twenty',
-  21 => 'twenty one',
+    11 => 'eleven',
+    12 => 'twelve',
+    13 => 'thirteen',
+    14 => 'fourteen',
+    15 => 'fifteen',
+    16 => 'sixteen',
+    17 => 'seventeen',
+    18 => 'eighteen',
+    19 => 'nineteen',
 
-  99 => 'ninety nine',
-  100 => 'one hundred',
-  102 => 'one hundred and two',
-  3000 => 'three thousand',
-  3007 => 'three thousand and seven',
+    20 => 'twenty',
+    21 => 'twenty one',
+    30 => 'thirty',
+    32 => 'thirty two',
+    40 => 'forty',
+    43 => 'forty three',
+    50 => 'fifty',
+    54 => 'fifty four',
+    60 => 'sixty',
+    65 => 'sixty five',
+    70 => 'seventy',
+    76 => 'seventy six',
+    80 => 'eighty',
+    87 => 'eighty seven',
+    90 => 'ninety',
+    98 => 'ninety eight',
 
-  9 * (10**9) + 9 => 'nine billion and nine',
-  12 * (10**12) + 12 => 'twelve trillion and twelve',
-  15 * (10**15) + 15 => 'fifteen quadrillion and fifteen',
-  18 * (10**18) + 18 => 'eighteen quintillion and eighteen',
-  21 * (10**21) + 21 => 'twenty one sextillion and twenty one',
-  24 * (10**24) + 24 => 'twenty four septillion and twenty four',
-  27 * (10**27) + 27 => 'twenty seven octillion and twenty seven',
-  30 * (10**30) + 30 => 'thirty nonillion and thirty',
-  33 * (10**33) + 33 => 'thirty three decillion and thirty three',
-  36 * (10**36) + 36 => 'thirty six undecillion and thirty six',
-  39 * (10**39) + 39 => 'thirty nine duodecillion and thirty nine',
-  42 * (10**42) + 42 => 'forty two tredecillion and forty two',
-  45 * (10**45) + 45 => 'forty five quattuordecillion and forty five',
-  48 * (10**48) + 48 => 'forty eight quindecillion and forty eight',
-  51 * (10**51) + 51 => 'fifty one sexdecillion and fifty one',
-  54 * (10**54) + 54 => 'fifty four septendecillion and fifty four',
-  57 * (10**57) + 57 => 'fifty seven octodecillion and fifty seven',
-  60 * (10**60) + 60 => 'sixty novemdecillion and sixty',
-  63 * (10**63) + 63 => 'sixty three vigintillion and sixty three',
-  66 * (10**66) + 66 => 'sixty six unvigintillion and sixty six',
-  69 * (10**69) + 69 => 'sixty nine duovigintillion and sixty nine',
-  72 * (10**72) + 72 => 'seventy two trevigintillion and seventy two',
-  75 * (10**75) + 75 => 'seventy five quattuorvigintillion and seventy five',
-  78 * (10**78) + 78 => 'seventy eight quinvigintillion and seventy eight',
-  81 * (10**81) + 81 => 'eighty one sexvigintillion and eighty one',
-  84 * (10**84) + 84 => 'eighty four septenvigintillion and eighty four',
-  87 * (10**87) + 87 => 'eighty seven octovigintillion and eighty seven',
-  90 * (10**90) + 90 => 'ninety novemvigintillion and ninety',
-  93 * (10**93) + 93 => 'ninety three trigintillion and ninety three',
-  96 * (10**96) + 96 => 'ninety six untrigintillion and ninety six',
-  99 * (10**99) + 99 => 'ninety nine duotrigintillion and ninety nine'
-}
+    100 => 'one hundred',
+    102 => 'one hundred and two',
+    115 => 'one hundred and fifteen',
 
-describe Wintr::Number do
+    5_000 => 'five thousand',
+    5_001 => 'five thousand and one',
+    5_010 => 'five thousand and ten',
+    5_011 => 'five thousand and eleven',
+    5_100 => 'five thousand one hundred',
+    5_101 => 'five thousand one hundred and one',
+    5_110 => 'five thousand one hundred and ten',
+    5_111 => 'five thousand one hundred and eleven',
+
+    # 17_011_007 => 'seventeen million eleven thousand and seven',
+    # 17_011_075 => 'seventeen million eleven thousand and seven five',
+    # 17_011_705 => 'seventeen million eleven thousand seven hundred and five',
+
+    56_945_781 => 'fifty six million nine hundred and forty five thousand seven hundred and eighty one',
+    126_000_010 => 'one hundred and twenty six million and ten',
+    999_999_999 => 'nine hundred and ninety nine million nine hundred and ninety nine thousand nine hundred and ninety nine',
+
+    9 * (10**9) + 9 => 'nine billion and nine',
+    12 * (10**12) + 12 => 'twelve trillion and twelve',
+    15 * (10**15) + 15 => 'fifteen quadrillion and fifteen',
+    18 * (10**18) + 18 => 'eighteen quintillion and eighteen',
+    21 * (10**21) + 21 => 'twenty one sextillion and twenty one',
+    24 * (10**24) + 24 => 'twenty four septillion and twenty four',
+    27 * (10**27) + 27 => 'twenty seven octillion and twenty seven',
+    30 * (10**30) + 30 => 'thirty nonillion and thirty',
+    33 * (10**33) + 33 => 'thirty three decillion and thirty three',
+    36 * (10**36) + 36 => 'thirty six undecillion and thirty six',
+    39 * (10**39) + 39 => 'thirty nine duodecillion and thirty nine',
+    42 * (10**42) + 42 => 'forty two tredecillion and forty two',
+    45 * (10**45) + 45 => 'forty five quattuordecillion and forty five',
+    48 * (10**48) + 48 => 'forty eight quindecillion and forty eight',
+    51 * (10**51) + 51 => 'fifty one sexdecillion and fifty one',
+    54 * (10**54) + 54 => 'fifty four septendecillion and fifty four',
+    57 * (10**57) + 57 => 'fifty seven octodecillion and fifty seven',
+    60 * (10**60) + 60 => 'sixty novemdecillion and sixty',
+    63 * (10**63) + 63 => 'sixty three vigintillion and sixty three',
+    66 * (10**66) + 66 => 'sixty six unvigintillion and sixty six',
+    69 * (10**69) + 69 => 'sixty nine duovigintillion and sixty nine',
+    72 * (10**72) + 72 => 'seventy two trevigintillion and seventy two',
+    75 * (10**75) + 75 => 'seventy five quattuorvigintillion and seventy five',
+    78 * (10**78) + 78 => 'seventy eight quinvigintillion and seventy eight',
+    81 * (10**81) + 81 => 'eighty one sexvigintillion and eighty one',
+    84 * (10**84) + 84 => 'eighty four septenvigintillion and eighty four',
+    87 * (10**87) + 87 => 'eighty seven octovigintillion and eighty seven',
+    90 * (10**90) + 90 => 'ninety novemvigintillion and ninety',
+    93 * (10**93) + 93 => 'ninety three trigintillion and ninety three',
+    96 * (10**96) + 96 => 'ninety six untrigintillion and ninety six',
+    99 * (10**99) + 99 => 'ninety nine duotrigintillion and ninety nine'
+  }
+end
+
+RSpec.describe Wintr::Number do
   describe "#to_s" do
-    CONVERSIONS.each do |integer, word|
-      it "converts #{integer}" do
-        Wintr::Number.new(integer).to_s.should == word
+    conversions.each do |integer, word|
+      it "converts #{integer} to #{word}" do
+        expect(Wintr::Number.new(integer).to_s).to eq(word)
       end
     end
   end

data/spec/wintr/tens_units_spec.rb

@@ -0,0 +1,101 @@
+require 'spec_helper'
+
+RSpec.describe Wintr::TensUnits do
+  describe '#to_s' do
+    it 'converts 00 to empty string' do
+      expect(Wintr::TensUnits.new('0', '0').to_s).to eq('')
+    end
+
+    it 'converts 01' do
+      expect(Wintr::TensUnits.new('0', '1').to_s).to eq('one')
+    end
+
+    it 'converts 02' do
+      expect(Wintr::TensUnits.new('0', '2').to_s).to eq('two')
+    end
+
+    it 'converts 03' do
+      expect(Wintr::TensUnits.new('0', '3').to_s).to eq('three')
+    end
+
+    it 'converts 04' do
+      expect(Wintr::TensUnits.new('0', '4').to_s).to eq('four')
+    end
+
+    it 'converts 05' do
+      expect(Wintr::TensUnits.new('0', '5').to_s).to eq('five')
+    end
+
+    it 'converts 06' do
+      expect(Wintr::TensUnits.new('0', '6').to_s).to eq('six')
+    end
+
+    it 'converts 07' do
+      expect(Wintr::TensUnits.new('0', '7').to_s).to eq('seven')
+    end
+
+    it 'converts 08' do
+      expect(Wintr::TensUnits.new('0', '8').to_s).to eq('eight')
+    end
+
+    it 'converts 09' do
+      expect(Wintr::TensUnits.new('0', '9').to_s).to eq('nine')
+    end
+
+    it 'converts 10' do
+      expect(Wintr::TensUnits.new('1', '0').to_s).to eq('ten')
+    end
+
+    it 'converts 11' do
+      expect(Wintr::TensUnits.new('1', '1').to_s).to eq('eleven')
+    end
+
+    it 'converts 12' do
+      expect(Wintr::TensUnits.new('1', '2').to_s).to eq('twelve')
+    end
+
+    it 'converts 13' do
+      expect(Wintr::TensUnits.new('1', '3').to_s).to eq('thirteen')
+    end
+
+    it 'converts 14' do
+      expect(Wintr::TensUnits.new('1', '4').to_s).to eq('fourteen')
+    end
+
+    it 'converts 15' do
+      expect(Wintr::TensUnits.new('1', '5').to_s).to eq('fifteen')
+    end
+
+    it 'converts 16' do
+      expect(Wintr::TensUnits.new('1', '6').to_s).to eq('sixteen')
+    end
+
+    it 'converts 17' do
+      expect(Wintr::TensUnits.new('1', '7').to_s).to eq('seventeen')
+    end
+
+    it 'converts 18' do
+      expect(Wintr::TensUnits.new('1', '8').to_s).to eq('eighteen')
+    end
+
+    it 'converts 19' do
+      expect(Wintr::TensUnits.new('1', '9').to_s).to eq('nineteen')
+    end
+
+    it 'converts 20' do
+      expect(Wintr::TensUnits.new('2', '0').to_s).to eq('twenty')
+    end
+
+    it 'converts 21' do
+      expect(Wintr::TensUnits.new('2', '1').to_s).to eq('twenty one')
+    end
+
+    it 'converts 77' do
+      expect(Wintr::TensUnits.new('7', '7').to_s).to eq('seventy seven')
+    end
+
+    it 'converts 99' do
+      expect(Wintr::TensUnits.new('9', '9').to_s).to eq('ninety nine')
+    end
+  end
+end

data/spec/wintr/{one_digit_group_spec.rb → units_spec.rb}

@@ -15,11 +15,11 @@ def single_digits
   }
 end
 
-describe Wintr::OneDigitGroup do
-  describe "#to_s" do
+RSpec.describe Wintr::Units do
+  describe '#to_s' do
     single_digits.each do |digit_string, word|
       it "converts #{digit_string} to #{word}" do
-        Wintr::OneDigitGroup.new(digit_string).to_s.should == word
+        expect(Wintr::Units.new(digit_string).to_s).to eq(word)
       end
     end
   end

data/spec/wintr/weighted_digit_array_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+RSpec.describe Wintr::WeightedDigitArray do
+  describe '#to_s' do
+    it 'converts 21 thousand' do
+      expect(Wintr::WeightedDigitArray.new(%w[2 1], 1).to_s).to eq('twenty one thousand')
+    end
+
+    it 'converts 123 thousand' do
+      expect(Wintr::WeightedDigitArray.new(%w[1 2 3], 1).to_s).to eq('one hundred and twenty three thousand')
+    end
+
+    it 'converts 103 million' do
+      expect(Wintr::WeightedDigitArray.new(%w[1 0 3], 2).to_s).to eq('one hundred and three million')
+    end
+
+    it 'converts 000 thousand to empty string' do
+      expect(Wintr::WeightedDigitArray.new(%w[0 0 0], 1).to_s).to eq('')
+    end
+
+    it 'converts 000 million to empty string' do
+      expect(Wintr::WeightedDigitArray.new(%w[0 0 0], 2).to_s).to eq('')
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wintr
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - R Headley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-23 00:00:00.000000000 Z
+date: 2015-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '3.2'
 description: Convert integers into their word equivalents
 email:
 - headleyra@yahoo.com
@@ -34,24 +34,21 @@ extra_rdoc_files:
 files:
 - README.md
 - lib/wintr.rb
-- lib/wintr/digit_group.rb
+- lib/wintr/constants.rb
+- lib/wintr/digit_array.rb
+- lib/wintr/hundreds_tens_units.rb
 - lib/wintr/number.rb
-- lib/wintr/one_digit_group.rb
-- lib/wintr/power_of_thousand.rb
-- lib/wintr/three_digit_group.rb
-- lib/wintr/two_digit_group.rb
+- lib/wintr/tens_units.rb
+- lib/wintr/units.rb
 - lib/wintr/version.rb
-- lib/wintr/weighted_digit_group.rb
-- lib/wintr/word_array.rb
+- lib/wintr/weighted_digit_array.rb
 - spec/spec_helper.rb
-- spec/wintr/digit_group_spec.rb
+- spec/wintr/digit_array_spec.rb
+- spec/wintr/hundreds_tens_units_spec.rb
 - spec/wintr/number_spec.rb
-- spec/wintr/one_digit_group_spec.rb
-- spec/wintr/power_of_thousand_spec.rb
-- spec/wintr/three_digit_group_spec.rb
-- spec/wintr/two_digit_group_spec.rb
-- spec/wintr/weighted_digit_group_spec.rb
-- spec/wintr/word_array_spec.rb
+- spec/wintr/tens_units_spec.rb
+- spec/wintr/units_spec.rb
+- spec/wintr/weighted_digit_array_spec.rb
 homepage: http://github.com/headleyra/wintr
 licenses:
 - MIT
@@ -77,12 +74,10 @@ signing_key:
 specification_version: 4
 summary: A Ruby integer to word converter
 test_files:
-- spec/wintr/two_digit_group_spec.rb
+- spec/wintr/digit_array_spec.rb
+- spec/wintr/tens_units_spec.rb
 - spec/wintr/number_spec.rb
-- spec/wintr/digit_group_spec.rb
-- spec/wintr/one_digit_group_spec.rb
-- spec/wintr/three_digit_group_spec.rb
-- spec/wintr/power_of_thousand_spec.rb
-- spec/wintr/word_array_spec.rb
-- spec/wintr/weighted_digit_group_spec.rb
+- spec/wintr/hundreds_tens_units_spec.rb
+- spec/wintr/weighted_digit_array_spec.rb
+- spec/wintr/units_spec.rb
 - spec/spec_helper.rb

data/lib/wintr/digit_group.rb

@@ -1,22 +0,0 @@
-require 'wintr/one_digit_group'
-require 'wintr/two_digit_group'
-require 'wintr/three_digit_group'
-
-module Wintr
-  class DigitGroup
-    def initialize(digits)
-      @digits = digits
-    end
-
-    def to_s
-      case @digits.size
-      when 1
-        OneDigitGroup.new(@digits[0]).to_s
-      when 2
-        TwoDigitGroup.new(@digits[0], @digits[1]).to_s
-      when 3
-        ThreeDigitGroup.new(@digits[0], @digits[1], @digits[2]).to_s
-      end
-    end
-  end
-end

data/lib/wintr/one_digit_group.rb

@@ -1,24 +0,0 @@
-module Wintr
-  class OneDigitGroup
-    UNITS = {
-      '0' => '',
-      '1' => 'one',
-      '2' => 'two',
-      '3' => 'three',
-      '4' => 'four',
-      '5' => 'five',
-      '6' => 'six',
-      '7' => 'seven',
-      '8' => 'eight',
-      '9' => 'nine'
-    }
-
-    def initialize(units)
-      @units = units
-    end
-
-    def to_s
-      UNITS[@units]
-    end
-  end
-end

data/lib/wintr/power_of_thousand.rb

@@ -1,48 +0,0 @@
-module Wintr
-  class PowerOfThousand
-    POWER = {
-      1 => 'thousand',
-      2 => 'million',
-      3 => 'billion',
-      4 => 'trillion',
-      5 => 'quadrillion',
-      6 => 'quintillion',
-      7 => 'sextillion',
-      8 => 'septillion',
-      9 => 'octillion',
-      10 => 'nonillion',
-      11 => 'decillion',
-      12 => 'undecillion',
-      13 => 'duodecillion',
-      14 => 'tredecillion',
-      15 => 'quattuordecillion',
-      16 => 'quindecillion',
-      17 => 'sexdecillion',
-      18 => 'septendecillion',
-      19 => 'octodecillion',
-      20 => 'novemdecillion',
-      21 => 'vigintillion',
-      22 => 'unvigintillion',
-      23 => 'duovigintillion',
-      24 => 'trevigintillion',
-      25 => 'quattuorvigintillion',
-      26 => 'quinvigintillion',
-      27 => 'sexvigintillion',
-      28 => 'septenvigintillion',
-      29 => 'octovigintillion',
-      30 => 'novemvigintillion',
-      31 => 'trigintillion',
-      32 => 'untrigintillion',
-      33 => 'duotrigintillion'
-    }
-
-    def initialize(power)
-      @power = power
-    end
-
-    def to_s
-      POWER[@power] || ''
-    end
-  end
-end
-

data/lib/wintr/three_digit_group.rb

@@ -1,21 +0,0 @@
-module Wintr
-  class ThreeDigitGroup
-    def initialize(hundreds, tens, units)
-      @hundreds, @tens, @units = hundreds, tens, units
-    end
-
-    def to_s
-      word_array = []
-      if @hundreds == '0' && @tens == '0' && @units == '0'
-        ''
-      else
-        word_array << OneDigitGroup.new(@hundreds).to_s
-        word_array << 'hundred' if @hundreds != '0'
-        word_array << 'and' unless @tens == '0' && @units == '0'
-        word_array << TwoDigitGroup.new(@tens, @units).to_s
-        WordArray.new(word_array).to_s
-      end
-    end
-  end
-end
-

data/lib/wintr/two_digit_group.rb

@@ -1,45 +0,0 @@
-module Wintr
-  class TwoDigitGroup
-    TEN_TO_NINETEEN = {
-      '10' => 'ten',
-      '11' => 'eleven',
-      '12' => 'twelve',
-      '13' => 'thirteen',
-      '14' => 'fourteen',
-      '15' => 'fifteen',
-      '16' => 'sixteen',
-      '17' => 'seventeen',
-      '18' => 'eighteen',
-      '19' => 'nineteen'
-    }
-    TENS = {
-      '2' => 'twenty',
-      '3' => 'thirty',
-      '4' => 'forty',
-      '5' => 'fifty',
-      '6' => 'sixty',
-      '7' => 'seventy',
-      '8' => 'eighty',
-      '9' => 'ninety'
-    }
-
-    def initialize(tens, units)
-      @tens, @units = tens, units
-    end
-
-    def to_s
-      word_array = []
-
-      if @tens == '1'
-        TEN_TO_NINETEEN[@tens + @units]
-      elsif @tens == '0' && @units == '0'
-        ''
-      else
-        word_array << TENS[@tens]
-        word_array << OneDigitGroup.new(@units).to_s
-        WordArray.new(word_array).to_s
-      end
-    end
-  end
-end
-

data/lib/wintr/weighted_digit_group.rb

@@ -1,17 +0,0 @@
-require 'wintr/digit_group'
-require 'wintr/power_of_thousand'
-require 'wintr/word_array'
-
-module Wintr
-  class WeightedDigitGroup
-    def initialize(digit_group, power_of_thousand)
-      @digit_group, @power_of_thousand = digit_group, power_of_thousand
-    end
-
-    def to_s
-      base_digit_group_in_words = DigitGroup.new(@digit_group).to_s
-      power_of_thousand_in_words = PowerOfThousand.new(@power_of_thousand).to_s if base_digit_group_in_words != ''
-      WordArray.new([base_digit_group_in_words, power_of_thousand_in_words]).to_s
-    end
-  end
-end

data/lib/wintr/word_array.rb

@@ -1,12 +0,0 @@
-module Wintr
-  class WordArray
-    def initialize(array)
-      @array = array
-    end
-
-    def to_s
-      @array.join(' ').squeeze(' ').strip
-    end
-  end
-end
-

data/spec/wintr/digit_group_spec.rb

@@ -1,28 +0,0 @@
-require 'spec_helper'
-
-module Wintr
-
-  describe DigitGroup do
-    describe "#to_s" do
-      it "should convert 0 to empty string" do
-        DigitGroup.new(['0']).to_s.should == ''
-      end
-      it "should convert 9" do
-        DigitGroup.new(['9']).to_s.should == 'nine'
-      end
-      it "should convert 10" do
-        DigitGroup.new(%w[1 0]).to_s.should == 'ten'
-      end
-      it "should convert 19" do
-        DigitGroup.new(%w[1 9]).to_s.should == 'nineteen'
-      end
-      it "should convert 20" do
-        DigitGroup.new(%w[2 0]).to_s.should == 'twenty'
-      end
-      it "should convert 702" do
-        DigitGroup.new(%w[7 0 2]).to_s.should == 'seven hundred and two'
-      end
-    end
-  end
-
-end

data/spec/wintr/power_of_thousand_spec.rb

@@ -1,23 +0,0 @@
-require 'spec_helper'
-
-module Wintr
-
-  describe PowerOfThousand do
-    describe "#to_s" do
-      it "should convert 0 to empty string" do
-        PowerOfThousand.new(0).to_s.should == ''
-      end
-      it "should convert 1 into it's power-of-a-thousand equivalent" do
-        PowerOfThousand.new(1).to_s.should == 'thousand'
-      end
-      it "should convert 2 into it's power-of-a-thousand equivalent" do
-        PowerOfThousand.new(2).to_s.should == 'million'
-      end
-      it "should convert rubbish input into empty string" do
-        PowerOfThousand.new('foo').to_s.should == ''
-      end
-    end
-  end
-
-end
-

data/spec/wintr/three_digit_group_spec.rb

@@ -1,24 +0,0 @@
-require 'spec_helper'
-
-module Wintr
-  describe ThreeDigitGroup do
-    describe "#to_s" do
-      it "should convert 000 to empty string" do
-        ThreeDigitGroup.new('0', '0', '0').to_s.should == ''
-      end
-      it "should convert 101" do
-        ThreeDigitGroup.new('1', '0', '1').to_s.should == 'one hundred and one'
-      end
-      it "should convert 900" do
-        ThreeDigitGroup.new('9', '0', '0').to_s.should == 'nine hundred'
-      end
-      it "should convert 070" do
-        ThreeDigitGroup.new('0', '7', '0').to_s.should == 'and seventy'
-      end
-      it "should convert 005" do
-        ThreeDigitGroup.new('0', '0', '5').to_s.should == 'and five'
-      end
-    end
-  end
-end
-

data/spec/wintr/two_digit_group_spec.rb

@@ -1,60 +0,0 @@
-require 'spec_helper'
-
-module Wintr
-  describe TwoDigitGroup do
-    describe "#to_s" do
-      it "should convert 00 to empty string" do
-        TwoDigitGroup.new('0', '0').to_s.should == ''
-      end
-      it "should convert 01 to one" do
-        TwoDigitGroup.new('0', '1').to_s.should == 'one'
-      end
-      it "should convert 09 to nine" do
-        TwoDigitGroup.new('0', '9').to_s.should == 'nine'
-      end
-      it "should convert 10" do
-        TwoDigitGroup.new('1', '0').to_s.should == 'ten'
-      end
-      it "should convert 11" do
-        TwoDigitGroup.new('1', '1').to_s.should == 'eleven'
-      end
-      it "should convert 12" do
-        TwoDigitGroup.new('1', '2').to_s.should == 'twelve'
-      end
-      it "should convert 13" do
-        TwoDigitGroup.new('1', '3').to_s.should == 'thirteen'
-      end
-      it "should convert 14" do
-        TwoDigitGroup.new('1', '4').to_s.should == 'fourteen'
-      end
-      it "should convert 15" do
-        TwoDigitGroup.new('1', '5').to_s.should == 'fifteen'
-      end
-      it "should convert 16" do
-        TwoDigitGroup.new('1', '6').to_s.should == 'sixteen'
-      end
-      it "should convert 17" do
-        TwoDigitGroup.new('1', '7').to_s.should == 'seventeen'
-      end
-      it "should convert 18" do
-        TwoDigitGroup.new('1', '8').to_s.should == 'eighteen'
-      end
-      it "should convert 19" do
-        TwoDigitGroup.new('1', '9').to_s.should == 'nineteen'
-      end
-      it "should convert 20" do
-        TwoDigitGroup.new('2', '0').to_s.should == 'twenty'
-      end
-      it "should convert 21" do
-        TwoDigitGroup.new('2', '1').to_s.should == 'twenty one'
-      end
-      it "should convert 77" do
-        TwoDigitGroup.new('7', '7').to_s.should == 'seventy seven'
-      end
-      it "should convert 99" do
-        TwoDigitGroup.new('9', '9').to_s.should == 'ninety nine'
-      end
-    end
-  end
-end
-

data/spec/wintr/weighted_digit_group_spec.rb

@@ -1,23 +0,0 @@
-require 'spec_helper'
-
-module Wintr
-  describe WeightedDigitGroup do
-    describe "#to_s" do
-      it "should should convert 23 thousand" do
-        WeightedDigitGroup.new(%w[2 1], 1).to_s.should == 'twenty one thousand'
-      end
-      it "should should convert 123 thousand" do
-        WeightedDigitGroup.new(%w[1 2 3], 1).to_s.should == 'one hundred and twenty three thousand'
-      end
-      it "should should convert 103 million" do
-        WeightedDigitGroup.new(%w[1 0 3], 2).to_s.should == 'one hundred and three million'
-      end
-      it "should should convert 000 thousand to empty string" do
-        WeightedDigitGroup.new(%w[0 0 0], 1).to_s.should == ''
-      end
-      it "should should convert 000 million to empty string" do
-        WeightedDigitGroup.new(%w[0 0 0], 2).to_s.should == ''
-      end
-    end
-  end
-end

data/spec/wintr/word_array_spec.rb

@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe Wintr::WordArray do
-  describe "#to_s" do
-    it "joins it's array then squeezes spaces" do
-      Wintr::WordArray.new([' foo     ', '    bar  ']).to_s.should == 'foo bar'
-    end
-  end
-end