numerouno 0.1.1 → 0.2.0

data/History.txt

@@ -1,3 +1,8 @@
+== 0.2.0 2009-10-13
+
+* Replace a number phrase within a string with their numeral equivalents
+* Handle upper case number phrases
+
 == 0.1.1 2009-09-03
 
 * Compatibility with Ruby 1.8.6

data/Manifest.txt

@@ -2,12 +2,32 @@ History.txt
 Manifest.txt
 README.rdoc
 Rakefile
-lib/numerouno.rb
+features/parse_billions.feature
+features/parse_hundreds.feature
+features/parse_literal_numerals.feature
+features/parse_millions.feature
+features/parse_powers_of_ten.feature
+features/parse_thousands.feature
+features/parse_trillions.feature
+features/parse_zero_to_ten.feature
+features/steps/numbers.rb
+features/substitute_numbers_within_a_string.feature
+features/support/env.rb
 lib/numerouno-parsing.rb
+lib/numerouno.rb
 lib/numerouno/combiner.rb
+lib/numerouno/numbers.rb
 lib/numerouno/parser.rb
 lib/numerouno/search.rb
+lib/numerouno/substitution.rb
 script/console
 script/destroy
 script/generate
-tasks/rspec.rake
+spec/numerouno/combiner_spec.rb
+spec/numerouno/parser_spec.rb
+spec/numerouno/search_spec.rb
+spec/numerouno/spec_helper.rb
+spec/numerouno/substitution_spec.rb
+spec/spec.opts
+tasks/rspec.rake
+todo

data/README.rdoc

@@ -3,6 +3,8 @@
 * http://github.com/brentsnook/numerouno
 * http://groups.google.com/group/numerouno-number-parsing
 
+== Description
+
 English natural language parser for numbers.
 
 * Parse 'five' to return 5
@@ -11,39 +13,54 @@ English natural language parser for numbers.
 
 Recognises numbers in the trillions.
 
+=== How does it all work?
+
+The English language has explicit rules for expressing numbers. Numeruno attempts to recognise strings based on these rules.
+
+Check out http://wiki.github.com/brentsnook/numerouno for details.
+  
 == Installation
 
   sudo gem install numerouno
 
-=== Building the Gem yourself
-
-Grab the code from github:
+Or grab the code from Github and build yourself:
 
   git clone git://github.com/brentsnook/numerouno.git
   cd numerouno
   rake install_gem
 
-== Use
+== Synopsis
 
 Just require numerouno to add magical number parsing powers to your strings:
 
   require 'numerouno'
   'sixty five'.as_number
+    => 65
+  '65'.as_number
+    => 65
+  'two bit varmint'.sub_numbers
+    => '2 bit varmint'
 
 Or if you're a sook who doesn't like the idea of String being opened up:
 
   require 'numerouno-parsing'
+
   Numerouno.parse 'sixty five'
+  Numerouno.replace 'two bit varmint'
 
