numbers_in_words 0.1.1 → 0.2.0

data/lib/numbers_in_words/language_writer.rb

@@ -0,0 +1,31 @@
+module NumbersInWords
+  class LanguageWriter
+    attr_reader :that
+    delegate :exceptions, :powers_of_ten, to: :language
+
+    def initialize that
+      @that = that
+    end
+
+    def language
+      if @language.is_a? Module
+        @language
+      else
+        @language = NumbersInWords.const_get(@language)
+      end
+    end
+
+
+    def group_words size
+      #1000 and over Numbers are split into groups of three
+      groups = NumberGroup.groups_of @that, size
+      powers = groups.keys.sort.reverse #put in descending order
+
+      powers.each do |power|
+        name = powers_of_ten[power]
+        digits = groups[power]
+        yield power, name, digits
+      end
+    end
+  end
+end

data/lib/numbers_in_words/number_group.rb

@@ -0,0 +1,55 @@
+module NumbersInWords
+  class NumberGroup
+    include Enumerable
+    attr_accessor :number
+
+    def each
+      @array.each { |item|  yield item}
+    end
+
+    def initialize number
+      @number = number
+    end
+
+    #split into groups this gives us 1234567 => 123 456 7
+    #so we need to reverse first
+    #in stages
+    def groups size
+      #1234567   => %w(765 432 1)
+      @array = @number.to_s.reverse.split("").in_groups_of(size)
+      #%w(765 432 1) => %w(1 432 765)
+      @array.reverse!
+
+      #%w(1 432 765) => [1, 234, 567]
+      @array.map! {|group| group.reverse.join("").to_i}
+      @array.reverse! # put in ascending order of power of ten
+
+      power = 0
+
+      #[1, 234, 567] => {6 => 1, 3 => 234, 0 => 567}
+      @array.inject({}) do |o, digits|
+        o[power] = digits
+        power += size
+        o
+      end
+    end
+
+    def split_decimals
+      if @number.is_a? Float
+        int, decimal = @number.to_s.split "."
+
+        return int.to_i, decimal.split(//).map(&:to_i)
+      end
+    end
+
+    def self.groups_of number, size
+      new(number).groups(size)
+    end
+
+    def split_googols
+      googols   = @number.to_s[0  ..  (-LENGTH_OF_GOOGOL)].to_i
+      remainder = @number.to_s[(1-LENGTH_OF_GOOGOL) .. -1].to_i
+      return googols, remainder
+    end
+  end
+end

data/lib/numbers_in_words/number_parser.rb

@@ -0,0 +1,81 @@
+module NumbersInWords::NumberParser
+  # Example: 364,895,457,898
+  #three hundred and sixty four billion eight hundred and ninety five million
+  #four hundred and fifty seven thousand eight hundred and ninety eight
+  #
+  #3 100 60 4 10^9, 8 100 90 5 10^6, 4 100 50 7 1000, 8 100 90 8
+  #                                                                    memory answer
+  #x1. 3 add to memory because answer and memory are zero                 3     0
+  #x2. memory * 100 (because memory<100)                                  300   0
+  #x3. 60 add to memory because memory > 60                               360   0
+  #x3. 4 add to memory because memory > 4                                364    0
+  #x4. multiply memory by 10^9 because memory < power of ten          364*10^9  0
+  #x5. add memory to answer  (and reset)memory > 8 (memory pow of ten > 2) 0   364*10^9
+  #x6. 8 add to memory because not finished                                8    ''
+  #x7. multiply memory by 100 because memory < 100                        800   ''
+  #x8. add 90 to memory because memory > 90                               890   ''
+  #x9. add 5 to memory because memory > 5                                 895   ''
+  #x10. multiply memory by 10^6 because memory < power of ten        895*10^6    ''
+  #x11. add memory to answer (and reset) because memory power ten > 2       0    364895 * 10^6
+  #x12. 4 add to memory because not finished                                4    ''
+  #x13. memory * 100 because memory < 100                                 400    ''
+  #x14. memory + 50 because memory > 50                                   450    ''
+  #x15. memory + 7  because memory > 7                                    457    ''
+  #x16. memory * 1000 because memory < 1000                            457000    ''
+  #x17. add memory to answer  (and reset)memory > 8 (memory pow of ten > 2) 0   364895457000
+  #x18. 8 add to memory because not finished                                8    ''
+  #x19. memory * 100 because memory < 100                                 800    ''
+  #x14. memory + 90 because memory > 90                                   890    ''
+  #x15. memory + 8  because memory > 8                                    898    ''
+  #16. finished so add memory to answer
+
+  #Example
+  #2001
+  #two thousand and one
+  #2 1000 1
+  #                                                        memory answer
+  #1. add 2 to memory because first                          2       0
+  #2. multiply memory by 1000 because memory < 1000        2000      0
+  #3. add memory to answer,reset,  because power of ten>2    0      2000
+  #4. add 1 to memory                                        1      2000
+  #5. finish - add memory to answer                          0      2001
+  def parse(integers)
+    memory = 0
+    answer = 0
+    reset = true #reset each time memory is reset
+    integers.each_with_index do |integer, index|
+      if reset
+        reset = false
+        memory += integer
+      else
+        #x4. multiply memory by 10^9 because memory < power of ten
+        if power_of_ten?(integer)
+          if power_of_ten(integer)> 2
+            memory *= integer
+            #17. add memory to answer  (and reset) (memory pow of ten > 2)
+            answer += memory
+            memory = 0
+            reset = true
+          end
+        end
+
+        if memory < integer
+          memory *= integer
+        else
+          memory += integer
+        end
+      end
+    end
+    answer += memory
+  end
+
+  def power_of_ten integer
+    Math.log10(integer)
+  end
+
+  def power_of_ten? integer
+    power_of_ten(integer) == power_of_ten(integer).to_i
+  end
+
+  extend self
+end

data/lib/numbers_in_words/to_number.rb

@@ -0,0 +1,82 @@
+class NumbersInWords::ToNumber
+  delegate :to_s, to: :that
+  delegate :powers_of_ten_to_i, :exceptions_to_i, to: :language
+  attr_reader :that, :language
+
+  def initialize that, language=NumbersInWords.language
+    @that = that
+    @language = language
+  end
+
+  def language
+    if @language.is_a? Module
+      @language
+    else
+      @language = NumbersInWords.const_get(@language)
+    end
+  end
+
+  def handle_negative text
+    -1 * (text.gsub(/^minus /, "")).in_numbers if text =~ /^minus /
+  end
+
+  def in_numbers
+    text = to_s
+
+    text = strip_punctuation text
+    i = handle_negative text
+    return i if i
+
+    h = handle_decimals text
+    return h if h
+
+    integers = word_array_to_integers text.split(" ")
+
+    NumbersInWords::NumberParser.parse integers
+  end
+
+  def strip_punctuation text
+    text = text.downcase.gsub(/[^a-z ]/, " ")
+    to_remove = true
+
+    to_remove = text.gsub! "  ", " " while to_remove
+
+    text
+  end
+
+  def handle_decimals text
+    match = text.match(/\spoint\s/)
+    if match
+      integer = match.pre_match.in_numbers
+
+      decimal = decimal_portion match.post_match
+
+      integer + decimal
+    end
+  end
+
+
+  def decimal_portion text
+    words    = text.split " "
+    integers = word_array_to_integers words
+    decimal  = "0." + integers.join()
+    decimal.to_f
+  end
+
+  #handles simple single word numbers
+  #e.g. one, seven, twenty, eight, thousand etc
+  def word_to_integer word
+    text = word.to_s.chomp.strip
+
+    exception = exceptions_to_i[text]
+    return exception if exception
+
+    power = powers_of_ten_to_i[text]
+    return 10 ** power if power
+  end
+
+  def word_array_to_integers words
+    words.map { |i| word_to_integer i }.compact
+  end
+end
+

data/lib/numbers_in_words/to_word.rb

@@ -0,0 +1,19 @@
+class NumbersInWords::ToWord
+  def initialize that, language=NumbersInWords.language
+    @that = that
+    @language = language
+  end
+
+  def in_words language=nil
+    language ||= @language
+
+    case language
+    when "English" #allow for I18n
+      in_english
+    end
+  end
+
+  def in_english
+    NumbersInWords::English::LanguageWriterEnglish.new(@that).in_words
+  end
+end

data/lib/numbers_in_words/version.rb

@@ -0,0 +1,3 @@
+module NumbersInWords
+  VERSION = "0.2.0"
+end

data/numbers_in_words.gemspec

@@ -1,32 +1,24 @@
 # -*- encoding: utf-8 -*-
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'numbers_in_words/version'
 
-Gem::Specification.new do |s|
-  s.name = "numbers_in_words"
-  s.version = "0.1.1"
+Gem::Specification.new do |gem|
+  gem.name          = "numbers_in_words"
+  gem.description   = "#in_words method for integers and #in_numbers for strings"
+  gem.summary       = "Example: 123.in_words # => \"one hundred and twenty three\", \"seventy-five point eight\".in_numbers # = > 75.8"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Mark Burns"]
-  s.date = "2012-04-10"
-  s.description = "#in_words method for integers and #in_numbers for strings"
-  s.email = "markthedeveloper@gmail.com"
-  s.extra_rdoc_files = ["CHANGELOG", "README", "lib/numbers.rb", "lib/numbers_in_words.rb", "lib/words.rb"]
-  s.files = ["CHANGELOG", "Manifest", "README", "Rakefile", "examples/display_numbers_in_words.rb", "init.rb", "lib/numbers.rb", "lib/numbers_in_words.rb", "lib/words.rb", "spec/numbers_in_words_spec.rb", "spec/words_in_numbers_spec.rb", "numbers_in_words.gemspec"]
-  s.homepage = "http://rubygems.org/gems/numbers_in_words"
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Numbers_in_words", "--main", "README"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = "numbers_in_words"
-  s.rubygems_version = "1.8.17"
-  s.summary = "Example: 123.in_words #=> \"one hundred and twenty three\", \"seventy-five point eight\".in_numbers #=> 75.8"
+  gem.version       = NumbersInWords::VERSION
+  gem.authors       = ["Mark Burns"]
+  gem.email         = ["markthedeveloper@gmail.com"]
+  gem.homepage      = "http://github.com/markburns/numbers_in_words"
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  gem.add_dependency      "activesupport"
+  gem.add_development_dependency      "rspec"
+  gem.add_development_dependency      "debugger"
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<active_support>, [">= 0"])
-    else
-      s.add_dependency(%q<active_support>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<active_support>, [">= 0"])
-  end
+  gem.files         = `git ls-files`.split($/)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.require_paths = ["lib"]
 end

