kabal 0.2.19 → 0.2.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afe3367013925af32229e8c4a516552299b46385
-  data.tar.gz: e50d47bb731812a5fd6ebf53446c74d8650f2378
+  metadata.gz: ace3cb07e31a4f58cd9d996c21293268c3654e99
+  data.tar.gz: 5abaea18a9c86cf789a0b02c13640918afa9c557
 SHA512:
-  metadata.gz: 9f83ed35ae41c3cb18150189f534b4c257be37579b90520ae52bb34d56561a177ecab0169e340e2896782d5b71379d0af5853595c00f209ab4f8c872dcd18ba9
-  data.tar.gz: dcab1c7d66dcb42c35f31c7a397a5163a42385d679e4ea5fed014e941a67d5b6ffc9141c59e55fa8644dca6d203747b90f464fa94e3d0ee52aeb51e4db1c9d8a
+  metadata.gz: c01b9cdfb2d9b04a5f02fa9096226f572e364a5c69c0521239156ed165395fe768f31cc6ed6d8706f976f6af27dc8629fbd1f61e1431b509812d386ed59ce99a
+  data.tar.gz: e9e0f3c767d68aae8277d8f8ff65b678af4b0686f1a46d374f4ec8f68b8d6baf34f105b5bfafee18118c8f98dc93558eb074d48f4fe2e6545910e93472ae06fc

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

@@ -21,8 +21,8 @@ module Kabal
       def three_words(number)
         return two_words number if number <= 99
         number_name = single(number / 100) + " " + names["ten_powers"][2]
-        number_name += " " + two_words(number % 100) if (number % 100 >= 10)
-        number_name += " and " + single(number % 100) if (number % 100 < 10)
+        number_name += " " + two_words(number % 100) if number % 100 >= 10
+        number_name += " " + names["and"] + " " + single(number % 100) if number % 100 < 10 and number % 100 != 0
         number_name
       end
 
@@ -46,7 +46,8 @@ module Kabal
       end
 
       def less_thousands(number)
-        @number_name += " and" if number < 100
+        return if number == 0
+        @number_name += " " + names["and"] if number < 100
         @number_name += " " + three_words(number % 1000) unless number == 0
       end
     end

data/lib/kabal/version.rb

@@ -1,3 +1,3 @@
 module Kabal
-  VERSION = "0.2.19"
+  VERSION = "0.2.20"
 end

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

@@ -13,6 +13,18 @@ class EnglishTest < TestCase
     assert_equal "twenty one", @eng.convert(21)
   end
 
+  def test_one_hundred
+    assert_equal "one hundred", @eng.convert(100)
+  end
+
+  def test_one_thousand
+    assert_equal "one thousand", @eng.convert(1000)
+  end
+
+  def test_one_million
+    assert_equal "one million", @eng.convert(1000000)
+  end
+
   def test_three_words
     assert_equal "one hundred twenty one", @eng.convert(121)
   end

data/yaml/languages/en.yml

@@ -1,4 +1,5 @@
 en:
+  and: "and"
   minus: minus
   dot: point
   single:

metadata

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