kabal 0.2.16 → 0.2.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9dd14ac5592f0825dcef46c3c338d7221a70f7e3
-  data.tar.gz: efbb5aad0a5e0806c8d76c9ac6b239f8d04bc703
+  metadata.gz: d39a7af74516c2775b90dbe30f456e4bee5ea60b
+  data.tar.gz: 663a90b0bfce2fec9703881377db0cac032e016c
 SHA512:
-  metadata.gz: 283bcb117219ed5e447c73e060d286e14ce7fdaa0f1c6b5bc714e0171593194860487fb60fb08d4e74c7436e55e56200c1570551995d86652a7edb5d83d03e3d
-  data.tar.gz: 2ac0141bf1c870138999d900bb3aed42862251b83b2a11dc7fafdd6dc337f6a48403af6faae2404466c1e0d12c3b025855e16a41f637e26d51e5552a8de064ee
+  metadata.gz: cd9f650d42390c04015f669c2d1d3b7aaf4bc7e337e4e5145c11f48cd2014e7012c988ba51130494afc14c2da5e85239aa9b7f7b329d92f77af4e9413431ec96
+  data.tar.gz: 109a7bf5fe2bc27c3a5650033a84cf5d99eb91f00d001f595bb57fbe3853a79d3b630497074f404c0dc0372c66ac5a5b5739f1bfabf66442f67852bfd0021e25

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

@@ -0,0 +1,32 @@
+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)
+        else
+          dot + " " + fractional_part_name(number)
+        end
+      end
+
+      def whole_part_name(number)
+        count = number.to_s.split('.')[0].to_i
+        count != 0 ? natural_number_name(count) : ""
+      end
+
+      def fractional_part_name(number)
+        name = ""
+        count_string = number.to_s.split('.')[1]
+        count = count_string.to_i
+        if count_string.size != count.to_s.size
+          (count.to_s.size..count_string.size - 1).each do
+            name += names["single"][0] + " "
+          end
+          name + natural_number_name(count)
+        else
+          natural_number_name(count)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,54 @@
+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]
+      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
+      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 += " and " + single(number % 100) if (number % 100 < 10)
+        number_name
+      end
+
+      def ten_powers(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) + " " + names["ten_powers"][number_order(number)]
+        elsif count(number) != 0
+          @number_name += " " + count_name(number) + " " + names["ten_powers"][number_order(number)]
+        end
+      end
+
+      def count_name(number)
+        three_words count(number)
+      end
+
+      def less_thousands(number)
+        @number_name += " and" if number < 100
+        @number_name += " " + three_words(number % 1000) unless number == 0
+      end
+    end
+  end
+end

data/lib/kabal/languages/english.rb

@@ -1,6 +1,10 @@
 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)
@@ -8,60 +12,9 @@ class Kabal::English < Kabal::Language
       number_words number
     end
   end
-  def number_words(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 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 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
-  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 += " and " + single(number % 100) if (number % 100 < 10)
-    number_name
-  end
 
-  def ten_powers(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) + " " + names["ten_powers"][number_order(number)]
-    elsif count(number) != 0
-      @number_name += " " + count_name(number) + " " + names["ten_powers"][number_order(number)]
-    end
-  end
-
-  def count_name(number)
-    three_words count(number)
-  end
-
-  def less_thousands(number)
-    @number_name += " and" if number < 100
-    @number_name += " " + three_words(number % 1000) unless number == 0
+  def number_words(number)
+    return natural_number_name number.round if natural? number
+    fractional_number_name number if fractional? number
   end
 end

data/lib/kabal/languages/language.rb

@@ -53,11 +53,14 @@ module Kabal
       names["whole"]
     end
 
+    def dot
+      names["dot"]
+    end
+
     def fractional?(number)
       number % 1 != 0
     end
 
-
     def natural?(number)
       number % 1 == 0
     end

data/lib/kabal/version.rb

@@ -1,3 +1,3 @@
 module Kabal
-  VERSION = "0.2.16"
+  VERSION = "0.2.17"
 end

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

@@ -36,10 +36,6 @@ 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
-    assert_equal NoSupportForFractionalNumberOnCurrentLanguages.message, @eng.convert(0.1)
-  end
   def test_hundred_random_numbers
     r = Random.new
     (1..63).each do |power|
@@ -56,4 +52,24 @@ class EnglishTest < TestCase
   def test_minus_one_hundred_fifty
     assert_equal "minus one hundred fifty", @eng.convert(-150)
   end
+  def test_1_point_5
+    assert_equal "one point five", @eng.convert(1.5)
+    assert_equal "minus one point five", @eng.convert(-1.5)
+  end
+  def test_125_point_125
+    assert_equal "one hundred twenty five point one hundred twenty five", @eng.convert(125.125)
+    assert_equal "minus one hundred twenty five point one hundred twenty five", @eng.convert(-125.125)
+  end
+  def test_zero_point_one
+    assert_equal "point one", @eng.convert(0.1)
+    assert_equal "minus point one", @eng.convert(-0.1)
+  end
+  def test_one_point_zero_five
+    assert_equal "one point zero five", @eng.convert(1.05)
+    assert_equal "minus one point zero five", @eng.convert(-1.05)
+  end
+  def test_one_point_zero_zero_zero_zero_zero_zero_zero_five
+    assert_equal "one point zero zero zero zero zero zero zero five", @eng.convert(1.00000005)
+    assert_equal "minus one point zero zero zero zero zero zero zero five", @eng.convert(-1.00000005)
+  end
 end

data/yaml/languages/en.yml

@@ -1,5 +1,6 @@
 en:
   minus: minus
+  dot: point
   single:
     0: zero
     1: one

data/yaml/support.yml

@@ -9,3 +9,5 @@ support:
     natural:
       min: "-(10 ** 66) + 1"
       max: "(10 ** 66) - 1"
+    fractional:
+      symbols: 16

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kabal
 version: !ruby/object:Gem::Version
-  version: 0.2.16
+  version: 0.2.17
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-24 00:00:00.000000000 Z
+date: 2014-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -62,6 +62,8 @@ files:
 - 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/english/fractional_numbers.rb
+- lib/kabal/languages/english/natural_numbers.rb
 - lib/kabal/languages/language.rb
 - lib/kabal/languages/russian.rb
 - lib/kabal/languages/russian/declinations.rb