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/options/hu.rb CHANGED

@@ -1 +1,3 @@
+# frozen_string_literal: true
 require 'numbers_and_words/strategies/figures_converter/options/hu/ordinal'

data/lib/numbers_and_words/strategies/figures_converter/options/hu/ordinal.rb CHANGED

@@ -1,58 +1,11 @@
+# frozen_string_literal: true
 module NumbersAndWords
   module Strategies
     module FiguresConverter
       module Options
         module Hu
-          class Ordinal
-            ZERO_TYPE = :zero
-            HUNDRED_TYPE = :hundreds
-            MEGS_TYPE = :megs
-            def initialize(proxy, *_args)
-              @strategy = proxy.strategy
-              @options = proxy.options
-            end
-            def result(type)
-              @type = type
-              MEGS_TYPE != type ? check_simple_numbers : check_megs_numbers
-            end
-            private
-            def active?
-              @options[:ordinal]
-            end
-            def check_simple_numbers
-              :ordinal if simple_numbers_condition && active?
-            end
-            def check_megs_numbers
-              :ordinal if megs_numbers_condition && active?
-            end
-            def simple_numbers_condition
-              current_capacity.nil? &&
-                (HUNDRED_TYPE != @type ||
-                 HUNDRED_TYPE == @type && simple_number_to_words.empty?)
-            end
-            def megs_numbers_condition
-              current_capacity == language_figures.ordinal_capacity
-            end
-            def simple_number_to_words
-              @strategy.language.simple_number_to_words
-            end
-            def current_capacity
-              @strategy.language.current_capacity
-            end
-            def language_figures
-              @strategy.language.parent_figures
-            end
+          class Ordinal < En::Ordinal
           end
         end
       end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 require 'numbers_and_words/strategies/figures_converter/options/pt-BR/gender'
 require 'numbers_and_words/strategies/figures_converter/options/pt-BR/ordinal'
 require 'numbers_and_words/strategies/figures_converter/options/pt-BR/remove_zero'

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

@@ -1,26 +1,11 @@
+# frozen_string_literal: true
 module NumbersAndWords
   module Strategies
     module FiguresConverter
       module Options
         module PtBr
-          class Gender
-            attr_accessor :strategy, :options
-            def initialize(proxy, *_args)
-              @strategy = proxy.strategy
-              @options = proxy.options
-            end
-            def result
-              gender = active? ? @options[:gender].to_sym : :male
-              %i[male female].include?(gender) ? gender : :male
-            end
-            private
-            def active?
-              @options[:gender]
-            end
+          class Gender < Base::Gender
           end
         end
       end

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

@@ -1,23 +1,11 @@
+# frozen_string_literal: true
 module NumbersAndWords
   module Strategies
     module FiguresConverter
       module Options
         module PtBr
-          class Ordinal
-            def initialize(proxy, *_args)
-              @strategy = proxy.strategy
-              @options = proxy.options
-            end
-            def result
-              return :ordinal if active?
-            end
-            private
-            def active?
-              @options[:ordinal]
-            end
+          class Ordinal < Base::Ordinal
           end
         end
       end

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

@@ -1,25 +1,11 @@
+# frozen_string_literal: true
 module NumbersAndWords
   module Strategies
     module FiguresConverter
       module Options
         module PtBr
-          class RemoveZero
-            attr_accessor :strategy, :options
-            def initialize(proxy, *_args)
-              @strategy = proxy.strategy
-              @options = proxy.options
-            end
-            def result
-              active?
-            end
-            private
-            def active?
-              @options[:remove_zero]
-            end
+          class RemoveZero < Base::RemoveZero
           end
         end
       end

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

@@ -1 +1,3 @@
+# frozen_string_literal: true
 require 'numbers_and_words/strategies/figures_converter/options/ru/gender'

data/lib/numbers_and_words/strategies/figures_converter/options/ru/gender.rb CHANGED

@@ -1,25 +1,11 @@
+# frozen_string_literal: true
 module NumbersAndWords
   module Strategies
     module FiguresConverter
       module Options
         module Ru
-          class Gender
-            attr_accessor :strategy, :options
-            def initialize(proxy, *_args)
-              @strategy = proxy.strategy
-              @options = proxy.options
-            end
-            def result
-              active? ? @options[:gender].to_sym : :male
-            end
-            private
-            def active?
-              @options[:gender]
-            end
+          class Gender < Base::Gender
           end
         end
       end

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

@@ -1 +1,3 @@
+# frozen_string_literal: true
 require 'numbers_and_words/strategies/figures_converter/options/ua/gender'

data/lib/numbers_and_words/strategies/figures_converter/options/ua/gender.rb CHANGED

@@ -1,25 +1,11 @@
+# frozen_string_literal: true
 module NumbersAndWords
   module Strategies
     module FiguresConverter
       module Options
         module Ua
-          class Gender
-            attr_accessor :strategy, :options
-            def initialize(proxy, *_args)
-              @strategy = proxy.strategy
-              @options = proxy.options
-            end
-            def result
-              active? ? @options[:gender].to_sym : :male
-            end
-            private
-            def active?
-              @options[:gender]
-            end
+          class Gender < Base::Gender
           end
         end
       end