data/spec/language_writer_spec.rb

@@ -0,0 +1,23 @@
+require './spec/spec_helper'
+
+describe NumbersInWords::English::LanguageWriterEnglish do
+  it "should display numbers grouped" do
+    count = 0
+    @writer = NumbersInWords::English::LanguageWriterEnglish.new(2111)
+    @writer.group_words(3) do |power, name, digits|
+      case count
+      when 0
+        power.should == 3
+        name.should == "thousand"
+        digits.should == 2
+      when 1
+        power.should == 0
+        name.should == "one"
+        digits.should == 111
+      end
+      count += 1
+    end
+  end
+end
+
+

data/spec/number_group_spec.rb

@@ -0,0 +1,17 @@
+require './spec/spec_helper'
+
+describe NumbersInWords::NumberGroup do
+  it "should split into group of three digit numbers" do
+    g = Numeric::NumberGroup
+
+    g.groups_of(1                   ,3 ).should == {0=>1                                          }
+    g.groups_of(12                  ,3 ).should == {0=>12                                         }
+    g.groups_of(123                 ,3 ).should == {0=>123                                        }
+    g.groups_of(1111                ,3 ).should == {3=>1    , 0=>111                              }
+    g.groups_of(87654               ,3 ).should == {3=>87   , 0=>654                              }
+    g.groups_of(1_234_567           ,3 ).should == {6=>1    , 3=>234  , 0=>567                    }
+    g.groups_of(123_456_789_101_112 ,3 ).should == {12=>123 , 9=>456  , 6=>789  , 3=>101 , 0=>112 }
+  end
+end
+
+

