numerical 0.0.1 → 0.0.2

data/LICENSE

@@ -0,0 +1,8 @@
+The MIT License (MIT)
+Copyright © 2012 Daniel Knell, http://danielknell.co.uk
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

data/README.md

@@ -0,0 +1,40 @@
+# Artisan Numerical
+
+Bi-Directional conversion between english language numbers (e.g.  'three hundred') and integers
+
+## Install
+
+To install Artisan Numerical via gem:
+
+    gem install numerical
+
+## Source
+
+To install from source:
+
+    hg clone https://bitbucket.org/artisanofcode/ruby-numerical
+
+or
+
+    git clone git://github.com/artisanofcode/ruby-numerical.git
+
+## History
+
+### 0.0.2
+
+Decomposing into encoder and decoder classes
+
+### 0.0.1
+
+Initial Release
+
+## Licence
+
+This project is licensed under the [MIT licence][licence].
+
+## Meta
+
+This project uses [Semantic Versioning][semver].
+
+[semver]: http://semver.org/ "Semantic Versioning"
+[licence]: http://dan.mit-license.org/ "MIT licence"

data/bin/numerical

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+require "numerical"
+
+if ARGV.count < 2 or not [ '-e', '-d' ].include? ARGV[0]
+  puts "usage: numerical [ -e | -d ] value"
+  puts ""
+  puts "options:"
+  puts "    -e  encode a numeric value into words"
+  puts "    -d  decode a numeric value from words"
+  exit(1)
+end
+
+if ARGV.shift == '-e'
+  puts Numerical.encode(ARGV.shift.to_i)
+else
+  puts Numerical.decode(ARGV.join(' '))
+end

data/lib/numerical.rb

@@ -1,116 +1,13 @@
-module Numerical
-  NUMBERS = {
-    "zero"      => 0,
-    "one"       => 1,
-    "two"       => 2,
-    "three"     => 3,
-    "four"      => 4,
-    "five"      => 5,
-    "six"       => 6,
-    "seven"     => 7,
-    "eight"     => 8,
-    "nine"      => 9,
-    "ten"       => 10,
-    "eleven"    => 11,
-    "twelve"    => 12,
-    "thirteen"  => 13,
-    "fourteen"  => 14,
-    "fifteen"   => 15,
-    "sixteen"   => 16,
-    "seventeen" => 17,
-    "eighteen"  => 18,
-    "nineteen"  => 19,
-    "twenty"    => 20,
-    "thirty"    => 30,
-    "forty"     => 40,
-    "fifty"     => 50,
-    "sixty"     => 60,
-    "seventy"   => 70,
-    "eighty"    => 80,
-    "ninety"    => 90,
-  }
-
-  REVERSE_NUMBERS = NUMBERS.invert
-
-  SHORT_FORM = {
-    "thousand"          => 1_000,
-    "million"           => 1_000_000,
-    "billion"           => 1_000_000_000,
-    "trillion"          => 1_000_000_000_000,
-    "quadrillion"       => 1_000_000_000_000_000,
-    "quintillion"       => 1_000_000_000_000_000_000,
-    "sextillion"        => 1_000_000_000_000_000_000_000,
-    "septillion"        => 1_000_000_000_000_000_000_000_000,
-    "octillion"         => 1_000_000_000_000_000_000_000_000_000,
-    "nonillion"         => 1_000_000_000_000_000_000_000_000_000_000,
-    "decillion"         => 1_000_000_000_000_000_000_000_000_000_000_000,
-    "undecillion"       => 1_000_000_000_000_000_000_000_000_000_000_000_000,
-    "duodecillion"      => 1_000_000_000_000_000_000_000_000_000_000_000_000_000,
-    "tredecillion"      => 1_000_000_000_000_000_000_000_000_000_000_000_000_000_000,
-    "quattuordecillion" => 1_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000,
-    "quindecillion"     => 1_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000,
-    "sexdecillion"      => 1_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000,
-    "septendecillion"   => 1_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000,
-    "octodecillion"     => 1_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000,
-    "novemdecillion"    => 1_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000,
-    "vigintillion"      => 1_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000,
-  }
-
-  REVERSE_SHORT_FORM = SHORT_FORM.invert
-
-  def self.encode(number)
-    # TODO recursion sucks
-    result = ''
-
-    if number < 21
-      result << REVERSE_NUMBERS[number]
-    elsif number < 100
-      result << REVERSE_NUMBERS[(number / 10) * 10]
-      if number % 10 != 0
-        result << '-' + REVERSE_NUMBERS[number % 10]
-      end
-    elsif number < 1000
-      result << REVERSE_NUMBERS[number / 100] + ' hundred'
-      if number % 100 != 0
-        result << ' and ' + Numerical.encode(number % 100)
-      end
-    else
-      magnitude = 1000 **  Math.log(number, 1000).floor
-
-      result << Numerical.encode(number / magnitude) + ' ' + REVERSE_SHORT_FORM[magnitude]
+require "numerical/constants"
+require "numerical/decoder"
+require "numerical/encoder"
 
