numbers_in_words 0.4.0 → 0.4.1

data/spec/writer_spec.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+RSpec.describe NumbersInWords::Writer do
+  let(:number) { 2_111 }
+  let(:writer) { described_class.new(number) }
+
+  it 'should display numbers grouped' do
+    count = 0
+
+    writer.group_words(3) do |power, name, digits|
+      case count
+      when 0
+        expect(power).to eq(3)
+        expect(name).to eq('thousand')
+        expect(digits).to eq(2)
+      when 1
+        expect(power).to eq(0)
+        expect(name).to eq('one')
+        expect(digits).to eq(111)
+      end
+      count += 1
+    end
+
+    expect(count).to eq 2
+  end
+end

data/spec/years_spec.rb

@@ -1,17 +1,27 @@
+# frozen_string_literal: true
+
 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
+describe NumbersInWords::NumericExtension do
+  YEARS = {
+    'thirteen hundred' => 13_00,
+    'twenty-two hundred' => 22_00,
+    'twenty-two hundred and five' => 22_05,
+    'fifteen sixteen seventeen' => 151_617,
+    'forty-nine ninety-eight forty-seven seventy-nine' => 49_984_779,
+    'one fifty' => 150,
+    'two fifty' => 250,
+    'three fifty' => 350,
+    'one point fifty-six fifty-seven' => 1.5657,
+    'one three forty-seven' => 1347,
+    'one three five-point forty-seven' => 135.47,
+    'one ten sixty-three' => 11_063,
+    'one nineteen ten oh five' => 1_191_005
+  }.freeze
 
+  YEARS.each do |k, v|
+    it do
+      expect(k.in_numbers).to eql(v)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: numbers_in_words
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Mark Burns
@@ -9,37 +9,37 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-02 00:00:00.000000000 Z
+date: 2020-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: 3.4.0
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.0
-description: "#in_words method for integers and #in_numbers for strings"
+        version: '0'
+description: convert written numbers into Integers and vice-versa
 email:
 - markthedeveloper@gmail.com
 - dimidd@gmail.com
@@ -54,28 +54,39 @@ files:
 - ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/spec
 - lib/numbers_in_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/exceptional_numbers.rb
+- lib/numbers_in_words/fraction.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/parsing/number_parser.rb
+- lib/numbers_in_words/parsing/pair_parsing.rb
+- lib/numbers_in_words/parsing/parse_fractions.rb
+- lib/numbers_in_words/parsing/parse_individual_number.rb
+- lib/numbers_in_words/parsing/parse_status.rb
+- lib/numbers_in_words/parsing/to_number.rb
+- lib/numbers_in_words/powers_of_ten.rb
 - lib/numbers_in_words/to_word.rb
 - lib/numbers_in_words/version.rb
+- lib/numbers_in_words/writer.rb
 - numbers_in_words.gemspec
-- spec/language_writer_spec.rb
+- spec/exceptional_numbers_spec.rb
+- spec/fraction_spec.rb
+- spec/fractions_spec.rb
 - spec/non_monkey_patch_spec.rb
 - spec/number_group_spec.rb
+- spec/number_parser_spec.rb
 - spec/numbers_in_words_spec.rb
 - spec/numerical_strings_spec.rb
 - spec/spec_helper.rb
+- spec/to_word_spec.rb
 - spec/words_in_numbers_spec.rb
+- spec/writer_spec.rb
 - spec/years_spec.rb
 homepage: http://github.com/markburns/numbers_in_words
 licenses: []
@@ -95,18 +106,22 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: 'Example: 123.in_words # => "one hundred and twenty three", "seventy-five
-  point eight".in_numbers # = > 75.8'
+summary: 'Example: NumbersInWords.in_words(123) # => "one hundred and twenty three",
+  NumbersInWords.in_numbers("seventy-five point eight") # = > 75.8'
 test_files:
-- spec/language_writer_spec.rb
+- spec/exceptional_numbers_spec.rb
+- spec/fraction_spec.rb
+- spec/fractions_spec.rb
 - spec/non_monkey_patch_spec.rb
 - spec/number_group_spec.rb
+- spec/number_parser_spec.rb
 - spec/numbers_in_words_spec.rb
 - spec/numerical_strings_spec.rb
 - spec/spec_helper.rb
+- spec/to_word_spec.rb
 - spec/words_in_numbers_spec.rb
+- spec/writer_spec.rb
 - spec/years_spec.rb

data/lib/numbers_in_words/english/constants.rb