data/spec/numbers_in_words_spec.rb

@@ -1,38 +1,4 @@
-require './lib/numbers_in_words'
-
-describe NumbersInWords::NumberGroup do
-
-  it "should split into group of three digit numbers" do
-    Numeric::NumberGroup.groups_of(1,3).should == {0=>1}
-    Numeric::NumberGroup.groups_of(12,3).should == {0=>12}
-    Numeric::NumberGroup.groups_of(123,3).should == {0=>123}
-    Numeric::NumberGroup.groups_of(1111,3).should == {3=>1,0=>111}
-    Numeric::NumberGroup.groups_of(87654,3).should == {3=>87,0=>654}
-    Numeric::NumberGroup.groups_of(1234567,3).should == {6=>1,3=>234,0=>567}
-    Numeric::NumberGroup.groups_of(123456789101112,3).should == {12=>123,9=>456,6=>789,3=>101,0=>112}
-  end
-end
-
-describe NumbersInWords::LanguageWriterEnglish do
-  it "should display numbers grouped" do
-    count = 0
-    @writer = NumbersInWords::LanguageWriterEnglish.new(2111)
-    @writer.group_words(3) do |power, name, digits|
-      case count
-      when 0
-        power.should == 3
-        name.should == "thousand"
-        digits.should == 2
-      when 1
-        power.should == 0
-        name.should == "one"
-        digits.should == 111
-      end
-      count += 1
-    end
-  end
-end
-
+require './spec/spec_helper'
 
 describe NumbersInWords do
   it "should print the digits 0-9 correctly" do

