numbers_and_words 0.11.0 → 0.11.1

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

@@ -6,37 +6,30 @@ module NumbersAndWords
           class Pronounced
             attr_accessor :strategy, :options
 
-            def initialize proxy, *args, &block
+            def initialize(proxy, *_args)
               @strategy = proxy.strategy
               @options = proxy.options
             end
 
-
-            def result
-              active? ? 'PRONOUNCED' : 'NOTPRONOUNCED'
-            end
-
             def active?
               @options[:pronounced]
             end
 
-            def process language, figures
-              if figures.to_a.count > 4
-                language.number_without_capacity_to_words + language.complex_number_to_words
-              elsif figures.capacity_count
+            def process(language, figures)
+              if figures.capacity_count
                 handle_thousands language, figures
               elsif figures.hundreds
                 handle_hundreds language, figures
-              elsif figures.tens or figures.ones
+              elsif figures.tens || figures.ones
                 language.simple_number_to_words
               else
                 []
               end
             end
 
-            def handle_thousands language, figures
+            def handle_thousands(language, figures)
               _units, _tens, hundreds, thousands = *figures.to_a.dup
-              if hundreds == 0
+              if hundreds.zero?
                 language.number_without_capacity_to_words + language.complex_number_to_words
               else
                 result = tens_with_oh language, figures
@@ -44,28 +37,26 @@ module NumbersAndWords
               end
             end
 
-            def handle_hundreds language, figures
+            def handle_hundreds(language, figures)
               _units, _tens, hundreds = *figures.to_a.dup
               result = tens_with_oh language, figures
               result.push hundreds.to_words
             end
 
-            def tens_with_oh language, figures
+            def tens_with_oh(language, figures)
               units, tens = *figures.to_a.dup
               result = []
-              if tens == 0
-                if units == 0
+              if tens.zero?
+                if units.zero?
                   result.push 'hundred'
                 else
                   result.push language.ones
                   result.push 'oh'
                 end
-              else
-                if figures.teens
-                  result.push language.teens
-                elsif figures.tens
-                  result.push language.complex_tens
-                end
+              elsif figures.teens
+                result.push language.teens
+              elsif figures.tens
+                result.push language.complex_tens
               end
             end
           end

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

@@ -6,12 +6,11 @@ module NumbersAndWords
           class RemoveHyphen
             attr_accessor :strategy, :options
 
-            def initialize proxy, *args, &block
+            def initialize(proxy, *_args)
               @strategy = proxy.strategy
               @options = proxy.options
             end
 
-
             def result
               active? ? ' ' : '-'
             end
@@ -26,4 +25,4 @@ module NumbersAndWords
       end
     end
   end
-end
+end

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

@@ -6,7 +6,7 @@ module NumbersAndWords
           class RemoveZero
             attr_accessor :strategy, :options
 
-            def initialize proxy, *args, &block
+            def initialize(proxy, *_args)
               @strategy = proxy.strategy
               @options = proxy.options
             end
@@ -25,4 +25,4 @@ module NumbersAndWords
       end
     end
   end
-end
+end

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

@@ -0,0 +1,3 @@
+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

@@ -0,0 +1,28 @@
+module NumbersAndWords
+  module Strategies
+    module FiguresConverter
+      module Options
+        module Es
+          class Apocopated
+            attr_accessor :strategy, :options
+
+            def initialize(proxy, *_args)
+              @strategy = proxy.strategy
+              @options = proxy.options
+            end
+
+            def result
+              active?
+            end
+
+            private
+
+            def active?
+              @options[:apocopated]
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+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
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+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
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -8,12 +8,12 @@ module NumbersAndWords
             HUNDRED_TYPE = :hundreds
             MEGS_TYPE = :megs
 
-            def initialize proxy, *args, &block
+            def initialize(proxy, *_args)
               @strategy = proxy.strategy
               @options = proxy.options
             end
 
-            def result type
+            def result(type)
               @type = type
               MEGS_TYPE != type ? check_simple_numbers : check_megs_numbers
             end
@@ -57,4 +57,4 @@ module NumbersAndWords
       end
     end
   end
-end
+end

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

@@ -6,14 +6,14 @@ module NumbersAndWords
           class Gender
             attr_accessor :strategy, :options
 
-            def initialize proxy, *args, &block
+            def initialize(proxy, *_args)
               @strategy = proxy.strategy
               @options = proxy.options
             end
 
             def result
               gender = active? ? @options[:gender].to_sym : :male
-              [:male, :female].include?(gender) ? gender : :male
+              %i[male female].include?(gender) ? gender : :male
             end
 
             private

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

@@ -4,7 +4,7 @@ module NumbersAndWords
       module Options
         module PtBr
           class Ordinal
-            def initialize proxy, *args, &block
+            def initialize(proxy, *_args)
               @strategy = proxy.strategy
               @options = proxy.options
             end

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

@@ -6,7 +6,7 @@ module NumbersAndWords
           class RemoveZero
             attr_accessor :strategy, :options
 
-            def initialize proxy, *args, &block
+            def initialize(proxy, *_args)
               @strategy = proxy.strategy
               @options = proxy.options
             end

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

@@ -6,7 +6,7 @@ module NumbersAndWords
           class Gender
             attr_accessor :strategy, :options
 
-            def initialize proxy, *args, &block
+            def initialize(proxy, *_args)
               @strategy = proxy.strategy
               @options = proxy.options
             end
@@ -25,4 +25,4 @@ module NumbersAndWords
       end
     end
   end
-end
+end

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

@@ -6,7 +6,7 @@ module NumbersAndWords
           class Gender
             attr_accessor :strategy, :options
 
-            def initialize proxy, *args, &block
+            def initialize(proxy, *_args)
               @strategy = proxy.strategy
               @options = proxy.options
             end
@@ -25,4 +25,4 @@ module NumbersAndWords
       end
     end
   end
-end
+end

data/lib/numbers_and_words/translations/base.rb

@@ -3,8 +3,8 @@ module NumbersAndWords
     class Base
       I18N_NAMESPACE = :numbers
 
-      def t attribute, options = {}
-        ::I18n.t attribute, options.merge(:scope => I18N_NAMESPACE)
+      def t(attribute, options = {})
+        ::I18n.t attribute, options.merge(scope: I18N_NAMESPACE)
       end
     end
   end

data/lib/numbers_and_words/translations/de.rb

@@ -4,21 +4,21 @@ module NumbersAndWords
       include NumbersAndWords::Translations::Families::Latin
       DEFAULT_POSTFIX = :combine
 
-      def ones number, options = {}
+      def ones(number, options = {})
         t([options[:prefix], :ones, options[:postfix] || DEFAULT_POSTFIX].join('.'))[number]
       end
 
-      def tens_with_ones numbers, options = {}
+      def tens_with_ones(numbers, options = {})
         [tens(numbers[1]), ones(numbers[0], options)].reverse.join 'und'
       end
 
-      def hundreds number, options = {}
+      def hundreds(number, _options = {})
         [ones(number), t(:hundreds)].join('')
       end
 
-      def zero options = {}
+      def zero(_options = {})
         ones 0
       end
     end
   end
-end
+end

data/lib/numbers_and_words/translations/es.rb

@@ -2,43 +2,48 @@ module NumbersAndWords
   module Translations
     class Es < Base
       include NumbersAndWords::Translations::Families::Latin
+      include NumbersAndWords::Translations::Extensions::FractionSignificance
 
-      TENS_CASE = 2
-
-      def one
-        t(:one)
-      end
-
-      def ones(number, _options = {})
-        t(:ones)[number]
+      def zero(_options = {})
+        t(%i[ones male].join('.'))[0]
       end
 
-      def one_twenties
-        t(:one_twenties)
+      def ones(number, options = {})
+        return if options[:is_one_thousand]
+        return t(%i[ones apocopated].join('.')) if options[:is_apocopated]
+        t([:ones, options[:gender]].join('.'))[number]
       end
 
-      def ones_twenties(number)
-        t(:ones_twenties)[number]
+      def twenties_with_ones(numbers, options = {})
+        return t(%i[twenties apocopated].join('.')) if options[:is_apocopated]
+        t([:twenties, options[:gender]].join('.'))[numbers[0]]
       end
 
-      def tens(numbers, options = {})
-        options[:alone] = true if options[:alone].nil?
-        (numbers == TENS_CASE && options[:alone]) ? t(:twenty) : super(numbers)
+      def tens_with_ones(numbers, options = {})
+        ones_number = if options[:is_apocopated] && numbers[0] == 1
+                        t(%i[ones apocopated].join('.'))
+                      else
+                        t([:ones, options[:gender]].join('.'))[numbers[0]]
+                      end
+        [tens(numbers[1], alone: false), t(:union), ones_number].join(' ')
       end
 
-      def tens_with_ones(numbers, _options = {})
-        union = numbers[1] == TENS_CASE ? '' : " #{t(:union)} "
-        ones_number = numbers[1] == TENS_CASE ? ones_twenties(numbers[0]) : ones(numbers[0])
-        [tens(numbers[1], alone: false), union, ones_number].join
+      def hundreds(number, options = {})
+        return t(%i[hundreds apocopated].join('.')) if options[:is_apocopated]
+        t([:hundreds, options[:gender]].join('.'))[number]
       end
 
-      def hundreds(number, options = {})
-        options[:is_hundred] = false if options[:is_hundred].nil?
-        options[:is_hundred] ? t(:one_hundred) : t(:hundreds)[number - 1]
+      def micros(capacity, number = nil)
+        micro, prefix = capacity
+        micros = number ? t(micro(micro), count: number) : micro(micro)
+        [micro_prefix(prefix), micros].compact.join
       end
 
-      def thousand
-        t(:thousand)
+      def micro_prefix(capacity)
+        case capacity
+        when 2 then t('micro_prefix.hundreds')
+        when 1 then t('micro_prefix.tens')
+        end
       end
     end
   end

data/lib/numbers_and_words/translations/et.rb

@@ -3,11 +3,11 @@ module NumbersAndWords
     class Et < Base
       include NumbersAndWords::Translations::Families::Latin
 
-      def tens_with_ones numbers, options = {}
-        [tens(numbers[1], :alone => false), ones(numbers[0])].join ' '
+      def tens_with_ones(numbers, _options = {})
+        [tens(numbers[1], alone: false), ones(numbers[0])].join ' '
       end
 
-      def hundreds number, options = {}
+      def hundreds(number, options = {})
         options[:separator] = ''
         super number, options
       end

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

@@ -2,18 +2,17 @@ module NumbersAndWords
   module Translations
     module Extensions
       module FractionSignificance
-
-        def micros capacity, number = nil, separator = '-'
+        def micros(capacity, number = nil, separator = '-')
           micro, prefix = capacity
-          micros = number ? t(micro(micro), :count => number) : micro(micro)
+          micros = number ? t(micro(micro), count: number) : micro(micro)
           [micro_prefix(prefix), micros].compact.join separator
         end
 
-        def micro capacity
+        def micro(capacity)
           t(:micro)[capacity]
         end
 
-        def micro_prefix capacity
+        def micro_prefix(capacity)
           case capacity
           when 2 then t(:hundreds)
           when 1 then tens(1)