RubyGems - numbers_and_words - Versions diffs - 0.11.5 → 0.11.6 - Mend

numbers_and_words 0.11.5 → 0.11.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (172) hide show

data/lib/numbers_and_words/strategies/figures_converter/decorators/fr.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 require 'numbers_and_words/strategies/figures_converter/decorators/fr/base'
 require 'numbers_and_words/strategies/figures_converter/decorators/fr/fractional'
 require 'numbers_and_words/strategies/figures_converter/decorators/fr/integral'

data/lib/numbers_and_words/strategies/figures_converter/decorators/fr/base.rb CHANGED

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

data/lib/numbers_and_words/strategies/figures_converter/decorators/fr/fractional.rb CHANGED

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

data/lib/numbers_and_words/strategies/figures_converter/decorators/fr/integral.rb CHANGED

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

data/lib/numbers_and_words/strategies/figures_converter/decorators/hu.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 require 'numbers_and_words/strategies/figures_converter/decorators/hu/base'
 require 'numbers_and_words/strategies/figures_converter/decorators/hu/fractional'
 require 'numbers_and_words/strategies/figures_converter/decorators/hu/integral'

data/lib/numbers_and_words/strategies/figures_converter/decorators/hu/base.rb CHANGED

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

data/lib/numbers_and_words/strategies/figures_converter/decorators/hu/fractional.rb CHANGED

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

data/lib/numbers_and_words/strategies/figures_converter/decorators/hu/integral.rb CHANGED

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

data/lib/numbers_and_words/strategies/figures_converter/decorators/pt-BR.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 require 'numbers_and_words/strategies/figures_converter/decorators/pt-BR/base'
 require 'numbers_and_words/strategies/figures_converter/decorators/pt-BR/fractional'
 require 'numbers_and_words/strategies/figures_converter/decorators/pt-BR/integral'

data/lib/numbers_and_words/strategies/figures_converter/decorators/pt-BR/base.rb CHANGED

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

data/lib/numbers_and_words/strategies/figures_converter/decorators/pt-BR/fractional.rb CHANGED

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

data/lib/numbers_and_words/strategies/figures_converter/decorators/pt-BR/integral.rb CHANGED

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

data/lib/numbers_and_words/strategies/figures_converter/decorators/ru.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 require 'numbers_and_words/strategies/figures_converter/decorators/ru/base'
 require 'numbers_and_words/strategies/figures_converter/decorators/ru/fractional'
 require 'numbers_and_words/strategies/figures_converter/decorators/ru/integral'

data/lib/numbers_and_words/strategies/figures_converter/decorators/ru/base.rb CHANGED

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

data/lib/numbers_and_words/strategies/figures_converter/decorators/ru/fractional.rb CHANGED

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

data/lib/numbers_and_words/strategies/figures_converter/decorators/ru/integral.rb CHANGED

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

data/lib/numbers_and_words/strategies/figures_converter/decorators/ua.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 require 'numbers_and_words/strategies/figures_converter/decorators/ua/base'
 require 'numbers_and_words/strategies/figures_converter/decorators/ua/fractional'
 require 'numbers_and_words/strategies/figures_converter/decorators/ua/integral'

data/lib/numbers_and_words/strategies/figures_converter/decorators/ua/base.rb CHANGED

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

data/lib/numbers_and_words/strategies/figures_converter/decorators/ua/fractional.rb CHANGED

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

data/lib/numbers_and_words/strategies/figures_converter/decorators/ua/integral.rb CHANGED

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

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 require 'numbers_and_words/strategies/figures_converter/decorators/vi/base'
 require 'numbers_and_words/strategies/figures_converter/decorators/vi/fractional'
 require 'numbers_and_words/strategies/figures_converter/decorators/vi/integral'

data/lib/numbers_and_words/strategies/figures_converter/decorators/vi/base.rb CHANGED

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

data/lib/numbers_and_words/strategies/figures_converter/decorators/vi/fractional.rb CHANGED

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

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

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

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 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'

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

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

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

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

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

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

data/lib/numbers_and_words/strategies/figures_converter/languages/en-GB.rb CHANGED

@@ -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 CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module NumbersAndWords
   module Strategies
     module FiguresConverter
@@ -27,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 CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module NumbersAndWords
   module Strategies
     module FiguresConverter
@@ -18,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
@@ -35,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
@@ -49,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?
@@ -65,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 CHANGED

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

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

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module NumbersAndWords
   module Strategies
     module FiguresConverter
@@ -9,10 +11,8 @@ module NumbersAndWords
           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 CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module NumbersAndWords
   module Strategies
     module FiguresConverter
@@ -56,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
@@ -77,7 +78,10 @@ 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?
@@ -86,11 +90,13 @@ module NumbersAndWords
                            (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

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

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

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

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

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

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

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

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

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

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