kabal 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c101bb50f76d3c3bfff154c5e420b69a2558e81a
-  data.tar.gz: 636f8f442b6b45c8f22ab111c465db1b1c1c760d
+  metadata.gz: 8222532ce70bc4277e557311bb3b92c789211a20
+  data.tar.gz: 0a3dfce8f30ec6db359a022cfe22c360f97cfb0f
 SHA512:
-  metadata.gz: d4a8e658b4c4f17f7c53348ef7510ef92297827976c341ab599733b1753560032b05fde56179fe0414088f3bd2c3f6275c6b5f16b88a228eff0682cc884849a3
-  data.tar.gz: 21377db86be3a7c956af37b0bd79163d206ca5a9011c732d2c3e7fc5fb72eeb22a15a0c9f97c8ad46f5855f6487ef5b91181122bcfb50322579bd600139c10c1
+  metadata.gz: f8f45ed8a597586f73eb2fbc7b7d4d14dc0260a3d2e44b0e857b67b57e8c0832a5337804719fb4d3043d4de7e8f2285bd8d3b508e2236890a61965329a14e141
+  data.tar.gz: 60593e22d43fb7bccb32d0de52f5a1e8d6069f0bdca06f5db7782e588b5d5c1e24a8cd447f3c61f6e09546bd44f657ac45474d801996c13e0399b4f84abda332

data/.gitignore

@@ -21,3 +21,4 @@ tmp
 *.a
 mkmf.log
 *.swp
+*.swo

data/README.md

@@ -2,6 +2,7 @@
 
 [![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)
+[![Inline docs](http://inch-pages.github.io/github/kalashnikovisme/kabal.png)](http://inch-pages.github.io/github/kalashnikovisme/kabal)
 [![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)
 [![Dependency Status](https://gemnasium.com/kalashnikovisme/kabal.svg)](https://gemnasium.com/kalashnikovisme/kabal)
@@ -41,12 +42,17 @@ You can choose language to "converting".
 Supported Languages:
 
 * Russian
+    * Natural Numbers
+    * Fractional Numbers
+    * Negative Numbers
+* English
+    * Natural Numbers
 
 *More languages will be added later.*
 
 You can see actual list of supported languages:
 
-    $> Kabal.supported_languages #=> ["Russian"]
+    $> Kabal.supported_languages #=> ["Russian", "English"]
 
 ## Contributing
 
@@ -79,9 +85,19 @@ To add Elfin language you should:
       minus: #Minus on Elfin Language#
     ```
 4. Add `Elfin: "el"` to `yaml/languages.yml`.
-5. Add `require "kabal/languages/elfin"` to `lib/kabal/supported_languages.rb`.
+5. Add `el: natural: min: {min_of_your_realization}" max: {max_of_your_realization} fractional: symbols: {count_of_symbols_after_dot_that_you_realized}` to `yaml/support.yml` 
+6. Add `require "kabal/languages/elfin"` to `lib/kabal/supported_languages.rb`.
 
 ## Testing
 
 Kabal has the BigTest. This test checks the correctness of the operation with all the numbers (0 to 10,000) in all supported languages.
-Be careful: BigTest working with 10 001 numbers on one languages during around 3 minutes.
+Be careful: BigTest now working around 6 minutes.
+Run BigTest
+
+    $> tconsole bigtest
+
+Relax!
+
+    $> tconsole all
+    
+runs all tests without Bigtest.

data/kabal.gemspec

@@ -10,10 +10,13 @@ Gem::Specification.new do |spec|
   spec.email         = ["kalashnikovisme@gmail.com"]
   spec.summary       = %q{Number To Text Helper}
   spec.description   = %q{Kabal allows you to translate numbers into text.}
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/kalashnikovisme/kabal"
   spec.license       = "MIT"
+  spec.required_ruby_version = '>= 2.0.0'
+  spec.metadata = { "issue_tracker" => "https://github.com/kalashnikovisme/kabal/issues" }
 
   spec.files         = `git ls-files`.split("\n")
+  spec.post_install_message = "See documentation of Kabal on https://github.com/kalashnikovisme/kabal"
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]

data/lib/kabal/errors/no_support_for_fractional_numbers_on_current_language_error.rb

@@ -0,0 +1,5 @@
+class Kabal::Errors::NoSupportForFractionalNumberOnCurrentLanguages < StandardError
+  def self.message
+    "Current language doesn't support fractional numbers"
+  end
+end

data/lib/kabal/errors.rb

@@ -1,4 +1,5 @@
 module Kabal::Errors
   require "kabal/errors/no_language_support_error"
   require "kabal/errors/number_out_range_error"
+  require "kabal/errors/no_support_for_fractional_numbers_on_current_language_error"
 end

data/lib/kabal/languages/english.rb

@@ -2,7 +2,7 @@ require 'kabal/languages/language'
 
 class Kabal::English < Kabal::Language
   def convert(number)
-    raise NumberOutRangeError.message if number < 0 or number >= 10 ** 12
+    raise NumberOutRangeError.message if number < 0 or number >= 10 ** 12 or number % 1 != 0
     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

@@ -5,6 +5,18 @@ module Kabal
       @lang = languages[self.to_s.split(":")[-2]]
     end
 
+    def supports_natural?
+      supports = YamlLoader.yaml_object "support"
+      supports["support"][lang]["natural"]
+    end
+
+    #TODO реализовать метод supports_negative?
+
+    def supports_fractional?
+      supports = YamlLoader.yaml_object "support"
+      supports["support"][lang]["fractional"]
+    end
+
     def names
       YamlLoader.yaml_object "languages/#{lang}"
     end
@@ -12,5 +24,17 @@ module Kabal
     def minus
       YamlLoader.yaml_object("languages/#{lang}")[lang]["minus"]
     end
+
+    def whole
+      YamlLoader.yaml_object("languages/#{lang}")[lang]["whole"]
+    end
+
+    def natural?(number)
+      number % 1 == 0
+    end
+
+    def fractional?(number)
+      number % 1 != 0
+    end
   end
 end

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

@@ -1,22 +1,34 @@
-class Declinations
-  def self.name_with_declination(ten_power_name, count)
-    #FIXME add gem russian
-    if ten_power_name[-1, 1] == "а"
-      return ten_power_name if ends_with_one? count
-      return ten_power_name[0..4] + "и" if end_with_two_or_three_of_four? count
-      ten_power_name[0..4]
-    else
-      return ten_power_name if ends_with_one? count
-      return ten_power_name + "а" if end_with_two_or_three_of_four? count
-      ten_power_name + "ов"
-    end
-  end
+module Kabal
+  module RussianRules
+    module Declinations
+      def self.name_with_declination(number_name, count)
+        #for 5.0e-11 like numbers
+        #FIXME find another way to convert number from exp form
+        if count.to_s.include? "e"
+          count = count.to_s.split('.')[0].to_i
+        end
+        #FIXME add gem russian
+        if number_name[-1, 1] == "а"
+          return number_name if ends_with_one? count
+          return number_name[0..4] + "и" if end_with_two_or_three_of_four? count
+          number_name[0..4]
+        elsif number_name[-1, 1] == "я"
+          return number_name if ends_with_one? count
+          number_name[0..-3] + "ых"
+        else
+          return number_name if ends_with_one? count
+          return number_name + "а" if end_with_two_or_three_of_four? count
+          number_name + "ов"
+        end
+      end
 
-  def self.ends_with_one?(count)
-    count.to_s[-1] == "1"
-  end
+      def self.ends_with_one?(count)
+        count.to_s[-1] == "1"
+      end
 
-  def self.end_with_two_or_three_of_four?(count)
-    count.to_s[-1] == "2" or count.to_s[-1] == "3" or count.to_s[-1] == "4"
+      def self.end_with_two_or_three_of_four?(count)
+        count.to_s[-1] == "2" or count.to_s[-1] == "3" or count.to_s[-1] == "4"
+      end
+    end
   end
 end

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

@@ -0,0 +1,36 @@
+module Kabal
+  module RussianRules
+    module FractionalNumbers
+      def fractional_number_name(number)
+        whole_part_name(number) + " " + fractional_part_name(number)
+      end
+
+      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)]
+        else
+          ten_powers_name = names[lang]["fractional_ten_powers"][fractional_number_order(number)]
+        end
+      end
+
+      def need_pre_word?(number)
+        fractional_number_order(number) > 3 and fractional_number_order(number) % 3 != 0
+      end
+
+      def fractional_number_order(number)
+        number.to_s.split('.')[1].length
+      end
+
+      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)
+      end
+
+      def whole_part_name(number)
+        count = number.to_s.split('.')[0].to_i
+        feminine_natural_number_name(count) + " " + Declinations.name_with_declination(whole, count)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,83 @@
+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
+        natural_number_name number
+      end
+
+      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
+        end
+        names[lang]["single"][number]
+      end
+
+      def two_words(number)
+        return single number if number <= 19
+        number_name = names[lang]["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]
+        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
+        less_thousands number if number_is_thousands? number
+        return @number_name if number_is_thousands? number
+        create_number_name number
+        ten_powers(number % (10 ** number_order(number)))
+      end
+
+      def number_order(number)
+        ((number.to_s.length - 1) / 3) * 3
+      end
+
+      def count(number)
+        number / (10 ** number_order(number))
+      end
+
+      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))
+        elsif count(number) != 0
+          @number_name += " " + count_name(number) + " " + Declinations.name_with_declination(names[lang]["ten_powers"][number_order(number)], count(number))
+        end
+      end
+
+      def less_thousands(number)
+        @number_name += " " + three_words(number % 1000) unless number == 0
+      end
+
+      def number_is_thousands?(number)
+        number_order(number) < 3
+      end
+
+      def count_name(number)
+        #FIXME number.to_S[-4] not good
+        @feminine_name = (number.to_s[-4] == "1" or number.to_s[-4] == "2") and count(number) and count(number) / 10 != 1 and number_order(number) == 3
+        three_words count(number)
+      end
+
+      def number_is_google?(number)
+        count(number) == 10 and number_order(number) == 99
+      end
+    end
+  end
+end

data/lib/kabal/languages/russian.rb

@@ -1,90 +1,26 @@
 require 'kabal/languages/language'
 require 'kabal/languages/russian/declinations'
+require 'kabal/languages/russian/natural_numbers'
+require 'kabal/languages/russian/fractional_numbers'
 
 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
     #FIXME find better way
     @number_name = nil
-    need_minus?(number) ? (minus + " " + natural_number_name(-number)) : natural_number_name(number)
+    need_minus?(number) ? (minus + " " + number_words(-number)) : number_words(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
-    return three_words(number) if number >= 100 and number <= 999
-    ten_powers(number) if number >= 1000
+  def number_words(number)
+    return natural_number_name number.round if natural? number
+    fractional_number_name number if fractional? number
   end
 
   def need_minus?(number)
     number < 0
   end
-
-  def single(number)
-    if @feminine_name_for_thousands
-      @feminine_name_for_thousands = false
-      return names[lang]["single_feminine"][count(number) % 10]
-    end
-    names[lang]["single"][number]
-  end
-
-  def two_words(number)
-    return single number if number <= 19
-    number_name = names[lang]["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]
-    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
-    less_thousands number if number_is_thousands? number
-    return @number_name if number_is_thousands? number
-    create_number_name number
-    ten_powers(number % (10 ** number_order(number)))
-  end
-
-  def number_order(number)
-    ((number.to_s.length - 1) / 3) * 3
-  end
-
-  def count(number)
-    number / (10 ** number_order(number))
-  end
-
-  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))
-    elsif count(number) != 0
-      @number_name += " " + count_name(number) + " " + Declinations.name_with_declination(names[lang]["ten_powers"][number_order(number)], count(number))
-    end
-  end
-
-  def less_thousands(number)
-    @number_name += " " + three_words(number % 1000) unless number == 0
-  end
-
-  def number_is_thousands?(number)
-    number_order(number) < 3
-  end
-
-  def count_name(number)
-    #FIXME number.to_S[-4] not good
-    @feminine_name_for_thousands = (number.to_s[-4] == "1" or number.to_s[-4] == "2") and count(number) and count(number) / 10 != 1 and number_order(number) == 3
-    three_words count(number)
-  end
-
-  def number_is_google?(number)
-    count(number) == 10 and number_order(number) == 99
-  end
 end

data/lib/kabal/version.rb

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

data/lib/kabal.rb

@@ -10,8 +10,7 @@ module Kabal
   include Config
 
   def to_text(number)
-    @language ||= "Russian"
-    obj = Object.const_get("Kabal::" + @language).new
+    obj = Object.const_get("Kabal::" + current_language).new
     obj.convert number
   end
 
@@ -36,10 +35,21 @@ module Kabal
 
   def current_language
     @language ||= "Russian"
+    @language
   end
 
   def supported_languages
     languages = YamlLoader.yaml_object "languages"
     languages.keys
   end
+
+  def current_language_supports_natural?
+    obj = Object.const_get("Kabal::" + current_language).new
+    obj.supports_natural?
+  end
+
+  def current_language_supports_fractional?
+    obj = Object.const_get("Kabal::" + current_language).new
+    obj.supports_fractional?
+  end
 end

data/test/lib/bigtest.rb

@@ -3,11 +3,24 @@ require "test_helper"
 include Kabal
 
 class BigTest < TestCase
-  def test_all_numbers_for_all_languages
+  def test_all_natural_numbers_for_all_languages
     Kabal.supported_languages.each do |lang|
       Kabal.language = lang
       (0..10 ** 4).each do |number|
-        assert Kabal.to_text number
+        assert Kabal.to_text(number), [lang, number].to_s
+      end
+    end
+  end
+
+  def test_all_fractional_numbers_in_all_languages
+    Kabal.supported_languages.each do |lang|
+      Kabal.language = lang
+      if Kabal.current_language_supports_fractional?
+        i = 0
+        while i < 10 do
+          assert Kabal.to_text(i), [lang, i].to_s
+          i = (i + 0.001).round 3
+        end
       end
     end
   end

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

@@ -51,4 +51,19 @@ class RussianTest < TestCase
     end
     assert_equal NumberOutRangeError.message, exception.message
   end
+  def test_to_text_with_fractional_number_with_zero
+    assert_equal @rus.convert(0.01), "ноль целых одна сотая"
+  end
+  def test_to_text_with_fractional_number
+    assert_equal @rus.convert(1.05), "одна целая пять сотых"
+  end
+  def test_to_text_with_fractional_number_like_whole
+    assert_equal @rus.convert(1.0), "один"
+  end
+  def test_to_text_with_fractional_number_with_preword
+    assert_equal @rus.convert(1.0005), "одна целая пять десятитысячных"
+  end
+  def test_to_text_with_fractional_number_with_exp_form
+    assert_equal @rus.convert(1.00000000005), "одна целая пять стомиллиардных"
+  end
 end

data/test/lib/kabal_test.rb

@@ -39,4 +39,12 @@ class KabalTest < TestCase
   def test_current_language
     assert Kabal.current_language
   end
+
+  def test_current_language_support_natural?
+    assert Kabal.current_language_supports_natural?
+  end
+
+  def test_current_language_support_fractional?
+    assert Kabal.current_language_supports_fractional?
+  end
 end

data/yaml/languages/ru.yml

@@ -1,5 +1,6 @@
 ru:
   minus: "минус"
+  whole: "целая"
   single:
     0: ноль
     1: один
@@ -80,3 +81,15 @@ ru:
     96: антригинтиллион
     99: дуотригинтиллион
     100: гугол
+  fractional_pre_words:
+    1: десяти
+    2: сто
+  fractional_ten_powers:
+    1: десятая
+    2: сотая
+    3: тысячная
+    6: миллионная
+    9: миллиардная
+    12: триллионная
+    15: квадраллионная
+    18: квинтиллионная

data/yaml/support.yml

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kabal
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-03 00:00:00.000000000 Z
+date: 2014-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -59,11 +59,14 @@ files:
 - lib/kabal/config/yaml_loader.rb
 - lib/kabal/errors.rb
 - lib/kabal/errors/no_language_support_error.rb
+- lib/kabal/errors/no_support_for_fractional_numbers_on_current_language_error.rb
 - lib/kabal/errors/number_out_range_error.rb
 - lib/kabal/languages/english.rb
 - lib/kabal/languages/language.rb
 - lib/kabal/languages/russian.rb
 - lib/kabal/languages/russian/declinations.rb
+- lib/kabal/languages/russian/fractional_numbers.rb
+- lib/kabal/languages/russian/natural_numbers.rb
 - lib/kabal/supported_languages.rb
 - lib/kabal/version.rb
 - test/lib/bigtest.rb
@@ -74,11 +77,13 @@ files:
 - yaml/languages.yml
 - yaml/languages/en.yml
 - yaml/languages/ru.yml
-homepage: ''
+- yaml/support.yml
+homepage: https://github.com/kalashnikovisme/kabal
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  issue_tracker: https://github.com/kalashnikovisme/kabal/issues
+post_install_message: See documentation of Kabal on https://github.com/kalashnikovisme/kabal
 rdoc_options: []
 require_paths:
 - lib
@@ -86,7 +91,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="