ziffern 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 315e0993fe513ac37395d1f11482815cc99bd338
-  data.tar.gz: efb38af4eb9f3a046e42e35d5488c03aadc0778b
+  metadata.gz: d46e6090528de5ba4744026e7b24e3fa57bd74ac
+  data.tar.gz: e597e79f69f4bed8851f55b505fcc27a05676d59
 SHA512:
-  metadata.gz: 0be10fde397f6ab2f527f8b6f4e357b8ed128b7be1304f1c77be85538a01968f6f6b79d934baf2215701a8df26ed1c5d724f2302a7de08d167b41048a31c16f9
-  data.tar.gz: b45e9c8c42634e11555da8079f3527220c1fa17444e14ba5f15bf4af8d34344c2e6a9f71cddd558b6a0eb95227250cd8d2456c7a7cddf0cdabc599c305b26974
+  metadata.gz: b71fc874f5c1255920801d7574bcfa6c198fb0b0e9b9bcf9b14eb8b26db0cd99e43051803f1e81d81718fd9b386027614661793cd5ea3ae66c517a87b0ae9082
+  data.tar.gz: a857c43870ebe02af318fa5a7b623783d55b27fe209138647d6e6123fb7595be63dc2535165d06d3f0be9fdde47b57153fea9b0fc64e55b4553ca31450d74f79

data/README.md

@@ -2,7 +2,7 @@
 
 **Number to text, in _German_!**
 
-Handles _positive and negative_ numbers up to **125 digits**, with _unlimited decimals_.
+Handles _positive and negative_ numbers up to **126 digits**, with _unlimited decimals_.
 
 Just create an instance of the class and use the `#to_german` method to convert numbers,
 it accepts floats, integers and strings, and will raise subclasses of `ArgumentError` if

data/ziffern.rb

@@ -2,14 +2,16 @@ 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 }
+  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 = %w{ zwanzig dreißig vierzig fünfzig sechzig siebzig achtzig neunzig }.unshift(nil, nil)
+  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 }.flat_map do |prefix|
-    %W( #{prefix}illion #{prefix}illiarde )
+  BIG = %w[
+    M B Tr Quadr Quint Sext Sept Okt Non Dez Undez Dodez Tredez
+    Quattuordez Quindez Sedez Septendez Dodevigint Undevigint Vigint
+ ].flat_map do |prefix|
+    %W[ #{prefix}illion #{prefix}illiarde ]
   end
 
   TooLargeNumberError = Class.new(ArgumentError)
@@ -78,10 +80,10 @@ class Ziffern
   end
 
   def convert_millions(number_of_millions)
-    groups = group_with_big_names(number_of_millions)
-    fail TooLargeNumberError if groups.size > BIG.size
+    pairs = pair_with_big_names(number_of_millions)
+    fail TooLargeNumberError if pairs.size > BIG.size
 
-    groups
+    pairs
       .reject { |amount,| amount.zero? }
       .map { |amount, name| quantify_big_name(amount, name) }
       .join(' ')
@@ -95,15 +97,15 @@ class Ziffern
   end
 
   # 12345678 => [[12, "Billion"], [345, "Milliarde"], [678, "Million"]]
-  def group_with_big_names(number_of_millions)
-    groups = []
+  def pair_with_big_names(number_of_millions)
+    number_groups = []
 
     until number_of_millions.zero?
       number_of_millions, last_3 = number_of_millions.divmod(1000)
-      groups << last_3
+      number_groups << last_3
     end
 
-    groups.zip(BIG).reverse
+    number_groups.zip(BIG).reverse
   end
 
   def convert_decimals(number)

data/ziffern_spec.rb

@@ -14,16 +14,6 @@ describe Ziffern do
     end
   end
 
-  context 'error handling' do
-    it 'throws an ArgumentError if the number is bigger than it can handle' do
-      expect { subject.to_german(10 ** 126) }.to raise_error Ziffern::TooLargeNumberError
-    end
-
-    it 'throws an error on faulty input' do
-      expect { subject.to_german("invalid.5") }.to raise_error Ziffern::InvalidNumberError
-    end
-  end
-
   context 'numbers up to 20' do
     test_german_numbers({
       0  => "null",
@@ -50,7 +40,7 @@ describe Ziffern do
     })
   end
 
-  context 'up to one million' do
+  context 'numbers up to one million' do
     test_german_numbers({
       1000    => "eintausend",
       1234    => "eintausendzweihundertvierunddreißig",
@@ -84,9 +74,9 @@ describe Ziffern do
     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",
-      5.0 => "fünf Komma null",
       -0.001 => "minus null Komma null null eins"
     })
   end
@@ -99,4 +89,17 @@ describe Ziffern do
     })
   end
 
+  context 'errors' do
+    it 'raises an error if the number is bigger than it can handle' do
+      expect { subject.to_german(10 ** 126) }.to raise_error Ziffern::TooLargeNumberError
+      expect { subject.to_german(-10 ** 126) }.to raise_error Ziffern::TooLargeNumberError
+    end
+
+    it 'raises an error on faulty input' do
+      expect { subject.to_german("invalid") }.to raise_error Ziffern::InvalidNumberError
+      expect { subject.to_german("invalid.5") }.to raise_error Ziffern::InvalidNumberError
+      expect { subject.to_german("5.5u") }.to raise_error Ziffern::InvalidNumberError
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ziffern
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Jimmy Börjesson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-14 00:00:00.000000000 Z
+date: 2014-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler