kabal 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33439037203abe61216a142cac5d9c02d06c238a
-  data.tar.gz: 7d5f04457e6e752f39a7e5fdb4dc6b5f11a1046a
+  metadata.gz: d22c90bd40aac3a8ba178f098bba486a0bfc9d49
+  data.tar.gz: 2e3f54d404fd4585828a8587c381e8d1ea29c250
 SHA512:
-  metadata.gz: 74532cb19862e75ac0b1526d18a00176b23a62d42f6941f176375413edce92f4f287a8c1758f9f5d8453579e73c66e4616a91863d2fbac1a669b317a087eed2e
-  data.tar.gz: ca456203cb903d8b62bc9c00a5e78400989ec92801860421a59f54a850e879b25b8edb61bcca204eb304a7f2071e2c1db913f793ec705aaa3651c8f870cae08a
+  metadata.gz: 9ac8dce387eae4fee82ee671cb233cea6bee2b3043423fe12f1b66a6279bf27ddfe23e6d2089fc0a29ef6b2a26efb8c89745cef73476e931757eee5a24bd5428
+  data.tar.gz: 681ffb3be175372b594c56182b6cd3bcdcf2ab11babf0075c69fe1311f1e7c32f05cd4fbc8aa2688e328d82fc6700fdae19dbef0e7eeed73902d62be641b617c

data/README.md

@@ -24,6 +24,7 @@ Or install it yourself as:
 Kabal has one main feature - number to text "converting".
 
     require 'kabal'
+    include Kabal
     Kabal.to_text 1 #=> "один"
     
 You can choose language to "converting".

data/lib/kabal/languages/russian.rb

@@ -13,11 +13,11 @@ class Kabal::Russian < Kabal::Language
   end
 
   def single(number)
-    if (number == 1 or number == 2) and @count and @count / 10 != 1 and @number_order == 3
-      names[lang]["single_feminine"][@count % 10]
-    else
-      names[lang]["single"][number]
+    if @feminine_name_for_thousands
+      @feminine_name_for_thousands = false
+      return names[lang]["single_feminine"][count(number) % 10]
     end
+    names[lang]["single"][number]
   end
 
   def two_words(number)
@@ -28,9 +28,7 @@ class Kabal::Russian < Kabal::Language
   end
 
   def three_words(number)
-    if number / 100 == 0
-      return two_words number
-    end
+    return two_words number if number / 100 == 0
     number_name = names[lang]["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)
@@ -39,30 +37,46 @@ class Kabal::Russian < Kabal::Language
 
   def ten_powers(number)
     #FIXME find better way
-    @number_order = ((number.to_s.length - 1) / 3) * 3
-    if @number_order < 3
-      unless number == 0
-        @number_name += " " + three_words(number % 1000)
-      end
-      return @number_name
-    end
-    @count = number / (10 ** @number_order)
-    if number_is_google?
-      return names[lang]["ten_powers"][100]
-    end
+    return names[lang]["ten_powers"][100] if number_is_google? number
+    less_thousands number if number_is_thousands? number
+    return @number_name if number_is_thousands? number
+    create_number_name number
+    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 + " " + Declinations.name_with_declination(names[lang]["ten_powers"][@number_order], @count)
-    elsif @count != 0
-      @number_name += " " + count_name + " " + Declinations.name_with_declination(names[lang]["ten_powers"][@number_order], @count)
+      @number_name = count_name(number) + " " + Declinations.name_with_declination(names[lang]["ten_powers"][number_order(number)], count(number))
+    elsif count(number) != 0
+      @number_name += " " + count_name(number) + " " + Declinations.name_with_declination(names[lang]["ten_powers"][number_order(number)], count(number))
     end
-    ten_powers(number % (10 ** @number_order))
   end
 
-  def count_name
-    three_words @count
+  def less_thousands(number)
+    unless number == 0
+      @number_name += " " + three_words(number % 1000)
+    end
+  end
+
+  def number_is_thousands?(number)
+    number_order(number) < 3
+  end
+
+  def count_name(number)
+    #FIXME number.to_S[-4] not good
+    @feminine_name_for_thousands = (number.to_s[-4] == "1" or number.to_s[-4] == "2") and count(number) and count(number) / 10 != 1 and number_order(number) == 3
+    three_words count(number)
   end
 
-  def number_is_google?
-    @count == 10 and @number_order == 99
+  def number_is_google?(number)
+    count(number) == 10 and number_order(number) == 99
   end
 end

data/lib/kabal/version.rb

@@ -1,3 +1,3 @@
 module Kabal
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

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