kabal 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de5e475e931da2b5e708213ce699c0e69cdcb1c5
-  data.tar.gz: 8f37d26b3228d9b9471fff1397de6a1ed3dee356
+  metadata.gz: c320388dd7d3d224706c90a97fcace03b2c86131
+  data.tar.gz: 90f36dc3e091c41cc0d119f83a35b4b41aba328d
 SHA512:
-  metadata.gz: a75d13edce6e537158b6ab2d9be8a5bbd46db205b9d693e851777fb4bb13fbcf0c6d9448ee4cf78425ad5e715666accf37e16025b373733d7650ce1b9847ec3c
-  data.tar.gz: 61291e01e663a5b7a05daa5117df56b3fe0976681d61037ace697056f63d9e90d0bcc97770d21bbd2338b3891661e0375f39e8b303f2722548d010c40d8ecd87
+  metadata.gz: e4c81f9fb94f5ceb2c481ccd3df54d875c2f9002922503999878cafea214e6ffa18f926ffad1a0d180d4e555d266b6d7304b51b7340d8e77ce6961653dafe279
+  data.tar.gz: ebbb2434ceb4606f2419fee3483de0bf8a0b21b7d2501c795d79d042b305ae03cee211e2946bda5c37eddb6dd78bb91ac867c05168a980ff788959c077f545fd

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)
+        join_with_spaces whole_part_name(number), dot, fractional_part_name(number)
       end
 
       def whole_part_name(number)

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

@@ -64,7 +64,7 @@ module Kabal
       end
 
       def number_with_space(number)
-        @number_name = count_name(number) + ' ' + Declinations.name_with_declination(names[:ten_powers][number_order(number)], count(number)) + ' '
+        @number_name = join_with_spaces(count_name(number), Declinations.name_with_declination(names[:ten_powers][number_order(number)], count(number))) + space
       end
 
       def number_without_space(number)

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

@@ -3,9 +3,10 @@ module Kabal
     module FractionalNumbers
       def fractional_number_name(number)
         if whole_part_name(number) != ''
-          whole_part_name(number) + ' ' + dot + ' ' + fractional_part_name(number)
+
+          join_with_spaces whole_part_name(number), dot, fractional_part_name(number)
         else
-          dot + ' ' + fractional_part_name(number)
+          join_with_spaces dot, fractional_part_name(number)
         end
       end
 

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

@@ -8,15 +8,15 @@ module Kabal
       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 += space + 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 && number % 100 != 0
+        number_name = join_with_spaces single(number / 100), names[:ten_powers][2]
+        number_name += space + two_words(number % 100) if number % 100 >= 10
+        number_name += space + join_with_spaces(names[:and], single(number % 100)) if number % 100 < 10 && number % 100 != 0
         number_name
       end
 
@@ -28,13 +28,13 @@ module Kabal
       end
 
       def count_name_with_order_name(number)
-        three_words(count(number)) + ' ' + names[:ten_powers][number_order(number)]
+        join_with_spaces 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 += space + names[:and] if number < 100
+        @number_name += space + three_words(number % 1000) unless number == 0
       end
     end
   end

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

@@ -31,7 +31,7 @@ module Kabal
       def number_name_with_zeros
         name = ''
         zeros_number.times do
-          name += names[:single][0] + ' '
+          name += names[:single][0] + space
         end
         name
       end

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

@@ -12,7 +12,7 @@ module Kabal
         if @number_name.nil?
           @number_name = count_name_with_order_name number
         elsif count(number) != 0
-          @number_name += ' ' + count_name_with_order_name(number)
+          @number_name += space + count_name_with_order_name(number)
         end
       end
     end

data/lib/kabal/languages/language.rb

@@ -23,7 +23,7 @@ module Kabal
     def convert_number(number)
       @number_name = nil
       if need_minus? number
-        minus + ' ' + number_words(-number)
+        join_with_spaces minus, number_words(-number)
       else
         number_words number
       end
@@ -123,5 +123,13 @@ module Kabal
     def need_minus?(number)
       number < 0
     end
+
+    def space
+      ' '
+    end
+
+    def join_with_spaces(*words)
+      words.to_a.join space
+    end
   end
 end

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

@@ -2,18 +2,18 @@ module Kabal
   module RussianRules
     module FractionalNumbers
       def fractional_number_name(number)
-        whole_part_name(number) + ' ' + fractional_part_name(number)
+        join_with_spaces whole_part_name(number), fractional_part_name(number)
       end
 
       def fractional_part_name(number)
         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)
+        join_with_spaces 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)
+        join_with_spaces feminine_natural_number_name(count), Declinations.name_with_declination(whole, count)
       end
 
       def fractional_ten_powers_name(number)

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

@@ -24,15 +24,15 @@ module Kabal
       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 += space + single(number % 10, this_is_end) if (number % 10 != 0)
         number_name
       end
 
       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)
+        return number_name += space + two_words(number % 100, this_is_end) if (number % 100 >= 20)
+        return number_name += space + single(number % 100, this_is_end) if (number % 100 != 0)
         number_name
       end
 
@@ -49,7 +49,7 @@ module Kabal
       end
 
       def less_thousands(number)
-        @number_name += ' ' + three_words(number % 1000) unless number == 0
+        @number_name += space + three_words(number % 1000) unless number == 0
       end
 
       def count_name(number)
@@ -62,7 +62,7 @@ module Kabal
       end
 
       def count_name_with_order_name(number)
-        count_name(number) + ' ' + Declinations.name_with_declination(names[:ten_powers][number_order(number)], count(number))
+        join_with_spaces 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 = '1.0.0'
+  VERSION = '1.0.1'
 end

metadata

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