kabal 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8222532ce70bc4277e557311bb3b92c789211a20
-  data.tar.gz: 0a3dfce8f30ec6db359a022cfe22c360f97cfb0f
+  metadata.gz: 161b4c5b4dffadd7c6f4b1646bad9f812ffbbd75
+  data.tar.gz: 827cf85130f5c2e630feaa72b2fa38d0761b0ea6
 SHA512:
-  metadata.gz: f8f45ed8a597586f73eb2fbc7b7d4d14dc0260a3d2e44b0e857b67b57e8c0832a5337804719fb4d3043d4de7e8f2285bd8d3b508e2236890a61965329a14e141
-  data.tar.gz: 60593e22d43fb7bccb32d0de52f5a1e8d6069f0bdca06f5db7782e588b5d5c1e24a8cd447f3c61f6e09546bd44f657ac45474d801996c13e0399b4f84abda332
+  metadata.gz: 77e8aacada18961448705cec34164e4d7dc705330349dc21f8e7f5ffaa00d6e0619eaffa0efd8aa284aac2b39e9bad19c0450f955e91ce158fa1b6cb5274228a
+  data.tar.gz: fd265f580a42da518ea712130cd7bd61bad020b193a9bc361f42740b894d4de6bfb6627cf684072efeb4b9e5522f555257729c4fe3e8a7427adfd9ece09ea5cf

data/lib/kabal/config.rb

@@ -1,3 +1,3 @@
 module Kabal::Config
-  require "kabal/config/yaml_loader.rb"
+  autoload :YamlLoader, "kabal/config/yaml_loader.rb"
 end

data/lib/kabal/languages/english.rb

@@ -1,8 +1,7 @@
 require 'kabal/languages/language'
 
 class Kabal::English < Kabal::Language
