numbers_and_words 0.11.0 → 0.11.1

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

@@ -4,7 +4,6 @@ module NumbersAndWords
       module Decorators
         module Hu
           class Fractional < Base
-
             def run
               "#{super} #{fraction_significance}"
             end
@@ -16,7 +15,7 @@ module NumbersAndWords
             end
 
             def full_fraction
-              (0..zero_length).inject(figures.clone) { |result, el| result.unshift '0' }.to_figures
+              (0..zero_length).inject(figures.clone) { |result, _el| result.unshift '0' }.to_figures
             end
 
             def figures
@@ -35,4 +34,4 @@ module NumbersAndWords
       end
     end
   end
-end
+end

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

@@ -9,4 +9,4 @@ module NumbersAndWords
       end
     end
   end
-end
+end

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

@@ -4,7 +4,6 @@ module NumbersAndWords
       module Decorators
         module PtBr
           class Fractional < Base
-
             def run
               "#{super} #{fraction_significance}"
             end
@@ -16,7 +15,7 @@ module NumbersAndWords
             end
 
             def full_fraction
-              (0..zero_length).inject(figures.clone) { |result, el| result.unshift 0 }.to_figures
+              (0..zero_length).inject(figures.clone) { |result, _el| result.unshift 0 }.to_figures
             end
 
             def figures

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

@@ -9,4 +9,4 @@ module NumbersAndWords
       end
     end
   end
-end
+end

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

@@ -4,7 +4,6 @@ module NumbersAndWords
       module Decorators
         module Ru
           class Fractional < Base
-
             def run
               @options[:gender] = :female
               "#{super} #{fraction_significance}"
@@ -17,7 +16,7 @@ module NumbersAndWords
             end
 
             def full_fraction
-              (0..zero_length).inject(figures.clone) { |result, el| result.unshift '0' }.to_figures
+              (0..zero_length).inject(figures.clone) { |result, _el| result.unshift '0' }.to_figures
             end
 
             def figures
@@ -36,4 +35,4 @@ module NumbersAndWords
       end
     end
   end
-end
+end

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

@@ -4,7 +4,6 @@ module NumbersAndWords
       module Decorators
         module Ru
           class Integral < Base
-
             def run
               @options[:gender] = :female
               "#{super} #{integral_significance}"
@@ -24,4 +23,4 @@ module NumbersAndWords
       end
     end
   end
-end
+end

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

@@ -9,4 +9,4 @@ module NumbersAndWords
       end
     end
   end
-end
+end

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

@@ -4,7 +4,6 @@ module NumbersAndWords
       module Decorators
         module Ua
           class Fractional < Base
-
             def run
               @options[:gender] = :female
               "#{super} #{fraction_significance}"
@@ -17,7 +16,7 @@ module NumbersAndWords
             end
 
             def full_fraction
-              (0..zero_length).inject(figures.clone) { |result, el| result.unshift '0' }.to_figures
+              (0..zero_length).inject(figures.clone) { |result, _el| result.unshift '0' }.to_figures
             end
 
             def figures
@@ -36,4 +35,4 @@ module NumbersAndWords
       end
     end
   end
-end
+end

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

@@ -4,7 +4,6 @@ module NumbersAndWords
       module Decorators
         module Ua
           class Integral < Base
-
             def run
               @options[:gender] = :female
               "#{super} #{integral_significance}"
@@ -24,4 +23,4 @@ module NumbersAndWords
       end
     end
   end
-end
+end

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

@@ -33,7 +33,7 @@ module NumbersAndWords
     module FiguresConverter
       module Languages
         class << self
-          def factory strategy
+          def factory(strategy)
             Object.const_get("#{name}::#{I18n.language_class_name}").new strategy
           end
         end

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

@@ -7,7 +7,7 @@ module NumbersAndWords
 
           attr_accessor :strategy, :figures, :translations, :strings, :options
 
-          def initialize strategy
+          def initialize(strategy)
             @strategy = strategy
             @figures = strategy.figures
             @translations = strategy.translations

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

@@ -6,7 +6,7 @@ module NumbersAndWords
           include Families::Latin
 
           def print_words