-      if number % magnitude != 0
-        result << ', ' + Numerical.encode(number % magnitude)
-      end
-    end
-
-    result
+module Numerical
+  def self.encode(value)
+    Numerical::Encoder.new.encode(value)
   end
 
-  def self.decode(text)
-    result = 0
-
-    current = 0
-
-    text.gsub! /(\d),(\d)/, "\\1\\2"
-
-    text.split(/[ \-,]+/).each do |word|
-      if /^\d+$/.match word
-        current += word.to_i
-      elsif NUMBERS.include? word
-        current += NUMBERS[word]
-      elsif "hundred" == word
-        current *= 100
-      elsif SHORT_FORM.include? word
-        result += current * SHORT_FORM[word]
-        current = 0
-      elsif "and" == word
-        # ignore...
-      else
-        raise ArgumentError, "Invalid text"
-      end
-    end
-
-    result += current
+  def self.decode(value)
+    Numerical::Decoder.new.decode(value)
   end
 end

data/lib/numerical/constants.rb

@@ -0,0 +1,58 @@
+module Numerical
+  class Constants
+    NUMBERS = {
+      "zero"      => 0,
+      "one"       => 1,
+      "two"       => 2,
+      "three"     => 3,
+      "four"      => 4,
+      "five"      => 5,
+      "six"       => 6,
+      "seven"     => 7,
+      "eight"     => 8,
+      "nine"      => 9,
+      "ten"       => 10,
+      "eleven"    => 11,
+      "twelve"    => 12,
+      "thirteen"  => 13,
+      "fourteen"  => 14,
+      "fifteen"   => 15,
+      "sixteen"   => 16,
+      "seventeen" => 17,
+      "eighteen"  => 18,
+      "nineteen"  => 19,
+      "twenty"    => 20,
+      "thirty"    => 30,
+      "forty"     => 40,
+      "fifty"     => 50,
+      "sixty"     => 60,
+      "seventy"   => 70,
+      "eighty"    => 80,
+      "ninety"    => 90,
+    }.freeze
+
+    SHORT_FORM = {
+      "thousand"          => 1000 ** 1,
+      "million"           => 1000 ** 2,
+      "billion"           => 1000 ** 3,
+      "trillion"          => 1000 ** 4,
+      "quadrillion"       => 1000 ** 5,
+      "quintillion"       => 1000 ** 6,
+      "sextillion"        => 1000 ** 7,
+      "septillion"        => 1000 ** 8,
+      "octillion"         => 1000 ** 9,
+      "nonillion"         => 1000 ** 10,
+      "decillion"         => 1000 ** 11,
+      "undecillion"       => 1000 ** 12,
+      "duodecillion"      => 1000 ** 13,
+      "tredecillion"      => 1000 ** 14,
+      "quattuordecillion" => 1000 ** 15,
+      "quindecillion"     => 1000 ** 16,
+      "sexdecillion"      => 1000 ** 17,
+      "septendecillion"   => 1000 ** 18,
+      "octodecillion"     => 1000 ** 19,
+      "novemdecillion"    => 1000 ** 20,
+      "vigintillion"      => 1000 ** 21,
+    }.freeze
+  end
+end

data/lib/numerical/decoder.rb

@@ -0,0 +1,32 @@
+module Numerical
+  class Decoder
+    NUMBERS = Numerical::Constants::NUMBERS
+
+    SHORT_FORM = Numerical::Constants::SHORT_FORM
+
+    def decode(value)
+      result = 0
+
+      current = 0
+
+      value.gsub(/(\d),(\d)/, "\\1\\2").split(/[ \-,]+/).each do |word|
+        if /^\d+$/.match word
+          current += word.to_i
+        elsif NUMBERS.include? word
+          current += NUMBERS[word]
+        elsif "hundred" == word
+          current *= 100
+        elsif SHORT_FORM.include? word
+          result += current * SHORT_FORM[word]
+          current = 0
+        elsif "and" == word
+          # ...
+        else
+          return nil
+        end
+      end
+
+      result += current
+    end
+  end
+end

data/lib/numerical/encoder.rb

@@ -0,0 +1,26 @@
+module Numerical
+  class Encoder
+    NUMBERS = Numerical::Constants::NUMBERS.invert.freeze
+
+    SHORT_FORM = Numerical::Constants::SHORT_FORM.invert.freeze
+
+    def encode(value)
+      case value
+      when 0 .. 20
+        result = NUMBERS[value]
+      when 21 .. 99
+        result = NUMBERS[(value / 10) * 10]
+        result += '-' + NUMBERS[value % 10] if value % 10 != 0
+      when 100 .. 999
+        result = NUMBERS[value / 100] + ' hundred'
+        result += ' and ' + encode(value % 100) if value % 100 != 0
+      else
+        magnitude = 1000 ** Math.log(value, 1000).floor
+        result = encode(value / magnitude) + ' ' + SHORT_FORM[magnitude]
+        result += ', ' + encode(value % magnitude) if value % magnitude != 0
+      end
+
+      result
+    end
+  end
+end

data/lib/numerical/version.rb

@@ -1,3 +1,3 @@
 module Numerical
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/spec/numerical/decoder_spec.rb