-== How does it all work?
+One serving suggestion is to use it to use it with your Cucumber[http://cukes.info/] steps.
 
-The English language has explicit rules for expressing numbers. Numeruno attempts to recognise strings based on these rules.
+meaning_steps.rb
 
-Check out http://wiki.github.com/brentsnook/numerouno for details.
+  require 'numerouno'
+
+  When /the meaning of life is (.+)/ do |number|
+    42.should == number.as_number
+  end
 
-== What is it good for?
+meaning_of_life.feature
 
-The main serving suggestion is to toss it with Chronic[http://chronic.rubyforge.org/] and Cucumber[http://cukes.info/] for an even tastier BDD salad.
+  Then the meaning of life is forty two
 
 == License
 

data/Rakefile

@@ -1,26 +1,25 @@
-%w[rubygems rake rake/clean fileutils newgem rubigen].each { |f| require f }
+%w[rubygems rake rake/clean hoe fileutils newgem rubigen].each { |f| require f }
 require File.dirname(__FILE__) + '/lib/numerouno'
 
-# Generate all the Rake tasks
-# Run 'rake -T' to see list of generated tasks (from gem root directory)
-$hoe = Hoe.new('numerouno', Numerouno::VERSION) do |p|
-  p.developer 'Brent Snook', 'brent@fuglylogic.com'
-  p.summary = %q{English natural language parser for numbers.}
-  p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
-  p.rubyforge_name = p.name
-  p.extra_dev_deps = [
+Hoe.spec 'numerouno' do
+  version = Numerouno::VERSION
+  developer 'Brent Snook', 'brent@fuglylogic.com'
+  self.readme_file = 'README.rdoc'
+  self.clean_globs |= %w[**/.DS_Store tmp *.log]
+  self.rsync_args = '-av --delete --ignore-errors' # is this needed?
+  self.extra_dev_deps = [
     ['newgem', ">= #{::Newgem::VERSION}"],
-    ['rspec', '>= 1.2.4'],
-    ['cucumber', '>= 0.3.1']
+    ['rspec', '>= 1.2.8'],
+    ['cucumber', '>= 0.3.103']
   ]
-  
-  p.clean_globs |= %w[**/.DS_Store tmp *.log]
-  path = (p.rubyforge_name == p.name) ? p.rubyforge_name : "\#{p.rubyforge_name}/\#{p.name}"
-  p.remote_rdoc_dir = File.join(path.gsub(/^#{p.rubyforge_name}\/?/,''), 'rdoc')
-  p.rsync_args = '-av --delete --ignore-errors'
 end
 
-require 'newgem/tasks' # load /tasks/*.rake
+require 'cucumber/rake/task'
+Cucumber::Rake::Task.new(:features) do |t|
+  t.cucumber_opts = "features --format pretty"
+end
+
+require 'newgem/tasks'
 Dir['tasks/**/*.rake'].each { |t| load t }
 
 task :default => [:spec, :features]

data/features/parse_billions.feature

@@ -0,0 +1,20 @@
+Feature: Parse billions
+
+  So that I can convert number strings into numerals
+  I want to parse strings containing billions
+
+  Scenario: Parse a billion with no multiplier
+    When 'a billion' is parsed
+    Then the number will be 1,000,000,000
+
+  Scenario: Parse several billion
+    When 'six hundred and thirty seven billion' is parsed
+    Then the number will be 637,000,000,000
+
+  Scenario: Parse several hundred billion straight
+    When 'seven hundred billion' is parsed
+    Then the number will be 700,000,000,000
+
+  Scenario: Parse numbers between billions
+    When 'two hundred and fifty billion, six hundred and thirty seven million, four hundred and thirty eight thousand, two hundred and ninety eight' is parsed
+    Then the number will be 250,637,438,298

data/features/parse_hundreds.feature

@@ -0,0 +1,20 @@
+Feature: Recognise hundreds
+
+  So that I can convert number strings into numerals
+  I want to parse strings containing hundreds
+
+  Scenario: Parse a hundred with no multiplier
+    When 'a hundred' is parsed
+    Then the number will be 100
+
+  Scenario: Parse several hundred
+    When 'five hundred' is parsed
+    Then the number will be 500
+
+  Scenario: Parse numbers between hundreds
+    When 'one hundred and thirty five' is parsed
+    Then the number will be 135
+
+  Scenario: Parse different ways of stating thousands
+    When 'twenty seven hundred' is parsed
+    Then the number will be 2700

data/features/parse_literal_numerals.feature

@@ -0,0 +1,8 @@
+Feature: Recognise literal numerals
+
+  So that I can avoid checking for number strings or numerals
+  I want to parse strings containing literal numerals
+
+  Scenario: Parse a literal numeral
+    When '10' is parsed
+    Then the number will be 10

data/features/parse_millions.feature

@@ -0,0 +1,20 @@
+Feature: Recognise millions
+
+  So that I can convert number strings into numerals
+  I want to parse strings containing millions
+
+  Scenario: Parse a million with no multiplier
+    When 'a million' is parsed
+    Then the number will be 1,000,000
+
+  Scenario: Parse several million
+    When 'six hundred and thirty seven million' is parsed
+    Then the number will be 637,000,000
+
+  Scenario: Parse several hundred million straight
+    When 'seven hundred million' is parsed
+    Then the number will be 700,000,000
+
+  Scenario: Parse numbers between millions
+    When 'six hundred and thirty seven million, four hundred and thirty eight thousand, two hundred and ninety eight' is parsed
+    Then the number will be 637,438,298

data/features/parse_powers_of_ten.feature

@@ -0,0 +1,36 @@
+Feature: Recognise powers of ten
+
+  So that I can convert number strings into numerals
+  I want to parse strings containing powers of ten
+
+  Scenario Outline: Parse normal numbers
+    When '<string>' is parsed 
+    Then the number will be <number>
+     
+  Scenarios: Parse 11 to 20 and powers of 10
+    | string    | number  |
+    | 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      |
+
+  Scenario: Parse 21 as separate words
+    When 'twenty one' is parsed
+    Then the number will be 21
+  
+  Scenario: Parse 21 as a single word
+    When 'twentyone' is parsed
+    Then the number will be 21

data/features/parse_thousands.feature

@@ -0,0 +1,16 @@
+Feature: Recognise thousands
+
+  So that I can convert number strings into numerals
+  I want to parse strings containing thousands
+
+  Scenario: Parse a thousand with no multiplier
+    When 'a thousand' is parsed
+    Then the number will be 1,000
+
+  Scenario: Parse several thousand
+    When 'six hundred and thirty seven thousand' is parsed
+    Then the number will be 637,000
+
+  Scenario: Parse numbers between thousands
+    When 'six hundred and thirty seven thousand, four hundred and thirty eight' is parsed
+    Then the number will be 637,438

data/features/parse_trillions.feature

@@ -0,0 +1,20 @@
+Feature: Recognise trillions
+
+  So that I can convert number strings into numerals
+  I want to parse strings containing trillions
+
+  Scenario: Parse a trillion with no multiplier
+    When 'a trillion' is parsed
+    Then the number will be 1,000,000,000,000
+
+  Scenario: Parse several trillion
+    When 'six hundred and thirty seven trillion' is parsed
+    Then the number will be 637,000,000,000,000
+
+  Scenario: Parse several hundred trillion straight
+    When 'seven hundred trillion' is parsed
+    Then the number will be 700,000,000,000,000
+
+  Scenario: Parse numbers between trillions
+    When 'nine hundred and forty two trillion, two hundred and fifty billion, six hundred and thirty seven million, four hundred and thirty eight thousand, two hundred and ninety eight' is parsed
+    Then the number will be 942,250,637,438,298

data/features/parse_zero_to_ten.feature

@@ -0,0 +1,34 @@
+Feature: Recognise from zero to ten
+ 
+  So that I can convert number strings into numerals
+  I want to parse strings containing zero to ten
+
+  Scenario Outline: Parse normal numbers
+    When '<string>' is parsed 
+    Then the number will be <number>
+     
+  Scenarios: Parse 1 to 10
+    | string  | number  |
+    | zero    | 0       |
+    | one     | 1       |
+    | two     | 2       |
+    | three   | 3       |
+    | four    | 4       |
+    | five    | 5       |
+    | six     | 6       |
+    | seven   | 7       |
+    | eight   | 8       |
+    | nine    | 9       |
+    | ten     | 10      |
+
+  Scenario: No number found
+    When 'gibberish' is parsed
+    Then an error will be raised stating that no number was found
+ 
+  Scenario: Number string contains noise
+    When 'a bratwurst costs two euros' is parsed
+    Then the number will be 2
+
+  Scenario: Number is upper case
+    When 'a bratwurst costs TWO euros' is parsed
+    Then the number will be 2

data/features/steps/numbers.rb

@@ -0,0 +1,24 @@
+When /^'(.*)' is parsed$/ do |string|
+  @string = string
+  @stimulus = lambda { string.as_number }
+end
+
+When /^'(.*)' has numbers substituted$/ do |string|
+  @string = string
+  @stimulus = lambda { string.sub_numbers }
+end
+
+Then /^the number will be (.*)$/ do |parsed_number|
+  @stimulus.call.should == parsed_number.gsub(',', '').to_i
+end
+
+Then /^an error will be raised stating that no number was found$/ do
+  @stimulus.should raise_error( 
+    Numerouno::NoNumberFoundError, 
+    "No number found in string: #{@string}" 
+  ) 
+end
+
+Then /^the string will be '(.*)'$/ do |replaced_string|
+  @stimulus.call.should == replaced_string
+end

data/features/substitute_numbers_within_a_string.feature

@@ -0,0 +1,42 @@
+Feature: Substitute numbers within a string
+
+  In order to allow tools like Chronic to parse a string containing a number
+  I want to substitute number phrases within a string with numerals
+
+  Scenario Outline: Substitute normal numbers
+    When 'I have <string> Alf pogs' has numbers substituted 
+    Then the string will be 'I have <number> Alf pogs'
+
+  Scenarios: Substitute numbers
+    | string    | number  |
+    | 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      |
+    | seven million, nine hundred and seventy seven | 7000977 |
+
+  

data/features/support/env.rb

@@ -0,0 +1,6 @@
+require File.dirname(__FILE__) + "/../../lib/numerouno"
+
+gem 'cucumber'
+require 'cucumber'
+gem 'rspec'
+require 'spec'

data/lib/numerouno-parsing.rb

@@ -3,14 +3,21 @@ $:.unshift(File.dirname(__FILE__)) unless
 
 [
   'combiner',
+  'numbers',
   'search',
-  'parser'
+  'parser',
+  'substitution'
 ].each {|file| require "numerouno/#{file}"}
 
 module Numerouno
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
   
   def self.parse string
     Parser.number_from string
-  end  
+  end
+  
+  def self.replace string
+    Substitution.new(string).sub
+  end
+  
 end

data/lib/numerouno.rb

@@ -7,6 +7,10 @@ module Numerouno
     def as_number
       Numerouno.parse self
     end
+    
+    def sub_numbers
+      Numerouno.replace self
+    end
   end
      
 end

data/lib/numerouno/numbers.rb

@@ -0,0 +1,52 @@
+module Numerouno
+  
+  module Numbers
+   
+    # the mapping between number strings and numbers needs to be ordered
+    # this is to avoid the wrong mapping being picked up
+    # i.e /seven/ would match 'seventy' before /seventy/ 
+    NUMBER_STRINGS = [
+      ['sixty', 60],
+      ['seventy', 70],
+      ['eighty', 80],
+      ['ninety', 90],
+      ['fourteen', 14],
+      ['sixteen', 16],
+      ['seventeen', 17],
+      ['eighteen', 18],
+      ['nineteen', 19],
+        
+      ['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],
+      ['fifteen', 15],
+      ['twenty', 20],
+      ['thirty', 30],
+      ['forty', 40],
+      ['fifty', 50],
+      
+      ['hundred', 100],
+      ['thousand', 1000],
+      ['million', 1000000],
+      ['billion', 1000000000],
+      ['trillion', 1000000000000]
+    ]
+    
+    NUMBER_LOOKUP = NUMBER_STRINGS.inject(Hash.new) do |hash, map|
+      hash[map[0]] = map[1]
+      hash
+    end
+     
+  end
+end

data/lib/numerouno/search.rb

@@ -9,52 +9,8 @@ module Numerouno
   end  
   
   class Search
-
-    # the mapping between number strings and numbers needs to be ordered
-    # this is to avoid the wrong mapping being picked up
-    # i.e /seven/ would match 'seventy' before /seventy/ 
-    NUMBER_STRINGS = [
-      ['sixty', 60],
-      ['seventy', 70],
-      ['eighty', 80],
-      ['ninety', 90],
-      ['fourteen', 14],
-      ['sixteen', 16],
-      ['seventeen', 17],
-      ['eighteen', 18],
-      ['nineteen', 19],
-        
-      ['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],
-      ['fifteen', 15],
-      ['twenty', 20],
-      ['thirty', 30],
-      ['forty', 40],
-      ['fifty', 50],
-      
-      ['hundred', 100],
-      ['thousand', 1000],
-      ['million', 1000000],
-      ['billion', 1000000000],
-      ['trillion', 1000000000000]
-    ]
     
-    NUMBER_LOOKUP = NUMBER_STRINGS.inject(Hash.new) do |hash, map|
-      hash[map[0]] = map[1]
-      hash
-    end
+    include Numbers
     
     def initialize string
       @string = string
@@ -71,7 +27,7 @@ module Numerouno
     def search
       if match = next_match
         @string = string_without match
-        @numbers[match.pre_match.length] = NUMBER_LOOKUP[match.to_s]
+        @numbers[match.pre_match.length] = NUMBER_LOOKUP[match.to_s.downcase]
       else
         @string = ''
       end
@@ -83,7 +39,7 @@ module Numerouno
     
     def next_match
       NUMBER_STRINGS.collect do |number_string, number|
-        @string.match number_string
+        @string.match(/#{number_string}/i)
       end.compact.first
     end
     

data/lib/numerouno/substitution.rb

@@ -0,0 +1,55 @@
+require 'strscan'
+
+module Numerouno
+  
+  class Substitution
+    
+    include Numbers
+    
+    def initialize source
+      @source = source
+    end
+  
+    def sub
+      matches = {}
+      
+      NUMBER_STRINGS.each do |number_string, number|
+        matches = matches_within(@source, number_string).merge(matches)
+      end
+
+      matches.empty? ? @source : replace(matches, @source)
+    end
+    
+    private
+
+    def match_locations source, string
+      match_locations = []
+      scanner = StringScanner.new source
+      while(scanner.scan_until(/#{string}/i))
+        match_locations << scanner.pre_match.length
+      end
+      match_locations
+    end
+    
+    def matches_within source, string 
+      start_vs_length = {}
+      match_locations(source, string).each do |start|
+        start_vs_length[start] = string.length
+      end
+      start_vs_length
+    end
+    
+    def replace match_locations, source
+      
+      sorted_matches = match_locations.sort
+      
+      first_match, last_match = sorted_matches.first, sorted_matches.last
+      range = (first_match.first..(last_match.first + last_match.last - 1))
+      
+      phrase = source[range]
+      
+      source.sub(/#{phrase.downcase}/i, Parser.number_from(phrase).to_s)
+    end
+  end
+  
+end

data/spec/numerouno/combiner_spec.rb

@@ -0,0 +1,64 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+
+describe Numerouno::Combiner do
+
+  before { @power = 1000 }
+  
+  it 'only combines numbers of the correct power' do
+    numbers = [2, 100, 3, 1000, 4, 1000000, 5]
+    combined(numbers).should eql([2, 100, 3004, 1000000, 5])
+  end
+  
+  describe 'multiplication' do
+    
+    it 'multiplies by the number on the left' do
+      combined([2, 1000]).should eql([2000])
+    end
+    
+    it "doesn't multiply when the current number is the first" do
+      combined([1000, 5]).should_not eql([5000])
+    end
+    
+    # there is no need to multiply powers of ten
+    # i.e. there is no 'two ten', number like 'twenty' are already multiplied 
+    it 'only multiplies when the current power is greater than ten' do
+      @power = 10
+      combined([5, 20]).should eql([5, 20])
+    end  
+  end
+  
+  describe 'addition' do
+
+    it 'adds the number on the right' do
+      combined([1000, 5]).should eql([1005])
+    end
+    
+    it "doesn't add when the current number is the last" do
+      combined([5, 1000]).should_not eql([1005])
+    end
+    
+    # we don't want to add a number that is greater
+    # because the current number is probably part of a multiplication
+    # i.e. "twenty thousand" should produce 20,000 not 1,020
+    it "doesn't add when the number is less than number to the right" do
+      combined([1000, 1000000]).should_not eql([1001000])
+    end  
+  end
+
+  def combined numbers
+    Numerouno::Combiner.new(numbers).of_power(@power).apply!
+    numbers
+  end
+end
+
+describe Numerouno::CombinerMethods do
+  
+  include Numerouno::CombinerMethods
+  
+  it 'build a combiner' do
+    numbers = [2, 100, 5]
+    combine(numbers).of_power(100).apply!
+    
+    numbers.should eql([205])
+  end  
+end

data/spec/numerouno/parser_spec.rb

@@ -0,0 +1,55 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+
+describe Numerouno::Parser do
+
+  it 'parses numbers for powers of ten up to a trillion' do
+    subject.stub!(:numbers_within).and_return([0])
+    combiners = [10, 100, 1000, 1000000, 1000000000, 1000000000000].collect do |power|
+      combiner = mock :combine
+      combiner.should_receive(:of_power).with(power).and_return combiner
+      combiner.should_receive(:apply!)
+      combiner
+    end
+
+    subject.stub!(:combine).exactly(6).times.and_return *combiners
+
+    subject.number_from ''
+  end
+
+  it 'sums all found numbers' do
+    subject.stub!(:numbers_within).and_return([7000, 600])
+    subject.stub!(:combine).and_return mock('combiner', :null_object => true)
+
+    subject.number_from('seven thousand, six hundred').should be(7600)
+  end
+
+  it 'fails when no numbers are found in string' do
+    lambda {
+      subject.number_from 'I contain no numbers'
+    }.should raise_error(Numerouno::NoNumberFoundError)
+  end
+end
+
+describe Numerouno::Parser, 'parsing' do
+
+  it 'parses the number 0' do
+    subject.number_from('0').should == 0
+  end  
+
+  it 'parses numbers greater than 0' do
+    subject.number_from('5').should == 5
+  end
+
+  it 'parses numbers less than 0' do
+    subject.number_from('-1').should == -1
+  end
+
+  it 'parses numbers starting with a numeral as a literal number' do
+    subject.number_from('55 hundred').should == 55
+  end
+
+  it 'numbers starting with a alphabetic character as a phrase' do
+    subject.number_from('two 5').should == 2
+  end
+ 
+end

data/spec/numerouno/search_spec.rb

@@ -0,0 +1,36 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+
+describe Numerouno::Search do
+  
+  # a lot of the search functionality is already covered in the features
+  
+  it 'finds all numbers within a string' do
+    search_for('seventy five thousand and forty two').should eql([70, 5, 1000, 40, 2])
+  end  
+  
+  it "doesn't falsely identify partial numbers in powers of ten" do
+    search_for('sixty seventy eighty ninety').should eql([60, 70, 80, 90])
+  end
+  
+  it "doesn't falsely identify partial numbers in teens" do
+    search_for('fourteen sixteen seventeen eighteen nineteen').should eql([14, 16, 17, 18, 19])
+  end
+  
+  it 'finds uppercase numbers' do
+    search_for('NINE is uppercase').should eql([9])
+  end
+  
+  def search_for string
+    Numerouno::Search.new(string).find_all
+  end 
+end
+
+describe Numerouno::SearchMethods do
+  
+  include Numerouno::SearchMethods
+  
+  it 'builds a search' do
+    numbers_within('one two three').should eql([1, 2, 3])  
+  end
+  
+end

data/spec/numerouno/spec_helper.rb

@@ -0,0 +1,10 @@
+begin
+  require 'spec'
+rescue LoadError
+  require 'rubygems'
+  gem 'rspec'
+  require 'spec'
+end
+
+$:.unshift(File.dirname(__FILE__) + '/../../lib')
+require 'numerouno'

data/spec/numerouno/substitution_spec.rb

@@ -0,0 +1,33 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+
+describe Numerouno::Substitution do
+  
+  it 'substitutes number phrases with a single word' do
+    substitution_for('my hamster has nine lives').should == 'my hamster has 9 lives'
+  end
+
+  it 'substitutes number phrases with several words' do
+    substitution_for('the answer is forty two, really').should == 'the answer is 42, really'
+  end
+  
+  it 'returns the source string when there are no matches' do
+    substitution_for("I don't need no stinking numbers").should == "I don't need no stinking numbers"
+  end
+  
+  it 'returns the source string for a string that consists only of a numeral' do
+    substitution_for('42').should == '42'
+  end
+  
+  it "doesn't get confused by similar looking numbers" do
+    substitution_for('I have seven hundred and seventy seven apricots').should == 'I have 777 apricots'
+  end
+  
+  it 'substitutes upper case number phrases' do
+    substitution_for('my hamster has NINE lives').should == 'my hamster has 9 lives'
+  end
+    
+  def substitution_for string
+    Numerouno::Substitution.new(string).sub
+  end
+  
+end

data/spec/spec.opts

@@ -0,0 +1,5 @@
+--colour
+--format
+specdoc
+--timeout
+20

data/todo

@@ -0,0 +1,16 @@
+== 0.1.2
+
+
+ - allow a part of a string to be replaced
+
+
+====== later
+
+- add lighthouse project
+
+- support positive and negative?
+- support conversion from number to phrase?
+- handle slang?
+  - grand
+  - K?
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: numerouno
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors: 
 - Brent Snook
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-04 00:00:00 +01:00
+date: 2009-10-13 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.3
+        version: 1.5.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.4
+        version: 1.2.8
     version: 
 - !ruby/object:Gem::Dependency 
   name: cucumber
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.1
+        version: 0.3.103
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -50,9 +50,16 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.0
+        version: 2.3.3
     version: 
-description: ""
+description: |-
+  English natural language parser for numbers.
+  
+  * Parse 'five' to return 5
+  * Parse 'seven hundred and fifty two billion, four hundred and twenty million, sixty thousand and forty two' to return 752,420,060,042
+  * Parse 'siebenundzwanzig' to have it fail because it doesn't recognise German.
+  
+  Recognises numbers in the trillions.
 email: 
 - brent@fuglylogic.com
 executables: []
@@ -62,21 +69,40 @@ extensions: []
 extra_rdoc_files: 
 - History.txt
 - Manifest.txt
-- README.rdoc
 files: 
 - History.txt
 - Manifest.txt
 - README.rdoc
 - Rakefile
-- lib/numerouno.rb
+- features/parse_billions.feature
+- features/parse_hundreds.feature
+- features/parse_literal_numerals.feature
+- features/parse_millions.feature
+- features/parse_powers_of_ten.feature
+- features/parse_thousands.feature
+- features/parse_trillions.feature
+- features/parse_zero_to_ten.feature
+- features/steps/numbers.rb
+- features/substitute_numbers_within_a_string.feature
+- features/support/env.rb
 - lib/numerouno-parsing.rb
+- lib/numerouno.rb
 - lib/numerouno/combiner.rb
+- lib/numerouno/numbers.rb
 - lib/numerouno/parser.rb
 - lib/numerouno/search.rb
+- lib/numerouno/substitution.rb
 - script/console
 - script/destroy
 - script/generate
+- spec/numerouno/combiner_spec.rb
+- spec/numerouno/parser_spec.rb
+- spec/numerouno/search_spec.rb
+- spec/numerouno/spec_helper.rb
+- spec/numerouno/substitution_spec.rb
+- spec/spec.opts
 - tasks/rspec.rake
+- todo
 has_rdoc: true
 homepage: http://github.com/brentsnook/numerouno
 licenses: []
@@ -105,6 +131,6 @@ rubyforge_project: numerouno
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: English natural language parser for numbers.
+summary: English natural language parser for numbers
 test_files: []