kabal 0.3.5 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87d659049e316b750ac3b8d89e42c3a95bfecc4d
-  data.tar.gz: 19aa78c47a2aa03e90871de4cf094654c568b142
+  metadata.gz: de5e475e931da2b5e708213ce699c0e69cdcb1c5
+  data.tar.gz: 8f37d26b3228d9b9471fff1397de6a1ed3dee356
 SHA512:
-  metadata.gz: d326228e18f5f2a2ae8cbb291cd3880771c7498cd3360f9ebc7c0503dc774f207fef91731cc0ff498c8cf21dea5a7e45e006122a90554df9addf8bde001f7937
-  data.tar.gz: 8594a4ef587c65f98a1fd19259dbc0ef672c1309a38bdc2126c937c84137b729e4908550b54a0141e279799bd7972514dfdb385c93abf2a656482cf37cde528b
+  metadata.gz: a75d13edce6e537158b6ab2d9be8a5bbd46db205b9d693e851777fb4bb13fbcf0c6d9448ee4cf78425ad5e715666accf37e16025b373733d7650ce1b9847ec3c
+  data.tar.gz: 61291e01e663a5b7a05daa5117df56b3fe0976681d61037ace697056f63d9e90d0bcc97770d21bbd2338b3891661e0375f39e8b303f2722548d010c40d8ecd87

data/.gitignore

@@ -20,5 +20,3 @@ tmp
 *.o
 *.a
 mkmf.log
-*.swp
-*.swo

data/Gemfile

@@ -8,3 +8,4 @@ gem 'tconsole', git: "git://github.com/gma/tconsole"
 gem 'coveralls', require: false
 gem 'simplecov'
 gem 'minitest', '4.7.5'
+gem 'activesupport'

data/README.md

