kabal 0.2.10 → 0.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5daad58f7a22bc997876db7403be9f32e3dd3b25
-  data.tar.gz: 2698a6ae3e7f568e4f9821cf85a67b4e18c03e4e
+  metadata.gz: 5b580af08037ba20f127cb0682ef45b7037e0d0d
+  data.tar.gz: fb214f852a961fe6ab669836b0c781e6ef1af5fc
 SHA512:
-  metadata.gz: 2882910533b1f26caad0079c21ce14353b66a16e58a4ace8518d806ac80cfe3ee4917dd2bb793e2072f0c39bc4e8aed2e12f7d8ce18e614a455ccd355867b94c
-  data.tar.gz: 7e52b94f4d8e72df47406f023efb8ba6349cc0b2e17264324d17e5dff8d9e101a5629e1df767aa55ac85f904239b1fa299ef2c2652b029b9ad6ea7e0071f5934
+  metadata.gz: 92c1d897cd2294239335a20d2c53882fadbad6c6c478d3d9c9523b31a97b304fe31b633f71aa96cfbda74adcba4ec106613eba46130cbebfac469ebba4863701
+  data.tar.gz: bcae9e1f9575d7a8acf3df8bf98d0268aaed22f0f31874fb5ea0248c87cd4157b2c54b787af6de92edae38851fe03c0cf43f665ca90c3ffdf020b4cac4df8940

data/lib/kabal.rb

@@ -29,7 +29,7 @@ module Kabal
       obj = Object.const_get("Kabal::" + language_at_once).new
       obj.convert number
     else
-      raise NoLanguageSupportError.message
+      NoLanguageSupportError.message
     end
   end
 
@@ -39,7 +39,7 @@ module Kabal
       obj = Object.const_get("Kabal::" + languages[language_at_once_index].first).new
       obj.convert number
     else
-      raise NoLanguageSupportError.message
+      NoLanguageSupportError.message
     end
   end
 

data/lib/kabal/languages/language.rb

@@ -6,8 +6,20 @@ module Kabal
     end
 
     def convert(number)
-      check_supports_for number
-      convert_number number
+      if no_supports? number
+        error number
+      else
+        convert_number number
+      end
+    end
+
+    def error(number)
+      if number_is_out_of_the_range? number
+        return Kabal::Errors::NumberOutRangeError.message
+      end
+      if not supports_fractional? and number % 1 != 0
+        Kabal::Errors::NoSupportForFractionalNumberOnCurrentLanguages.message
+      end
     end
 
     def lang
@@ -29,10 +41,6 @@ module Kabal
       eval @supports["natural"]["max"]
     end
 
-    def supports_fractional?
-      @supports["fractional"]
-    end
-
     def names
       @names[lang]
     end
@@ -70,13 +78,16 @@ module Kabal
       number / (10 ** number_order(number))
     end
 
-    def check_supports_for(number)
-      if number % 1 != 0 and not supports_fractional?
-        raise Kabal::Errors::NoSupportForFractionalNumberOnCurrentLanguages.message
-      end
-      if number >= max_value or number <= min_value
-        raise Kabal::Errors::NumberOutRangeError.message
-      end
+    def supports_fractional?
+      @supports["fractional"]
+    end
+
+    def number_is_out_of_the_range?(number)
+      number >= max_value or number <= min_value
+    end
+
+    def no_supports?(number)
+      (number % 1 != 0 and not supports_fractional?) or number_is_out_of_the_range?(number)
     end
   end
 end

data/lib/kabal/version.rb

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

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

@@ -38,10 +38,7 @@ class EnglishTest < TestCase
   end
 
   def test_fractional_number
-    exception = assert_raises RuntimeError do
-      @eng.convert 0.1
-    end
-    assert_equal NoSupportForFractionalNumberOnCurrentLanguages.message, exception.message
+    assert_equal NoSupportForFractionalNumberOnCurrentLanguages.message, @eng.convert(0.1)
   end
   def test_hundred_random_numbers
     r = Random.new

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

@@ -46,10 +46,7 @@ class RussianTest < TestCase
     assert_equal @rus.convert(-22000), "минус двадцать две тысячи"
   end
   def test_to_text_with_negative_number
-    exception = assert_raises RuntimeError do
-      @rus.convert -(10 ** 103)
-    end
-    assert_equal NumberOutRangeError.message, exception.message
+    assert_equal NumberOutRangeError.message, @rus.convert(-(10 ** 103))
   end
   def test_to_text_with_fractional_number_with_zero
     assert_equal @rus.convert(0.01), "ноль целых одна сотая"

data/test/lib/kabal_test.rb

@@ -21,15 +21,10 @@ class KabalTest < TestCase
   end
 
   def test_to_text_in_language_with_unsupported_language
-    #FIXME replace RuntimeError to NoLanguageSupportError
-    exception = assert_raises RuntimeError do
-      Kabal.to_text_in_language(125125125125, "Elfin")
-    end
-    assert_equal NoLanguageSupportError.message, exception.message
+    assert_equal NoLanguageSupportError.message, Kabal.to_text_in_language(125125125125, "Elfin")
   end
 
   def test_language_init_with_unsupported_language
-    #FIXME replace RuntimeError to NoLanguageSupportError
     exception = assert_raises RuntimeError do
       Kabal.language = "Elfin"
     end

metadata

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