kabal 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 161b4c5b4dffadd7c6f4b1646bad9f812ffbbd75
-  data.tar.gz: 827cf85130f5c2e630feaa72b2fa38d0761b0ea6
+  metadata.gz: 23924e082596e41018e847bfd9096c4d7e99fa0d
+  data.tar.gz: 284457d7491749ef5f4b7d0fbc6fdf57fe1deba7
 SHA512:
-  metadata.gz: 77e8aacada18961448705cec34164e4d7dc705330349dc21f8e7f5ffaa00d6e0619eaffa0efd8aa284aac2b39e9bad19c0450f955e91ce158fa1b6cb5274228a
-  data.tar.gz: fd265f580a42da518ea712130cd7bd61bad020b193a9bc361f42740b894d4de6bfb6627cf684072efeb4b9e5522f555257729c4fe3e8a7427adfd9ece09ea5cf
+  metadata.gz: f33f54547f1815dc2b504202a7f02b9894918033dbba63b1651ae38fb690c757fef6c7a2cfc873b69d7847a216f1f03c113376b6f6f5f98803d3a1010f491c2c
+  data.tar.gz: 8eedf49941bae9d8001a9e94d67f155602e66730226f1c2f561c99ede8d44798391da142e4faf0545beef9d4a4d3abe9a3222dcea18f06e2c4eb3becd9758fdc

data/lib/kabal/languages/english.rb

@@ -7,6 +7,13 @@ class Kabal::English < Kabal::Language
     return three_words number if number >= 100 and number <= 999
     ten_powers number if number >= 100
   end
+  def natural_number_name(number)
+    #FIXME switch case next lines
+    return single(number) if number >= 0 and number <= 19
+    return two_words(number) if number >= 20 and number <= 99
+    return three_words(number) if number >= 100 and number <= 999
+    ten_powers(number) if number >= 1000
+  end
 
   def single(number)
     names["single"][number]
@@ -34,14 +41,6 @@ class Kabal::English < Kabal::Language
     ten_powers number % (10 ** number_order(number))
   end
 
-  def number_order(number)
-    ((number.to_s.length - 1) / 3) * 3
-  end
-
-  def count(number)
-    number / (10 ** number_order(number))
-  end
-
   def create_number_name(number)
     if @number_name.nil?
       @number_name = count_name(number) + " " + names["ten_powers"][number_order(number)]
@@ -58,8 +57,4 @@ class Kabal::English < Kabal::Language
     @number_name += " and" if number < 100
     @number_name += " " + three_words(number % 1000) unless number == 0
   end
-
-  def number_is_thousands?(number)
-    number_order(number) < 3
-  end
 end

data/lib/kabal/languages/language.rb

@@ -49,18 +49,27 @@ module Kabal
       number % 1 != 0
     end
 
-    def natural_number_name(number)
-      #FIXME switch case next lines
-      return single(number) if number >= 0 and number <= 19
-      return two_words(number) if number >= 20 and number <= 99
-      return three_words(number) if number >= 100 and number <= 999
-      ten_powers(number) if number >= 1000
-    end
 
     def natural?(number)
       number % 1 == 0
     end
 
+    def number_is_thousands?(number)
+      number_order(number) < 3
+    end
+
+    def number_is_google?(number)
+      count(number) == 10 and number_order(number) == 99
+    end
+
+    def number_order(number)
+      ((number.to_s.length - 1) / 3) * 3
+    end
+
+    def count(number)
+      number / (10 ** number_order(number))
+    end
+
     def check_supports_for(number)
       if number % 1 != 0 and not supports_fractional?
         raise NoSupportForFractionalNumberOnCurrentLanguages.message

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

@@ -5,6 +5,17 @@ module Kabal
         whole_part_name(number) + " " + fractional_part_name(number)
       end
 
+      def fractional_part_name(number)
+        fractional_part = (number % 1).round(fractional_number_order(number))
+        fractional_order = ((fractional_part) * (10 ** fractional_number_order(number))).to_s.split('.')[0].to_i
+        feminine_natural_number_name(fractional_order, true) + " " + Declinations.name_with_declination(fractional_ten_powers_name(number), fractional_part)
+      end
+
+      def whole_part_name(number)
+        count = number.to_s.split('.')[0].to_i
+        feminine_natural_number_name(count) + " " + Declinations.name_with_declination(whole, count)
+      end
+
       def fractional_ten_powers_name(number)
         ten_powers_name = ""
         if need_pre_word? number
@@ -30,16 +41,6 @@ module Kabal
         number.to_s.split('.')[1].length
       end
 
