integer_expansion 1.0.0 → 1.2.2

data/lib/integer_expansion.rb

@@ -2,7 +2,6 @@ require File.dirname(__FILE__) + '/methods/new_roman'
 require File.dirname(__FILE__) + '/methods/old_roman'
 require File.dirname(__FILE__) + '/methods/factorial'
 require File.dirname(__FILE__) + '/methods/english_number'
-require File.dirname(__FILE__) + '/methods/commas'
 
 class Integer
   def to_roman

data/lib/methods/english_number.rb

@@ -1,70 +1,49 @@
-def english_number(number)
-  raise ArgumentError.new("Input be greater than or equal to 0.") if number < 0
-  return 'zero' if number == 0
-  string = ''
-
-  factor = number.to_s.length - 1
-
-  if factor >= 2
-
-    factor_check = [12,9,6,3] # trillions, billions, millions, thousands
-    factor_check.each do |x|
-      if factor >= x
-        lead_digits = (number % 10 ** (x + 3)) / 10 ** x # remove numbers from higher and lower factors
-        string += parser(lead_digits) + ' ' + factors(x) + ' ' if lead_digits != 0
-      end
+NUM_WORD_PAIRS = [[10 ** 12,  'trillion'],
+                  [10 **  9,   'billion'], 
+                  [10 **  6,   'million'],
+                  [10 **  3,  'thousand'],
+                  [10 **  2,   'hundred'],
+                  [90,    'ninety'], 
+                  [80,    'eighty'], 
+                  [70,   'seventy'], 
+                  [60,     'sixty'], 
+                  [50,     'fifty'], 
+                  [40,    'fourty'], 
+                  [30,    'thirty'], 
+                  [20,    'twenty'],
+                  [19,  'nineteen'], 
+                  [18,  'eighteen'], 
+                  [17, 'seventeen'], 
+                  [16,   'sixteen'], 
+                  [15,   'fifteen'], 
+                  [14,   'fouteen'], 
+                  [13,  'thirteen'], 
+                  [12,    'twelve'], 
+                  [11,    'eleven'],
+                  [10,       'ten'], 
+                  [ 9,      'nine'], 
+                  [ 8,     'eight'], 
+                  [ 7,     'seven'],
+                  [ 6,       'six'], 
+                  [ 5,      'five'], 
+                  [ 4,      'four'], 
+                  [ 3,     'three'],
+                  [ 2,       'two'], 
+                  [ 1,       'one']]
+
+def english_number(num)
+  raise ArgumentError.new("Input be greater than or equal to 0.") if num < 0
+  return 'one' if num == 1
+  to_words_array = []
+ 
+  NUM_WORD_PAIRS.each do |pair|
+    if num > 99
+      lead_digits = (num % (pair[0] * 1000)) / pair[0]
+      to_words_array << english_number(lead_digits) if lead_digits > 0
     end
-
-    string += 'and ' if ((number % 1000 < 100) && (number % 1000 != 0))
-    string += parser(number % 1000) # last three digits
-    string.chop! if number % 1000 == 0 # remove extra space if no ones or tens
-  else
-    string += small_number(number)
+    to_words_array << pair[1] if (num / pair[0]) > 0
+    num %= pair[0]
   end