@@ -7,9 +7,10 @@
 [![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)
 [![Still MainTained](http://stillmaintained.com/kalashnikovisme/kabal.png)](http://stillmaintained.com/kalashnikovisme/kabal)
+[![Code Climate](https://codeclimate.com/github/kalashnikovisme/kabal/badges/gpa.svg)](https://codeclimate.com/github/kalashnikovisme/kabal)
 
 
-Kabal allows you to translate number into text.
+Kabal allows you to translate number into text. See Demo on [http://kabal.herokuapp.com](http://kabal.herokuapp.com)
 
 ## Installation
 
@@ -51,6 +52,7 @@ Supported Languages:
     * Negative Numbers
 * Deutsch
     * Natural Number { max 10 ** 24 }
+    * Fractional Numbers
     * Negative Numbers
 
 Interfaces:

data/kabal.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Pavel Kalashnikov"]
   spec.email         = ["kalashnikovisme@gmail.com"]
   spec.summary       = %q{Number To Text Helper}
-  spec.description   = %q{Kabal allows you to translate numbers into text on languages: English, Russian, Deutsch}
+  spec.description   = %q{Kabal allows you to translate numbers into text on languages: English, Russian, Deutsch. See demo on http://kabal.herokuapp.com}
   spec.homepage      = "https://github.com/kalashnikovisme/kabal"
   spec.license       = "MIT"
   spec.required_ruby_version = '>= 2.0.0'

data/lib/kabal.rb

@@ -1,7 +1,7 @@
-autoload :Version, "kabal/version"
-require "kabal/supported_languages"
-require "kabal/errors"
-require "kabal/config"
+autoload :Version, 'kabal/version'
+require 'kabal/supported_languages'
+require 'kabal/errors'
+require 'kabal/config'
 require 'yaml'
 
 module Kabal
@@ -14,22 +14,22 @@ module Kabal
   end
 
   def language=(language_to_set)
-    languages = Kabal::Config::YamlLoader.yaml_object "languages"
+    languages = Kabal::Config::YamlLoader.yaml_object 'languages'
     if languages[language_to_set]
       @language = language_to_set
     else
-      raise NoLanguageSupportError.message
+      fail NoLanguageSupportError.message
     end
   end
 
   def to_text_in_language(number, language_at_once)
     number = string_convert number
-    languages = Kabal::Config::YamlLoader.yaml_object "languages"
+    languages = Kabal::Config::YamlLoader.yaml_object 'languages'
     if languages[language_at_once]
-      if number > maximum_for(language_at_once) or number < minimum_for(language_at_once)
+      if number > maximum_for(language_at_once) || number < minimum_for(language_at_once)
         NumberOutRangeError.message
       else
-        obj = Object.const_get("Kabal::" + language_at_once).new
+        obj = Object.const_get(language_class_name(language_at_once)).new
         obj.convert number
       end
     else
@@ -39,9 +39,9 @@ module Kabal
 
   def to_text_in_language_by_index(number, language_at_once_index)
     number = string_convert number
-    languages = Kabal::Config::YamlLoader.yaml_object("languages").to_a
+    languages = Kabal::Config::YamlLoader.yaml_object('languages').to_a
     if languages[language_at_once_index]
-      obj = Object.const_get("Kabal::" + languages[language_at_once_index].first).new
+      obj = Object.const_get(language_class_name(languages[language_at_once_index].first)).new
       obj.convert number
     else
       NoLanguageSupportError.message
@@ -49,42 +49,42 @@ module Kabal
   end
 
   def current_language
-    @language ||= "Russian"
+    @language ||= 'English'
     @language
   end
 
   def supported_languages
-    languages = Kabal::Config::YamlLoader.yaml_object "languages"
+    languages = Kabal::Config::YamlLoader.yaml_object 'languages'
     languages.keys
   end
 
   def current_language_supports_natural?
-    obj = Object.const_get("Kabal::" + current_language).new
+    obj = Object.const_get(language_class_name(current_language)).new
     obj.supports_natural?
   end
 
   def current_language_supports_fractional?
-    obj = Object.const_get("Kabal::" + current_language).new
+    obj = Object.const_get(language_class_name(current_language)).new
     obj.supports_fractional?
   end
 
   def language_supports_negative?(language)
-    obj = Object.const_get("Kabal::" + language).new
+    obj = Object.const_get(language_class_name(language)).new
     obj.supports_negative?
   end
 
   def language_supports_fractional?(language)
-    obj = Object.const_get("Kabal::" + language).new
+    obj = Object.const_get(language_class_name(language)).new
     obj.supports_fractional?
   end
 
   def maximum_for(language)
-    obj = Object.const_get("Kabal::" + language).new
+    obj = Object.const_get(language_class_name(language)).new
     obj.max_value
   end
 
   def minimum_for(language)
-    obj = Object.const_get("Kabal::" + language).new
+    obj = Object.const_get(language_class_name(language)).new
     obj.min_value
   end
 
@@ -103,6 +103,10 @@ module Kabal
   end
 
   def string_is_float?(number)
-    number.include? "."
+    number.include? '.'
+  end
+
+  def language_class_name(language)
+    'Kabal::' + language
   end
 end

data/lib/kabal/config.rb

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

data/lib/kabal/config/yaml_loader.rb

@@ -1,12 +1,14 @@
+require 'active_support/core_ext/hash'
+
 module Kabal
   module Config
     class YamlLoader
       def self.gem_root
-        Gem::Specification.find_by_name("kabal").gem_dir
+        Gem::Specification.find_by_name('kabal').gem_dir
       end
 
       def self.yaml_object(filename)
-        yaml_obj = YAML.load_file(gem_root + "/yaml/" + filename + ".yml")
+        YAML.load_file(gem_root + '/yaml/' + filename + '.yml').with_indifferent_access
       end
     end
   end

data/lib/kabal/errors.rb

@@ -1,6 +1,8 @@
-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"
-  require "kabal/errors/error"
+module Kabal
+  module 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'
+    require 'kabal/errors/error'
+  end
 end

data/lib/kabal/errors/error.rb

@@ -1,14 +1,14 @@
-require "kabal/config"
+require 'kabal/config'
 
 module Kabal
   module Errors
     class Error < StandardError
-      @message = "There is some error"
-      @code = "Unknown error code"
+      @message = 'There is some error'
+      @code = 'Unknown error code'
 
       def self.message
-        errors = Kabal::Config::YamlLoader.yaml_object "errors"
-        errors["errors"]["messages"][@code]
+        errors = Kabal::Config::YamlLoader.yaml_object 'errors'
+        errors[:errors][:messages][@code]
       end
     end
   end

data/lib/kabal/errors/no_language_support_error.rb

@@ -1,4 +1,4 @@
-require "kabal/errors/error"
+require 'kabal/errors/error'
 
 module Kabal
   module Errors

data/lib/kabal/errors/no_support_for_fractional_numbers_on_current_language_error.rb

@@ -1,4 +1,4 @@
-require "kabal/errors/error"
+require 'kabal/errors/error'
 
 module Kabal
   module Errors

data/lib/kabal/errors/number_out_range_error.rb

@@ -1,4 +1,4 @@
-require "kabal/errors/error"
+require 'kabal/errors/error'
 
 module Kabal
   module Errors

data/lib/kabal/languages/deutsch.rb

@@ -3,20 +3,9 @@ require 'kabal/languages/deutsch/natural_numbers'
 require 'kabal/languages/deutsch/declinations'
 require 'kabal/languages/deutsch/fractional_numbers'
 
-class Kabal::Deutsch < Kabal::Language
-  include Kabal::DeutschRules::NaturalNumbers
-  include Kabal::DeutschRules::FractionalNumbers
-
-  def convert(number)
-    if need_minus? number
-      minus + " " + number_words(-number)
-    else
-      number_words number
-    end
-  end
-
-  def number_words(number)
-    return natural_number_name number.round if natural? number
-    fractional_number_name number if fractional? number
+module Kabal
+  class Deutsch < Kabal::Language
+    include Kabal::DeutschRules::NaturalNumbers
+    include Kabal::DeutschRules::FractionalNumbers
   end
 end

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

@@ -3,10 +3,10 @@ module Kabal
     module Declinations
       def self.name_with_declination(number_name, count)
         if count != 1
-          if number_name[-1, 1] == "n"
-            return number_name + "en"
-          elsif number_name[-1, 1] == "e"
-            return number_name + "n"
+          if number_name[-1, 1] == 'n'
+            return number_name + 'en'
+          elsif number_name[-1, 1] == 'e'
+            return number_name + 'n'
           end
         end
         number_name

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

@@ -2,7 +2,7 @@ module Kabal
   module DeutschRules
     module FractionalNumbers
       def fractional_number_name(number)
-        whole_part_name(number) + " " + dot + " " + fractional_part_name(number)
+        whole_part_name(number) + ' ' + dot + ' ' + fractional_part_name(number)
       end
 
       def whole_part_name(number)
@@ -10,33 +10,9 @@ module Kabal
         natural_number_name(count)
       end
 
-      def fractional_part_name(number)
-        name = ""
-        count_string = fractional_part_string(number).split('.')[1]
-        count = count_string.to_i
-        if count_string.size != count.to_s.size
-          (count_string.size - count.to_s.size).times do
-            name += names["single"][0] + " "
-          end
-          name + natural_number_name(count)
-        else
-          natural_number_name(count)
-        end
-      end
-
       def fractional_part_string(number)
         "%.#{fractional_part_order(number)}f" % number
       end
-
-      def fractional_part_order(number)
-        #FIXME find better way with whole 0 numbers
-        number_string = number.to_s
-        if number_string.include? "-"
-          number_string.split('-')[1].to_i
-        else
-          number_string.split('.')[1].length
-        end
-      end
     end
   end
 end

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

@@ -1,35 +1,29 @@
 module Kabal
   module DeutschRules
     module NaturalNumbers
-      def natural_number_name(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
-        ten_powers number if number >= 100
-      end
       def single(number)
-        unless @ein
-          names["single"][number]
-        else
+        if @ein
           @ein = false
-          names["single"][number].chop
+          names[:single][number].chop
+        else
+          names[:single][number]
         end
       end
 
       def two_words(number)
         return single number if number <= 19
-        number_name = names["two_words"][number / 10]
+        number_name = names[:two_words][number / 10]
         @ein = (number % 10 == 1)
-        number_name = single(number % 10) + names["and"] + number_name if (number % 10 != 0)
+        number_name = single(number % 10) + names[:and] + number_name if (number % 10 != 0)
         number_name
       end
 
       def three_words(number)
         return two_words number if number <= 99
         @ein = (number / 100 == 1)
-        number_name = single(number / 100) + names["ten_powers"][2]
+        number_name = single(number / 100) + names[:ten_powers][2]
         number_name += two_words(number % 100) if (number % 100 >= 10)
-        number_name += single(number % 100) if number % 100 < 10 and number % 100 != 0
+        number_name += single(number % 100) if number % 100 < 10 && number % 100 != 0
         number_name
       end
 
@@ -37,7 +31,7 @@ module Kabal
         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))
+        ten_powers number % (10**number_order(number))
       end
 
       def create_number_name(number)
@@ -63,11 +57,19 @@ module Kabal
 
       def words_to_add(number)
         if millions_or_greater?(number)
-          @number_name = count_name(number) + " " + Declinations.name_with_declination(names["ten_powers"][number_order(number)], count(number)) + " "
+          number_with_space number
         else
-          @number_name = count_name(number) + Declinations.name_with_declination(names["ten_powers"][number_order(number)], count(number))
+          number_without_space number
         end
       end
+
+      def number_with_space(number)
+        @number_name = count_name(number) + ' ' + Declinations.name_with_declination(names[:ten_powers][number_order(number)], count(number)) + ' '
+      end
+
+      def number_without_space(number)
+        @number_name = count_name(number) + Declinations.name_with_declination(names[:ten_powers][number_order(number)], count(number))
+      end
     end
   end
 end

data/lib/kabal/languages/english.rb

@@ -2,19 +2,9 @@ require 'kabal/languages/language'
 require 'kabal/languages/english/natural_numbers'
 require 'kabal/languages/english/fractional_numbers'
 
-class Kabal::English < Kabal::Language
-  include Kabal::EnglishRules::NaturalNumbers
-  include Kabal::EnglishRules::FractionalNumbers
-  def convert_number(number)
-    if need_minus? number
-      minus + " " + number_words(-number)
-    else
-      number_words number
-    end
-  end
-
-  def number_words(number)
-    return natural_number_name number.round if natural? number
-    fractional_number_name number if fractional? number
+module Kabal
+  class English < Kabal::Language
+    include Kabal::EnglishRules::NaturalNumbers
+    include Kabal::EnglishRules::FractionalNumbers
   end
 end

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

@@ -2,45 +2,21 @@ module Kabal
   module EnglishRules
     module FractionalNumbers
       def fractional_number_name(number)
-        if whole_part_name(number) != ""
-          whole_part_name(number) + " " + dot + " " + fractional_part_name(number)
+        if whole_part_name(number) != ''
+          whole_part_name(number) + ' ' + dot + ' ' + fractional_part_name(number)
         else
-          dot + " " + fractional_part_name(number)
+          dot + ' ' + fractional_part_name(number)
         end
       end
 
       def whole_part_name(number)
         count = number.floor
-        count != 0 ? natural_number_name(count) : ""
-      end
-
-      def fractional_part_name(number)
-        name = ""
-        count_string = fractional_part_string(number).to_s.split('.')[1]
-        count = count_string.to_i
-        if count_string.size != count.to_s.size
-          (count_string.size - count.to_s.size).times do
-            name += names["single"][0] + " "
-          end
-          name + natural_number_name(count)
-        else
-          natural_number_name(count)
-        end
+        count != 0 ? natural_number_name(count) : ''
       end
 
       def fractional_part_string(number)
         "%.#{fractional_part_order(number)}f" % number
       end
-
-      def fractional_part_order(number)
-        #FIXME find better way with whole 0 numbers
-        number_string = number.to_s
-        if number_string.include? "-"
-          number_string.split('-')[1].to_i
-        else
-          number_string.split('.')[1].length
-        end
-      end
     end
   end
 end

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

@@ -1,28 +1,22 @@
 module Kabal
   module EnglishRules
     module NaturalNumbers
-      def natural_number_name(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
-        ten_powers number if number >= 100
-      end
       def single(number)
-        names["single"][number]
+        names[:single][number]
       end
 
       def two_words(number)
         return single number if number <= 19
-        number_name = names["two_words"][number / 10]
-        number_name += " " + single(number % 10) if (number % 10 != 0)
+        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["ten_powers"][2]
-        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 = single(number / 100) + ' ' + names[:ten_powers][2]
+        number_name += ' ' + two_words(number % 100) if number % 100 >= 10
+        number_name += ' ' + names[:and] + ' ' + single(number % 100) if number % 100 < 10 && number % 100 != 0
         number_name
       end
 
@@ -30,25 +24,17 @@ module Kabal
         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 create_number_name(number)
-        if @number_name.nil?
-          @number_name = count_name(number) + " " + names["ten_powers"][number_order(number)]
-        elsif count(number) != 0
-          @number_name += " " + count_name(number) + " " + names["ten_powers"][number_order(number)]
-        end
+        ten_powers number % (10**number_order(number))
       end
 
-      def count_name(number)
-        three_words count(number)
+      def count_name_with_order_name(number)
+        three_words(count(number)) + ' ' + names[:ten_powers][number_order(number)]
       end
 
       def less_thousands(number)
         return if number == 0
-        @number_name += " " + names["and"] if number < 100
-        @number_name += " " + three_words(number % 1000) unless number == 0
+        @number_name += ' ' + names[:and] if number < 100
+        @number_name += ' ' + three_words(number % 1000) unless number == 0
       end
     end
   end

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

@@ -0,0 +1,40 @@
+module Kabal
+  module GlobalRules
+    module FractionalNumbers
+      def fractional_part_order(number)
+        number_string = number.to_s
+        if number_string.include? '-'
+          number_string.split('-')[1].to_i
+        else
+          number_string.split('.')[1].length
+        end
+      end
+
+      def fractional_part_name(number)
+        @count_string = fractional_part_string(number).to_s.split('.')[1]
+        @count_int = @count_string.to_i
+        if there_zeros_before_fractional_part?
+          number_name_with_zeros + natural_number_name(@count_int)
+        else
+          natural_number_name @count_int
+        end
+      end
+
+      def there_zeros_before_fractional_part?
+        @count_string.size != @count_int.to_s.size
+      end
+
+      def zeros_number
+        @count_string.size - @count_int.to_s.size
+      end
+
+      def number_name_with_zeros
+        name = ''
+        zeros_number.times do
+          name += names[:single][0] + ' '
+        end
+        name
+      end
+    end
+  end
+end

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

@@ -0,0 +1,20 @@
+module Kabal
+  module GlobalRules
+    module NaturalNumbers
+      def natural_number_name(number)
+        return single number if number >= 0 && number <= 19
+        return two_words number if number >= 0 && number <= 99
+        return three_words number if number >= 100 && number <= 999
+        ten_powers number if number >= 100
+      end
+
+      def create_number_name(number)
+        if @number_name.nil?
+          @number_name = count_name_with_order_name number
+        elsif count(number) != 0
+          @number_name += ' ' + count_name_with_order_name(number)
+        end
+      end
+    end
+  end
+end

data/lib/kabal/languages/language.rb

@@ -1,8 +1,15 @@
+require 'kabal/languages/global/fractional_numbers'
+require 'kabal/languages/global/natural_numbers'
+
 module Kabal
   class Language
+    include Kabal::GlobalRules::NaturalNumbers
+    include Kabal::GlobalRules::FractionalNumbers
+
     def initialize
       @names = Kabal::Config::YamlLoader.yaml_object "languages/#{lang}"
-      @supports = Kabal::Config::YamlLoader.yaml_object("support")["support"][lang]
+      support_file = Kabal::Config::YamlLoader.yaml_object('support')
+      @supports = support_file[:support][lang]
     end
 
     def convert(number)
@@ -13,22 +20,36 @@ module Kabal
       end
     end
 
+    def convert_number(number)
+      @number_name = nil
+      if need_minus? number
+        minus + ' ' + number_words(-number)
+      else
+        number_words number
+      end
+    end
+
+    def number_words(number)
+      return natural_number_name number.round if natural? number
+      fractional_number_name number if fractional? number
+    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
+      if (!supports_fractional?) && (number % 1 != 0)
         Kabal::Errors::NoSupportForFractionalNumberOnCurrentLanguages.message
       end
     end
 
     def lang
-      languages = Kabal::Config::YamlLoader.yaml_object "languages"
-      @lang = languages[self.to_s.split(":")[-2]]
+      languages = Kabal::Config::YamlLoader.yaml_object 'languages'
+      @lang = languages[self.to_s.split(':')[-2]]
     end
 
     def supports_natural?
-      @supports["natural"]
+      @supports[:natural]
     end
 
     def supports_negative?
@@ -36,11 +57,11 @@ module Kabal
     end
 
     def min_value
-      eval @supports["natural"]["min"]
+      eval @supports[:natural][:min]
     end
 
     def max_value
-      eval @supports["natural"]["max"]
+      eval @supports[:natural][:max]
     end
 
     def names
@@ -48,15 +69,15 @@ module Kabal
     end
 
     def minus
-      names["minus"]
+      names[:minus]
     end
 
     def whole
-      names["whole"]
+      names[:whole]
     end
 
     def dot
-      names["dot"]
+      names[:dot]
     end
 
     def fractional?(number)
@@ -72,7 +93,7 @@ module Kabal
     end
 
     def number_is_google?(number)
-      count(number) == 10 and number_order(number) == 99
+      count(number) == 10 && number_order(number) == 99
     end
 
     def number_order(number)
@@ -80,19 +101,23 @@ module Kabal
     end
 
     def count(number)
-      number / (10 ** number_order(number))
+      number / (10**number_order(number))
     end
 
     def supports_fractional?
-      @supports["fractional"]
+      @supports[:fractional]
     end
 
     def number_is_out_of_the_range?(number)
-      number >= max_value or number <= min_value
+      number >= max_value || number <= min_value
+    end
+
+    def fractional_but_no_support_fractional?(number)
+      number % 1 != 0 && !supports_fractional?
     end
 
     def no_supports?(number)
-      (number % 1 != 0 and not supports_fractional?) or number_is_out_of_the_range?(number)
+      fractional_but_no_support_fractional?(number) || number_is_out_of_the_range?(number)
     end
 
     def need_minus?(number)

data/lib/kabal/languages/russian.rb

@@ -3,22 +3,9 @@ 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(number)
-    #FIXME find better way
-    @number_name = nil
-    if need_minus? number
-      minus + " " + number_words(-number)
-    else
-      number_words number
-    end
-  end
-
-  def number_words(number)
-    return natural_number_name number.round if natural? number
-    fractional_number_name number if fractional? number
+module Kabal
+  class Russian < Kabal::Language
+    include Kabal::RussianRules::NaturalNumbers
+    include Kabal::RussianRules::FractionalNumbers
   end
 end

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

@@ -2,32 +2,30 @@ 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"
+        if count.to_s.include? 'e'
           count = count.to_s.split('.')[0].to_i
         end
-        #FIXME add gem russian
-        if number_name[-1, 1] == "а"
+        # 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
+          return number_name[0..4] + 'и' if end_with_two_or_three_of_four? count
           number_name[0..4]
-        elsif number_name[-1, 1] == "я"
+        elsif number_name[-1, 1] == 'я'
           return number_name if ends_with_one? count
-          number_name[0..-3] + "ых"
+          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 + "ов"
+          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" and (count % 100) / 10 != 1
+        count.to_s[-1] == '1' && (count % 100) / 10 != 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"
+        count.to_s[-1] == '2' || count.to_s[-1] == '3' || count.to_s[-1] == '4'
       end
     end
   end

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

@@ -2,49 +2,38 @@ module Kabal
   module RussianRules
     module FractionalNumbers
       def fractional_number_name(number)
-        whole_part_name(number) + " " + fractional_part_name(number)
+        whole_part_name(number) + ' ' + fractional_part_name(number)
       end
 
       def fractional_part_name(number)
-        fractional_part = (number % 1).round(fractional_number_order(number))
-        fractional_order = ((fractional_part) * (10 ** fractional_number_order(number))).to_s.split('.')[0].to_i
-        feminine_natural_number_name(fractional_order, true) + " " + Declinations.name_with_declination(fractional_ten_powers_name(number), fractional_part)
+        fractional_part = (number % 1).round(fractional_part_order(number))
+        fractional_order = ((fractional_part) * (10**fractional_part_order(number))).to_s.split('.')[0].to_i
+        feminine_natural_number_name(fractional_order, true) + ' ' + Declinations.name_with_declination(fractional_ten_powers_name(number), fractional_part)
       end
 
       def whole_part_name(number)
         count = number.floor
-        feminine_natural_number_name(count) + " " + Declinations.name_with_declination(whole, count)
+        feminine_natural_number_name(count) + ' ' + Declinations.name_with_declination(whole, count)
       end
 
       def fractional_ten_powers_name(number)
-        ten_powers_name = ""
         if need_pre_word? number
-          ten_powers_name = fractional_pre_word(number) + fractional_order_word(number)
+          fractional_pre_word(number) + fractional_order_word(number)
         else
-          ten_powers_name = names["fractional_ten_powers"][fractional_number_order(number)]
+          names[:fractional_ten_powers][fractional_part_order(number)]
         end
       end
 
       def fractional_order_word(number)
-        names["fractional_ten_powers"][fractional_number_order(number) - (fractional_number_order(number) % 3)]
+        names[:fractional_ten_powers][fractional_part_order(number) - (fractional_part_order(number) % 3)]
       end
 
       def fractional_pre_word(number)
-        names["fractional_pre_words"][fractional_number_order(number) % 3]
+        names[:fractional_pre_words][fractional_part_order(number) % 3]
       end
 
       def need_pre_word?(number)
-        fractional_number_order(number) > 3 and fractional_number_order(number) % 3 != 0
-      end
-
-      def fractional_number_order(number)
-        #FIXME find better way with whole 0 numbers
-        number_string = number.to_s
-        if number_string.include? "-"
-          number_string.split('-')[1].to_i
-        else
-          number_string.split('.')[1].length
-        end
+        fractional_part_order(number) > 3 && fractional_part_order(number) % 3 != 0
       end
     end
   end

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

@@ -2,74 +2,67 @@ module Kabal
   module RussianRules
     module NaturalNumbers
       def feminine_natural_number_name(number, fractional_part = false)
+        @number_name = nil
         @number = number
         @feminine_name = !fractional_part
         @fractional_part = fractional_part
         natural_number_name number
       end
 
-      def natural_number_name(number)
-        #FIXME switch case next lines
-        return single(number, true) if number >= 0 and number <= 19
-        return two_words(number, true) if number >= 20 and number <= 99
-        return three_words(number, true) if number >= 100 and number <= 999
-        ten_powers(number) if number >= 1000
-      end
-
-      def single(number, this_is_end = false)
+      def single(number, this_is_end = true)
         if @feminine_name
           @feminine_name = false
-          return names["single_feminine"][count(number) % 10] if count(number) % 10 == 1 or count(number) % 10 == 2
+          return names[:single_feminine][count(number) % 10] if count_can_be_feminine? number
         end
-        if @fractional_part and this_is_end
+        if @fractional_part && this_is_end
           @fractional_part = false
-          return names["single_feminine"][count(number) % 10] if count(number) % 10 == 1 or count(number) % 10 == 2
+          return names[:single_feminine][count(number) % 10] if count_can_be_feminine? number
         end
-        names["single"][number]
+        names[:single][number]
       end
 
-      def two_words(number, this_is_end = false)
+      def two_words(number, this_is_end = true)
         return single(number, this_is_end) if number <= 19
-        number_name = names["two_words"][number / 10]
-        number_name += " " + single(number % 10, this_is_end) if (number % 10 != 0)
+        number_name = names[:two_words][number / 10]
+        number_name += ' ' + single(number % 10, this_is_end) if (number % 10 != 0)
         number_name
       end
 
-      def three_words(number, this_is_end = false)
+      def three_words(number, this_is_end = true)
         return two_words(number, this_is_end) if number / 100 == 0
-        number_name = names["three_words"][number / 100]
-        return number_name += " " + two_words(number % 100, this_is_end) if (number % 100 >= 20)
-        return number_name += " " + single(number % 100, this_is_end) if (number % 100 != 0)
+        number_name = names[:three_words][number / 100]
+        return number_name += ' ' + two_words(number % 100, this_is_end) if (number % 100 >= 20)
+        return number_name += ' ' + single(number % 100, this_is_end) if (number % 100 != 0)
         number_name
       end
 
       def ten_powers(number)
-        return names["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
         ten_powers(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["ten_powers"][number_order(number)], count(number))
-        elsif count(number) != 0
-          @number_name += " " + count_name(number) + " " + Declinations.name_with_declination(names["ten_powers"][number_order(number)], count(number))
-        end
+      def count_can_be_feminine?(number)
+        count(number) % 10 == 1 || count(number) % 10 == 2
       end
 
       def less_thousands(number)
-        @number_name += " " + three_words(number % 1000, true) unless number == 0
+        @number_name += ' ' + three_words(number % 1000) unless number == 0
       end
 
       def count_name(number)
-        if (number.to_s[-4] == "1" or number.to_s[-4] == "2") and count(number) and (count(number) % 100) / 10 != 1 and number_order(number) == 3
+        if (number.to_s[-4] == '1' || number.to_s[-4] == '2') && count(number) && (count(number) % 100) / 10 != 1 && number_order(number) == 3
           @feminine_name = true
         else
           @feminine_name = false
         end
-        three_words count(number)
+        three_words count(number), false
+      end
+
+      def count_name_with_order_name(number)
+        count_name(number) + ' ' + Declinations.name_with_declination(names[:ten_powers][number_order(number)], count(number))
       end
     end
   end

data/lib/kabal/version.rb

@@ -1,3 +1,3 @@
 module Kabal
-  VERSION = "0.3.5"
+  VERSION = '1.0.0'
 end

data/test/lib/kabal_test.rb

@@ -5,10 +5,11 @@ include Kabal
 class KabalTest < TestCase
   def test_language_init
     Kabal.language = "Russian"
-    assert_equal Kabal.current_language, "Russian"
+    assert_equal "Russian", Kabal.current_language
   end
 
   def test_to_text
+    Kabal.language = "Russian"
     assert_equal "сто двадцать пять миллиардов сто двадцать пять миллионов сто двадцать пять тысяч сто двадцать пять", Kabal.to_text(125125125125)
     assert_equal "сто двадцать пять миллиардов сто двадцать пять миллионов сто двадцать пять тысяч сто двадцать пять", Kabal.to_text("125125125125")
   end
@@ -57,15 +58,15 @@ class KabalTest < TestCase
   end
 
   def test_maximum_for_language
-    assert_equal Kabal.maximum_for("Russian"), 10 ** 102
-    assert_equal Kabal.maximum_for("English"), (10 ** 66) - 1
-    assert_equal Kabal.maximum_for("Deutsch"), (10 ** 24) - 1
+    assert_equal 10 ** 102, Kabal.maximum_for("Russian")
+    assert_equal (10 ** 66) - 1, Kabal.maximum_for("English")
+    assert_equal (10 ** 24) - 1, Kabal.maximum_for("Deutsch")
   end
 
   def test_minimum_for_language
-    assert_equal Kabal.minimum_for("Russian"), -(10 ** 102)
-    assert_equal Kabal.minimum_for("English"), -(10 ** 66) + 1
-    assert_equal Kabal.minimum_for("Deutsch"), -(10 ** 24) + 1
+    assert_equal -(10 ** 102), Kabal.minimum_for("Russian")
+    assert_equal -(10 ** 66) + 1, Kabal.minimum_for("English")
+    assert_equal -(10 ** 24) + 1, Kabal.minimum_for("Deutsch")
   end
 
   def test_minimum_and_maximum_convert_for_language
@@ -88,9 +89,11 @@ class KabalTest < TestCase
   end
 
   def test_bad_number_test
-    assert_equal Kabal.to_text("110000000000000001011"), "сто десять квинтиллионов одна тысяча одиннадцать"
-    assert_equal Kabal.to_text("11000000000000011"), "одиннадцать квадраллионов одиннадцать"
-    assert_equal Kabal.to_text("112223334445556661011"), "сто двенадцать квинтиллиона двести двадцать три квадраллиона триста тридцать четыре триллиона четыреста сорок пять миллиардов пятьсот пятьдесят шесть миллионов шестьсот шестьдесят одна тысяча одиннадцать"
-    assert_equal Kabal.to_text("909090909.1234"), "девятьсот девять миллионов девяносто тысяч девятьсот девять целых девятьсот девять миллионов девяносто тысяч девятьсот девять одна тысяча двести тридцать четыре десятитысячных"
+    Kabal.language = "Russian"
+    assert_equal "сто десять квинтиллионов одна тысяча одиннадцать", Kabal.to_text("110000000000000001011")
+    assert_equal "одиннадцать квадраллионов одиннадцать", Kabal.to_text("11000000000000011")
+    assert_equal "сто двенадцать квинтиллиона двести двадцать три квадраллиона триста тридцать четыре триллиона четыреста сорок пять миллиардов пятьсот пятьдесят шесть миллионов шестьсот шестьдесят одна тысяча одиннадцать", Kabal.to_text("112223334445556661011")
+    assert_equal "девятьсот девять миллионов девяносто тысяч девятьсот девять целых одна тысяча двести тридцать четыре десятитысячных", Kabal.to_text("909090909.1234")
+    assert_equal "девятьсот девять миллионов девяносто тысяч девятьсот девять целых одна тысяча двести тридцать четыре десятитысячных", Kabal.to_text(909090909.1234)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kabal
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 1.0.0
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-02 00:00:00.000000000 Z
+date: 2014-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: 'Kabal allows you to translate numbers into text on languages: English,
-  Russian, Deutsch'
+  Russian, Deutsch. See demo on http://kabal.herokuapp.com'
 email:
 - kalashnikovisme@gmail.com
 executables: []
@@ -70,6 +70,8 @@ files:
 - lib/kabal/languages/english.rb
 - lib/kabal/languages/english/fractional_numbers.rb
 - lib/kabal/languages/english/natural_numbers.rb
+- lib/kabal/languages/global/fractional_numbers.rb
+- lib/kabal/languages/global/natural_numbers.rb
 - lib/kabal/languages/language.rb
 - lib/kabal/languages/russian.rb
 - lib/kabal/languages/russian/declinations.rb