ziffern 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25bd87f236fb8e209bcb94ff511df1c216fc1638
-  data.tar.gz: e8de6118bd969f5e0d361f78c6da694cd165ed6c
+  metadata.gz: 70eaaad3cbb7f3b3f9a771ad594808d1b3355b99
+  data.tar.gz: 1258f0ad107131e9115f7adf83432468e14c11da
 SHA512:
-  metadata.gz: 9c153a5aca865b0fbd8709803ea350d2d4f7e5b1f3a707b0bdb2c2f79290bbcc1116c04a022f390d159958f43ff54fa118b7f371ffb93bb20b6271edb14de39d
-  data.tar.gz: ab6711f475ee2363617f5c7cfbbd0f58a673a0ef064e5c94884d683ff035d70ab9fc0c7ddced8bd838ea3bedb517dcc93dfebaa4cde7ec8a989f4faaf9d1ef3f
+  metadata.gz: 4a0c95ca8673b14b036fdc9ce3bc8fbd648e33bc26930e3a27f3f99f0ef174db185cd4e6e6fda7e678c178c8b1e6a4f0857c403a6156fdc93e26c0c3d8ca978d
+  data.tar.gz: a7c6f2f32f0703acbdb4ab0208af68a3ef9da098facc9cb5a555d53a0ee2be313df7ac10409082e79342c1ac745cfd64fb4c4f24d80dc0f31a8f42ac18b6a5b5

data/ziffern.rb

@@ -2,7 +2,7 @@ class Ziffern
 
   # http://de.wikipedia.org/wiki/Zahlennamen
 
-  NINETEEN = %w{ null ein zwei drei vier fünf sechs sieben acht neun zehn elf zwölf
+  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)
@@ -14,20 +14,21 @@ class Ziffern
 
 
   def to_german(number)
-    convert_integer_with_sign(number) + convert_decimals(number)
+    convert_sign(number) + convert_integer(number) + convert_decimals(number)
   end
 
   private
 
-  def convert_integer_with_sign(number)
-    number = number.to_i
-    text = convert_integer(number.abs)
-    text = "minus #{text}" if number < 0
-    text
+  def convert_sign(number)
+    if number.to_f < 0
+      "minus "
+    else
+      ""
+    end
   end
 
   def convert_integer(number)
-    convert(number.to_i, 'eins')
+    convert(number.to_i.abs, 'eins')
   end
 
   def convert(number, one='ein')
@@ -47,25 +48,26 @@ class Ziffern
     if remainder.zero?
       TENS[ten]
     else
-      "#{NINETEEN[remainder]}und#{TENS[ten]}"
+      "#{convert(remainder)}und#{TENS[ten]}"
     end
   end
 
-  def quantify_by_factor(factor, name, number)
+  def quantify_by_factor(factor, quantifier, number)
     amount, remainder = number.divmod(factor)
 
-    result = convert(amount) + name
-    result.tap do |result|
-      result << convert(remainder) unless remainder.zero?
-    end
+    text = convert(amount) + quantifier
+    text << convert(remainder) unless remainder.zero?
+
+    text
   end
 
   def bignums(number)
     number_of_millions, remainder = number.divmod(1000_000)
 
-    convert_millions(number_of_millions).tap do |result|
-      result << " " << convert_integer(remainder) unless remainder.zero?
-    end
+    text = convert_millions(number_of_millions)
+    text << " " << convert_integer(remainder) unless remainder.zero?
+
+    text
   end
 
   def convert_millions(number_of_millions)

data/ziffern_spec.rb

@@ -81,6 +81,7 @@ describe Ziffern do
       -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
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ziffern
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Jimmy Börjesson