ziffern 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70eaaad3cbb7f3b3f9a771ad594808d1b3355b99
-  data.tar.gz: 1258f0ad107131e9115f7adf83432468e14c11da
+  metadata.gz: 315e0993fe513ac37395d1f11482815cc99bd338
+  data.tar.gz: efb38af4eb9f3a046e42e35d5488c03aadc0778b
 SHA512:
-  metadata.gz: 4a0c95ca8673b14b036fdc9ce3bc8fbd648e33bc26930e3a27f3f99f0ef174db185cd4e6e6fda7e678c178c8b1e6a4f0857c403a6156fdc93e26c0c3d8ca978d
-  data.tar.gz: a7c6f2f32f0703acbdb4ab0208af68a3ef9da098facc9cb5a555d53a0ee2be313df7ac10409082e79342c1ac745cfd64fb4c4f24d80dc0f31a8f42ac18b6a5b5
+  metadata.gz: 0be10fde397f6ab2f527f8b6f4e357b8ed128b7be1304f1c77be85538a01968f6f6b79d934baf2215701a8df26ed1c5d724f2302a7de08d167b41048a31c16f9
+  data.tar.gz: b45e9c8c42634e11555da8079f3527220c1fa17444e14ba5f15bf4af8d34344c2e6a9f71cddd558b6a0eb95227250cd8d2456c7a7cddf0cdabc599c305b26974

data/README.md

@@ -4,18 +4,21 @@
 
 Handles _positive and negative_ numbers up to **125 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
+it is not able to handle what you pass in.
+
 ```ruby
 require 'ziffern'
 converter = Ziffern.new
 
-[1, -5, 12345, 99.99, '0.00', 10**63 + 1].each do |number|
-  puts converter.to_german(number)
-end
-
-# >> eins
-# >> minus fünf
-# >> zwölftausenddreihundertfünfundvierzig
-# >> neunundneunzig Komma neun neun
-# >> null Komma null null
-# >> eine Dezilliarde eins
+converter.to_german 1           # => "eins"
+converter.to_german -5          # => "minus fünf"
+converter.to_german 12345       # => "zwölftausenddreihundertfünfundvierzig"
+converter.to_german 99.99       # => "neunundneunzig Komma neun neun"
+converter.to_german 0.00        # => "null Komma null"
+converter.to_german '0.00'      # => "null Komma null null"
+converter.to_german 10**125     # => "einhundert Vigintilliarden"
+converter.to_german 'invalid'   # ~> Ziffern::InvalidNumberError
+converter.to_german 10**126     # ~> Ziffern::TooLargeNumberError
 ```

data/ziffern.rb

@@ -8,17 +8,24 @@ class Ziffern
   TENS = %w{ zwanzig dreißig vierzig fünfzig sechzig siebzig achtzig neunzig }.unshift(nil, nil)
 
   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|
+        Quattuordez Quindez Sedez Septendez Dodevigint Undevigint Vigint }.flat_map do |prefix|
     %W( #{prefix}illion #{prefix}illiarde )
   end
 
+  TooLargeNumberError = Class.new(ArgumentError)
+  InvalidNumberError  = Class.new(ArgumentError)
 
   def to_german(number)
+    fail InvalidNumberError unless valid_number?(number)
     convert_sign(number) + convert_integer(number) + convert_decimals(number)
   end
 
   private
 
+  def valid_number?(number)
+    !!number.to_s[/\A-?\d+(\.\d+)?\z/]
+  end
+
   def convert_sign(number)
     if number.to_f < 0
       "minus "
@@ -72,10 +79,10 @@ class Ziffern
 
   def convert_millions(number_of_millions)
     groups = group_with_big_names(number_of_millions)
-    fail ArgumentError, 'Number too large' if groups.size > BIG.size
+    fail TooLargeNumberError if groups.size > BIG.size
 
     groups
-      .reject { |amount, *| amount.zero? }
+      .reject { |amount,| amount.zero? }
       .map { |amount, name| quantify_big_name(amount, name) }
       .join(' ')
   end

data/ziffern_spec.rb

@@ -14,6 +14,16 @@ 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",
@@ -60,10 +70,6 @@ describe Ziffern do
     })
   end
 
-  it 'throws an ArgumentError if the number is bigger than it can handle' do
-    expect { subject.to_german(10 ** 126) }.to raise_error ArgumentError
-  end
-
   context 'negative numbers' do
     test_german_numbers({
       -1 => "minus eins",

metadata

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