figures 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de702fb97a926179fce3f9980284d4b5bb08ac84
-  data.tar.gz: 01ce6d9a38a368679b3678670019fe44f24e9048
+  metadata.gz: a46955406747f8f41903de63ea0c16298d28ede2
+  data.tar.gz: 12fc043abf6ea720f7d009ccd2845cb0eabd1cc8
 SHA512:
-  metadata.gz: 46e1fe163048f8b3d053217c3995fca5fd19f43fd6c3a9283b57078ea56e4e5cf733524b35c376ff790a396e6efee500102f305cfaa7971002129f6734cc0fa8
-  data.tar.gz: e536e4b30f22cae941cef4497949de67f85764f824e1ffcb04d915ec4a304d3cafd0d0adccd328b5f52a8f6f6ab93d31de4077984668146535c832619e1ff386
+  metadata.gz: 7f9f475009fc3ecc748fa0c5e71c7326225f8c078477513e45d5a2c85d9a0e440b6b40f0c350ee4ea17dc566197b0a23e97c9c99dcbd55ed9356de24f03ac038
+  data.tar.gz: 6ef00052728d61532d0dcd7133ba3dab7da4c904f8a8e8d6c691d0492c1c420bd6c7c1df62aac1b5bcaa699c3842c1b9453d6c4c0fe2ed6f43f912a80243ef42

data/.gitignore

@@ -1 +1,2 @@
 Gemfile.lock
+/pkg

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## CHANGELOG
 
+### 0.2.0
+
+* Support even larger numbers
+* Improve German edge cases
+
 ### 0.1.0
 
 * Inital release

data/MIT-LICENSE.txt

@@ -1,4 +1,5 @@
 Copyright (c) 2015 Paul Götze, paul.christoph.goetze@gmail.com
+Copyright (c) 2015 Jan Lelis, mail@janlelis.de
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -15,10 +15,13 @@ gem 'figures'
 ```ruby
 require 'figures'
 
-Figures.parse(1234, :de) # => 'eintausendzweihundertvierunddreißig'
+>> Figures.parse(1234, :de)
+=> 'eintausendzweihundertvierunddreißig'
+>> Figures.parse(11948643178718557106276991626757751015195481434, :de)
+=> "elf Septilliarden neunhundertachtundvierzig Septillionen sechshundertdreiundvierzig Sextilliarden einhundertachtundsiebzig Sextillionen siebenhundertachtzehn Quintilliarden fünfhundertsiebenundfünfzig Quintillionen einhundertsechs Quadrilliarden zweihundertsechsundsiebzig Quadrillionen neunhunderteinundneunzig Trilliarden sechshundertsechsundzwanzig Trillionen siebenhundertsiebenundfünfzig Billiarden siebenhunderteinundfünfzig Billionen fünfzehn Milliarden einhundertfünfundneunzig Millionen vierhunderteinundachtzigtausendvierhundertvierunddreißig"
 ```
 
 
 ## MIT License
 
-Copyright (C) 2015 Paul Götze. Released under the MIT license.
+Copyright (C) 2015 Paul Götze, Jan Lelis. Released under the MIT license.

data/lib/figures.rb

@@ -1,9 +1,8 @@
 require_relative "figures/version"
-
 require_relative "figures/german"
 
 module Figures
   def self.parse(number, language_code = :de)
-    Figures::German.new(number.to_s).parse
+    Figures::German.new(number).parse
   end
 end

data/lib/figures/german.rb

@@ -1,89 +1,137 @@
 module Figures
   class German
-    WORDS = {
-      copula: "und",
-      digits: %w[null ein zwei drei vier fünf sechs sieben acht neun],
-      tens: %w[eine zehn zwanzig dreißig vierzig fünfzig sechzig siebzig achzig neunzig],
-      exponents: %w[hundert tausend million milliarden billion billiarden trillion trilliarden quadrillionen quadrilliarden quintillion sextillion sextilliarden]
+    UNITS   = %w{ eins zwei drei vier fünf sechs sieben acht neun }.freeze
+
+    PREFIXES = {
+      units:          %w{ tausend mi bi tri quadri quinti sexti septi okti noni },
+      union_units:    %w{ un duo tre quattuor quinqua se septe okto nove },
+      union_tens:     %w{ dezi viginti triginta quadraginta quinquaginta sexaginta septuaginta oktoginta nonaginta },
+      union_hundreds: %w{ zenti duzenti trezenti quadringenti quingenti seszenti septingenti oktingenti nongenti }
+    }.freeze
+
+    EXCEPTIONS = {
+      /^eins(hundert|tausend)/ => 'ein\1',
+      /^eins\s/    => 'eine ',
+      /einsund/    => 'einund',
+      'einszehn'   => 'elf',
+      'zweizehn'   => 'zwölf',
+      'sechszehn'  => 'sechzehn',
+      'siebenzehn' => 'siebzehn',
+      'zweizig'    => 'zwanzig',
+      'dreizig'    => 'dreißig',
+      'sechszig'   => 'sechzig',
+      'siebenzig'  => 'siebzig'
     }.freeze
 
+    attr_reader :number
+
     def initialize(number)
       @number = number.to_i
     end
 
     def parse
-      return WORDS[:digits][@number] if @number < 10 && @number >= 0
+      return 'null' if number == 0
 
-      number_string = @number.to_s.reverse.scan(/.{1,3}/).map.with_index{ |number_part, index|
-        parse_triple(number_part.reverse.to_i, index)
-      }.reverse.join
+      triples = split_into_reverse_triples(number)
 
-      number_string.sub! /^und/, '' # TODO investigate
+      word = triples.each_with_index.reduce('') do |result, (triple, index)|
+        triple_word = triple_to_word(triple, index)
+        result.prepend(triple_word)
+      end.strip
 
-      if @number < 0
-        "minus #{number_string}"
-      else
-        number_string
-      end
+      number < 0 ? "minus #{word}" : word
     end
 
-    def parse_triple(number, triple_index)
-      temp_number = number.abs
-      number_word = ""
-      temp_tens   = ""
+    private
 
-      return 'eins' if temp_number == 1 && triple_index == 0 # FIXME 
-
-      while temp_number > 0
-        decimal_power = Math.log10(temp_number).floor
-        number_base = 10 ** decimal_power
-        number_tail = temp_number - (temp_number % number_base)
-        digit = number_tail / number_base
+    def triples_count
+      @triples_count ||= split_into_reverse_triples(number).count
+    end
 
-        copula = ((digit > 1) ? WORDS[:copula] : "")
-        leading_single = (triple_index >= 2 && digit == 1) ? WORDS[:tens][0].to_s : WORDS[:digits][digit].to_s
+    def split_into_reverse_triples(number)
+      @reverse_triples ||= number.abs.to_s.reverse.scan(/.{1,3}/).map(&:reverse)
+    end
 
-        if decimal_power == 2
-          number_word << WORDS[:digits][digit].to_s << WORDS[:exponents][0].to_s
-        end
+    def triple_to_word(triple, triple_index)
+      hundred_digit, ten_digit, unit_digit = split_triple(triple)
 
-        if decimal_power == 0 && !temp_tens.empty?
-          number_word << WORDS[:digits][digit].to_s
-        end
+      word = [
+        hundred(hundred_digit),
+        unit(unit_digit),
+        copula(unit_digit, ten_digit),
+        ten(ten_digit)
+      ].join
 
-        if decimal_power == 0 && temp_tens.empty?
-          number_word << copula << leading_single
-        end
+      word = append_exponent_identifier(word, triple_index)
+      apply_exceptions(word)
+    end
 
-        if decimal_power == 1
-          temp_tens << copula << WORDS[:tens][digit].to_s
-        end
+    # splits up a triple into hundreds, tens and unit position
+    def split_triple(triple)
+      triple.match(/\A(\d)??(\d)??(\d)\z/).captures.map(&:to_i)
+    end
 
-        temp_number = temp_number - number_tail
-      end
+    # returns the word for the given unit number
+    def unit(digit)
+      return '' if digit.zero?
+      UNITS[digit - 1]
+    end
 
-      number_word << temp_tens
+    # returns the copula between unit position and tens
+    def copula(unit_digit, ten_digit)
+      'und' if ten_digit > 1 && !unit_digit.zero?
+    end
 
-      if triple_index > 0
-        number_word << WORDS[:exponents][triple_index].to_s
+    # returns the word for the given tens digit
+    def ten(digit)
+      case digit
+      when 0 then ''
+      when 1 then 'zehn'
+      else unit(digit) + 'zig'
       end
+    end
 
-      number_word = handle_exceptions(number_word)
-      number_word = remove_wrong_leadings(number_word)
+    # returns the word for the given hundreds number
+    def hundred(digit)
+      case digit
+      when 0 then ''
+      else unit(digit) + 'hundert'
+      end
+    end
 
-      number_word
+    # adds the exponent word to the triple word
+    # e.g. tausend for the second triple   (index = 1)
+    #      Million for the third triple    (index = 2)
+    #      Milliarde for the fourth triple (index = 3)
+    #
+    #      indexes => PREFIXES index
+    #      2,3 => 1; 4,5 => 2; 6,7 => 3; ... : floored division by 2
+    # etc.
+    def append_exponent_identifier(word, index)
+      return word if word.empty? || index.zero? || triples_count == 1
+
+      if index == 1
+        word + PREFIXES[:units][0]
+      elsif index.even?
+        pluralize_if_plural(word + ' ' + (PREFIXES[:units][index / 2] + "llion ").capitalize)
+      elsif index.odd?
+        pluralize_if_plural(word + ' ' + (PREFIXES[:units][index / 2] + "lliarde ").capitalize)
+      end
     end
 
-    def handle_exceptions(word)
-      word = word.gsub('einzehn', 'elf')
-      word = word.gsub('zweizehn', 'zwölf')
-      word = word.gsub('sechszehn', 'sechzehn')
-      word = word.gsub('siebenzehn', 'siebzehn')
+    # pluralizes exponent identifiers
+    def pluralize_if_plural(word)
+      word =~ /^eins / ? word : word.sub(/e? $/, 'en ')
     end
 
-    def remove_wrong_leadings(word)
-      word.gsub(/^(und|null)/, '')
+    # replaces all exceptions in the number word
+    def apply_exceptions(word)
+      EXCEPTIONS.each do |exception, replacement|
+        word.sub!(exception, replacement)
+      end
+
+      word
     end
-    
+
   end
-end
+end

data/lib/figures/version.rb

@@ -1,5 +1,5 @@
 module Figures
-  VERSION = "0.1.0".freeze
+  VERSION = "0.2.0".freeze
 end
 
 

data/spec/figures_spec.rb

@@ -112,6 +112,10 @@ describe Figures do
         assert_equal 'einhunderteins', Figures.parse(101, :de)
       end
 
+      it 'parses 131' do
+        assert_equal 'einhunderteinunddreißig', Figures.parse(131, :de)
+      end
+
       it 'parses 199' do
         assert_equal 'einhundertneunundneunzig', Figures.parse(199, :de)
       end
@@ -141,15 +145,32 @@ describe Figures do
       end
 
       it 'parses 1_000_000' do
-        fail 'figure out'
-        assert_equal 'million', Figures.parse(1_000_000, :de)
+        assert_equal 'eine Million', Figures.parse(1_000_000, :de)
+      end
+
+      it 'parses 1_000_001' do
+        assert_equal 'eine Million eins', Figures.parse(1_000_001, :de)
       end
 
       it 'parses 2_000_000' do
-        fail 'figure out'
-        assert_equal 'zwei millionen', Figures.parse(1_000_000, :de)
+        assert_equal 'zwei Millionen', Figures.parse(2_000_000, :de)
+      end
+
+      it 'parses 21_000_000' do
+        assert_equal 'einundzwanzig Millionen', Figures.parse(21_000_000, :de)
+      end
+
+      it 'parses 1_000_000_000' do
+        assert_equal 'eine Milliarde', Figures.parse(1_000_000_000, :de)
+      end
+
+      it 'parses 2_000_000_000' do
+        assert_equal 'zwei Milliarden', Figures.parse(2_000_000_000, :de)
+      end
+
+      it 'parses 2_000_003_000_000' do
+        assert_equal 'zwei Billionen drei Millionen', Figures.parse(2_000_003_000_000, :de)
       end
     end
   end
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: figures
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Paul Götze
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-26 00:00:00.000000000 Z
+date: 2015-11-01 00:00:00.000000000 Z
 dependencies: []
 description: German number words.
 email: paul.christoph.goetze@gmail.com
@@ -26,6 +26,7 @@ files:
 - Rakefile
 - figures.gemspec
 - lib/figures.rb
+- lib/figures/.german.rb.swp
 - lib/figures/german.rb
 - lib/figures/version.rb
 - spec/figures_spec.rb
@@ -49,7 +50,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: German number words