numbers_in_words 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ae79a47b168a7aa57ce40a4cea7cfc6c35eae27
-  data.tar.gz: dab916e39bd24eeaff4c02c06816874506b053cb
+  metadata.gz: f2857f0873d094b51ce7ca5e4a90ac8e999bebb6
+  data.tar.gz: b0e885874e36c119b69290ae0bb30110419f7031
 SHA512:
-  metadata.gz: c6ae5c2eb9cad7c67563c2cad679741098841c7d74b12ac0dfa45a50082baedb511c3bb58b1a92f887bdb5857d9189c048addecdaa387a47cbe76f58fab26816
-  data.tar.gz: 76d00e6c848827df1739a9d0b0d3476b061c5355a5d2fb13eab0d2a432c1d9c061a133b76d17286690d0408879e9857085d86ce86c31243038f2776f7e2db5d1
+  metadata.gz: 98b44efc9e3c5bd28d5f3f26d11fd4b62f12fde010ce4ca30fe35e57ca10a8cb0822ac50fcb977a4823d7c722a75c71c670b52584c5361c2aae8fe2527ff95a9
+  data.tar.gz: 99b23e8c07dea648e1afc393f28f4b8981594c30a05bb4970b616cd76098294ddaf7b450bf683dd1656e8cadf01573b7fcf86164e32d12afbba95adde26e31ed

data/.codeclimate.yml

@@ -10,3 +10,5 @@ ratings:
   - "**.rb"
 exclude_paths:
 - spec/**/*
+- .codeclimate.yml
+- .rubocop.yml

data/README.md

