ziffern 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18a6b3bbaa49bf77b2a43b7f599ee2ace027220c
-  data.tar.gz: addfb473e2871b9220f88674d4287fd34faf8a43
+  metadata.gz: 5cadc04633b8f106d4c01957413527dd59f4831e
+  data.tar.gz: 5b0021a6b2eb4dd8aabe0d64f55d103e4a2458e4
 SHA512:
-  metadata.gz: 841f50fce4240e1ad1d100434769051a1d43e9510953d83f6f74cb27cf486b76c747fdf96ad38015fd3409b90f1880cc5e66ebd3723d05901f8fb78290850d4c
-  data.tar.gz: cf31aabdeb1891b87c63871cbeb5fb536692e8861c67539f36e6a61e5fe8078ba28831703051c930547770e9cb07b79bcaf08c97e021b567a8250272d5969436
+  metadata.gz: 885b3ef08c8bffc4a6d5222dcde118cc22c224ad14d2c4dd1f5786aa37f3e27829213b739c804e4cc101695950437fa18b31d395f319527d622f63f11edca393
+  data.tar.gz: 60b9d746600c8637a71e2dd7481d05a214089d71e122d006ccb7145395ceda0c1e89bad3298081a28bc66b53a5a4c06eaa1325882838bd6af050db09bfdcd2a2

data/ziffern.rb

@@ -2,14 +2,61 @@ class Ziffern
 
   # http://de.wikipedia.org/wiki/Zahlennamen
 