@@ -0,0 +1,121 @@
+require 'spec_helper'
+
+describe Numerical::Decoder do
+  before do
+    @decoder = Numerical::Decoder.new
+  end
+
+  describe ".decode" do
+    it "should handle basic numbers" do
+      @decoder.decode("zero").should == 0
+      @decoder.decode("one").should == 1
+      @decoder.decode("two").should == 2
+      @decoder.decode("three").should == 3
+      @decoder.decode("four").should == 4
+      @decoder.decode("five").should == 5
+      @decoder.decode("six").should == 6
+      @decoder.decode("seven").should == 7
+      @decoder.decode("eight").should == 8
+      @decoder.decode("nine").should == 9
+      @decoder.decode("ten").should == 10
+      @decoder.decode("eleven").should == 11
+      @decoder.decode("twelve").should == 12
+      @decoder.decode("thirteen").should == 13
+      @decoder.decode("fourteen").should == 14
+      @decoder.decode("fifteen").should == 15
+      @decoder.decode("sixteen").should == 16
+      @decoder.decode("seventeen").should == 17
+      @decoder.decode("eighteen").should == 18
+      @decoder.decode("nineteen").should == 19
+      @decoder.decode("twenty").should == 20
+      @decoder.decode("thirty").should == 30
+      @decoder.decode("forty").should == 40
+      @decoder.decode("fifty").should == 50
+      @decoder.decode("sixty").should == 60
+      @decoder.decode("seventy").should == 70
+      @decoder.decode("eighty").should == 80
+      @decoder.decode("ninety").should == 90
+    end
+
+    it "should handle complicated numbers" do
+      @decoder.decode("twenty one").should == 21
+      @decoder.decode("thirty two").should == 32
+      @decoder.decode("forty three").should == 43
+      @decoder.decode("fifty four").should == 54
+      @decoder.decode("sixty five").should == 65
+      @decoder.decode("seventy six").should == 76
+      @decoder.decode("eighty seven").should == 87
+      @decoder.decode("ninety eight").should == 98
+    end
+
+    it "should handle large numbers" do
+      @decoder.decode("one thousand").should == 1 * 1000 ** 1
+      @decoder.decode("two million").should == 2 * 1000 ** 2
+      @decoder.decode("three billion").should == 3 * 1000 ** 3
+      @decoder.decode("four trillion").should == 4 * 1000 ** 4
+      @decoder.decode("five quadrillion").should == 5 * 1000 ** 5
+      @decoder.decode("six quintillion").should == 6 * 1000 ** 6
+      @decoder.decode("seven sextillion").should == 7 * 1000 ** 7
+      @decoder.decode("eight septillion").should == 8 * 1000 ** 8
+      @decoder.decode("nine octillion").should == 9 * 1000 ** 9
+      @decoder.decode("ten nonillion").should == 10 * 1000 ** 10
+      @decoder.decode("eleven decillion").should == 11 * 1000 ** 11
+      @decoder.decode("twelve undecillion").should == 12 * 1000 ** 12
+      @decoder.decode("thirteen duodecillion").should == 13 * 1000 ** 13
+      @decoder.decode("fourteen tredecillion").should == 14 * 1000 ** 14
+      @decoder.decode("fifteen quattuordecillion").should == 15 * 1000 ** 15
+      @decoder.decode("sixteen quindecillion").should == 16 * 1000 ** 16
+      @decoder.decode("seventeen sexdecillion").should == 17 * 1000 ** 17
+      @decoder.decode("eighteen septendecillion").should == 18 * 1000 ** 18
+      @decoder.decode("nineteen octodecillion").should == 19 * 1000 ** 19
+      @decoder.decode("twenty novemdecillion").should == 20 * 1000 ** 20
+      @decoder.decode("twenty one vigintillion").should == 21 * 1000 ** 21
+    end
+
+    it "should handle hundreds" do
+      @decoder.decode("one hundred").should == 100
+      @decoder.decode("two hundred thousand").should == 200_000
+      @decoder.decode("three hundred million").should == 300_000_000
+      @decoder.decode("four hundred billion").should == 400_000_000_000
+      @decoder.decode("five hundred trillion").should == 500_000_000_000_000
+      @decoder.decode("six hundred quadrillion").should == 600_000_000_000_000_000
+    end
+
+    it "should handle complicated large numbers" do
+      @decoder.decode("one thousand three hundred five").should == 1305
+      @decoder.decode("thirty two million five hundred thousand").should == 32500000
+      @decoder.decode("five hundred fifty three vigintillion nine hundred twenty novemdecillion twenty five").should == 553920 * 1000 ** 20 + 25
+    end
+
+    it "should return nil for invalid numbers" do
+      @decoder.decode('one zillion').should == nil
+      @decoder.decode('twenty gazillion three hundred thousand').should == nil
+      @decoder.decode('foobar').should == nil
+    end
+
+    it "should allow some words" do
+      @decoder.decode("one thousand and twenty three").should == 1023
+    end
+
+    it "should allow hyphens" do
+      @decoder.decode("twenty-one").should == 21
+      @decoder.decode("forty-two").should == 42
+    end
+
+    it "should support numeric characters" do
+      @decoder.decode("23").should == 23
+      @decoder.decode("1 hundred").should == 100
+      @decoder.decode("2 hundred thousand").should == 200_000
+      @decoder.decode("3 hundred million").should == 300_000_000
+      @decoder.decode("4 hundred billion").should == 400_000_000_000
+      @decoder.decode("5 hundred trillion").should == 500_000_000_000_000
+      @decoder.decode("600 quadrillion").should == 600_000_000_000_000_000
+      @decoder.decode("1,000,000").should == 1_000_000
+    end
+
+    it "should allow commas" do
+      @decoder.decode("five thousand, three hundred, twenty one").should == 5321
+      @decoder.decode("nine thousand, fifty three").should == 9053
+    end
+  end
+end

data/spec/numerical/encoder_spec.rb