@@ -1,124 +0,0 @@
-module NumbersInWords
-  module English
-
-    def self.canonize(w)
-      aliases = {
-        "oh" => "zero"
-      }
-      canon = aliases[w]
-      return canon ? canon : w
-    end
-
-    def self.exceptions
-      {
-        0 => "zero",
-        1 => "one",
-        2 => "two",
-        3 => "three",
-        4 => "four",
-        5 => "five",
-        6 => "six",
-        7 => "seven",
-        8 => "eight",
-        9 => "nine",
-
-        10 => "ten",
-        11 => "eleven",
-        12 => "twelve",
-
-        13 => "thirteen",
-        14 => "fourteen",
-        15 => "fifteen",
-        16 => "sixteen" ,
-        17 => "seventeen",
-        18 => "eighteen",
-        19 => "nineteen",
-
-        20 => "twenty",
-        30 => "thirty",
-        40 => "forty",
-        50 => "fifty",
-        60 => "sixty",
-        70 => "seventy",
-        80 => "eighty",
-        90 => "ninety"
-      }
-    end
-
-    def self.swap_keys hsh
-      hsh.inject({}){|h,(k,v)| h[v]=k; h}
-    end
-
-    def self.powers_of_ten
-      {
-        0   => "one",
-        1   => "ten",
-        2   => "hundred",
-        3   => "thousand",
-        6   => "million",
-        9   => "billion",
-        12  => "trillion",
-        15  => "quadrillion",
-        18  => "quintillion",
-        21  => "sextillion",
-        24  => "septillion",
-        27  => "octillion",
-        30  => "nonillion",
-        33  => "decillion",
-        36  => "undecillion",
-        39  => "duodecillion",
-        42  => "tredecillion",
-        45  => "quattuordecillion",
-        48  => "quindecillion",
-        51  => "sexdecillion",
-        54  => "septendecillion",
-        57  => "octodecillion",
-        60  => "novemdecillion",
-        63  => "vigintillion",
-        66  => "unvigintillion",
-        69  => "duovigintillion",
-        72  => "trevigintillion",
-        75  => "quattuorvigintillion",
-        78  => "quinvigintillion",
-        81  => "sexvigintillion",
-        84  => "septenvigintillion",
-        87  => "octovigintillion",
-        90  => "novemvigintillion",
-        93  => "trigintillion",
-        96  => "untrigintillion",
-        99  => "duotrigintillion",
-        100 => "googol"
-      }
-    end
-
-    def self.exceptions_to_i
-      swap_keys exceptions
-    end
-
-    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

@@ -1,116 +0,0 @@
-module NumbersInWords
-  module English
-    class LanguageWriterEnglish < LanguageWriter
-      delegate :to_i, to: :that
-
-      def initialize that
-        super that
-        @language = "English"
-      end
-
-      def negative
-        "minus " + NumbersInWords.in_words(-@that)
-      end
-
-      def in_words
-        v = handle_exception
-        return v if v
-
-        in_decimals = decimals
-        return in_decimals if in_decimals
-
-        number = to_i
-
-        return negative() if number < 0
-
-        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 = ""
-
-        tens = (number/10).round*10 #write the tens
-
-        output << exceptions[tens] # e.g. eighty
-
-        digit = number - tens       #write the digits
-
-        unless digit == 0
-          output << " " + NumbersInWords.in_words(digit)
-        end
-
-        output
-      end
-
-      def handle_exception
-        exceptions[@that] if @that.is_a?(Integer) and exceptions[@that]
-      end
-
-
-      def write
-        length = @that.to_s.length
-        output =
-          if length == 3
-            #e.g. 113 splits into "one hundred" and "thirteen"
-            write_groups(2)
-
-            #more than one hundred less than one googol
-          elsif length < LENGTH_OF_GOOGOL
-            write_groups(3)
-
-          elsif length >= LENGTH_OF_GOOGOL
-            write_googols
-          end
-        output.strip
-      end
-
-      def decimals
-        int, decimals = NumberGroup.new(@that).split_decimals
-        if int
-          out = NumbersInWords.in_words(int) + " point "
-          decimals.each do |decimal|
-            out << NumbersInWords.in_words(decimal.to_i) + " "
-          end
-          out.strip
-        end
-      end
-
-      private
-
-      def write_googols
-        googols, remainder = NumberGroup.new(@that).split_googols
-        output = ""
-
-        output << " " + NumbersInWords.in_words(googols) + " googol"
-        if remainder > 0
-          prefix = " "
-          prefix << "and " if remainder < 100
-          output << prefix + NumbersInWords.in_words(remainder)
-        end
-
-        output
-      end
-
-      def write_groups group
-        #e.g. 113 splits into "one hundred" and "thirteen"
-        output = ""
-        group_words(group) do |power, name, digits|
-          if digits > 0
-            prefix = " "
-            #no and between thousands and hundreds
-            prefix << "and " if power == 0  and digits < 100
-            output << prefix + NumbersInWords.in_words(digits)
-            output << prefix + name unless power == 0
-          end
-        end
-        output
-      end
-    end
-  end
-end

data/lib/numbers_in_words/language_writer.rb

@@ -1,30 +0,0 @@
-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