numbers_and_words 0.11.2 → 0.11.7

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

@@ -1,16 +1,16 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Strategies
     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 +40,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-GB.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Strategies
     module FiguresConverter

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

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Strategies
     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) })
@@ -29,14 +29,8 @@ module NumbersAndWords
           def strings_logic
             if @options.pronounced.active?
               @options.pronounced.process self, @figures
-            elsif @figures.capacity_count
-              number_without_capacity_to_words + complex_number_to_words
-            elsif @figures.hundreds
-              hundreds_number_to_words
-            elsif @figures.tens || @figures.ones
-              simple_number_to_words
             else
-              []
+              super
             end
           end
 

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

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Strategies
     module FiguresConverter
       module Languages
         class Es < Base
-          include Families::Latin
-
           def capacity_iteration
             super.compact
           end
@@ -20,14 +20,10 @@ module NumbersAndWords
           end
 
           def tens_with_ones
-            if @figures.tens == 2
-              @translations
-                .twenties_with_ones(@figures, gender: gender,
-                                              is_apocopated: one_apocopated?)
-            else
-              super({ gender: gender,
-                      is_apocopated: one_apocopated? })
-            end
+            options = { gender: gender, is_apocopated: one_apocopated? }
+            return @translations.twenties_with_ones(@figures, options) if @figures.tens == 2
+
+            super(options)
           end
 
           def hundreds
@@ -37,6 +33,7 @@ module NumbersAndWords
 
           def megs
             return @translations.megs(1, number: 1) if long_scale_thousand?
+
             super({ number: @figures.number_in_capacity(@current_capacity) })
           end
 
@@ -51,12 +48,12 @@ module NumbersAndWords
 
           def long_scale_thousand?
             @current_capacity.odd? &&
-              @figures.number_in_capacity(@current_capacity - 1) != 0
+              !@figures.number_in_capacity(@current_capacity - 1).zero?
           end
 
           def one_apocopated?
-            true if @current_capacity > 0 && @figures.ones == 1 ||
-                    @options.apocopated.result
+            @current_capacity.positive? && @figures.ones == 1 ||
+              @options.apocopated.result
           end
 
           def hundred_apocopated?
@@ -67,6 +64,7 @@ module NumbersAndWords
             @current_capacity ||= 0
 
             return :male if @current_capacity >= 2
+
             @options.gender.result
           end
 

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

@@ -1,10 +1,10 @@
+# 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) })
           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

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

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Strategies
     module FiguresConverter

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

@@ -1,12 +1,10 @@
+# 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)
@@ -15,14 +13,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 +20,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

@@ -1,10 +1,10 @@
+# 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? && '-' || '')
           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

@@ -1,12 +1,10 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Strategies
     module FiguresConverter
       module Languages
         class Ka < Base
-          include Families::Latin
-
-          private
-
           def capacity_iteration
             words = []
             capacity_words = words_in_capacity(@current_capacity)
@@ -15,25 +13,25 @@ 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
 
           def megs
-            prefix = if @figures.hundreds || @figures.tens || @figures.ones
-                       :partials
-                     end
+            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?
+            FiguresArray::THOUSAND_CAPACITY == @current_capacity
+          end
         end
       end
     end

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

@@ -1,12 +1,10 @@
+# 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)
@@ -15,6 +13,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 +26,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

@@ -1,22 +1,12 @@
+# 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
-            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

@@ -1,20 +1,18 @@
+# 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
+              capacity_words.empty? ? [] : [capacity_words, megs].join
             else
               super
             end

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

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Strategies
     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 +39,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?))
@@ -58,8 +58,7 @@ module NumbersAndWords
           def gender
             return (options.gender.result || :male) if maybe_ordinal
 
-            @current_capacity ||= 0
-            if @current_capacity > 0 && figures[0] == 1
+            if current_capacity&.positive? && figures[0] == 1
               :male
             else
               options.gender.result
@@ -79,22 +78,25 @@ module NumbersAndWords
           end
 
           def one_thousand?
-            current_capacity == 1 && figures[0] == 1 && figures.hundreds.nil? && figures.tens.nil?
+            current_capacity == 1 &&
+              figures.ones == 1 &&
+              figures.tens.nil? &&
+              figures.hundreds.nil?
           end
 
           def without_connector?
             return false if with_comma?
-            # without connector when there is hundreds and tens_with_ones
-            return true if figures.hundreds && figures.tens_with_ones
-            # without connector when there is hundreds and tens
-            return true if figures.hundreds && figures.tens
-            # without connector when there is hundreds and ones
-            return true if figures.hundreds && figures.ones
+            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