@@ -0,0 +1,90 @@
+require 'spec_helper'
+
+describe Numerical::Encoder do
+  before do
+    @encoder = Numerical::Encoder.new
+  end
+
+  describe ".encode" do
+    it "should handle basic numbers" do
+      @encoder.encode(0).should == "zero"
+      @encoder.encode(1).should == "one"
+      @encoder.encode(2).should == "two"
+      @encoder.encode(3).should == "three"
+      @encoder.encode(4).should == "four"
+      @encoder.encode(5).should == "five"
+      @encoder.encode(6).should == "six"
+      @encoder.encode(7).should == "seven"
+      @encoder.encode(8).should == "eight"
+      @encoder.encode(9).should == "nine"
+      @encoder.encode(10).should == "ten"
+      @encoder.encode(11).should == "eleven"
+      @encoder.encode(12).should == "twelve"
+      @encoder.encode(13).should == "thirteen"
+      @encoder.encode(14).should == "fourteen"
+      @encoder.encode(15).should == "fifteen"
+      @encoder.encode(16).should == "sixteen"
+      @encoder.encode(17).should == "seventeen"
+      @encoder.encode(18).should == "eighteen"
+      @encoder.encode(19).should == "nineteen"
+      @encoder.encode(20).should == "twenty"
+      @encoder.encode(30).should == "thirty"
+      @encoder.encode(40).should == "forty"
+      @encoder.encode(50).should == "fifty"
+      @encoder.encode(60).should == "sixty"
+      @encoder.encode(70).should == "seventy"
+      @encoder.encode(80).should == "eighty"
+      @encoder.encode(90).should == "ninety"
+    end
+
+    it "should handle complicated numbers" do
+      @encoder.encode(21).should == "twenty-one"
+      @encoder.encode(32).should == "thirty-two"
+      @encoder.encode(43).should == "forty-three"
+      @encoder.encode(54).should == "fifty-four"
+      @encoder.encode(65).should == "sixty-five"
+      @encoder.encode(76).should == "seventy-six"
+      @encoder.encode(87).should == "eighty-seven"
+      @encoder.encode(98).should == "ninety-eight"
+    end
+
+    it "should handle large numbers" do
+      @encoder.encode(1 * 1000 ** 1).should == "one thousand"
+      @encoder.encode(2 * 1000 ** 2).should == "two million"
+      @encoder.encode(3 * 1000 ** 3).should == "three billion"
+      @encoder.encode(4 * 1000 ** 4).should == "four trillion"
+      @encoder.encode(5 * 1000 ** 5).should == "five quadrillion"
+      @encoder.encode(6 * 1000 ** 6).should == "six quintillion"
+      @encoder.encode(7 * 1000 ** 7).should == "seven sextillion"
+      @encoder.encode(8 * 1000 ** 8).should == "eight septillion"
+      @encoder.encode(9 * 1000 ** 9).should == "nine octillion"
+      @encoder.encode(10 * 1000 ** 10).should == "ten nonillion"
+      @encoder.encode(11 * 1000 ** 11).should == "eleven decillion"
+      @encoder.encode(12 * 1000 ** 12).should == "twelve undecillion"
+      @encoder.encode(13 * 1000 ** 13).should == "thirteen duodecillion"
+      @encoder.encode(14 * 1000 ** 14).should == "fourteen tredecillion"
+      @encoder.encode(15 * 1000 ** 15).should == "fifteen quattuordecillion"
+      @encoder.encode(16 * 1000 ** 16).should == "sixteen quindecillion"
+      @encoder.encode(17 * 1000 ** 17).should == "seventeen sexdecillion"
+      @encoder.encode(18 * 1000 ** 18).should == "eighteen septendecillion"
+      @encoder.encode(19 * 1000 ** 19).should == "nineteen octodecillion"
+      @encoder.encode(20 * 1000 ** 20).should == "twenty novemdecillion"
+      @encoder.encode(21 * 1000 ** 21).should == "twenty-one vigintillion"
+    end
+
+    it "should handle hundreds" do
+      @encoder.encode(100).should == "one hundred"
+      @encoder.encode(200_000).should == "two hundred thousand"
+      @encoder.encode(300_000_000).should == "three hundred million"
+      @encoder.encode(400_000_000_000).should == "four hundred billion"
+      @encoder.encode(500_000_000_000_000).should == "five hundred trillion"
+      @encoder.encode(600_000_000_000_000_000).should == "six hundred quadrillion"
+    end
+
+    it "should handle complicated large numbers" do
+      @encoder.encode(1305).should == "one thousand, three hundred and five"
+      @encoder.encode(32500000).should == "thirty-two million, five hundred thousand"
+      @encoder.encode(553920 * 1000 ** 20 + 25).should == "five hundred and fifty-three vigintillion, nine hundred and twenty novemdecillion, twenty-five"
+    end
+  end
+end

data/spec/numerical_spec.rb

@@ -2,198 +2,54 @@ require 'spec_helper'
 
 describe Numerical do
   describe ".encode" do
