numbers_and_words 0.10.0 → 0.11.12

data/lib/numbers_and_words/strategies/figures_converter/decorators/fr.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+require 'numbers_and_words/strategies/figures_converter/decorators/fr/base'
+require 'numbers_and_words/strategies/figures_converter/decorators/fr/fractional'
+require 'numbers_and_words/strategies/figures_converter/decorators/fr/integral'

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Strategies
     module FiguresConverter
@@ -9,4 +11,4 @@ module NumbersAndWords
       end
     end
   end
-end
+end

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

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Strategies
     module FiguresConverter
       module Decorators
         module Hu
           class Fractional < Base
-
             def run
               "#{super} #{fraction_significance}"
             end
@@ -12,11 +13,11 @@ module NumbersAndWords
             private
 
             def fraction_significance
-              @strategy.translations.micros full_fraction.fraction_capacity, figures.reverse.join.to_i
+              @strategy.translations.micros full_fraction.fraction_capacity
             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 +36,4 @@ module NumbersAndWords
       end
     end
   end
-end
+end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Strategies
     module FiguresConverter
@@ -9,4 +11,4 @@ module NumbersAndWords
       end
     end
   end
-end
+end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'numbers_and_words/strategies/figures_converter/decorators/hu/base'
 require 'numbers_and_words/strategies/figures_converter/decorators/hu/fractional'
-require 'numbers_and_words/strategies/figures_converter/decorators/hu/integral'
+require 'numbers_and_words/strategies/figures_converter/decorators/hu/integral'

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

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module NumbersAndWords
+  module Strategies
+    module FiguresConverter
+      module Decorators
+        module PtBr
+          class Base < Decorators::Base
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module NumbersAndWords
+  module Strategies
+    module FiguresConverter
+      module Decorators
+        module PtBr
+          class Fractional < Base
+            def run
+              "#{super} #{fraction_significance}"
+            end
+
+            private
+
+            def fraction_significance
+              @strategy.translations.micros full_fraction.fraction_capacity, figures.join.to_i
+            end
+
+            def full_fraction
+              (0..zero_length).inject(figures.clone) { |result, _el| result.unshift 0 }.to_figures
+            end
+
+            def figures
+              @strategy.figures.reverse
+            end
+
+            def zero_length
+              fraction_length - figures.length
+            end
+
+            def fraction_length
+              @options[:fractional][:length].to_i
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module NumbersAndWords
+  module Strategies
+    module FiguresConverter
+      module Decorators
+        module PtBr
+          class Integral < Base
+            def run
+              "#{super}#{integral_significance}"
+            end
+
+            private
+
+            def integral_significance
+              " #{@strategy.translations.integral quantity}" if @options[:remove_zero].nil?
+            end
+
+            def quantity
+              figures.reverse.join.to_i
+            end
+
+            def figures
+              @strategy.language.figures
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+require 'numbers_and_words/strategies/figures_converter/decorators/pt-BR/base'
+require 'numbers_and_words/strategies/figures_converter/decorators/pt-BR/fractional'
+require 'numbers_and_words/strategies/figures_converter/decorators/pt-BR/integral'

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Strategies
     module FiguresConverter
@@ -9,4 +11,4 @@ module NumbersAndWords
       end
     end
   end
-end
+end

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

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Strategies
     module FiguresConverter
       module Decorators
         module Ru
           class Fractional < Base
-
             def run
               @options[:gender] = :female
               "#{super} #{fraction_significance}"
@@ -17,7 +18,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 +37,4 @@ module NumbersAndWords
       end
     end
   end
-end
+end

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

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Strategies
     module FiguresConverter
       module Decorators
         module Ru
           class Integral < Base
-
             def run
               @options[:gender] = :female
               "#{super} #{integral_significance}"
@@ -24,4 +25,4 @@ module NumbersAndWords
       end
     end
   end
-end
+end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'numbers_and_words/strategies/figures_converter/decorators/ru/base'
 require 'numbers_and_words/strategies/figures_converter/decorators/ru/fractional'
 require 'numbers_and_words/strategies/figures_converter/decorators/ru/integral'

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Strategies
     module FiguresConverter
@@ -9,4 +11,4 @@ module NumbersAndWords
       end
     end
   end
-end
+end

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

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Strategies
     module FiguresConverter
       module Decorators
         module Ua
           class Fractional < Base
-
             def run
               @options[:gender] = :female
               "#{super} #{fraction_significance}"
@@ -17,7 +18,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 +37,4 @@ module NumbersAndWords
       end
     end
   end
-end
+end

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

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Strategies
     module FiguresConverter
       module Decorators
         module Ua
           class Integral < Base
-
             def run
               @options[:gender] = :female
               "#{super} #{integral_significance}"
@@ -24,4 +25,4 @@ module NumbersAndWords
       end
     end
   end
-end
+end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'numbers_and_words/strategies/figures_converter/decorators/ua/base'
 require 'numbers_and_words/strategies/figures_converter/decorators/ua/fractional'
 require 'numbers_and_words/strategies/figures_converter/decorators/ua/integral'

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

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module NumbersAndWords
+  module Strategies
+    module FiguresConverter
+      module Decorators
+        module Vi
+          class Base < Decorators::Base
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module NumbersAndWords
+  module Strategies
+    module FiguresConverter
+      module Decorators
+        module Vi
+          class Fractional < Base
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module NumbersAndWords
+  module Strategies
+    module FiguresConverter
+      module Decorators
+        module Vi
+          class Integral < Base
+          end
+        end
+      end
+    end
+  end
+end

data/lib/numbers_and_words/strategies/figures_converter/decorators/vi.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+require 'numbers_and_words/strategies/figures_converter/decorators/vi/base'
+require 'numbers_and_words/strategies/figures_converter/decorators/vi/fractional'
+require 'numbers_and_words/strategies/figures_converter/decorators/vi/integral'

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

@@ -1,36 +1,43 @@
+# frozen_string_literal: true
+
 require 'numbers_and_words/strategies/figures_converter/decorators/base'
 require 'numbers_and_words/strategies/figures_converter/decorators/en'
-require 'numbers_and_words/strategies/figures_converter/decorators/en_gb'
+require 'numbers_and_words/strategies/figures_converter/decorators/en-GB'
+require 'numbers_and_words/strategies/figures_converter/decorators/es'
+require 'numbers_and_words/strategies/figures_converter/decorators/fr'
 require 'numbers_and_words/strategies/figures_converter/decorators/ru'
+require 'numbers_and_words/strategies/figures_converter/decorators/pt-BR'
 require 'numbers_and_words/strategies/figures_converter/decorators/hu'
 require 'numbers_and_words/strategies/figures_converter/decorators/ua'
+require 'numbers_and_words/strategies/figures_converter/decorators/cs'
+require 'numbers_and_words/strategies/figures_converter/decorators/vi'
 
 module NumbersAndWords
   module Strategies
     module FiguresConverter
       module Decorators
         class << self
-          AVAILABLE = [:integral, :fractional]
+          AVAILABLE = %i[integral fractional].freeze
 
-          def factory strategy, options
+          def factory(strategy, options)
             enabled_decorator(options).new strategy, options
           end
 
           private
 
-          def enabled_decorator options
-            decorator_class AVAILABLE.select { |name| !options[name].nil? }.first
+          def enabled_decorator(options)
+            decorator_class AVAILABLE.reject { |name| options[name].nil? }.first
           end
 
-          def decorator_class method_name
-            method_name ? decorator_class_name(method_name).constantize : Decorators::Base
+          def decorator_class(method_name)
+            method_name ? Object.const_get(decorator_class_name(method_name)) : Decorators::Base
           end
 
-          def decorator_class_name method_name
-            "#{name}::#{I18n.language_class_name}::#{method_name.to_s.camelcase}"
+          def decorator_class_name(method_name)
+            "#{name}::#{I18n.language_class_name}::#{method_name.to_s.split('_').collect(&:capitalize).join}"
           end
         end
       end
     end
   end
-end
+end

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

@@ -1,13 +1,15 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Strategies
     module FiguresConverter
       module Languages
         class Base
-          include Languages::Families::Base
+          include Families::Base
 
           attr_accessor :strategy, :figures, :translations, :strings, :options
 
-          def initialize strategy
+          def initialize(strategy)
             @strategy = strategy
             @figures = strategy.figures
             @translations = strategy.translations
@@ -16,11 +18,11 @@ module NumbersAndWords
 
           def words
             @strings = strings_logic
-            @strings.empty? && zero || print_words
+            (@strings.empty? && zero) || print_words
           end
 
           def print_words
-            @strings.reverse.join ' '
+            @strings.reverse.join(' ')
           end
         end
       end

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

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module NumbersAndWords
+  module Strategies
+    module FiguresConverter
+      module Languages
+        class Cs < Base
+          # methods in translations/cs.rb which can work with :gender or :ordinal
+          %i[ones teens tens tens_with_ones hundreds].each do |method_name|
+            define_method(method_name) do
+              super(internal_options)
+            end
+          end
+
+          def zero
+            super(internal_options) unless maybe_remove_zero
+          end
+
+          def megs(*args)
+            super({ number: @figures.number_in_capacity(@current_capacity) }.merge(args.first || {}))
+          end
+
+          def gender
+            # @current_capacity = order of block of 3 digits, backwards (0 = hundreds tens ones)
+            @current_capacity ||= 0
+
+            if @current_capacity.zero?
+              options.gender.result
+            elsif @current_capacity > 2 && @current_capacity.odd?
+              :female # miliardy, biliardy, triliardy...
+            else
+              :male
+            end
+          end
+
+          private
+
+          def internal_options
+            { gender: gender, prefix: maybe_ordinal }
+          end
+
+          def maybe_remove_zero
+            @options.remove_zero.result
+          end
+
+          def maybe_ordinal
+            @options.ordinal.result
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,27 +1,27 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Strategies
     module FiguresConverter
       module Languages
         class De < Base
-          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
-            [print_megs, print_other].select(&:present?).join ' '
+            [print_megs, print_other].reject(&:empty?).join(' ')
           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,27 +33,27 @@ 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|
-              [el[1..-1].to_a.reverse.join(''), el.first].join(' ')
-            }.select(&:present?).reverse.join(' ')
+            complex_part[1..].map do |el|
+              [el[1..].to_a.reverse.join, el.first].join(' ')
+            end.reject(&:empty?).reverse.join(' ')
           end
 
           def print_other
-            [print_thousands, simple_part.reverse.join('')].join('')
+            [print_thousands, simple_part.reverse.join].join
           end
 
           def print_thousands
-            complex_part.first.reverse.join('')
+            complex_part.first.reverse.join
           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 → en-GB.rb}

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Strategies
     module FiguresConverter
@@ -7,4 +9,4 @@ module NumbersAndWords
       end
     end
   end
-end
+end

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

@@ -1,40 +1,48 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Strategies
     module FiguresConverter
       module Languages
         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
+            else
+              super
+            end
+          end
+
           def maybe_hyphen_separator
             @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