numbers_and_words 0.11.2 → 0.11.3

data/lib/numbers_and_words/strategies/figures_converter/decorators/vi/integral.rb

@@ -0,0 +1,12 @@
+module NumbersAndWords
+  module Strategies
+    module FiguresConverter
+      module Decorators
+        module Vi
+          class Integral < Base
+          end
+        end
+      end
+    end
+  end
+end

data/lib/numbers_and_words/strategies/figures_converter/languages.rb

@@ -1,33 +1,29 @@
 require 'numbers_and_words/strategies/figures_converter/languages/families/helpers'
 require 'numbers_and_words/strategies/figures_converter/languages/families/base'
-
 require 'numbers_and_words/strategies/figures_converter/languages/base'
 
-require 'numbers_and_words/strategies/figures_converter/languages/families/latin'
-
+require 'numbers_and_words/strategies/figures_converter/languages/cs'
+require 'numbers_and_words/strategies/figures_converter/languages/de'
 require 'numbers_and_words/strategies/figures_converter/languages/en'
 require 'numbers_and_words/strategies/figures_converter/languages/en-GB'
+require 'numbers_and_words/strategies/figures_converter/languages/es'
+require 'numbers_and_words/strategies/figures_converter/languages/et'
 require 'numbers_and_words/strategies/figures_converter/languages/fr'
 require 'numbers_and_words/strategies/figures_converter/languages/hu'
-require 'numbers_and_words/strategies/figures_converter/languages/et'
-require 'numbers_and_words/strategies/figures_converter/languages/se'
 require 'numbers_and_words/strategies/figures_converter/languages/it'
+require 'numbers_and_words/strategies/figures_converter/languages/ka'
+require 'numbers_and_words/strategies/figures_converter/languages/lt'
+require 'numbers_and_words/strategies/figures_converter/languages/lv'
 require 'numbers_and_words/strategies/figures_converter/languages/nl'
+require 'numbers_and_words/strategies/figures_converter/languages/pt-BR'
+require 'numbers_and_words/strategies/figures_converter/languages/pt'
+require 'numbers_and_words/strategies/figures_converter/languages/se'
 require 'numbers_and_words/strategies/figures_converter/languages/tr'
-require 'numbers_and_words/strategies/figures_converter/languages/es'
-require 'numbers_and_words/strategies/figures_converter/languages/lv'
-require 'numbers_and_words/strategies/figures_converter/languages/lt'
-require 'numbers_and_words/strategies/figures_converter/languages/de'
 
 require 'numbers_and_words/strategies/figures_converter/languages/families/cyrillic'
-
 require 'numbers_and_words/strategies/figures_converter/languages/ru'
 require 'numbers_and_words/strategies/figures_converter/languages/ua'
-require 'numbers_and_words/strategies/figures_converter/languages/pt'
-require 'numbers_and_words/strategies/figures_converter/languages/pt-BR'
-require 'numbers_and_words/strategies/figures_converter/languages/cs'
-
-require 'numbers_and_words/strategies/figures_converter/languages/ka'
+require 'numbers_and_words/strategies/figures_converter/languages/vi'
 
 module NumbersAndWords
   module Strategies

data/lib/numbers_and_words/strategies/figures_converter/languages/base.rb

@@ -3,7 +3,7 @@ module NumbersAndWords
     module FiguresConverter
       module Languages
         class Base
-          include Languages::Families::Base
+          include Families::Base
 
           attr_accessor :strategy, :figures, :translations, :strings, :options
 
@@ -20,7 +20,7 @@ module NumbersAndWords
           end
 
           def print_words
-            @strings.reverse.join ' '
+            @strings.reverse.join(' ')
           end
         end
       end

data/lib/numbers_and_words/strategies/figures_converter/languages/cs.rb

@@ -3,8 +3,6 @@ module NumbersAndWords
     module FiguresConverter
       module Languages
         class Cs < Base
-          include Families::Latin
-
           # methods in translations/cs.rb which can work with :gender or :ordinal
           %i[ones teens tens tens_with_ones hundreds].each do |method_name|
             define_method(method_name) do
@@ -21,13 +19,13 @@ module NumbersAndWords
           end
 
           def gender
-            @current_capacity ||= 0
             # @current_capacity = order of block of 3 digits, backwards (0 = hundreds tens ones)
+            @current_capacity ||= 0
 
             if @current_capacity.zero?
               options.gender.result
             elsif @current_capacity > 2 && @current_capacity.odd?
-              :female # miliardy, biliardy, triliardy .....
+              :female # miliardy, biliardy, triliardy...
             else
               :male
             end

data/lib/numbers_and_words/strategies/figures_converter/languages/de.rb

@@ -3,14 +3,12 @@ module NumbersAndWords
     module FiguresConverter
       module Languages
         class De < Base
-          include Families::Latin
-
           def print_words
-            complex_part.count > 1 ? print_megs_words : @strings.flatten.reverse.join('')
+            complex_part.count > 1 ? print_megs_words : @strings.flatten.reverse.join
           end
 
           def print_megs_words
-            [print_megs, print_other].reject(&:empty?).join ' '
+            [print_megs, print_other].reject(&:empty?).join(' ')
           end
 
           def complex_number_to_words
@@ -40,16 +38,16 @@ module NumbersAndWords
 
           def print_megs
             complex_part[1..-1].map do |el|
-              [el[1..-1].to_a.reverse.join(''), el.first].join(' ')
+              [el[1..-1].to_a.reverse.join, el.first].join(' ')
             end.reject(&:empty?).reverse.join(' ')
           end
 
           def print_other
-            [print_thousands, simple_part.reverse.join('')].join('')
+            [print_thousands, simple_part.reverse.join].join
           end
 
           def print_thousands
-            complex_part.first.reverse.join('')
+            complex_part.first.reverse.join
           end
 
           def simple_part

data/lib/numbers_and_words/strategies/figures_converter/languages/en.rb

@@ -3,8 +3,6 @@ module NumbersAndWords
     module FiguresConverter
       module Languages
         class En < Base
-          include Families::Latin
-
           %i[ones teens tens megs].each do |method_name|
             define_method(method_name) do
               super({ prefix: maybe_ordinal(method_name) })

data/lib/numbers_and_words/strategies/figures_converter/languages/es.rb

@@ -3,8 +3,6 @@ module NumbersAndWords
     module FiguresConverter
       module Languages
         class Es < Base
-          include Families::Latin
-
           def capacity_iteration
             super.compact
           end

data/lib/numbers_and_words/strategies/figures_converter/languages/et.rb

@@ -3,8 +3,6 @@ module NumbersAndWords
     module FiguresConverter
       module Languages
         class Et < Base
-          include Families::Latin
-
           def megs
             super({ number: @figures.number_in_capacity(@current_capacity) })
           end

data/lib/numbers_and_words/strategies/figures_converter/languages/fr.rb

@@ -3,10 +3,6 @@ module NumbersAndWords
     module FiguresConverter
       module Languages
         class Fr < Base
-          include Families::Latin
-
-          private
-
           def capacity_iteration
             words = []
             capacity_words = words_in_capacity(@current_capacity)
@@ -15,14 +11,6 @@ module NumbersAndWords
             words
           end
 
-          def one?
-            words_in_capacity(@current_capacity) == [translations.ones(1)]
-          end
-
-          def thousand?
-            FiguresArray::THOUSAND_CAPACITY == @current_capacity
-          end
-
           def hundreds
             super({ pluralize: simple_number_to_words.empty? })
           end
@@ -30,6 +18,16 @@ module NumbersAndWords
           def megs
             super({ number: @figures.number_in_capacity(@current_capacity) })
           end
+
+          private
+
+          def one?
+            words_in_capacity(@current_capacity) == [translations.ones(1)]
+          end
+
+          def thousand?
+            FiguresArray::THOUSAND_CAPACITY == @current_capacity
+          end
         end
       end
     end

data/lib/numbers_and_words/strategies/figures_converter/languages/hu.rb

@@ -3,8 +3,6 @@ module NumbersAndWords
     module FiguresConverter
       module Languages
         class Hu < Base
-          include Families::Latin
-
           def print_words
             inner_reverse_words.reverse.join(greater_than_2000? && '-' || '')
           end

data/lib/numbers_and_words/strategies/figures_converter/languages/it.rb

@@ -3,7 +3,6 @@ module NumbersAndWords
     module FiguresConverter
       module Languages
         class It < Base
-          include Families::Latin
         end
       end
     end

data/lib/numbers_and_words/strategies/figures_converter/languages/ka.rb

@@ -3,10 +3,6 @@ module NumbersAndWords
     module FiguresConverter
       module Languages
         class Ka < Base
-          include Families::Latin
-
-          private
-
           def capacity_iteration
             words = []
             capacity_words = words_in_capacity(@current_capacity)
@@ -15,14 +11,6 @@ module NumbersAndWords
             words
           end
 
-          def one?
-            words_in_capacity(@current_capacity) == [translations.ones(1)]
-          end
-
-          def thousand?
-            FiguresArray::THOUSAND_CAPACITY == @current_capacity
-          end
-
           def hundreds
             super({ only_hundreds: figures[0, 2] == [0, 0] })
           end
@@ -34,6 +22,16 @@ module NumbersAndWords
 
             super(prefix: prefix)
           end
+
+          private
+
+          def one?
+            words_in_capacity(@current_capacity) == [translations.ones(1)]
+          end
+
+          def thousand?
+            FiguresArray::THOUSAND_CAPACITY == @current_capacity
+          end
         end
       end
     end

data/lib/numbers_and_words/strategies/figures_converter/languages/lt.rb

@@ -3,10 +3,6 @@ module NumbersAndWords
     module FiguresConverter
       module Languages
         class Lt < Base
-          include Families::Latin
-
-          private
-
           def capacity_iteration
             words = []
             capacity_words = words_in_capacity(@current_capacity)
@@ -15,6 +11,12 @@ module NumbersAndWords
             words
           end
 
+          def megs
+            super({ number: @figures.number_in_capacity(@current_capacity) })
+          end
+
+          private
+
           def one?
             words_in_capacity(@current_capacity) == [translations.ones(1)]
           end
@@ -22,14 +24,6 @@ module NumbersAndWords
           def thousand?
             FiguresArray::THOUSAND_CAPACITY == @current_capacity
           end
-
-          def hundreds
-            super({ is_hundred: (figures[1, 2] == [0, 1] && simple_number_to_words.empty?) })
-          end
-
-          def megs
-            super({ number: @figures.number_in_capacity(@current_capacity) })
-          end
         end
       end
     end

data/lib/numbers_and_words/strategies/figures_converter/languages/lv.rb

@@ -3,20 +3,8 @@ module NumbersAndWords
     module FiguresConverter
       module Languages
         class Lv < Base
-          include Families::Latin
-
-          private
-
-          def capacity_iteration
-            words = []
-            capacity_words = words_in_capacity(@current_capacity)
-            words.push(megs) unless capacity_words.empty?
-            words += capacity_words
-            words
-          end
-
-          def hundreds
-            super({ is_hundred: (figures[1, 2] == [0, 1] && simple_number_to_words.empty?) })
+          def tens_with_ones
+            super separator: ' '
           end
 
           def megs

data/lib/numbers_and_words/strategies/figures_converter/languages/nl.rb

@@ -3,8 +3,6 @@ module NumbersAndWords
     module FiguresConverter
       module Languages
         class Nl < Base
-          include Families::Latin
-
           def hundreds_number_to_words
             [super.reverse.join]
           end

data/lib/numbers_and_words/strategies/figures_converter/languages/pt-BR.rb

@@ -3,8 +3,6 @@ module NumbersAndWords
     module FiguresConverter
       module Languages
         class PtBr < Base
-          include Families::Latin
-
           %i[teens tens tens_with_ones].each do |method_name|
             define_method(method_name) do
               super(internal_options)
@@ -39,7 +37,7 @@ module NumbersAndWords
           end
 
           def megs
-            super(internal_options.merge(is_one: words_in_capacity(current_capacity) == [translations.ones(1, internal_options)],
+            super(internal_options.merge(number: @figures.number_in_capacity(@current_capacity),
                                          is_opaque: opaque?,
                                          is_without_connector: without_connector?,
                                          is_with_comma: with_comma?))

data/lib/numbers_and_words/strategies/figures_converter/languages/pt.rb

@@ -3,14 +3,12 @@ module NumbersAndWords
     module FiguresConverter
       module Languages
         class Pt < Base
-          include Families::Latin
-
           def hundreds
             super({ is_hundred: hundred?, is_one_hundred: one_hundred? })
           end
 
           def megs
-            super({ is_one: words_in_capacity(@current_capacity) == [@translations.ones(1)] })
+            super({ number: @figures.number_in_capacity(@current_capacity) })
           end
 
           private

data/lib/numbers_and_words/strategies/figures_converter/languages/se.rb

@@ -3,7 +3,6 @@ module NumbersAndWords
     module FiguresConverter
       module Languages
         class Se < Base
-          include Families::Latin
         end
       end
     end

data/lib/numbers_and_words/strategies/figures_converter/languages/tr.rb

@@ -3,10 +3,6 @@ module NumbersAndWords
     module FiguresConverter
       module Languages
         class Tr < Base
-          include Families::Latin
-
-          private
-
           def capacity_iteration
             words = []
             capacity_words = words_in_capacity(@current_capacity)
@@ -15,6 +11,8 @@ module NumbersAndWords
             words
           end
 
+          private
+
           def one?
             words_in_capacity(@current_capacity) == [translations.ones(1)]
           end

data/lib/numbers_and_words/strategies/figures_converter/languages/vi.rb

@@ -0,0 +1,96 @@
+module NumbersAndWords
+  module Strategies
+    module FiguresConverter
+      module Languages
+        class Vi < Base
+          def print_words
+            value = super
+            remove_billion_noice(value)
+          end
+
+          def strings_logic
+            if fractional?
+              if fraction_number_zeros_leading.zero?
+                @options.options[:integeral] = true
+                integeral_string_logic
+              else
+                fractional_with_zero_leading_string_logic
+              end
+            else
+              integeral_string_logic
+            end
+          end
+
+          def fractional_with_zero_leading_string_logic
+            leading_zeros = [0] * fraction_number_zeros_leading
+            (@figures + leading_zeros).map(&:to_words)
+          end
+
+          def integeral_string_logic
+            if @figures.capacity_count
+              number_without_capacity_to_words + complex_number_to_words
+            elsif hundreds?
+              hundreds_number_to_words
+            elsif @figures.tens || @figures.ones
+              simple_number_to_words
+            else
+              []
+            end
+          end
+
+          def hundreds?
+            @figures.hundreds ||
+              (@figures.size == 3 && (@figures.teens || @figures.tens || @figures.ones))
+          end
+
+          def hundreds(options = {})
+            if @figures.hundreds.to_i.zero?
+              translate :hundreds, 0, options
+            else
+              super
+            end
+          end
+
+          def ones(options = {})
+            if @figures.capacity_length >= 2
+              ones_union(options)
+            else
+              super
+            end
+          end
+
+          def ones_union(options = {})
+            translate :ones_union, @figures.ones, options
+          end
+
+          def fractional?
+            !@options.options[:fractional].nil? && !@options.options[:integeral]
+          end
+
+          def fraction_length
+            return 0 unless @options.options[:fractional]
+            @options.options[:fractional][:length]
+          end
+
+          def fraction_number_zeros_leading
+            fraction_length - @figures.length
+          end
+
+          def remove_billion_noice(value)
+            parts = value.split(billion_unit).map(&:strip)
+            if value.end_with?(billion_unit)
+              parts.insert(-1, billion_unit).join(' ')
+            else
+              return value if parts.size <= 2
+              parts.insert(-2, billion_unit).join(' ')
+            end
+          end
+
+          def billion_unit
+            translate :mega, 3
+          end
+        end
+      end
+    end
+  end
+end