kabal 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc725820d84c44702241e372e5ed2b85cb38bc3a
-  data.tar.gz: ec3329559be4a8c3a65b938014faa401c82c9496
+  metadata.gz: 08e4ee26ce056a29fc5170e2dae9aafb09646e48
+  data.tar.gz: ebe8eb272d894fcb5978f810aa10147afe64a59a
 SHA512:
-  metadata.gz: 6860d8a77351e36d445ab966848126e9c4081403e4ae6919f7382c2e26c2bb16649de055c45b912fdf0d7e87be5abdae597ee18fe58af79ccbc9c4968902338f
-  data.tar.gz: 53eb4b57612e2e12841072f7bc25e58fd7bf6fff66c4a93173e32f6ba800c7b80473f1f771eb5609a12e047fca9250450077a712f48411e1e55d2e28c5e49741
+  metadata.gz: 39857db4c41b30a3fd95bc2acbe343ec1f3dc439f1f4ca1ee01562ab999d94e69e9bd7dddc68a9e031051711c9ebbc1412cb4765fb15db48f7940bf48c8ce101
+  data.tar.gz: 8e8b0398be6979358f4192fcd47e968dba963b5325e06bb0a87b4800515c7451358e6c5d3e4476a66ba8d2a3119a7a5030d4ab3a5e0e4e3dd227e2a8a42b048c

data/lib/kabal/languages/deutsch/fractional_numbers.rb

@@ -6,13 +6,13 @@ module Kabal
       end
 
       def whole_part_name(number)
-        count = number.to_s.split('.')[0].to_i
+        count = number.floor
         natural_number_name(count)
       end
 
       def fractional_part_name(number)
         name = ""
-        count_string = number.to_s.split('.')[1]
+        count_string = fractional_part_string(number).split('.')[1]
         count = count_string.to_i
         if count_string.size != count.to_s.size
           (count_string.size - count.to_s.size).times do
@@ -23,6 +23,20 @@ module Kabal
           natural_number_name(count)
         end
       end
+
+      def fractional_part_string(number)
+        "%.#{fractional_part_order(number)}f" % number
+      end
+
+      def fractional_part_order(number)
+        #FIXME find better way with whole 0 numbers
+        number_string = number.to_s
+        if number_string.include? "-"
+          number_string.split('-')[1].to_i
+        else
+          number_string.split('.')[1].length
+        end
+      end
     end
   end
 end

data/lib/kabal/languages/english/fractional_numbers.rb

@@ -10,13 +10,13 @@ module Kabal
       end
 
       def whole_part_name(number)
-        count = number.to_s.split('.')[0].to_i
+        count = number.floor
         count != 0 ? natural_number_name(count) : ""
       end
 
       def fractional_part_name(number)
         name = ""
-        count_string = number.to_s.split('.')[1]
+        count_string = fractional_part_string(number).to_s.split('.')[1]
         count = count_string.to_i
         if count_string.size != count.to_s.size
           (count_string.size - count.to_s.size).times do
@@ -27,6 +27,20 @@ module Kabal
           natural_number_name(count)
         end
       end
+
+      def fractional_part_string(number)
+        "%.#{fractional_part_order(number)}f" % number
+      end
+
+      def fractional_part_order(number)
+        #FIXME find better way with whole 0 numbers
+        number_string = number.to_s
+        if number_string.include? "-"
+          number_string.split('-')[1].to_i
+        else
+          number_string.split('.')[1].length
+        end
+      end
     end
   end
 end

data/lib/kabal/languages/russian/fractional_numbers.rb

@@ -12,7 +12,7 @@ module Kabal
       end
 
       def whole_part_name(number)
-        count = number.to_s.split('.')[0].to_i
+        count = number.floor
         feminine_natural_number_name(count) + " " + Declinations.name_with_declination(whole, count)
       end
 
@@ -38,9 +38,14 @@ module Kabal
       end
 
       def fractional_number_order(number)
-        number.to_s.split('.')[1].length
+        #FIXME find better way with whole 0 numbers
+        number_string = number.to_s
+        if number_string.include? "-"
+          number_string.split('-')[1].to_i
+        else
+          number_string.split('.')[1].length
+        end
       end
-
     end
   end
 end

data/lib/kabal/version.rb

@@ -1,3 +1,3 @@
 module Kabal
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/test/lib/kabal/languages/deutsch_test.rb

@@ -81,4 +81,8 @@ class DeutschTest < TestCase
     assert_equal "eins Komma null null null null null null null fünf", @deu.convert(1.00000005)
     assert_equal "minus eins Komma null null null null null null null fünf", @deu.convert(-1.00000005)
   end
+  def test_zero_point_zero_zero_zero_zero_zero_zero_zero_five
+    assert_equal "null Komma null null null null null null null fünf", @deu.convert(0.00000005)
+    assert_equal "minus null Komma null null null null null null null fünf", @deu.convert(-0.00000005)
+  end
 end

data/test/lib/kabal/languages/english_test.rb

@@ -92,4 +92,8 @@ class EnglishTest < TestCase
   def test_big_number
     assert_equal "forty seven novemdecillion twenty six octodecillion one hundred fifty seven septendecillion eight hundred twenty five sexdecillion six hundred twenty seven quindecillion nine hundred eighty quattuordecillion seven hundred thirty three tredecillion four hundred thirty nine duodecillion two hundred twenty five undecillion eight hundred twenty three decillion three hundred fifty three nonillion twenty nine octillion six hundred fifty seven septillion seven hundred forty five sextillion five hundred forty four quintillion six hundred forty six quadrillion seven hundred sixty one trillion eight hundred ninety billion seventy four million two hundred forty four thousand and three", @eng.convert(47026157825627980733439225823353029657745544646761890074244003)
   end
+  def test_zero_point_zero_zero_zero_zero_zero_zero_zero_five
+    assert_equal "point zero zero zero zero zero zero zero five", @eng.convert(0.00000005)
+    assert_equal "minus point zero zero zero zero zero zero zero five", @eng.convert(-0.00000005)
+  end
 end

data/test/lib/kabal/languages/russian_test.rb

@@ -92,4 +92,8 @@ class RussianTest < TestCase
   def test_111000
     assert_equal "сто одиннадцать тысяч", @rus.convert(111000)
   end
+  def test_zero_point_zero_zero_zero_zero_zero_zero_zero_five
+    assert_equal "ноль целых пять стомиллионных", @rus.convert(0.00000005)
+    assert_equal "минус ноль целых пять стомиллионных", @rus.convert(-0.00000005)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kabal
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Pavel Kalashnikov