-    it "should handle basic numbers" do
-      Numerical.encode(0).should == "zero"
-      Numerical.encode(1).should == "one"
-      Numerical.encode(2).should == "two"
-      Numerical.encode(3).should == "three"
-      Numerical.encode(4).should == "four"
+    it "should encode numbers" do
       Numerical.encode(5).should == "five"
-      Numerical.encode(6).should == "six"
-      Numerical.encode(7).should == "seven"
-      Numerical.encode(8).should == "eight"
-      Numerical.encode(9).should == "nine"
-      Numerical.encode(10).should == "ten"
-      Numerical.encode(11).should == "eleven"
-      Numerical.encode(12).should == "twelve"
-      Numerical.encode(13).should == "thirteen"
-      Numerical.encode(14).should == "fourteen"
-      Numerical.encode(15).should == "fifteen"
-      Numerical.encode(16).should == "sixteen"
-      Numerical.encode(17).should == "seventeen"
-      Numerical.encode(18).should == "eighteen"
-      Numerical.encode(19).should == "nineteen"
-      Numerical.encode(20).should == "twenty"
-      Numerical.encode(30).should == "thirty"
-      Numerical.encode(40).should == "forty"
-      Numerical.encode(50).should == "fifty"
-      Numerical.encode(60).should == "sixty"
-      Numerical.encode(70).should == "seventy"
-      Numerical.encode(80).should == "eighty"
-      Numerical.encode(90).should == "ninety"
-    end
-
-    it "should handle complicated numbers" do
-      Numerical.encode(21).should == "twenty-one"
-      Numerical.encode(32).should == "thirty-two"
-      Numerical.encode(43).should == "forty-three"
-      Numerical.encode(54).should == "fifty-four"
-      Numerical.encode(65).should == "sixty-five"
-      Numerical.encode(76).should == "seventy-six"
-      Numerical.encode(87).should == "eighty-seven"
       Numerical.encode(98).should == "ninety-eight"
-    end
-
-    it "should handle large numbers" do
-      Numerical.encode(1_000).should == "one thousand"
-      Numerical.encode(2_000_000).should == "two million"
-      Numerical.encode(3_000_000_000).should == "three billion"
-      Numerical.encode(4_000_000_000_000).should == "four trillion"
-      Numerical.encode(5_000_000_000_000_000).should == "five quadrillion"
-      Numerical.encode(6_000_000_000_000_000_000).should == "six quintillion"
-      Numerical.encode(7_000_000_000_000_000_000_000).should == "seven sextillion"
-      Numerical.encode(8_000_000_000_000_000_000_000_000).should == "eight septillion"
-      Numerical.encode(9_000_000_000_000_000_000_000_000_000).should == "nine octillion"
-      Numerical.encode(10_000_000_000_000_000_000_000_000_000_000).should == "ten nonillion"
-      Numerical.encode(11_000_000_000_000_000_000_000_000_000_000_000).should == "eleven decillion"
-      Numerical.encode(12_000_000_000_000_000_000_000_000_000_000_000_000).should == "twelve undecillion"
-      Numerical.encode(13_000_000_000_000_000_000_000_000_000_000_000_000_000).should == "thirteen duodecillion"
-      Numerical.encode(14_000_000_000_000_000_000_000_000_000_000_000_000_000_000).should == "fourteen tredecillion"
-      Numerical.encode(15_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000).should == "fifteen quattuordecillion"
-      Numerical.encode(16_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000).should == "sixteen quindecillion"
-      Numerical.encode(17_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000).should == "seventeen sexdecillion"
-      Numerical.encode(18_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000).should == "eighteen septendecillion"
-      Numerical.encode(19_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000).should == "nineteen octodecillion"
-      Numerical.encode(20_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000).should == "twenty novemdecillion"
-      Numerical.encode(21_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000).should == "twenty-one vigintillion"
-    end
-
-    it "should handle hundreds" do
-      Numerical.encode(100).should == "one hundred"
-      Numerical.encode(200_000).should == "two hundred thousand"
-      Numerical.encode(300_000_000).should == "three hundred million"
-      Numerical.encode(400_000_000_000).should == "four hundred billion"
-      Numerical.encode(500_000_000_000_000).should == "five hundred trillion"
-      Numerical.encode(600_000_000_000_000_000).should == "six hundred quadrillion"
-    end
-
-    it "should handle complicated large numbers" do
+      Numerical.encode(1 * 1000 ** 1).should == "one thousand"
+      Numerical.encode(21 * 1000 ** 21).should == "twenty-one vigintillion"
+      Numerical.encode(600 * 1000 ** 5).should == "six hundred quadrillion"
       Numerical.encode(1305).should == "one thousand, three hundred and five"