data/spec/spec_helper.rb

@@ -0,0 +1,2 @@
+require 'numbers_in_words'
+require 'numbers_in_words/duck_punch'

data/spec/words_in_numbers_spec.rb

@@ -1,4 +1,4 @@
-require './lib/words'
+require './spec/spec_helper'
 
 describe WordsInNumbers do
   it "should do the digits 0-10" do

metadata

@@ -1,60 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: numbers_in_words
 version: !ruby/object:Gem::Version
-  version: 0.1.1
   prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Mark Burns
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-10 00:00:00.000000000 Z
+date: 2013-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: active_support
-  requirement: &70207857965260 !ruby/object:Gem::Requirement
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  name: activesupport
   prerelease: false
-  version_requirements: *70207857965260
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: rspec
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: debugger
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! '#in_words method for integers and #in_numbers for strings'
-email: markthedeveloper@gmail.com
+email:
+- markthedeveloper@gmail.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- CHANGELOG
-- README
-- lib/numbers.rb
-- lib/numbers_in_words.rb
-- lib/words.rb
+extra_rdoc_files: []
 files:
-- CHANGELOG
-- Manifest
-- README
+- .gitignore
+- Gemfile
+- Gemfile.lock
+- LICENSE.txt
+- README.md
 - Rakefile
-- examples/display_numbers_in_words.rb
-- init.rb
-- lib/numbers.rb
 - lib/numbers_in_words.rb
-- lib/words.rb
+- lib/numbers_in_words/duck_punch.rb
+- lib/numbers_in_words/english/constants.rb
+- lib/numbers_in_words/english/language_writer_english.rb
+- lib/numbers_in_words/language_writer.rb
+- lib/numbers_in_words/number_group.rb
+- lib/numbers_in_words/number_parser.rb
+- lib/numbers_in_words/to_number.rb
+- lib/numbers_in_words/to_word.rb
+- lib/numbers_in_words/version.rb
+- numbers_in_words.gemspec
+- spec/language_writer_spec.rb
+- spec/number_group_spec.rb
 - spec/numbers_in_words_spec.rb
+- spec/spec_helper.rb
 - spec/words_in_numbers_spec.rb
-- numbers_in_words.gemspec
-homepage: http://rubygems.org/gems/numbers_in_words
+homepage: http://github.com/markburns/numbers_in_words
 licenses: []
 post_install_message: 
-rdoc_options:
-- --line-numbers
-- --inline-source
-- --title
-- Numbers_in_words
-- --main
-- README
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -62,18 +99,29 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
+      segments:
+      - 0
+      hash: -1513551754306869579
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '1.2'
+      segments:
+      - 0
+      hash: -1513551754306869579
+      version: '0'
 requirements: []
-rubyforge_project: numbers_in_words
-rubygems_version: 1.8.17
+rubyforge_project: 
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: ! 'Example: 123.in_words #=> "one hundred and twenty three", "seventy-five
-  point eight".in_numbers #=> 75.8'
-test_files: []
+summary: ! 'Example: 123.in_words # => "one hundred and twenty three", "seventy-five
+  point eight".in_numbers # = > 75.8'
+test_files:
+- spec/language_writer_spec.rb
+- spec/number_group_spec.rb
+- spec/numbers_in_words_spec.rb
+- spec/spec_helper.rb
+- spec/words_in_numbers_spec.rb