data/lib/numbers_and_words/translations.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 require 'numbers_and_words/translations/base'
 require 'numbers_and_words/translations/families/base'
 require 'numbers_and_words/translations/families/cyrillic'

data/lib/numbers_and_words/translations/base.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module NumbersAndWords
   module Translations
     class Base

data/lib/numbers_and_words/translations/cs.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module NumbersAndWords
   module Translations
     class Cs < Base

data/lib/numbers_and_words/translations/de.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module NumbersAndWords
   module Translations
     class De < Base

data/lib/numbers_and_words/translations/en-GB.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module NumbersAndWords
   module Translations
     class EnGb < Base

data/lib/numbers_and_words/translations/en.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module NumbersAndWords
   module Translations
     class En < Base

data/lib/numbers_and_words/translations/es.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module NumbersAndWords
   module Translations
     class Es < Base
@@ -5,13 +7,14 @@ module NumbersAndWords
       include NumbersAndWords::Translations::Extensions::FractionSignificance
       def zero(_options = {})
-        t(%i[ones male].join('.'))[0]
+        t('ones.male')[0]
       end
       def ones(number, options = {})
         return if options[:is_one_thousand]
-        return t(%i[ones apocopated].join('.')) if number == 1 &&
-                                                   options[:is_apocopated]
+        return t('ones.apocopated') if number == 1 &&
+                                       options[:is_apocopated]
         t([:ones, options[:gender]].join('.'))[number]
       end
@@ -20,12 +23,14 @@ module NumbersAndWords
       end
       def twenties_with_ones(numbers, options = {})
-        return t(%i[twenties apocopated].join('.')) if options[:is_apocopated]
+        return t('twenties.apocopated') if options[:is_apocopated]
         t([:twenties, options[:gender]].join('.'))[numbers[0]]
       end
       def hundreds(number, options = {})
-        return t(%i[hundreds apocopated].join('.')) if options[:is_apocopated]
+        return t('hundreds.apocopated') if options[:is_apocopated]
         t([:hundreds, options[:gender]].join('.'))[number]
       end
     end

data/lib/numbers_and_words/translations/et.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module NumbersAndWords
   module Translations
     class Et < Base

data/lib/numbers_and_words/translations/extensions/fraction_significance.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module NumbersAndWords
   module Translations
     module Extensions

data/lib/numbers_and_words/translations/families/base.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module NumbersAndWords
   module Translations
     module Families

data/lib/numbers_and_words/translations/families/cyrillic.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module NumbersAndWords
   module Translations
     module Families

data/lib/numbers_and_words/translations/families/latin.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module NumbersAndWords
   module Translations
     module Families

data/lib/numbers_and_words/translations/fr.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module NumbersAndWords
   module Translations
     class Fr < Base
@@ -8,16 +10,15 @@ module NumbersAndWords
       def tens(number, options = {})
         return t(:eighty) if number == SPECIAL_TENS_CASE && options[:alone].nil?
         super number, options
       end
-      def tens_with_ones(numbers, _options = {})
-        if [7, 9].include? numbers[1]
-          [tens(numbers[1] - 1, alone: false), teens(numbers)].join('-')
-        else
-          separator = numbers[0] == 1 ? " #{union} " : '-'
-          [tens(numbers[1], alone: false), ones(numbers[0])].join(separator)
-        end
+      def tens_with_ones(numbers, options = {})
+        return [tens(numbers[1] - 1, alone: false), teens(numbers)].join('-') if [7, 9].include? numbers[1]
+        separator = numbers[0] == 1 ? " #{union} " : '-'
+        super numbers, options.merge(separator: separator)
       end
       def hundreds(number, options = {})
@@ -25,6 +26,7 @@ module NumbersAndWords
         hundreds = t(:hundreds, count: count)
         return hundreds if number == 1
         [t(:ones)[number], hundreds].join(' ')
       end
     end

data/lib/numbers_and_words/translations/hu.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module NumbersAndWords
   module Translations
     class Hu < Base

data/lib/numbers_and_words/translations/hy.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module NumbersAndWords
   module Translations
     class Hy < Base

data/lib/numbers_and_words/translations/it.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module NumbersAndWords
   module Translations
     class It < Base

data/lib/numbers_and_words/translations/ka.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module NumbersAndWords
   module Translations
     class Ka < Base
@@ -40,7 +42,7 @@ module NumbersAndWords
       def tens_with_ones(numbers, _options = {})
         range = vigesimal_range(numbers[1])
-        minor = if numbers[1] - range[:multiplicative] > 0
+        minor = if (numbers[1] - range[:multiplicative]).positive?
                   teens(numbers)
                 else
                   ones(numbers[0])

data/lib/numbers_and_words/translations/lt.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module NumbersAndWords
   module Translations
     class Lt < Base

data/lib/numbers_and_words/translations/lv.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module NumbersAndWords
   module Translations
     class Lv < Base

data/lib/numbers_and_words/translations/nl.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module NumbersAndWords
   module Translations
     class Nl < Base
@@ -9,6 +11,7 @@ module NumbersAndWords
       def hundreds(number, _options = {})
         return t(:hundreds) if number == 1
         super number, separator: ''
       end
     end