kabal 0.2.14 → 0.2.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 501779f1e454f2db85b91289089e709ab8682701
-  data.tar.gz: aeac5f808d26d4cab88c1f2b5ee76c2d14a3a113
+  metadata.gz: 1ac2ea874e174e6bc64bfbacfc1969a2a569c490
+  data.tar.gz: bf93eea3f84e8a1f3b3439fef48fcad2ec48ef4c
 SHA512:
-  metadata.gz: c011c155472b7e4805d9361036fc80db9b17f27f5493ce9782f4eebebc6ef3d5c0c8e53310850f1a4b49204309fa7c0159da93f33475ae6931819643d6bcc339
-  data.tar.gz: 9e76695801c851494e90390f7220204414c0b93530d798655e6eae48c38abead1088004fb0a56f1150f14cd6f1b5127c8df53a53b0d31da6a3fd4ee8a4fb407d
+  metadata.gz: 22523b591f6ab9cd3717e3da54c4ba601d1f8b30c2d01ee0b352c80a7b3112b60c2796689ff7c71e7ef380be4dc128315cde0ac3947f8736fdbdf6e43fcfc932
+  data.tar.gz: 08e397d34caef6675084259ff71b90a2bf5e8e7089bcb1199691c203d1477afa5868bc3a3d232d676dfa1e8de9eb98d34edd80478cd37b1b76dc59969e98843c

data/README.md

@@ -47,6 +47,7 @@ Supported Languages:
     * Negative Numbers
 * English
     * Natural Numbers { max 10 ** 63 }
+    * Negative Numbers
 
 *More languages will be added later.*
 

data/lib/kabal/languages/english.rb

@@ -2,6 +2,13 @@ require 'kabal/languages/language'
 
 class Kabal::English < Kabal::Language
   def convert_number(number)
+    if need_minus? number
+      minus + " " + number_words(-number)
+    else
+      number_words number
+    end
+  end
+  def number_words(number)
     return single number if number >= 0 and number <= 19
     return two_words number if number >= 0 and number <= 99
     return three_words number if number >= 100 and number <= 999

data/lib/kabal/languages/language.rb

@@ -89,5 +89,9 @@ module Kabal
     def no_supports?(number)
       (number % 1 != 0 and not supports_fractional?) or number_is_out_of_the_range?(number)
     end
+
+    def need_minus?(number)
+      number < 0
+    end
   end
 end

data/lib/kabal/languages/russian.rb

@@ -21,8 +21,4 @@ class Kabal::Russian < Kabal::Language
     return natural_number_name number.round if natural? number
     fractional_number_name number if fractional? number
   end
-
-  def need_minus?(number)
-    number < 0
-  end
 end

data/lib/kabal/version.rb

@@ -1,3 +1,3 @@
 module Kabal
-  VERSION = "0.2.14"
+  VERSION = "0.2.15"
 end

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

@@ -47,4 +47,10 @@ class EnglishTest < TestCase
       assert @eng.convert(number), number
     end
   end
+  def test_minus_one
+    assert_equal "minus one", @eng.convert(-1)
+  end
+  def test_minus_one_million_and_one_and_one_and_one
+    assert_equal "minus one hundred eleven million one hundred fifty thousand and twenty one", @eng.convert(-111150021)
+  end
 end

data/yaml/support.yml

@@ -7,5 +7,5 @@ support:
       symbols: 16
   en:
     natural:
-      min: "0"
+      min: "-(10 ** 66) + 1"
       max: "(10 ** 66) - 1"

metadata

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