-      Numerical.encode(32500000).should == "thirty-two million, five hundred thousand"
-      Numerical.encode(553_920_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_025).should == "five hundred and fifty-three vigintillion, nine hundred and twenty novemdecillion, twenty-five"
     end
   end
 
   describe ".decode" do
-    it "should handle basic numbers" do
-      Numerical.decode("zero").should == 0
-      Numerical.decode("one").should == 1
-      Numerical.decode("two").should == 2
-      Numerical.decode("three").should == 3
-      Numerical.decode("four").should == 4
+    it "should decode numbers" do
       Numerical.decode("five").should == 5
-      Numerical.decode("six").should == 6
-      Numerical.decode("seven").should == 7
-      Numerical.decode("eight").should == 8
-      Numerical.decode("nine").should == 9
-      Numerical.decode("ten").should == 10
-      Numerical.decode("eleven").should == 11
-      Numerical.decode("twelve").should == 12
-      Numerical.decode("thirteen").should == 13
-      Numerical.decode("fourteen").should == 14
-      Numerical.decode("fifteen").should == 15
-      Numerical.decode("sixteen").should == 16
-      Numerical.decode("seventeen").should == 17
-      Numerical.decode("eighteen").should == 18
-      Numerical.decode("nineteen").should == 19
-      Numerical.decode("twenty").should == 20
-      Numerical.decode("thirty").should == 30
-      Numerical.decode("forty").should == 40
-      Numerical.decode("fifty").should == 50
-      Numerical.decode("sixty").should == 60
-      Numerical.decode("seventy").should == 70
-      Numerical.decode("eighty").should == 80
-      Numerical.decode("ninety").should == 90
-    end
-
-    it "should handle complicated numbers" do
-      Numerical.decode("twenty one").should == 21
-      Numerical.decode("thirty two").should == 32
-      Numerical.decode("forty three").should == 43
-      Numerical.decode("fifty four").should == 54
-      Numerical.decode("sixty five").should == 65
-      Numerical.decode("seventy six").should == 76
-      Numerical.decode("eighty seven").should == 87
       Numerical.decode("ninety eight").should == 98
-    end
-
-    it "should handle large numbers" do
-      Numerical.decode("one thousand").should == 1_000
-      Numerical.decode("two million").should == 2_000_000
-      Numerical.decode("three billion").should == 3_000_000_000
-      Numerical.decode("four trillion").should == 4_000_000_000_000
-      Numerical.decode("five quadrillion").should == 5_000_000_000_000_000
-      Numerical.decode("six quintillion").should == 6_000_000_000_000_000_000
-      Numerical.decode("seven sextillion").should == 7_000_000_000_000_000_000_000
-      Numerical.decode("eight septillion").should == 8_000_000_000_000_000_000_000_000
-      Numerical.decode("nine octillion").should == 9_000_000_000_000_000_000_000_000_000
-      Numerical.decode("ten nonillion").should == 10_000_000_000_000_000_000_000_000_000_000
-      Numerical.decode("eleven decillion").should == 11_000_000_000_000_000_000_000_000_000_000_000
-      Numerical.decode("twelve undecillion").should == 12_000_000_000_000_000_000_000_000_000_000_000_000
-      Numerical.decode("thirteen duodecillion").should == 13_000_000_000_000_000_000_000_000_000_000_000_000_000
-      Numerical.decode("fourteen tredecillion").should == 14_000_000_000_000_000_000_000_000_000_000_000_000_000_000
-      Numerical.decode("fifteen quattuordecillion").should == 15_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000
-      Numerical.decode("sixteen quindecillion").should == 16_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000
-      Numerical.decode("seventeen sexdecillion").should == 17_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000
-      Numerical.decode("eighteen septendecillion").should == 18_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000
-      Numerical.decode("nineteen octodecillion").should == 19_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000
-      Numerical.decode("twenty novemdecillion").should == 20_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000
-      Numerical.decode("twenty one vigintillion").should == 21_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000
-    end
-
-    it "should handle hundreds" do
-      Numerical.decode("one hundred").should == 100
-      Numerical.decode("two hundred thousand").should == 200_000
-      Numerical.decode("three hundred million").should == 300_000_000
-      Numerical.decode("four hundred billion").should == 400_000_000_000
-      Numerical.decode("five hundred trillion").should == 500_000_000_000_000
-      Numerical.decode("six hundred quadrillion").should == 600_000_000_000_000_000
-    end
-
-    it "should handle complicated large numbers" do
+      Numerical.decode("one thousand").should == 1 * 1000 ** 1
+      Numerical.decode("twenty one vigintillion").should == 21 * 1000 ** 21
+      Numerical.decode("six hundred quadrillion").should == 600 * 1000 ** 5
       Numerical.decode("one thousand three hundred five").should == 1305
-      Numerical.decode("thirty two million five hundred thousand").should == 32500000
-      Numerical.decode("five hundred fifty three vigintillion nine hundred twenty novemdecillion twenty five").should == 553_920_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_025
-    end
-
-    it "should throw an error for invalid numbers" do
-      lambda { Numerical.decode('one zillion') }.should raise_error
-      lambda { Numerical.decode('twenty gazillion three hundred thousand') }.should raise_error
     end
+  end
 
-    it "should allow some words" do
-      Numerical.decode("one thousand and twenty three").should == 1023
+  it "should be able to decode encoded numbers" do
+    # check powers of two
+    i = 0
+    while 2 ** i < 1000 ** 22
+      Numerical.decode(Numerical.encode(2 ** i)).should == 2 ** i
+      i += 1
     end
 
-    it "should allow hyphens" do
-      Numerical.decode("twenty-one").should == 21
-      Numerical.decode("forty-two").should == 42
+    # check powers of three
+    i = 0
+    while 3 ** i < 1000 ** 22
+      Numerical.decode(Numerical.encode(3 ** i)).should == 3 ** i
+      i += 1
     end
 
-    it "should support numeric characters" do
-      Numerical.decode("23").should == 23
-      Numerical.decode("1 hundred").should == 100
-      Numerical.decode("2 hundred thousand").should == 200_000
-      Numerical.decode("3 hundred million").should == 300_000_000
-      Numerical.decode("4 hundred billion").should == 400_000_000_000
-      Numerical.decode("5 hundred trillion").should == 500_000_000_000_000
-      Numerical.decode("600 quadrillion").should == 600_000_000_000_000_000
-      Numerical.decode("1,000,000").should == 1_000_000
+    # check powers of five
+    i = 0
+    while 5 ** i < 1000 ** 22
+      Numerical.decode(Numerical.encode(5 ** i)).should == 5 ** i
+      i += 1
     end
 
-    it "should allow commas" do
-      Numerical.decode("five thousand, three hundred, twenty one").should == 5321
-      Numerical.decode("nine thousand, fifty three").should == 9053
+    # check powers of seven
+    i = 0
+    while 7 ** i < 1000 ** 22
+      Numerical.decode(Numerical.encode(7 ** i)).should == 7 ** i
+      i += 1
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: numerical
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-05 00:00:00.000000000 Z
+date: 2013-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -47,14 +47,21 @@ description: Bi-Directional conversion between english language numbers (e.g.  '
   hundred') and integers
 email:
 - contact@danielknell.co.uk
-executables: []
+executables:
+- numerical
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/numerical/constants.rb
+- lib/numerical/decoder.rb
+- lib/numerical/encoder.rb
 - lib/numerical/version.rb
 - lib/numerical.rb
 - LICENSE
 - README.md
+- bin/numerical
+- spec/numerical/decoder_spec.rb
+- spec/numerical/encoder_spec.rb
 - spec/numerical_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/artisanofcode/ruby-numerical
@@ -82,5 +89,7 @@ signing_key:
 specification_version: 3
 summary: English language number parsing and generation for ruby
 test_files:
+- spec/numerical/decoder_spec.rb
+- spec/numerical/encoder_spec.rb
 - spec/numerical_spec.rb
 - spec/spec_helper.rb