-            1 < complex_part.count ? print_megs_words : @strings.flatten.reverse.join('')
+            complex_part.count > 1 ? print_megs_words : @strings.flatten.reverse.join('')
           end
 
           def print_megs_words
@@ -14,14 +14,14 @@ module NumbersAndWords
           end
 
           def complex_number_to_words
-            (1..@figures.capacity_count).map { |capacity|
+            (1..@figures.capacity_count).map do |capacity|
               @current_capacity = capacity
               capacity_iteration
-            }
+            end
           end
 
           def ones
-            super(:postfix => postfix)
+            super(postfix: postfix)
           end
 
           def postfix
@@ -33,15 +33,15 @@ module NumbersAndWords
           end
 
           def megs
-            super({:number => @figures.number_in_capacity(@current_capacity)})
+            super({ number: @figures.number_in_capacity(@current_capacity) })
           end
 
           private
 
           def print_megs
-            complex_part[1..-1].map { |el|
+            complex_part[1..-1].map do |el|
               [el[1..-1].to_a.reverse.join(''), el.first].join(' ')
-            }.reject(&:empty?).reverse.join(' ')
+            end.reject(&:empty?).reverse.join(' ')
           end
 
           def print_other
@@ -53,7 +53,7 @@ module NumbersAndWords
           end
 
           def simple_part
-            @strings.select { |f| !f.is_a?(Array) }
+            @strings.reject { |f| f.is_a?(Array) }
           end
 
           def complex_part
@@ -63,4 +63,4 @@ module NumbersAndWords
       end
     end
   end
-end
+end

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

@@ -7,4 +7,4 @@ module NumbersAndWords
       end
     end
   end
-end
+end

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

@@ -5,40 +5,38 @@ module NumbersAndWords
         class En < Base
           include Families::Latin
 
-          [:ones, :teens, :tens, :megs].each do |method_name|
-            define_method(method_name) {
-              super({:prefix => maybe_ordinal(method_name)})
-            }
+          %i[ones teens tens megs].each do |method_name|
+            define_method(method_name) do
+              super({ prefix: maybe_ordinal(method_name) })
+            end
           end
 
           def hundreds
-            maybe_union_after_hundreds super({:prefix => maybe_ordinal(:hundreds)})
+            maybe_union_after_hundreds super({ prefix: maybe_ordinal(:hundreds) })
           end
 
           def zero
-            super({:prefix => maybe_ordinal(:zero)}) unless maybe_remove_zero
+            super({ prefix: maybe_ordinal(:zero) }) unless maybe_remove_zero
           end
 
           def tens_with_ones
             super({
-              :separator => maybe_hyphen_separator,
-              :prefix => maybe_ordinal(:tens_with_ones)
+              separator: maybe_hyphen_separator,
+              prefix: maybe_ordinal(:tens_with_ones)
             })
           end
 
           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
-              if @figures.capacity_count
-                number_without_capacity_to_words + complex_number_to_words
-              elsif @figures.hundreds
-                hundreds_number_to_words
-              elsif @figures.tens or @figures.ones
-                simple_number_to_words
-              else
-                []
-              end
+              []
             end
           end
 
@@ -46,11 +44,11 @@ module NumbersAndWords
             @options.remove_hyphen.result
           end
 
-          def maybe_ordinal type
+          def maybe_ordinal(type)
             @options.ordinal.result type
           end
 
-          def maybe_union_after_hundreds translations
+          def maybe_union_after_hundreds(translations)
             @options.hundreds_with_union.modify_or_leave translations
           end
 

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

@@ -6,47 +6,72 @@ module NumbersAndWords
           include Families::Latin
 
           def capacity_iteration
-            words = []
-            capacity_words = words_in_capacity(@current_capacity)
-            words.push megs unless capacity_words.empty?
+            super.compact
+          end
+
+          def zero
+            super unless maybe_remove_zero
+          end
 
-            capacity_words = capacity_words.map do |word|
-              if twenty_one?
-                word.gsub(@translations.ones(1), @translations.one_twenties)
-              elsif !thousand? || !one?
-                word.gsub(@translations.ones(1), @translations.one)
-              end
-            end.compact
+          def ones
+            super({ gender: gender,
+                    is_one_thousand: one_thousand?,
+                    is_apocopated: one_apocopated? })
+          end
 
-            words + capacity_words
+          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
           end
 
           def hundreds
-            super({ is_hundred: (figures[1, 2] == [0, 1] &&
-                                 simple_number_to_words.empty?) })
+            super({ gender: gender,
+                    is_apocopated: hundred_apocopated? })
           end
 
           def megs
-            if thousand? &&
-               @figures.number_in_capacity(@current_capacity - 1) != 0
-              @translations.thousand
-            else
-              super({ number: @figures.number_in_capacity(@current_capacity) })
-            end
+            return @translations.megs(1, number: 1) if long_scale_thousand?
+            super({ number: @figures.number_in_capacity(@current_capacity) })
           end
 
           private
 
-          def one?
-            [@translations.ones(1)] == words_in_capacity(@current_capacity)
+          def one_thousand?
+            @current_capacity.odd? &&
+              @figures.ones == 1 &&
+              @figures.tens.nil? &&
+              @figures.hundreds.nil?
           end
 
-          def thousand?
-            @current_capacity.odd?
+          def long_scale_thousand?
+            @current_capacity.odd? &&
+              @figures.number_in_capacity(@current_capacity - 1) != 0
+          end
+
+          def one_apocopated?
+            true if @current_capacity > 0 && @figures.ones == 1 ||
+                    @options.apocopated.result
+          end
+
+          def hundred_apocopated?
+            @figures.hundreds == 1 && @figures.round_hundred?
+          end
+
+          def gender
+            @current_capacity ||= 0
+
+            return 'male'.to_sym if @current_capacity >= 2
+            @options.gender.result
           end
 
-          def twenty_one?
-            figures.reverse[0..1] == [2, 1]
+          def maybe_remove_zero
+            @options.remove_zero.result
           end
         end
       end

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

@@ -6,9 +6,8 @@ module NumbersAndWords
           include Families::Latin
 
           def megs
-            super({:number => @figures.number_in_capacity(@current_capacity)})
+            super({ number: @figures.number_in_capacity(@current_capacity) })
           end
-
         end
       end
     end

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

@@ -13,7 +13,7 @@ module NumbersAndWords
                 number_without_capacity_to_words + complex_number_to_words
               elsif @figures.hundreds
                 hundreds_number_to_words
-              elsif @figures.tens or @figures.ones
+              elsif @figures.tens || @figures.ones
                 simple_number_to_words
               else
                 []
@@ -21,10 +21,10 @@ module NumbersAndWords
             end
 
             def complex_number_to_words
-              (1..@figures.capacity_count).map { |capacity|
+              (1..@figures.capacity_count).map do |capacity|
                 @current_capacity = capacity
                 capacity_iteration
-              }.flatten
+              end.flatten
             end
 
             def capacity_iteration
@@ -34,14 +34,14 @@ module NumbersAndWords
               words + capacity_words
             end
 
-            def words_in_capacity capacity = 0
+            def words_in_capacity(capacity = 0)
               save_parent_figures do
                 @figures = @parent_figures.figures_array_in_capacity(capacity)
                 strings_logic
               end
             end
 
-            alias_method :number_without_capacity_to_words, :words_in_capacity
+            alias number_without_capacity_to_words words_in_capacity
 
             def hundreds_number_to_words
               simple_number_to_words + [hundreds]

data/lib/numbers_and_words/strategies/figures_converter/languages/families/cyrillic.rb

@@ -19,14 +19,14 @@ module NumbersAndWords
               end
             end
 
-            [:ones, :tens_with_ones].each do |method_name|
-              define_method(method_name) {
-                super({:gender => gender})
-              }
+            %i[ones tens_with_ones].each do |method_name|
+              define_method(method_name) do
+                super({ gender: gender })
+              end
             end
 
             def megs
-              super({:number => @figures.number_in_capacity(@current_capacity)})
+              super({ number: @figures.number_in_capacity(@current_capacity) })
             end
           end
         end