numbers_and_words 0.11.2 → 0.11.7

data/lib/numbers_and_words/strategies/figures_converter/options/en/ordinal.rb

@@ -1,18 +1,15 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Strategies
     module FiguresConverter
       module Options
         module En
-          class Ordinal
+          class Ordinal < Base::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
@@ -20,10 +17,6 @@ module NumbersAndWords
 
             private
 
-            def active?
-              @options[:ordinal]
-            end
-
             def check_simple_numbers
               :ordinal if simple_numbers_condition && active?
             end

data/lib/numbers_and_words/strategies/figures_converter/options/en/pronounced.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Strategies
     module FiguresConverter
@@ -45,19 +47,10 @@ module NumbersAndWords
 
             def tens_with_oh(language, figures)
               units, tens = *figures.to_a.dup
-              result = []
-              if tens.zero?
-                if units.zero?
-                  result.push 'hundred'
-                else
-                  result.push language.ones
-                  result.push 'oh'
-                end
-              elsif figures.teens
-                result.push language.teens
-              elsif figures.tens
-                result.push language.complex_tens
-              end
+              return (units.zero? ? ['hundred'] : [language.ones, 'oh']) if tens.zero?
+              return [language.teens] if figures.teens
+
+              [language.complex_tens]
             end
           end
         end

data/lib/numbers_and_words/strategies/figures_converter/options/en/remove_hyphen.rb

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

data/lib/numbers_and_words/strategies/figures_converter/options/en/remove_zero.rb

@@ -1,25 +1,11 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Strategies
     module FiguresConverter
       module Options
         module En
-          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/es.rb

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

data/lib/numbers_and_words/strategies/figures_converter/options/es/apocopated.rb

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

data/lib/numbers_and_words/strategies/figures_converter/options/es/gender.rb

@@ -1,25 +1,11 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Strategies
     module FiguresConverter
       module Options
         module Es
-          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/es/remove_zero.rb

@@ -1,25 +1,11 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Strategies
     module FiguresConverter
       module Options
         module Es
-          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/hu.rb

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

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

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

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

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

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

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

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

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

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

@@ -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'
@@ -22,6 +24,8 @@ require 'numbers_and_words/translations/pt'
 require 'numbers_and_words/translations/pt-BR'
 require 'numbers_and_words/translations/ka'
 require 'numbers_and_words/translations/cs'
+require 'numbers_and_words/translations/vi'
+require 'numbers_and_words/translations/hy'
 
 module NumbersAndWords
   module Translations

data/lib/numbers_and_words/translations/base.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Translations
     class Base
       I18N_NAMESPACE = :numbers
 
       def t(attribute, options = {})
-        ::I18n.t attribute, options.merge(scope: I18N_NAMESPACE)
+        ::I18n.t attribute, **options.merge(scope: I18N_NAMESPACE)
       end
     end
   end

data/lib/numbers_and_words/translations/cs.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Translations
     class Cs < Base
@@ -12,53 +14,26 @@ module NumbersAndWords
         t([options[:prefix], :ones, options[:gender]].join('.'))[number]
       end
 
-      # for 20, 30, 60
       def tens(number, options = {})
         t([options[:prefix], :tens, gender_to_use(options)].join('.'))[number]
       end
 
-      # for 12, 13, 19
-      def teens(number_arr, options = {})
-        t([options[:prefix], :teens, gender_to_use(options)].join('.'))[number_arr.first]
+      def teens(numbers, options = {})
+        t([options[:prefix], :teens, gender_to_use(options)].join('.'))[numbers[0]]
       end
 
-      # for 42, 23, 69
-      def tens_with_ones(numbers_arr, options = {})
-        connector = ' '
-        [tens(numbers_arr[1], options), connector, ones(numbers_arr[0], options)].join
+      def tens_with_ones(numbers, options = {})
+        [tens(numbers[1], options), ones(numbers[0], options)].join(' ')
       end
 
       def hundreds(number, options = {})
         t([options[:prefix], :hundreds, gender_to_use(options)].join('.'))[number]
       end
 
-      def megs(capacity, options = {})
-        number = options[:number]
-        mega_name = "#{options[:prefix]}.mega"
-        number ? t(mega(capacity), count: number) : t(mega_name)[capacity]
-      end
-
-      def mega(capacity)
-        t(:mega)[capacity]
-      end
-
       def integral(number, _options = {})
         t(:integral, count: number)
       end
 
-      def micros(capacity, number = nil, separator = '')
-        micro, prefix = capacity
-        micros = t(:micro, count: number)[micro]
-        [micro_prefix(prefix), micros].compact.join separator
-      end
-
-      def micro_prefix(capacity)
-        case capacity
-        when 2 then t(:sub_micro)[2]
-        when 1 then t(:sub_micro)[1]
-        end
-      end
-
       private
 
       def ordinal?(options)