-      def fractional_part_name(number)
-        fractional_part = (number % 1).round(fractional_number_order(number))
-        fractional_order = ((fractional_part) * (10 ** fractional_number_order(number))).to_s.split('.')[0].to_i
-        feminine_natural_number_name(fractional_order) + " " + Declinations.name_with_declination(fractional_ten_powers_name(number), fractional_part)
-      end
-
-      def whole_part_name(number)
-        count = number.to_s.split('.')[0].to_i
-        feminine_natural_number_name(count) + " " + Declinations.name_with_declination(whole, count)
-      end
     end
   end
 end

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

@@ -2,33 +2,48 @@ module Kabal
   module RussianRules
     module NaturalNumbers
 
-      def feminine_natural_number_name(number)
-        @feminine_name = true
+      def feminine_natural_number_name(number, fractional_part = false)
+        @number = number
+        @feminine_name = !fractional_part
+        @fractional_part = fractional_part
         natural_number_name number
       end
 
-      def single(number)
+      def natural_number_name(number)
+        #FIXME switch case next lines
+        return single(number, true) if number >= 0 and number <= 19
+        return two_words(number, true) if number >= 20 and number <= 99
+        return three_words(number, true) if number >= 100 and number <= 999
+        ten_powers(number) if number >= 1000
+      end
+
+      def single(number, this_is_end = false)
         if @feminine_name
           @feminine_name = false
           return names["single_feminine"][count(number) % 10] if count(number) % 10 == 1 or count(number) % 10 == 2
         end
+        if @fractional_part and this_is_end
+          @fractional_part = false
+          return names["single_feminine"][count(number) % 10] if count(number) % 10 == 1 or count(number) % 10 == 2
+        end
         names["single"][number]
       end
 
-      def two_words(number)
-        return single number if number <= 19
+      def two_words(number, this_is_end = false)
+        return single(number, this_is_end) if number <= 19
         number_name = names["two_words"][number / 10]
-        number_name += " " + single(number % 10) if (number % 10 != 0)
+        number_name += " " + single(number % 10, this_is_end) if (number % 10 != 0)
         number_name
       end
 
-      def three_words(number)
-        return two_words number if number / 100 == 0
+      def three_words(number, this_is_end = false)
+        return two_words(number, this_is_end) if number / 100 == 0
         number_name = names["three_words"][number / 100]
-        return number_name += " " + two_words(number % 100) if (number % 100 >= 20)
-        return number_name += " " + single(number % 100) if (number % 100 != 0)
+        return number_name += " " + two_words(number % 100, this_is_end) if (number % 100 >= 20)
+        return number_name += " " + single(number % 100, this_is_end) if (number % 100 != 0)
         number_name
       end
+
       def ten_powers(number)
         #FIXME find better way
         return names["ten_powers"][100] if number_is_google? number
@@ -38,14 +53,6 @@ module Kabal
         ten_powers(number % (10 ** number_order(number)))
       end
 
-      def number_order(number)
-        ((number.to_s.length - 1) / 3) * 3
-      end
-
-      def count(number)
-        number / (10 ** number_order(number))
-      end
-
       def create_number_name(number)
         if @number_name.nil?
           @number_name = count_name(number) + " " + Declinations.name_with_declination(names["ten_powers"][number_order(number)], count(number))
@@ -55,11 +62,7 @@ module Kabal
       end
 
       def less_thousands(number)
-        @number_name += " " + three_words(number % 1000) unless number == 0
-      end
-
-      def number_is_thousands?(number)
-        number_order(number) < 3
+        @number_name += " " + three_words(number % 1000, true) unless number == 0
       end
 
       def count_name(number)
@@ -68,8 +71,8 @@ module Kabal
         three_words count(number)
       end
 
-      def number_is_google?(number)
-        count(number) == 10 and number_order(number) == 99
+      def is_number_ten_powers?
+        @number <= -1000 and @number >= 1000
       end
     end
   end

data/lib/kabal/version.rb

@@ -1,3 +1,3 @@
 module Kabal
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

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

@@ -66,4 +66,7 @@ class RussianTest < TestCase
   def test_to_text_with_fractional_number_with_exp_form
     assert_equal @rus.convert(1.00000000005), "одна целая пять стомиллиардных"
   end
+  def test_to_text_with_some_number
+    assert_equal @rus.convert(1.23567891), "одна целая двадцать три миллиона пятьсот шестьдесят семь тысяч восемьсот девяносто одна стомиллионная"
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kabal
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-10 00:00:00.000000000 Z
+date: 2014-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler