numbers_and_words 0.10.0 → 0.11.12

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

@@ -1,34 +1,75 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Strategies
     module FiguresConverter
       module Languages
         class Es < Base
-          include Families::Latin
-
           def capacity_iteration
-            words = []
-            capacity_words = words_in_capacity(@current_capacity)
-            words.push megs(capacity_words) unless capacity_words.empty?
+            super.compact
+          end
 
-            if 0 < @current_capacity
-              # eg 1000000 should be "un millon" not "uno millon"
-              #    501000 should be "quinientos un mil" not "quinientos uno mil"
-              # so we replace "uno" with "un" throughout
+          def zero
+            super unless maybe_remove_zero
+          end
+
+          def ones
+            super({ gender: gender,
+                    is_one_thousand: one_thousand?,
+                    is_apocopated: one_apocopated? })
+          end
 
-              capacity_words = capacity_words.map{|word|
-                word.gsub( @translations.ones(1), @translations.one )
-              }
-            end
+          def tens_with_ones
+            options = { gender: gender, is_apocopated: one_apocopated? }
+            return @translations.twenties_with_ones(@figures, options) if @figures.tens == 2
 
-            words + capacity_words
+            super(options)
           end
 
           def hundreds
-            super({:is_hundred => (figures[1,2] == [0,1] && simple_number_to_words.empty?)})
+            super({ gender: gender,
+                    is_apocopated: hundred_apocopated? })
+          end
+
+          def megs
+            return @translations.megs(1, number: 1) if long_scale_thousand?
+
+            super({ number: @figures.number_in_capacity(@current_capacity) })
+          end
+
+          private
+
+          def one_thousand?
+            @current_capacity.odd? &&
+              @figures.ones == 1 &&
+              @figures.tens.nil? &&
+              @figures.hundreds.nil?
+          end
+
+          def long_scale_thousand?
+            @current_capacity.odd? &&
+              !@figures.number_in_capacity(@current_capacity - 1).zero?
+          end
+
+          def one_apocopated?
+            (@current_capacity.positive? && @figures.ones == 1) ||
+              @options.apocopated.result
+          end
+
+          def hundred_apocopated?
+            @figures.hundreds == 1 && @figures.round_hundred?
+          end
+
+          def gender
+            @current_capacity ||= 0
+
+            return :male if @current_capacity >= 2
+
+            @options.gender.result
           end
 
-          def megs capacity_words
-            super({:is_one => capacity_words == [@translations.ones(1)]})
+          def maybe_remove_zero
+            @options.remove_zero.result
           end
         end
       end

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

@@ -1,14 +1,13 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Strategies
     module FiguresConverter
       module Languages
         class Et < Base
-          include Families::Latin
-
           def megs
-            super({:number => @figures.number_in_capacity(@current_capacity)})
+            super({ number: @figures.number_in_capacity(@current_capacity) })
           end
-
         end
       end
     end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Strategies
     module FiguresConverter
@@ -13,7 +15,7 @@ module NumbersAndWords
                 number_without_capacity_to_words + complex_number_to_words
               elsif @figures.hundreds
                 hundreds_number_to_words
-              elsif @figures.tens or @figures.ones
+              elsif @figures.tens || @figures.ones
                 simple_number_to_words
               else
                 []
@@ -21,10 +23,10 @@ module NumbersAndWords
             end
 
             def complex_number_to_words
-              (1..@figures.capacity_count).map { |capacity|
+              (1..@figures.capacity_count).map do |capacity|
                 @current_capacity = capacity
                 capacity_iteration
-              }.flatten
+              end.flatten
             end
 
             def capacity_iteration
@@ -34,14 +36,14 @@ module NumbersAndWords
               words + capacity_words
             end
 
-            def words_in_capacity capacity = 0
+            def words_in_capacity(capacity = 0)
               save_parent_figures do
                 @figures = @parent_figures.figures_array_in_capacity(capacity)
                 strings_logic
               end
             end
 
-            alias_method :number_without_capacity_to_words, :words_in_capacity
+            alias number_without_capacity_to_words words_in_capacity
 
             def hundreds_number_to_words
               simple_number_to_words + [hundreds]

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Strategies
     module FiguresConverter
@@ -19,14 +21,14 @@ module NumbersAndWords
               end
             end
 
-            [:ones, :tens_with_ones].each do |method_name|
-              define_method(method_name) {
-                super({:gender => gender})
-              }
+            %i[ones tens_with_ones].each do |method_name|
+              define_method(method_name) do |*args|
+                super({ gender: gender }.merge(args.first || {}))
+              end
             end
 
-            def megs
-              super({:number => @figures.number_in_capacity(@current_capacity)})
+            def megs(*args)
+              super({ number: @figures.number_in_capacity(@current_capacity) }.merge(args.first || {}))
             end
           end
         end

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

@@ -1,31 +1,29 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Strategies
     module FiguresConverter
       module Languages
         module Families
           module Helpers
-            [:zero].each do |method_name|
-              define_method(method_name) { |*args|
-                options = args.first || {}
-                translate method_name, options
-              }
+            def zero(*args)
+              options = args.first || {}
+              translate :zero, options
             end
 
-            [:ones, :teens, :tens, :tens_with_ones, :hundreds].each do |method_name|
-              define_method(method_name) { |*args|
+            %i[ones teens tens tens_with_ones hundreds].each do |method_name|
+              define_method(method_name) do |*args|
                 options = args.first || {}
                 translate method_name, @figures.send(method_name), options
-              }
+              end
             end
 
-            [:megs].each do |method_name|
-              define_method(method_name) { |*args|
-                options = args.first || {}
-                translate method_name, @current_capacity, options
-              }
+            def megs(*args)
+              options = args.first || {}
+              translate :megs, @current_capacity, options
             end
 
-            def translate method_name, *args
+            def translate(method_name, *args)
               translations.send method_name, *args
             end
           end

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

@@ -1,37 +1,37 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Strategies
     module FiguresConverter
       module Languages
         class Fr < 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 unless is_a_thousand? and is_a_one?
+            words += capacity_words unless thousand? && one?
             words
           end
 
-          def is_a_one?
-            [translations.ones(1)] == words_in_capacity(@current_capacity)
+          def hundreds
+            super({ pluralize: simple_number_to_words.empty? })
           end
 
-          def is_a_thousand?
-            FiguresArray::THOUSAND_CAPACITY == @current_capacity
+          def megs
+            super({ number: @figures.number_in_capacity(@current_capacity) })
           end
 
-          def hundreds
-            super({:pluralize => simple_number_to_words.empty?})
+          private
+
+          def one?
+            words_in_capacity(@current_capacity) == [translations.ones(1)]
           end
 
-          def megs
-            super({:number => @figures.number_in_capacity(@current_capacity)})
+          def thousand?
+            @current_capacity == FiguresArray::THOUSAND_CAPACITY
           end
         end
       end
     end
   end
-end
+end

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

@@ -1,12 +1,12 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Strategies
     module FiguresConverter
       module Languages
         class Hu < Base
-          include Families::Latin
-
           def print_words
-            inner_reverse_words.reverse.join(greater_than_2000? && '-' || '')
+            inner_reverse_words.reverse.join(greater_than_2000? ? '-' : '')
           end
 
           def inner_reverse_words
@@ -22,7 +22,7 @@ module NumbersAndWords
               number_without_capacity_to_words + complex_number_to_words
             elsif @figures.hundreds
               [hundreds_number_to_words]
-            elsif @figures.tens or @figures.ones
+            elsif @figures.tens || @figures.ones
               [simple_number_to_words]
             else
               []
@@ -31,10 +31,10 @@ module NumbersAndWords
 
           def complex_number_to_words
             count = @figures.capacity_count
-            (1..count).map { |capacity|
+            (1..count).map do |capacity|
               @current_capacity = capacity
               capacity_iteration.flatten
-            }.reject(&:empty?)
+            end.reject(&:empty?)
           end
 
           def simple_number_to_words
@@ -47,13 +47,13 @@ module NumbersAndWords
             end
           end
 
-          [:zero, :ones, :teens, :tens, :tens_with_ones, :hundreds, :megs].each do |method_name|
-            define_method(method_name) {
-              super({:prefix => maybe_ordinal(method_name)})
-            }
+          %i[zero ones teens tens tens_with_ones hundreds megs].each do |method_name|
+            define_method(method_name) do
+              super({ prefix: maybe_ordinal(method_name) })
+            end
           end
 
-          def maybe_ordinal type
+          def maybe_ordinal(type)
             @options.ordinal.result type
           end
         end

data/lib/numbers_and_words/strategies/figures_converter/languages/{families/latin.rb → hy.rb}

@@ -1,11 +1,10 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Strategies
     module FiguresConverter
       module Languages
-        module Families
-          module Latin
-            include Base
-          end
+        class Hy < Base
         end
       end
     end

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

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Strategies
     module FiguresConverter
       module Languages
         class It < Base
-          include Families::Latin
         end
       end
     end

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

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module NumbersAndWords
+  module Strategies
+    module FiguresConverter
+      module Languages
+        class Ka < Base
+          def capacity_iteration
+            words = []
+            capacity_words = words_in_capacity(@current_capacity)
+            words.push(megs) unless capacity_words.empty?
+            words += capacity_words unless thousand? && one?
+            words
+          end
+
+          def hundreds
+            super({ only_hundreds: figures[0, 2] == [0, 0] })
+          end
+
+          def megs
+            prefix = (:partials if @figures.hundreds || @figures.tens || @figures.ones)
+
+            super(prefix: prefix)
+          end
+
+          private
+
+          def one?
+            words_in_capacity(@current_capacity) == [translations.ones(1)]
+          end
+
+          def thousand?
+            @current_capacity == FiguresArray::THOUSAND_CAPACITY
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module NumbersAndWords
+  module Strategies
+    module FiguresConverter
+      module Languages
+        class Kz < Base
+        end
+      end
+    end
+  end
+end

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

@@ -1,34 +1,30 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Strategies
     module FiguresConverter
       module Languages
         class Lt < 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 unless is_a_thousand? and is_a_one?
+            words += capacity_words unless thousand? && one?
             words
           end
 
-          def is_a_one?
-            [translations.ones(1)] == words_in_capacity(@current_capacity)
+          def megs
+            super({ number: @figures.number_in_capacity(@current_capacity) })
           end
 
-          def is_a_thousand?
-            FiguresArray::THOUSAND_CAPACITY == @current_capacity
-          end
+          private
 
-          def hundreds
-            super({:is_hundred => (figures[1,2] == [0,1] && simple_number_to_words.empty?)})
+          def one?
+            words_in_capacity(@current_capacity) == [translations.ones(1)]
           end
 
-          def megs
-            super({:number => @figures.number_in_capacity(@current_capacity)})
+          def thousand?
+            @current_capacity == FiguresArray::THOUSAND_CAPACITY
           end
         end
       end

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

@@ -1,34 +1,16 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Strategies
     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 unless is_a_thousand? and is_a_one?
-            words
-          end
-
-          def is_a_one?
-            [translations.ones(1)] == words_in_capacity(@current_capacity)
-          end
-
-          def is_a_thousand?
-            FiguresArray::THOUSAND_CAPACITY == @current_capacity
-          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
-            super({:number => @figures.number_in_capacity(@current_capacity)})
+            super({ number: @figures.number_in_capacity(@current_capacity) })
           end
         end
       end

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

@@ -1,24 +1,48 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Strategies
     module FiguresConverter
       module Languages
         class Nl < Base
-          include Families::Latin
-
           def hundreds_number_to_words
             [super.reverse.join]
           end
 
           def capacity_iteration
-            if FiguresArray::THOUSAND_CAPACITY == @current_capacity
-              words = []
-              capacity_words = words_in_capacity(@current_capacity)
-              words.push megs unless capacity_words.empty?
-              capacity_words.empty? ? [] : [capacity_words, words].join
+            return super if @current_capacity != FiguresArray::THOUSAND_CAPACITY
+            return [] if apply_tens_of_hundreds?
+            return megs if figures.number_in_capacity(@current_capacity) == 1
+
+            capacity_words = words_in_capacity(@current_capacity)
+            capacity_words.empty? ? [] : [capacity_words, megs].join
+          end
+
+          def simple_number_to_words
+            if @figures.only_ones && @figures.ones == 1
+              [@translations.t(:loose_one)]
             else
               super
             end
           end
+
+          def number_without_capacity_to_words
+            return super unless apply_tens_of_hundreds?
+
+            base = save_parent_figures do
+              @figures = @parent_figures[2, 2].to_figures
+              simple_number_to_words
+            end
+            [([base, translate(:hundreds, 1)] + simple_number_to_words).join]
+          end
+
+          private
+
+          def apply_tens_of_hundreds?
+            @options.tens_of_hundreds.result &&
+              (1..9).cover?(figures.number_in_capacity(FiguresArray::THOUSAND_CAPACITY)) &&
+              figures.hundreds
+          end
         end
       end
     end

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

@@ -0,0 +1,118 @@
+# frozen_string_literal: true
+
+module NumbersAndWords
+  module Strategies
+    module FiguresConverter
+      module Languages
+        class PtBr < Base
+          %i[teens tens tens_with_ones].each do |method_name|
+            define_method(method_name) do
+              super(internal_options)
+            end
+          end
+
+          def zero
+            super unless maybe_remove_zero
+          end
+
+          def words
+            super.strip
+          end
+
+          def complex_number_to_words
+            super.compact
+          end
+
+          def capacity_iteration
+            words = []
+            capacity_words = words_in_capacity(current_capacity)
+            words.push(megs) unless capacity_words.empty? || (capacity_words.empty? && figures[0] == 1)
+            words + capacity_words
+          end
+
+          def ones
+            super internal_options.merge(is_one_thousand: one_thousand?)
+          end
+
+          def hundreds
+            super(internal_options.merge(is_hundred: hundred?, is_one_hundred: one_hundred?, gender: gender))
+          end
+
+          def megs
+            super(internal_options.merge(number: @figures.number_in_capacity(@current_capacity),
+                                         is_opaque: opaque?,
+                                         is_without_connector: without_connector?,
+                                         is_with_comma: with_comma?))
+          end
+
+          private
+
+          def internal_options
+            { gender: gender, prefix: maybe_ordinal }
+          end
+
+          def maybe_ordinal
+            @options.ordinal.result
+          end
+
+          def gender
+            return (options.gender.result || :male) if maybe_ordinal
+
+            if current_capacity&.positive? && figures[0] == 1
+              :male
+            else
+              options.gender.result
+            end
+          end
+
+          def hundred?
+            figures[0].zero? && figures[1].zero? && simple_number_to_words.empty?
+          end
+
+          def one_hundred?
+            hundred? && figures[2] == 1
+          end
+
+          def opaque?
+            figures.opaque? current_capacity
+          end
+
+          def one_thousand?
+            current_capacity == 1 &&
+              figures.ones == 1 &&
+              figures.tens.nil? &&
+              figures.hundreds.nil?
+          end
+
+          def without_connector?
+            return false if with_comma?
+            return true if figures.hundreds &&
+                           (figures.tens_with_ones ||
+                            figures.tens ||
+                            figures.ones)
+
+            false
+          end
+
+          def with_comma?
+            return false unless @current_capacity > 1
+
+            # if any lower capacity is single word, in portuguese only tens are single words
+            number_under_capacity = figures.number_under_capacity(@current_capacity)
+            return false if number_under_capacity < 20
+
+            figures_under_capacity = figures.figures_array_under_capacity(@current_capacity)
+            return false if figures_under_capacity.count(0) == (figures_under_capacity.size - 1)
+
+            # else use comma
+            true
+          end
+
+          def maybe_remove_zero
+            @options.remove_zero.result
+          end
+        end
+      end
+    end
+  end
+end