numbers_and_words 0.11.3 → 0.11.8

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'
@@ -23,6 +25,8 @@ 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'
+require 'numbers_and_words/translations/kz'
 
 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

data/lib/numbers_and_words/translations/de.rb

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

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

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

data/lib/numbers_and_words/translations/en.rb

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

data/lib/numbers_and_words/translations/es.rb

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

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

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

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

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

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

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

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

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

data/lib/numbers_and_words/translations/fr.rb

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

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

data/lib/numbers_and_words/translations/hy.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module NumbersAndWords
+  module Translations
+    class Hy < Base
+      include NumbersAndWords::Translations::Families::Latin
+
+      def tens_with_ones(numbers, options = {})
+        options[:separator] ||= ''
+        super
+      end
+
+      def hundreds(number, _options = {})
+        parts = [t(:hundreds)]
+        parts.unshift(t(:ones)[number]) if number > 1
+
+        parts.join(' ')
+      end
+    end
+  end
+end

data/lib/numbers_and_words/translations/it.rb

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

data/lib/numbers_and_words/translations/ka.rb

@@ -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/kz.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module NumbersAndWords
+  module Translations
+    class Kz < Base
+      include NumbersAndWords::Translations::Families::Latin
+    end
+  end
+end

data/lib/numbers_and_words/translations/lt.rb

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

data/lib/numbers_and_words/translations/lv.rb

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

data/lib/numbers_and_words/translations/nl.rb

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

data/lib/numbers_and_words/translations/pt-BR.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Translations
     class PtBr < Base
@@ -14,6 +16,7 @@ module NumbersAndWords
 
       def ones(number, options = {})
         return if options[:is_one_thousand]
+
         t([options[:prefix], :ones, options[:gender]].join('.'))[number]
       end
 
@@ -24,25 +27,29 @@ module NumbersAndWords
       end
 
       def teens(number, options = {})
-        return [tens(1, options), ' ', ones(number[0], options)].join if ordinal? options
+        return [tens(1, options), ones(number[0], options)].join(' ') if ordinal? options
+
         super(number, options)
       end
 
       def tens_with_ones(numbers, options = {})
         connector = ordinal?(options) ? ' ' : " #{union} "
-        [tens(numbers[1], options), connector, ones(numbers[0], options)].join
+        [tens(numbers[1], options), ones(numbers[0], options)].join(connector)
       end
 
       def hundreds(number, options = {})
         return t(:one_hundred) if options[:is_one_hundred] && !ordinal?(options)
+
         hundreds = t([options[:prefix], :hundreds, options[:gender]].join('.'))[number]
         return hundreds if ordinal?(options) || options[:is_hundred]
+
         [hundreds, union].join(' ')
       end
 
       def megs(capacity, options = {})
         return t([options[:prefix], :mega, options[:gender]].join('.'))[capacity] if ordinal?(options)
         return super(capacity, options) if options[:is_opaque] || options[:is_without_connector]
+
         suffix = options[:is_with_comma] ? ',' : " #{union}"
         super(capacity, options) + suffix
       end