-  
-  string
-end
-
-
-def small_number(number) # numbers under 99
-  string = ''
-  small_hash   = {  1 => 'one',        2 => 'two',       3 => 'three', 
-                    4 => 'four',       5 => 'five',      6 => 'six', 
-                    7 => 'seven',      8 => 'eight',     9 => 'nine',
-                   11 => 'eleven',    12 => 'twelve',   13 => 'thirteen', 
-                   14 => 'fourteen',  15 => 'fifteen',  16 => 'sixteen', 
-                   17 => 'seventeen', 18 => 'eighteen', 19 => 'nineteen',
-                   10 => 'ten',       20 => 'twenty',   30 => 'thirty', 
-                   40 => 'fourty',    50 => 'fifty',    60 => 'sixty', 
-                   70 => 'seventy',   80 => 'eighty',   90 => 'ninety'}
-
-  if number < 20
-    return small_hash[number]
-  else
-    extra = number % 10
-    string += small_hash[number - extra]
-    string += ' ' + small_hash[extra] if extra != 0
-  end
-  string
-end
-
-def parser(number) # decides is lead_digits needs to be processed as hundreds, or a small number
-  string = ''
-  string += hundreds(number) if number >= 100
-  string += small_number(number) if number < 100 && number != 0
-  string
-end 
-
-def hundreds(number)
-  string = ''
-  string += small_number(number / 100 )
-  string += ' ' + factors(2)
-  string += ' and ' + small_number(number % 100) if number % 100 != 0
-  string
-end
-
-def factors(number) # 10 ** factor
-  hundred_hash = { 2 => 'hundred', 3 => 'thousand', 6 => 'million',
-                   9 => 'billion', 12 => 'trillion'}
-  hundred_hash[number]
+ 
+  to_words_array.join(' ')
 end

data/lib/methods/new_roman.rb

@@ -1,23 +1,22 @@
-# require './old_roman'
-# necessary to run independently
+NEW_ROMAN_ARRAY = [[1000,  'M'], 
+                   [ 900, 'CM'], 
+                   [ 500,  'D'], 
+                   [ 400, 'CD'], 
+                   [ 100,  'C'],  
+                   [  90, 'XC'],
+                   [  50,  'L'],  
+                   [  40, 'XL'], 
+                   [  10,  'X'],   
+                   [   9, 'IX'], 
+                   [   5,  'V'],   
+                   [   4, 'IV'], 
+                   [   1,  'I']]
 
-def new_roman(year)
-  raise ArgumentError.new("Input must be greater than 0.") if year < 1
-  digits = year.to_s.split('').reverse
-  new_roman = []
-  nines_fours = [['IX','IV'], # ones
-   			         ['XC','XL'], # tens
-				         ['CM','CD']] # hundreds
-
-  digits.each_with_index do |x,i|
-    if x == "9"
-      new_roman << nines_fours[i][0]
-    elsif x == "4"
-      new_roman << nines_fours[i][1]
-    else
-      new_roman << old_roman(x.to_i * (10 ** i))
-    end
+def new_roman(number)
+  string = ''
+  NEW_ROMAN_ARRAY.each do |pair|
+    string += pair[1] * (number / pair[0])
+    number %= pair[0]
   end
-
-  new_roman.reverse.join
-end
+  string
+end

data/lib/methods/old_roman.rb

@@ -1,12 +1,16 @@
-def old_roman(year)
-  raise ArgumentError.new("Input must not be negative.") if year < 0
+OLD_ROMAN_ARRAY = [[1000, 'M'], 
+                   [ 500, 'D'], 
+                   [ 100, 'C'],  
+                   [  50, 'L'],  
+                   [  10, 'X'],   
+                   [   5, 'V'],   
+                   [   1, 'I']]
+
+def old_roman(number)
   string = ''
-  string += 'M' * (year / 1000)
-  string += 'D' * (year % 1000 / 500)
-  string += 'C' * (year % 500 / 100)
-  string += 'L' * (year % 100 / 50)
-  string += 'X' * (year % 50 / 10)
-  string += 'V' * (year % 10 / 5)
-  string += 'I' * (year % 5 / 1)
+  OLD_ROMAN_ARRAY.each do |pair|
+    string += pair[1] * (number / pair[0])
+    number %= pair[0]
+  end
   string
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: integer_expansion
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-27 00:00:00.000000000 Z
+date: 2013-10-12 00:00:00.000000000 Z
 dependencies: []
 description: 1999#to_roman, 1999#to_old_roman, 4#fact, 1999#to_english, 1999#add_commas
 email: tydotg@gmail.com