ziffern 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 784b7651963c3d172aa3bcf7e404760f3260eefa
-  data.tar.gz: 75236a977a0952a3a342bc443e66dfdad03cafac
+  metadata.gz: 3decb1b23ebb05d69c96e55a3228ff68831450ea
+  data.tar.gz: cc753ab15904d7dbb3de5730f4c7d1870fa0ae69
 SHA512:
-  metadata.gz: 074a40b8cc9ab7bc119f7c9c505c0e1709cc906f012ba6b4b79b6198bb0a6b09ca09e59acde4f755810f25b59cb896db4c78af1165be399e53991a37487dbaec
-  data.tar.gz: 088340abdc8033fa0175629cacf60dd3a1f4c4195ade5b290aaecc6ab414d5af89a2e719b780d367e3ef948bd29d14acec593b29bc77e108250d77d73aecd338
+  metadata.gz: a6a4ccbe9c01aafeded729931dcb876fcad6e63b88ec7de5333fa6d72ed7c95a8dcfe351d84192c142ae16aa78acb3c0007a1adb9ec0980195fa7cd4a741d2e6
+  data.tar.gz: 168685d82b6cd9c495800619e87eeecec0d1af51d8123cba870b49afe357c67fbbbe221112b7f241c1b9c3a8126006208b5a688c3e6f5ac8ce18dbf3c5090779

data/ziffern.rb

@@ -14,25 +14,23 @@ class Ziffern
 
 
   def to_german(number)
+    return "minus #{to_german(-number)}" if number.to_f < 0
     convert_integer(number) + convert_decimals(number)
   end
 
   private
 
   def convert_integer(number)
-    number = number.to_i
-    return 'eins' if number == 1
-    return "minus #{convert_integer(number.abs)}" if number < 0
-
-    convert(number)
+    convert(number.to_i, 'eins')
   end
 
-  def convert(number)
+  def convert(number, one='ein')
     case number
+    when 1             then one
     when 0..19         then NINETEEN[number]
     when 20..99        then twenty_to_99(number)
-    when 100..999      then quantify_factor(100,  'hundert', number)
-    when 1000..999_999 then quantify_factor(1000, 'tausend', 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)
     end
   end
@@ -47,7 +45,7 @@ class Ziffern
     end
   end
 
-  def quantify_factor(factor, name, number)
+  def quantify_by_factor(factor, name, number)
     amount, remainder = number.divmod(factor)
 
     result = convert(amount) + name
@@ -75,12 +73,8 @@ class Ziffern
   end
 
   def quantify_big_name(amount, big_name)
-    if amount == 1
-      quantity = 'eine'
-    else
-      quantity = convert(amount)
-      big_name = big_name.sub(/(e?)$/, 'en')
-    end
+    quantity = convert(amount, 'eine')
+    big_name = big_name.sub(/(e?)$/, 'en') unless amount == 1
 
     "#{quantity} #{big_name}"
   end
@@ -111,5 +105,4 @@ class Ziffern
   def convert_digits(number)
     number.to_s.chars.map { |digit| convert_integer(digit) }.join(' ')
   end
-
 end

metadata

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