-  NINETEEN = %w[ null eins zwei drei vier fünf sechs sieben acht neun zehn elf zwölf
-                 dreizehn vierzehn fünfzehn sechzehn siebzehn achtzehn neunzehn ]
-
-  TENS = [nil, nil] + %w[ zwanzig dreißig vierzig fünfzig sechzig siebzig achtzig neunzig ]
-
-  BIG = %w[
-    M B Tr Quadr Quint Sext Sept Okt Non Dez Undez Dodez Tredez
-    Quattuordez Quindez Sedez Septendez Dodevigint Undevigint Vigint
+  FIRST_TWENTY = %w[
+    null
+    eins
+    zwei
+    drei
+    vier
+    fünf
+    sechs
+    sieben
+    acht
+    neun
+    zehn
+    elf
+    zwölf
+    dreizehn
+    vierzehn
+    fünfzehn
+    sechzehn
+    siebzehn
+    achtzehn
+    neunzehn
+  ]
+
+  TENS = [nil, nil] + %w[
+    zwanzig
+    dreißig
+    vierzig
+    fünfzig
+    sechzig
+    siebzig
+    achtzig
+    neunzig
+  ]
+
+  LARGE_NUMBERS = %w[
+    M
+    B
+    Tr
+    Quadr
+    Quint
+    Sext
+    Sept
+    Okt
+    Non
+    Dez
+    Undez
+    Dodez
+    Tredez
+    Quattuordez
+    Quindez
+    Sedez
+    Septendez
+    Dodevigint
+    Undevigint
+    Vigint
   ].flat_map { |prefix|
     %W[ #{prefix}illion #{prefix}illiarde ]
   }
@@ -31,25 +78,21 @@ class Ziffern
   end
 
   def convert_sign(number)
-    if number.to_f < 0
-      "minus "
-    else
-      ""
-    end
+    number.to_f < 0 ? "minus " : ""
   end
 
   def convert_integer(number)
-    convert(number.to_i.abs, 'eins')
+    convert(number.to_i.abs, "eins")
   end
 
-  def convert(number, one='ein')
+  def convert(number, one = "ein")
     case number
     when 1             then one
-    when 0..19         then NINETEEN[number]
+    when 0..19         then FIRST_TWENTY[number]
     when 20..99        then twenty_to_99(number)
-    when 100..999      then quantify_by_factor(100,  'hundert', number)
-    when 1000..999_999 then quantify_by_factor(1000, 'tausend', number)
-    else bignums(number)
+    when 100..999      then quantify_by_factor(100,  "hundert", number)
+    when 1000..999_999 then quantify_by_factor(1000, "tausend", number)
+    else convert_large_number(number)
     end
   end
 
@@ -72,7 +115,7 @@ class Ziffern
     text
   end
 
-  def bignums(number)
+  def convert_large_number(number)
     number_of_millions, remainder = number.divmod(1000_000)
 
     text = convert_millions(number_of_millions)
@@ -82,39 +125,49 @@ class Ziffern
   end
 
   def convert_millions(number_of_millions)
-    pairs = pair_with_big_names(number_of_millions)
-    fail TooLargeNumberError if pairs.size > BIG.size
+    named_number_groups = slice_by_factor(number_of_millions, 1000)
+    large_number_names  = large_number_names(named_number_groups.count)
 
-    pairs
-      .reject { |amount,| amount.zero? }
+    fail TooLargeNumberError if named_number_groups.size > LARGE_NUMBERS.size
+
+    named_number_groups
+      .zip(large_number_names)
+      .reject { |amount, _| amount.zero? }
       .map    { |amount, name| quantify_big_name(amount, name) }
-      .join(' ')
+      .join(" ")
   end
 
   def quantify_big_name(amount, big_name)
-    quantity = convert(amount, 'eine')
-    big_name = big_name.sub(/(e?)$/, 'en') unless amount == 1
+    [convert(amount, "eine"), pluralize_big_name(amount, big_name)].join(" ")
+  end
 
-    "#{quantity} #{big_name}"
+  def pluralize_big_name(amount, big_name)
+    amount == 1 ? big_name : big_name.sub(/(e?)$/, "en")
   end
 
-  # 12345678 => [[12, "Billion"], [345, "Milliarde"], [678, "Million"]]
-  def pair_with_big_names(number_of_millions)
-    number_groups = []
+  # slice_by_factor(12345678, 1000) => [12, 345, 678]
+  def slice_by_factor(number, factor)
+    result    = []
+    remainder = number
 
-    until number_of_millions.zero?
-      number_of_millions, last_3 = number_of_millions.divmod(1000)
-      number_groups << last_3
+    until remainder.zero?
+      remainder, slice = remainder.divmod(1000)
+      result << slice
     end
 
-    number_groups.zip(BIG).reverse
+    result.reverse
+  end
+
+  # large_number_names(3) => ["Billion", "Milliarde", "Million"]
+  def large_number_names(count)
+    LARGE_NUMBERS.take(count).reverse
   end
 
   def convert_decimals(number)
     decimals = get_decimals_as_string(number)
-    return '' if decimals.empty?
+    return "" if decimals.empty?
 
-    ' Komma ' + convert_digits(decimals)
+    " Komma " + convert_digits(decimals)
   end
 
   def get_decimals_as_string(number)
@@ -122,6 +175,6 @@ class Ziffern
   end
 
   def convert_digits(number)
-    number.to_s.chars.map { |digit| convert_integer(digit) }.join(' ')
+    number.to_s.chars.map { |digit| convert_integer(digit) }.join(" ")
   end
 end

data/ziffern_spec.rb

@@ -4,8 +4,8 @@ describe Ziffern do
 
   subject { Ziffern.new }
 
-  def self.test_german_numbers(hash)
-    hash.each do |integer, german|
+  def self.test_german_numbers(tests)
+    tests.each do |integer, german|
       instance_eval do
         it "converts #{integer} to #{german}" do
           expect(subject.to_german(integer)).to eq german
@@ -15,34 +15,34 @@ describe Ziffern do
   end
 
   context 'numbers up to 20' do
-    test_german_numbers({
+    test_german_numbers(
       0  => "null",
       1  => "eins",
       13 => "dreizehn",
       19 => "neunzehn",
-    })
+    )
   end
 
   context 'numbers up to 100' do
-    test_german_numbers({
+    test_german_numbers(
       20 => "zwanzig",
       21 => "einundzwanzig",
       63 => "dreiundsechzig",
       99 => "neunundneunzig",
-    })
+    )
   end
 
   context 'numbers up to 1000' do
-    test_german_numbers({
+    test_german_numbers(
       100 => "einhundert",
       101 => "einhunderteins",
       234 => "zweihundertvierunddreißig",
       999 => "neunhundertneunundneunzig",
-    })
+    )
   end
 
   context 'numbers up to one million' do
-    test_german_numbers({
+    test_german_numbers(
       1000    => "eintausend",
       1001    => "eintausendeins",
       101000  => "einhunderteintausend",
@@ -50,48 +50,48 @@ describe Ziffern do
       1234    => "eintausendzweihundertvierunddreißig",
       10_000  => "zehntausend",
       999_999 => "neunhundertneunundneunzigtausendneunhundertneunundneunzig",
-    })
+    )
   end
 
   context 'really big numbers' do
-    test_german_numbers({
+    test_german_numbers(
       1_000_000     => "eine Million",
       1_000_001     => "eine Million eins",
       2_204_510     => "zwei Millionen zweihundertviertausendfünfhundertzehn",
       1_203_400_021 => "eine Milliarde zweihundertdrei Millionen vierhunderttausendeinundzwanzig",
       3_000_000_000_000_099 => "drei Billiarden neunundneunzig",
       10 ** 123 => "eine Vigintilliarde"
-    })
+    )
   end
 
   context 'negative numbers' do
-    test_german_numbers({
+    test_german_numbers(
       -1  => "minus eins",
       -20 => "minus zwanzig",
       -21 => "minus einundzwanzig",
       -63 => "minus dreiundsechzig",
       -99 => "minus neunundneunzig",
-    })
+    )
   end
 
   context 'decimals' do
-    test_german_numbers({
+    test_german_numbers(
       0.1234  => "null Komma eins zwei drei vier",
       5.6789  => "fünf Komma sechs sieben acht neun",
       5.0     => "fünf Komma null",
       -5.6    => "minus fünf Komma sechs",
       -567.89 => "minus fünfhundertsiebenundsechzig Komma acht neun",
       -0.001  => "minus null Komma null null eins"
-    })
+    )
   end
 
   context 'strings' do
-    test_german_numbers({
+    test_german_numbers(
       '-0'     => "null",
       '-123'   => "minus einhundertdreiundzwanzig",
       '-123.1' => "minus einhundertdreiundzwanzig Komma eins",
       '5.00'   => "fünf Komma null null",
-    })
+    )
   end
 
   context 'errors' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ziffern
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Jimmy Börjesson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-19 00:00:00.000000000 Z
+date: 2017-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 description: 
-email: lagginglion@gmail.com
+email: alcesleo@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -81,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Converts numbers to text, in German.