-  def convert(number)
-    raise NumberOutRangeError.message if number < 0 or number >= 10 ** 12 or number % 1 != 0
+  def convert_number(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
@@ -10,19 +9,19 @@ class Kabal::English < Kabal::Language
   end
 
   def single(number)
-    names[lang]["single"][number]
+    names["single"][number]
   end
 
   def two_words(number)
     return single number if number <= 19
-    number_name = names[lang]["two_words"][number / 10]
+    number_name = names["two_words"][number / 10]
     number_name += " " + single(number % 10) if (number % 10 != 0)
     number_name
   end
 
   def three_words(number)
     return two_words number if number <= 99
-    number_name = single(number / 100) + " " + names[lang]["ten_powers"][2]
+    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
@@ -45,9 +44,9 @@ class Kabal::English < Kabal::Language
 
   def create_number_name(number)
     if @number_name.nil?
-      @number_name = count_name(number) + " " + names[lang]["ten_powers"][number_order(number)]
+      @number_name = count_name(number) + " " + names["ten_powers"][number_order(number)]
     elsif count(number) != 0
-      @number_name += " " + count_name(number) + " " + names[lang]["ten_powers"][number_order(number)]
+      @number_name += " " + count_name(number) + " " + names["ten_powers"][number_order(number)]
     end
   end
 

data/lib/kabal/languages/language.rb

@@ -1,40 +1,73 @@
 module Kabal
   class Language
+    def initialize
+      @names = YamlLoader.yaml_object "languages/#{lang}"
+      @supports = YamlLoader.yaml_object("support")["support"][lang]
+    end
+
+    def convert(number)
+      check_supports_for number
+      convert_number number
+    end
+
     def lang
       languages = YamlLoader.yaml_object "languages"
       @lang = languages[self.to_s.split(":")[-2]]
     end
 
     def supports_natural?
-      supports = YamlLoader.yaml_object "support"
-      supports["support"][lang]["natural"]
+      @supports["natural"]
     end
 
     #TODO реализовать метод supports_negative?
 
+    def min_value
+      eval @supports["natural"]["min"]
+    end
+
+    def max_value
+      eval @supports["natural"]["max"]
+    end
+
     def supports_fractional?
-      supports = YamlLoader.yaml_object "support"
-      supports["support"][lang]["fractional"]
+      @supports["fractional"]
     end
 
     def names
-      YamlLoader.yaml_object "languages/#{lang}"
+      @names[lang]
     end
 
     def minus
-      YamlLoader.yaml_object("languages/#{lang}")[lang]["minus"]
+      names["minus"]
     end
 
     def whole
-      YamlLoader.yaml_object("languages/#{lang}")[lang]["whole"]
+      names["whole"]
+    end
+
+    def fractional?(number)
+      number % 1 != 0
+    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
+      return three_words(number) if number >= 100 and number <= 999
+      ten_powers(number) if number >= 1000
     end
 
     def natural?(number)
       number % 1 == 0
     end
 
-    def fractional?(number)
-      number % 1 != 0
+    def check_supports_for(number)
+      if number % 1 != 0 and not supports_fractional?
+        raise NoSupportForFractionalNumberOnCurrentLanguages.message
+      end
+      if number >= max_value or number <= min_value
+        raise NumberOutRangeError.message
+      end
     end
   end
 end

data/lib/kabal/languages/russian.rb

@@ -7,9 +7,7 @@ class Kabal::Russian < Kabal::Language
   include Kabal::RussianRules::NaturalNumbers
   include Kabal::RussianRules::FractionalNumbers
 
-  def convert(number)
-    #FIXME find way to get min and max from yml file
-    raise NumberOutRangeError.message if number <= -(10 ** 102) or number >= 10 ** 102
+  def convert_number(number)
     #FIXME find better way
     @number_name = nil
     need_minus?(number) ? (minus + " " + number_words(-number)) : number_words(number)

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

@@ -8,12 +8,20 @@ module Kabal
       def fractional_ten_powers_name(number)
         ten_powers_name = ""
         if need_pre_word? number
-         ten_powers_name = names[lang]["fractional_pre_words"][fractional_number_order(number) % 3] + names[lang]["fractional_ten_powers"][fractional_number_order(number) - (fractional_number_order(number) % 3)]
+          ten_powers_name = fractional_pre_word(number) + fractional_order_word(number)
         else
-          ten_powers_name = names[lang]["fractional_ten_powers"][fractional_number_order(number)]
+          ten_powers_name = names["fractional_ten_powers"][fractional_number_order(number)]
         end
       end
 
+      def fractional_order_word(number)
+        names["fractional_ten_powers"][fractional_number_order(number) - (fractional_number_order(number) % 3)]
+      end
+
+      def fractional_pre_word(number)
+        names["fractional_pre_words"][fractional_number_order(number) % 3]
+      end
+
       def need_pre_word?(number)
         fractional_number_order(number) > 3 and fractional_number_order(number) % 3 != 0
       end
@@ -24,7 +32,8 @@ module Kabal
 
       def fractional_part_name(number)
         fractional_part = (number % 1).round(fractional_number_order(number))
-        feminine_natural_number_name(((fractional_part) * (10 ** fractional_number_order(number))).to_s.split('.')[0].to_i) + " " + Declinations.name_with_declination(fractional_ten_powers_name(number), fractional_part)
+        fractional_order = ((fractional_part) * (10 ** fractional_number_order(number))).to_s.split('.')[0].to_i
+        feminine_natural_number_name(fractional_order) + " " + Declinations.name_with_declination(fractional_ten_powers_name(number), fractional_part)
       end
 
       def whole_part_name(number)

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

@@ -1,13 +1,6 @@
 module Kabal
   module RussianRules
     module NaturalNumbers
-      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
-        return three_words(number) if number >= 100 and number <= 999
-        ten_powers(number) if number >= 1000
-      end
 
       def feminine_natural_number_name(number)
         @feminine_name = true
@@ -17,28 +10,28 @@ module Kabal
       def single(number)
         if @feminine_name
           @feminine_name = false
-          return names[lang]["single_feminine"][count(number) % 10] if count(number) % 10 == 1 or count(number) % 10 == 2
+          return names["single_feminine"][count(number) % 10] if count(number) % 10 == 1 or count(number) % 10 == 2
         end
-        names[lang]["single"][number]
+        names["single"][number]
       end
 
       def two_words(number)
         return single number if number <= 19
-        number_name = names[lang]["two_words"][number / 10]
+        number_name = names["two_words"][number / 10]
         number_name += " " + single(number % 10) if (number % 10 != 0)
         number_name
       end
 
       def three_words(number)
         return two_words number if number / 100 == 0
-        number_name = names[lang]["three_words"][number / 100]
+        number_name = names["three_words"][number / 100]
         return number_name += " " + two_words(number % 100) if (number % 100 >= 20)
         return number_name += " " + single(number % 100) if (number % 100 != 0)
         number_name
       end
       def ten_powers(number)
         #FIXME find better way
-        return names[lang]["ten_powers"][100] if number_is_google? number
+        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
         create_number_name number
@@ -55,9 +48,9 @@ module Kabal
 
       def create_number_name(number)
         if @number_name.nil?
-          @number_name = count_name(number) + " " + Declinations.name_with_declination(names[lang]["ten_powers"][number_order(number)], count(number))
+          @number_name = count_name(number) + " " + Declinations.name_with_declination(names["ten_powers"][number_order(number)], count(number))
         elsif count(number) != 0
-          @number_name += " " + count_name(number) + " " + Declinations.name_with_declination(names[lang]["ten_powers"][number_order(number)], count(number))
+          @number_name += " " + count_name(number) + " " + Declinations.name_with_declination(names["ten_powers"][number_order(number)], count(number))
         end
       end
 

data/lib/kabal/supported_languages.rb

@@ -1,6 +1,5 @@
 module Kabal
   module SupportedLanguages
-    #FIXME add autoload
     require 'kabal/languages/russian'
     require 'kabal/languages/english'
   end

data/lib/kabal/version.rb

@@ -1,3 +1,3 @@
 module Kabal
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

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

@@ -36,4 +36,11 @@ class EnglishTest < TestCase
   def test_hundred_millions_with_and
     assert_equal @eng.convert(111150021), "one hundred eleven million one hundred fifty thousand and twenty one"
   end
+
+  def test_fractional_number
+    exception = assert_raises RuntimeError do
+      @eng.convert 0.1
+    end
+    assert_equal NoSupportForFractionalNumberOnCurrentLanguages.message, exception.message
+  end
 end

data/yaml/support.yml

@@ -2,8 +2,10 @@ support:
   ru:
     natural:
       min: "-(10 ** 102)"
-      max: "-(10 ** 102)"
+      max: "10 ** 102"
     fractional:
       symbols: 16
   en:
-    natural: true
+    natural:
+      min: "0"
+      max: "10 ** 12"

metadata

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