@@ -1,9 +1,10 @@
 [![Build Status](http://img.shields.io/travis/markburns/numbers_in_words.svg)](https://travis-ci.org/markburns/numbers_in_words)
 [![Dependency Status](http://img.shields.io/gemnasium/markburns/numbers_in_words.svg)](https://gemnasium.com/markburns/numbers_in_words)
 [![Code Climate](http://img.shields.io/codeclimate/github/markburns/numbers_in_words.svg)](https://codeclimate.com/github/markburns/numbers_in_words)
+[![Test Coverage](https://codeclimate.com/github/markburns/numbers_in_words/badges/coverage.svg)](https://codeclimate.com/github/markburns/numbers_in_words/coverage)
 [![Gem Version](http://img.shields.io/gem/v/numbers_in_words.svg)](https://rubygems.org/gems/numbers_in_words)
 [![License](http://img.shields.io/:license-mit-blue.svg)](http://markburns.mit-license.org)
-[![Badges](http://img.shields.io/:badges-6/6-ff6799.svg)](https://github.com/badges/badgerbadgerbadger)
+[![Badges](http://img.shields.io/:badges-7/7-ff6799.svg)](https://github.com/badges/badgerbadgerbadger)
 
 Installation
 ============
@@ -12,7 +13,7 @@ Installation
 gem 'numbers_in_words'
 
 require 'numbers_in_words'
-require 'numbers_in_words/duck_punch' #see why later
+require 'numbers_in_words/duck_punch' #optional see why later
 ```
 
 This project was created for a test for a job interview. I haven't really used
@@ -27,7 +28,7 @@ require 'numbers_in_words'
 NumbersInWords.in_words(112)
 #=> one hundred and twelve
 
-NumbersInWords.in_numbers(112)
+NumbersInWords.in_numbers("one googol")
 #=>10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 
 NumbersInWords.in_numbers("Seventy million, five-hundred and fifty six thousand point eight nine three")

data/lib/numbers_in_words.rb

@@ -21,12 +21,12 @@ module NumbersInWords
       @language ||= "English"
     end
 
-    def in_words(i, language=NumbersInWords.language)
-      NumbersInWords::ToWord.new(i, language).in_words
+    def in_words(i, language=NumbersInWords.language, only_compress=false)
+      NumbersInWords::ToWord.new(i, language).in_words(only_compress)
     end
 
-    def in_numbers(s, language=NumbersInWords.language)
-      NumbersInWords::ToNumber.new(s, language).in_numbers
+    def in_numbers(s, language=NumbersInWords.language, only_compress=false)
+      NumbersInWords::ToNumber.new(s, language).in_numbers(only_compress)
     end
   end
 end

data/lib/numbers_in_words/duck_punch.rb

@@ -5,8 +5,8 @@ module NumbersInWords
 end
 
 module WordsInNumbers
-  def in_numbers language=NumbersInWords.language
-    NumbersInWords.in_numbers(self, language)
+  def in_numbers(only_compress = false, language=NumbersInWords.language)
+    NumbersInWords::ToNumber.new(self, language).in_numbers(only_compress)
   end
 end
 

data/lib/numbers_in_words/english/constants.rb

@@ -1,5 +1,14 @@
 module NumbersInWords
   module English
+
+    def self.canonize(w)
+      aliases = {
+        "oh" => "zero"
+      }
+      canon = aliases[w]
+      return canon ? canon : w
+    end
+
     def self.exceptions
       {
         0 => "zero",
@@ -89,5 +98,27 @@ module NumbersInWords
     def self.powers_of_ten_to_i
       swap_keys powers_of_ten
     end
+
+    POWERS_RX = Regexp.union(powers_of_ten.values[1..-1])
+
+    def self.check_mixed(txt)
+      mixed = txt.match /^(-?\d+(.\d+)?) (#{POWERS_RX}s?)$/
+      if mixed && mixed[1] && mixed[3]
+        matches = [mixed[1], mixed[3]].map{ |m| NumbersInWords.in_numbers m }
+        return matches.reduce(&:*)
+      end
+    end
+
+    def self.check_one(txt)
+      one = txt.match /^one (#{POWERS_RX})$/
+    end
+
+    def self.strip_minus(txt)
+      stripped = txt.gsub(/^minus/, "") if txt =~ /^minus/
+    end
+
+    def self.check_decimal(txt)
+      txt.match(/\spoint\s/)
+    end
   end
 end

data/lib/numbers_in_words/english/language_writer_english.rb

@@ -23,22 +23,29 @@ module NumbersInWords
 
         return negative() if number < 0
 
-        length = number.to_s.length
+        output = if number.to_s.length == 2 #20-99
+                   handle_tens(number)
+                 else
+                   write() #longer numbers
+                 end
+
+        output.strip
+      end
+
+      def handle_tens(number)
         output = ""
 
-        if length == 2 #20-99
-          tens = (number/10).round*10 #write the tens
+        tens = (number/10).round*10 #write the tens
 
-          output << exceptions[tens] # e.g. eighty
+        output << exceptions[tens] # e.g. eighty
 
-          digit = number - tens       #write the digits
+        digit = number - tens       #write the digits
 
-          output << " " + NumbersInWords.in_words(digit) unless digit==0
-        else
-          output << write() #longer numbers
+        unless digit == 0
+          output << " " + NumbersInWords.in_words(digit)
         end
 
-        output.strip
+        output
       end
 
       def handle_exception

data/lib/numbers_in_words/language_writer.rb

@@ -15,7 +15,6 @@ module NumbersInWords
       end
     end
 
-
     def group_words size
       #1000 and over Numbers are split into groups of three
       groups = NumberGroup.groups_of @that, size

data/lib/numbers_in_words/number_group.rb

@@ -3,8 +3,8 @@ module NumbersInWords
     include Enumerable
     attr_accessor :number
 
-    def each
-      @array.each { |item|  yield item}
+    def self.groups_of number, size
+      new(number).groups(size)
     end
 
     def initialize number
@@ -42,10 +42,6 @@ module NumbersInWords
       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

data/lib/numbers_in_words/number_parser.rb

@@ -1,4 +1,5 @@
 module NumbersInWords::NumberParser
+  SCALES_N = [100, 1000, 1000000, 1000000000, 1000000000000, 10**100]
   # 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
@@ -39,7 +40,7 @@ module NumbersInWords::NumberParser
   #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)
+  def parse_ints(integers)
     memory = 0
     answer = 0
     reset = true #reset each time memory is reset
@@ -58,8 +59,7 @@ module NumbersInWords::NumberParser
             reset = true
           end
         end
-
-        if memory < integer
+        if memory < integer 
           memory *= integer
         else
           memory += integer
@@ -69,6 +69,18 @@ module NumbersInWords::NumberParser
     answer += memory
   end
 
+  def parse(integers, only_compress = false)
+    if integers.length < 2
+      return integers if only_compress
+      return integers.empty? ? 0 : integers[0]
+    end
+    if [] == (SCALES_N & integers)
+      return pair_parse(integers, only_compress)
+    end
+
+    parse_ints(integers)
+  end
+
   def power_of_ten integer
     Math.log10(integer)
   end
@@ -77,5 +89,47 @@ module NumbersInWords::NumberParser
     power_of_ten(integer) == power_of_ten(integer).to_i
   end
 
+  # 15,16
+  # 85,16
+  def pair_parse(ints, only_compress = false)
+    ints = compress(ints)
+    return ints if only_compress
+    return ints[0] if ints.length == 1
+    sum = 0
+    ints.each do |n|
+      sum *= n >= 10 ? 100 : 10
+      sum += n
+    end
+    sum
+  end
+
+  # [40, 2] => [42]
+  def compress(ints)
+    res = []
+    i = 0
+    return [] if ints.empty?
+    while i < ints.length - 1
+      int, jump = compress_int(ints[i], ints[i + 1])
+      res << int
+      i += jump
+    end
+    if i < ints.length
+      res << ints[-1]
+    else
+      res
+    end
+  end
+
+  def compress_int(int, sequel)
+    tens = int % 10 == 0 && int > 10
+    if tens && sequel < 10
+      return [int + sequel, 2]
+    else
+      return [int, 1]
+    end
+
+    [res, jump]
+  end
+
   extend self
 end

data/lib/numbers_in_words/to_number.rb

@@ -1,6 +1,7 @@
 class NumbersInWords::ToNumber
   delegate :to_s, to: :that
-  delegate :powers_of_ten_to_i, :exceptions_to_i, to: :language
+  delegate :powers_of_ten_to_i, :exceptions_to_i, :canonize, \
+    :check_mixed, :check_one, :strip_minus, :check_decimal, to: :language
   attr_reader :that, :language
 
   def initialize that, language=NumbersInWords.language
@@ -16,27 +17,42 @@ class NumbersInWords::ToNumber
     end
   end
 
-  def handle_negative text
-    -1 * (text.gsub(/^minus /, "")).in_numbers if text =~ /^minus /
+  def handle_negative(text, only_compress)
+    stripped = strip_minus text
+    if stripped
+      stripped_n = NumbersInWords.in_numbers(stripped, language, only_compress)
+      only_compress ? stripped_n.map{ |k| k * -1 } : -1 * stripped_n
+    end
   end
 
-  def in_numbers
-    text = to_s
+  def in_numbers(only_compress = false)
+    text = to_s.strip
+    return text.to_f if text =~ /^-?\d+(.\d+)?$/
 
     text = strip_punctuation text
-    i = handle_negative text
+
+    i = handle_negative(text, only_compress)
     return i if i
 
+    mixed = check_mixed text
+    return mixed if mixed
+
+    one = check_one text
+    if one
+      res = NumbersInWords.in_numbers(one[1], language)
+      return only_compress ? [res] : res
+    end
+
     h = handle_decimals text
     return h if h
 
     integers = word_array_to_integers text.split(" ")
 
-    NumbersInWords::NumberParser.parse integers
+    NumbersInWords::NumberParser.parse integers, only_compress
   end
 
   def strip_punctuation text
-    text = text.downcase.gsub(/[^a-z ]/, " ")
+    text = text.downcase.gsub(/[^a-z 0-9]/, " ")
     to_remove = true
 
     to_remove = text.gsub! "  ", " " while to_remove
@@ -45,28 +61,18 @@ class NumbersInWords::ToNumber
   end
 
   def handle_decimals text
-    match = text.match(/\spoint\s/)
+    match = check_decimal text
     if match
-      integer = match.pre_match.in_numbers
-
-      decimal = decimal_portion match.post_match
-
-      integer + decimal
+      integer = NumbersInWords.in_numbers(match.pre_match)
+      decimal = NumbersInWords.in_numbers(match.post_match)
+      integer +=  "0.#{decimal}".to_f
     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
+    text = canonize(word.to_s.chomp.strip)
 
     exception = exceptions_to_i[text]
     return exception if exception

data/lib/numbers_in_words/version.rb

@@ -1,3 +1,3 @@
 module NumbersInWords
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/numbers_in_words.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |gem|
   gem.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.authors       = ["Mark Burns", "Dimid Duchovny"]
+  gem.email         = ["markthedeveloper@gmail.com", "dimidd@gmail.com"]
   gem.homepage      = "http://github.com/markburns/numbers_in_words"
 
   gem.add_dependency      "activesupport"

data/spec/non_monkey_patch_spec.rb

@@ -19,6 +19,12 @@ describe "NumbersInWords" do
   describe ".in_numbers" do
     it do
       expect(NumbersInWords.in_numbers("one hundred")).to eq 100
+
+      expect(NumbersInWords.in_numbers("minus one hundred")).to eq -100
+      expect(NumbersInWords.in_numbers("twenty four" )).to eq 24
+      expect(NumbersInWords.in_numbers("one point two")).to eq 1.2
+      expect(NumbersInWords.in_numbers("one hundred googol")).to eq  100*10**100
+      expect(NumbersInWords.in_numbers("one hundred googol and thirty")).to eq 30 + 100*10**100
     end
   end
 

data/spec/numerical_strings_spec.rb

@@ -0,0 +1,19 @@
+require './spec/spec_helper'
+
+describe NumbersInWords do
+  it "should recognize numerical strings" do
+    arr = %w(8 56 100 5789 3435356)
+    arr.each{ |s| expect(s.in_numbers).to eql(s.to_f) }
+  end
+
+  it "should recognize mixed strings" do
+    mixed = {
+      "19 hundred" => 1_900.0,
+      "20 thousand" => 20_000.0,
+      "100 million" => 100_000_000.0,
+      "7 billion" => 7_000_000_000.0,
+      "42 trillion" => 42_000_000_000_000.0
+    }
+    mixed.each{ |k, v| expect(k.in_numbers).to eql(v) }
+  end
+end

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
+require "codeclimate-test-reporter"
+CodeClimate::TestReporter.start
+
 require 'numbers_in_words'
 require 'numbers_in_words/duck_punch'
 
-require "codeclimate-test-reporter"
-CodeClimate::TestReporter.start
 

data/spec/words_in_numbers_spec.rb

@@ -132,4 +132,14 @@ describe WordsInNumbers do
       in_numbers).to eq(75.84327694518)
   end
 
+  it "should handle years notation" do
+    expect("fifteen sixteen".in_numbers) .to eq(1516)
+    expect("eighty five sixteen".in_numbers) .to eq(8516)
+    expect("nineteen ninety six".in_numbers) .to eq(1996)
+    expect("forty nine ninety eight forty seven seventy nine".in_numbers) .to eq(49984779)
+    expect("fifteen sixteen".in_numbers) .to eq(1516)
+    expect("fifteen sixteen seven".in_numbers) .to eq(15167)
+    expect("fifteen sixteen seventeen".in_numbers) .to eq(151617)
+  end
+
 end

data/spec/years_spec.rb

@@ -0,0 +1,17 @@
+require './spec/spec_helper'
+
+describe WordsInNumbers do
+  it "should handle years notation" do
+    expect("fifteen sixteen seventeen".in_numbers).to eq(151617)
+    expect("forty nine ninety eight forty seven seventy nine".in_numbers).to eq(49984779)
+     expect("sixty seven six".in_numbers) .to eq(676)
+     expect("one fifty".in_numbers).to eq(150)
+     expect("two fifty".in_numbers).to eq(250)
+     expect("one point fifty six fifty seven".in_numbers).to eq(1.5657) 
+     expect("one three forty seven".in_numbers).to eq(1347) 
+     expect("one three five point forty seven".in_numbers).to eq(135.47)
+		 expect("one ten sixty three".in_numbers).to eq(11063)
+     expect("one nineteen ten oh five".in_numbers).to eq(1191005)
+  end
+
+end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: numbers_in_words
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Mark Burns
+- Dimid Duchovny
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-30 00:00:00.000000000 Z
+date: 2015-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -41,6 +42,7 @@ dependencies:
 description: "#in_words method for integers and #in_numbers for strings"
 email:
 - markthedeveloper@gmail.com
+- dimidd@gmail.com
 executables:
 - spec
 extensions: []
@@ -71,8 +73,10 @@ files:
 - spec/non_monkey_patch_spec.rb
 - spec/number_group_spec.rb
 - spec/numbers_in_words_spec.rb
+- spec/numerical_strings_spec.rb
 - spec/spec_helper.rb
 - spec/words_in_numbers_spec.rb
+- spec/years_spec.rb
 homepage: http://github.com/markburns/numbers_in_words
 licenses: []
 metadata: {}
@@ -102,5 +106,7 @@ test_files:
 - spec/non_monkey_patch_spec.rb
 - spec/number_group_spec.rb
 - spec/numbers_in_words_spec.rb
+- spec/numerical_strings_spec.rb
 - spec/spec_helper.rb
 - spec/words_in_numbers_spec.rb
+- spec/years_spec.rb