kabal 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d28a23b9df3d9bab99f1e29aa39421d97308bb59
-  data.tar.gz: 09de7b299034fc55883df75aaae3925c30d3be39
+  metadata.gz: fc725820d84c44702241e372e5ed2b85cb38bc3a
+  data.tar.gz: ec3329559be4a8c3a65b938014faa401c82c9496
 SHA512:
-  metadata.gz: 95600c2862d68496e9e31f6bfd8f95dee95548797aa14e4fd60fc402e26b0b2883d6309415a506858ece13a1d4eb4a2c41e82ca9ed94a1e58ed1283ef4affd82
-  data.tar.gz: 3a7e32acd2221c4fe80a82274f5d2af085adb3472e402204c9d4ef2667b8013fe68daecf70bdbc889e377173df5406cf68a20fb12b6494825d2067b3fb95d2f6
+  metadata.gz: 6860d8a77351e36d445ab966848126e9c4081403e4ae6919f7382c2e26c2bb16649de055c45b912fdf0d7e87be5abdae597ee18fe58af79ccbc9c4968902338f
+  data.tar.gz: 53eb4b57612e2e12841072f7bc25e58fd7bf6fff66c4a93173e32f6ba800c7b80473f1f771eb5609a12e047fca9250450077a712f48411e1e55d2e28c5e49741

data/README.md

@@ -49,12 +49,13 @@ Supported Languages:
     * Natural Numbers { max 10 ** 63 }
     * Fractional Numbers
     * Negative Numbers
-
-*More languages will be added later.*
+* Deutsch
+    * Natural Number { max 10 ** 24 }
+    * Negative Numbers
 
 Some interfaces:
 
-    $> Kabal.supported_languages #=> ["Russian", "English"]
+    $> Kabal.supported_languages #=> ["Russian", "English", "Deutsch"]
     $> Kabal.to_text_in_language(1, "English") #=> "one"
     $> Kabal.to_text_in_language_by_index(1, 0) #=> "один"
     $> Kabal.current_language_supports_natural? #=> true
@@ -77,10 +78,10 @@ Some interfaces:
 To add Elfin language you should:
 
 1. Create `lib/kabal/languages/elfin.rb`. You'll describe rules of this language to drawing numbers there.
-    
+
     ```ruby
     require 'kabal/languages/language'
-        
+
     class Kabal::Elfin < Kabal::Language
         def convert(number)
             #anything you want
@@ -95,14 +96,14 @@ To add Elfin language you should:
       minus: #Minus on Elfin Language#
     ```
 4. Add `Elfin: "el"` to `yaml/languages.yml`.
-5. Add to `yaml/support.yml` 
+5. Add to `yaml/support.yml`
 
     ```yaml
-    el: 
-      natural: 
+    el:
+      natural:
         min: {min_of_your_realization}
-        max: {max_of_your_realization} 
-      fractional: 
+        max: {max_of_your_realization}
+      fractional:
         symbols: {count_of_symbols_after_dot_that_you_realized}
     ```
 6. Add `require "kabal/languages/elfin"` to `lib/kabal/supported_languages.rb`.
@@ -110,7 +111,7 @@ To add Elfin language you should:
 ## 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 now working around 6 minutes.
+Be careful: BigTest now working around 8 minutes.
 Run BigTest
 
     $> tconsole bigtest
@@ -118,5 +119,5 @@ Run BigTest
 Relax!
 
     $> tconsole all
-    
+
 runs all tests without Bigtest.

data/lib/kabal/languages/deutsch.rb

@@ -1,9 +1,11 @@
 require 'kabal/languages/language'
 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
@@ -14,6 +16,7 @@ class Kabal::Deutsch < Kabal::Language
   end
 
   def number_words(number)
-    natural_number_name number.round if natural? number
+    return natural_number_name number.round if natural? number
+    fractional_number_name number if fractional? number
   end
 end

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

@@ -0,0 +1,28 @@
+module Kabal
+  module DeutschRules
+    module FractionalNumbers
+      def fractional_number_name(number)
+        whole_part_name(number) + " " + dot + " " + fractional_part_name(number)
+      end
+
+      def whole_part_name(number)
+        count = number.to_s.split('.')[0].to_i
+        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_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
+    end
+  end
+end

data/lib/kabal/version.rb

@@ -1,3 +1,3 @@
 module Kabal
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

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

@@ -61,4 +61,24 @@ class DeutschTest < TestCase
   def test_minus_one_hundred_fifty
     assert_equal "minus einhundertfünfzig", @deu.convert(-150)
   end
+  def test_1_point_5
+    assert_equal "eins Komma fünf", @deu.convert(1.5)
+    assert_equal "minus eins Komma fünf", @deu.convert(-1.5)
+  end
+  def test_125_point_125
+    assert_equal "einhundertfünfundzwanzig Komma einhundertfünfundzwanzig", @deu.convert(125.125)
+    assert_equal "minus einhundertfünfundzwanzig Komma einhundertfünfundzwanzig", @deu.convert(-125.125)
+  end
+  def test_zero_point_one
+    assert_equal "null Komma eins", @deu.convert(0.1)
+    assert_equal "minus null Komma eins", @deu.convert(-0.1)
+  end
+  def test_one_point_zero_five
+    assert_equal "eins Komma null fünf", @deu.convert(1.05)
+    assert_equal "minus eins Komma null fünf", @deu.convert(-1.05)
+  end
+  def test_one_point_zero_zero_zero_zero_zero_zero_zero_five
+    assert_equal "eins Komma null null null null null null null fünf", @deu.convert(1.00000005)
+    assert_equal "minus eins Komma null null null null null null null fünf", @deu.convert(-1.00000005)
+  end
 end

data/yaml/languages/de.yml

@@ -1,4 +1,5 @@
 de:
+  dot: Komma
   and: "und"
   minus: "minus"
   single:

data/yaml/support.yml

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kabal
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-29 00:00:00.000000000 Z
+date: 2014-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -64,6 +64,7 @@ files:
 - lib/kabal/errors/number_out_range_error.rb
 - lib/kabal/languages/deutsch.rb
 - lib/kabal/languages/deutsch/declinations.rb
+- lib/kabal/languages/deutsch/fractional_numbers.rb
 - lib/kabal/languages/deutsch/natural_numbers.rb
 - lib/kabal/languages/english.rb
 - lib/kabal/languages/english/fractional_numbers.rb