kabal 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d22c90bd40aac3a8ba178f098bba486a0bfc9d49
-  data.tar.gz: 2e3f54d404fd4585828a8587c381e8d1ea29c250
+  metadata.gz: 3cf4b9fcfb470eb18a488ba782bdacd664767a3a
+  data.tar.gz: 8b6ad5bd552fdcb7cc42aff56039cac8991b85b4
 SHA512:
-  metadata.gz: 9ac8dce387eae4fee82ee671cb233cea6bee2b3043423fe12f1b66a6279bf27ddfe23e6d2089fc0a29ef6b2a26efb8c89745cef73476e931757eee5a24bd5428
-  data.tar.gz: 681ffb3be175372b594c56182b6cd3bcdcf2ab11babf0075c69fe1311f1e7c32f05cd4fbc8aa2688e328d82fc6700fdae19dbef0e7eeed73902d62be641b617c
+  metadata.gz: cf141f18e9a73bb9e03dd7998ca45c6855bb3259983b3a241b3d7c2bbaab86c67471144ac9a427df5501708589b9ba1de15ef498db08ad0e1828b87ea22d586a
+  data.tar.gz: cdcf93b6454fe22751d380b30a02892c693457bb84a1bb5795d851c54b2ae65bd9a3e609cb5222437ef25509476b423fe01186b5882c6fe2cd2cb16b6e8c93cb

data/README.md

@@ -2,6 +2,8 @@
 
 [![Build Status](https://travis-ci.org/kalashnikovisme/kabal.svg?branch=master)](https://travis-ci.org/kalashnikovisme/kabal)
 [![Coverage Status](https://coveralls.io/repos/kalashnikovisme/kabal/badge.png?branch=master)](https://coveralls.io/r/kalashnikovisme/kabal?branch=master)
+[![Gem Version](https://badge.fury.io/rb/kabal.svg)](http://badge.fury.io/rb/kabal)
+[![endorse](https://api.coderwall.com/kalashnikovisme/endorsecount.png)](https://coderwall.com/kalashnikovisme)
 
 Kabal allows you to translate number into text.
 

data/lib/kabal/languages/language.rb

@@ -8,5 +8,9 @@ module Kabal
     def names
       YamlLoader.yaml_object "languages/#{lang}"
     end
+
+    def minus
+      YamlLoader.yaml_object("languages/#{lang}")[lang]["minus"]
+    end
   end
 end

data/lib/kabal/languages/russian.rb

@@ -4,7 +4,13 @@ require 'kabal/languages/russian/declinations'
 class Kabal::Russian < Kabal::Language
   def convert(number)
     #FIXME find way to get min and max from yml file
-    raise NumberOutRangeError.message if number < 0 or number >= 10 ** 102
+    raise NumberOutRangeError.message if number <= -(10 ** 102) or number >= 10 ** 102
+    #FIXME find better way
+    @number_name = nil
+    need_minus?(number) ? (minus + " " + natural_number_name(-number)) : natural_number_name(number)
+  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
@@ -12,6 +18,10 @@ class Kabal::Russian < Kabal::Language
     ten_powers(number) if number >= 1000
   end
 
+  def need_minus?(number)
+    number < 0
+  end
+
   def single(number)
     if @feminine_name_for_thousands
       @feminine_name_for_thousands = false
@@ -61,9 +71,7 @@ class Kabal::Russian < Kabal::Language
   end
 
   def less_thousands(number)
-    unless number == 0
-      @number_name += " " + three_words(number % 1000)
-    end
+    @number_name += " " + three_words(number % 1000) unless number == 0
   end
 
   def number_is_thousands?(number)

data/lib/kabal/version.rb

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

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

@@ -7,37 +7,47 @@ class RussianTest < TestCase
 
   def test_to_text_with_single_number
     assert_equal @rus.convert(1), "один"
+    assert_equal @rus.convert(-1), "минус один"
   end
   def test_to_text_with_two_words_number
     assert_equal @rus.convert(25), "двадцать пять"
+    assert_equal @rus.convert(-25), "минус двадцать пять"
   end
   def test_to_text_with_three_words_number
     assert_equal @rus.convert(625), "шестьсот двадцать пять"
+    assert_equal @rus.convert(-625), "минус шестьсот двадцать пять"
   end
   def test_to_text_with_ten_powers
     assert_equal @rus.convert(125625), "сто двадцать пять тысяч шестьсот двадцать пять"
+    assert_equal @rus.convert(-125625), "минус сто двадцать пять тысяч шестьсот двадцать пять"
   end
   def test_to_text_with_ten_powers_millions
     assert_equal @rus.convert(125125625), "сто двадцать пять миллионов сто двадцать пять тысяч шестьсот двадцать пять"
+    assert_equal @rus.convert(-125125625), "минус сто двадцать пять миллионов сто двадцать пять тысяч шестьсот двадцать пять"
   end
   def test_to_text_with_ten_powers_some_number
     assert_equal @rus.convert(1000001), "один миллион один"
+    assert_equal @rus.convert(-1000001), "минус один миллион один"
   end
   def test_to_text_with_google
     assert_equal @rus.convert(10 ** 100), "гугол"
+    assert_equal @rus.convert(-(10 ** 100)), "минус гугол"
   end
   def test_to_text_with_three_words_without_second_order
     assert_equal @rus.convert(101), "сто один"
+    assert_equal @rus.convert(-101), "минус сто один"
   end
   def test_to_text_with_three_words_without_first_and_second_order
     assert_equal @rus.convert(200), "двести"
+    assert_equal @rus.convert(-200), "минус двести"
   end
   def test_to_text_with_thousands
     assert_equal @rus.convert(22000), "двадцать две тысячи"
+    assert_equal @rus.convert(-22000), "минус двадцать две тысячи"
   end
   def test_to_text_with_negative_number
     exception = assert_raises RuntimeError do
-      @rus.convert -1
+      @rus.convert -(10 ** 103)
     end
     assert_equal NumberOutRangeError.message, exception.message
   end

data/yaml/languages/ru.yml

@@ -1,4 +1,5 @@
 ru:
+  minus: "минус"
   single:
     0: ноль
     1: один

metadata

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