kabal 0.2.9 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 813ac39940e2a2c9b6da8b38d3c76730ae3bfeb6
-  data.tar.gz: d623a344b9024a9794d3ad220daee550ff934028
+  metadata.gz: 5daad58f7a22bc997876db7403be9f32e3dd3b25
+  data.tar.gz: 2698a6ae3e7f568e4f9821cf85a67b4e18c03e4e
 SHA512:
-  metadata.gz: 4991b3ee930be2c5aee68abe6461bed9f43064f881468b390a2c7e53e131711ceff2ea8112576a9ad2117e0c15ce2af434b4dc5b0db69a70b976eb8cb8669691
-  data.tar.gz: 45e417159c0e91893f533f7d25ea1fb2d96a7be05487a4782fa9227cf5efc9b8c1e5b8c7951116f00362bcb56bfba4fb85e3acd076c71ecc7e01a064c73aa6a1
+  metadata.gz: 2882910533b1f26caad0079c21ce14353b66a16e58a4ace8518d806ac80cfe3ee4917dd2bb793e2072f0c39bc4e8aed2e12f7d8ce18e614a455ccd355867b94c
+  data.tar.gz: 7e52b94f4d8e72df47406f023efb8ba6349cc0b2e17264324d17e5dff8d9e101a5629e1df767aa55ac85f904239b1fa299ef2c2652b029b9ad6ea7e0071f5934

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

@@ -23,7 +23,7 @@ module Kabal
       end
 
       def self.ends_with_one?(count)
-        count.to_s[-1] == "1"
+        count.to_s[-1] == "1" and (count % 100) / 10 != 1
       end
 
       def self.end_with_two_or_three_of_four?(count)

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

@@ -44,7 +44,6 @@ module Kabal
       end
 
       def ten_powers(number)
-        #FIXME find better way
         return names["ten_powers"][100] if number_is_google? number
         less_thousands number if number_is_thousands? number
         return @number_name if number_is_thousands? number
@@ -65,8 +64,11 @@ module Kabal
       end
 
       def count_name(number)
-        #FIXME number.to_S[-4] not good
-        @feminine_name = (number.to_s[-4] == "1" or number.to_s[-4] == "2") and count(number) and count(number) / 10 != 1 and number_order(number) == 3
+        if (number.to_s[-4] == "1" or number.to_s[-4] == "2") and count(number) and (count(number) % 100) / 10 != 1 and number_order(number) == 3
+          @feminine_name = true
+        else
+          @feminine_name = false
+        end
         three_words count(number)
       end
 

data/lib/kabal/version.rb

@@ -1,3 +1,3 @@
 module Kabal
-  VERSION = "0.2.9"
+  VERSION = "0.2.10"
 end

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

@@ -45,7 +45,7 @@ class EnglishTest < TestCase
   end
   def test_hundred_random_numbers
     r = Random.new
-    (1..65).each do |power|
+    (1..63).each do |power|
       number = r.rand(10 ** power)
       assert @eng.convert(number), number
     end

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

@@ -79,4 +79,10 @@ class RussianTest < TestCase
       assert @rus.convert(number), number
     end
   end
+  def test_11000
+    assert_equal @rus.convert(11000), "одиннадцать тысяч"
+  end
+  def test_111000
+    assert_equal @rus.convert(111000), "сто одиннадцать тысяч"
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kabal
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-24 00:00:00.000000000 Z
+date: 2014-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler