numbers_and_words 0.10.0 → 0.11.12

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

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 require 'numbers_and_words/strategies/figures_converter/options/en/hundreds_with_union'
 require 'numbers_and_words/strategies/figures_converter/options/en/remove_hyphen'
 require 'numbers_and_words/strategies/figures_converter/options/en/ordinal'
-require 'numbers_and_words/strategies/figures_converter/options/en/remove_zero'
+require 'numbers_and_words/strategies/figures_converter/options/en/pronounced'
+require 'numbers_and_words/strategies/figures_converter/options/en/remove_zero'

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

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+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,14 @@
+# frozen_string_literal: true
+
+module NumbersAndWords
+  module Strategies
+    module FiguresConverter
+      module Options
+        module Es
+          class Gender < Base::Gender
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module NumbersAndWords
+  module Strategies
+    module FiguresConverter
+      module Options
+        module Es
+          class RemoveZero < Base::RemoveZero
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +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/hu/ordinal.rb

@@ -1,60 +1,14 @@
+# 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, &block
-              @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
     end
   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/nl/tens_of_hundreds.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module NumbersAndWords
+  module Strategies
+    module FiguresConverter
+      module Options
+        module Nl
+          class TensOfHundreds
+            attr_accessor :strategy, :options
+
+            def initialize(proxy, *_args)
+              @strategy = proxy.strategy
+              @options = proxy.options
+            end
+
+            def result
+              active?
+            end
+
+            private
+
+            def active?
+              @options[:tens_of_hundreds]
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+require 'numbers_and_words/strategies/figures_converter/options/nl/tens_of_hundreds'

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

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

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

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

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

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

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

@@ -0,0 +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/ru/gender.rb

@@ -1,28 +1,14 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Strategies
     module FiguresConverter
       module Options
         module Ru
-          class Gender
-            attr_accessor :strategy, :options
-
-            def initialize proxy, *args, &block
-              @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
     end
   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/ua/gender.rb

@@ -1,28 +1,14 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Strategies
     module FiguresConverter
       module Options
         module Ua
-          class Gender
-            attr_accessor :strategy, :options
-
-            def initialize proxy, *args, &block
-              @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
     end
   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.rb

@@ -1,8 +1,15 @@
+# frozen_string_literal: true
+
+require 'numbers_and_words/strategies/figures_converter/options/base'
 require 'numbers_and_words/strategies/figures_converter/options/en'
-require 'numbers_and_words/strategies/figures_converter/options/en_gb'
+require 'numbers_and_words/strategies/figures_converter/options/en-GB'
+require 'numbers_and_words/strategies/figures_converter/options/es'
+require 'numbers_and_words/strategies/figures_converter/options/hu'
+require 'numbers_and_words/strategies/figures_converter/options/nl'
+require 'numbers_and_words/strategies/figures_converter/options/pt-BR'
 require 'numbers_and_words/strategies/figures_converter/options/ru'
 require 'numbers_and_words/strategies/figures_converter/options/ua'
-require 'numbers_and_words/strategies/figures_converter/options/hu'
+require 'numbers_and_words/strategies/figures_converter/options/cs'
 
 module NumbersAndWords
   module Strategies
@@ -11,21 +18,31 @@ module NumbersAndWords
         class Proxy
           attr_accessor :strategy, :options
 
-          def initialize strategy, options
+          def initialize(strategy, options)
             @strategy = strategy
             @options = options
           end
 
-          def method_missing method_name, *args, &block
-            proxy_class_name(method_name).constantize.new self, args, block
+          def method_missing(method_name, *args, &block)
+            method = Object.const_get(proxy_class_name(method_name))
+
+            if method
+              method.new(self, args, block)
+            else
+              super
+            end
           rescue NameError
-            return nil
+            nil
+          end
+
+          def respond_to_missing?(method_name, include_private: false)
+            Object.const_get(proxy_class_name(method_name)) || super
           end
 
           private
 
-          def proxy_class_name method_name
-            "#{module_name}::#{I18n.language_class_name}::#{method_name.to_s.camelcase}"
+          def proxy_class_name(method_name)
+            "#{module_name}::#{I18n.language_class_name}::#{method_name.to_s.split('_').collect(&:capitalize).join}"
           end
 
           def module_name
@@ -35,4 +52,4 @@ module NumbersAndWords
       end
     end
   end
-end
+end

data/lib/numbers_and_words/strategies/figures_converter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'numbers_and_words/strategies/figures_converter/languages'
 require 'numbers_and_words/strategies/figures_converter/options'
 require 'numbers_and_words/strategies/figures_converter/decorators'
@@ -6,10 +8,9 @@ module NumbersAndWords
   module Strategies
     module FiguresConverter
       class Base
-
         attr_accessor :options, :figures, :translations, :language, :decorator
 
-        def initialize figures, options = {}
+        def initialize(figures, options = {})
           @figures = figures.reverse
 
           @decorator = Decorators.factory(self, options)
@@ -24,8 +25,8 @@ module NumbersAndWords
 
         private
 
-        def around
-          decorator.run { yield }
+        def around(&block)
+          decorator.run(&block)
         end
       end
     end

data/lib/numbers_and_words/strategies.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'numbers_and_words/strategies/figures_converter'
 require 'numbers_and_words/strategies/array_joiner'
 
@@ -13,4 +15,4 @@ module NumbersAndWords
       end
     end
   end
-end
+end

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)
+      def t(attribute, options = {})
+        ::I18n.t attribute, **options.merge(scope: I18N_NAMESPACE)
       end
     end
   end

data/lib/numbers_and_words/translations/cs.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module NumbersAndWords
+  module Translations
+    class Cs < Base
+      include NumbersAndWords::Translations::Families::Base
+      include NumbersAndWords::Translations::Extensions::FractionSignificance
+
+      def zero(options = {})
+        ones(0, options)
+      end
+
+      def ones(number, options = {})
+        t([options[:prefix], :ones, options[:gender]].join('.'))[number]
+      end
+
+      def tens(number, options = {})
+        t([options[:prefix], :tens, gender_to_use(options)].join('.'))[number]
+      end
+
+      def teens(numbers, options = {})
+        t([options[:prefix], :teens, gender_to_use(options)].join('.'))[numbers[0]]
+      end
+
+      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 integral(number, _options = {})
+        t(:integral, count: number)
+      end
+
+      private
+
+      def ordinal?(options)
+        options[:prefix] == :ordinal
+      end
+
+      def gender_to_use(options)
+        ordinal?(options) ? options[:gender] : nil
+      end
+    end
+  end
+end

data/lib/numbers_and_words/translations/de.rb

@@ -1,24 +1,26 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Translations
     class De < Base
-      include NumbersAndWords::Translations::Families::Latin
+      include NumbersAndWords::Translations::Families::Base
       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 = {}
-        [tens(numbers[1]), ones(numbers[0], options)].reverse.join 'und'
+      def tens_with_ones(numbers, options = {})
+        [tens(numbers[1]), ones(numbers[0], options)].reverse.join(union)
       end
 
-      def hundreds number, options = {}
-        [ones(number), t(:hundreds)].join('')
+      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/en-GB.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module NumbersAndWords
+  module Translations
+    class EnGb < Base
+      include NumbersAndWords::Translations::Families::Latin
+      include NumbersAndWords::Translations::Extensions::FractionSignificance
+    end
+  end
+end

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,36 +1,37 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Translations
     class Es < Base
-      include NumbersAndWords::Translations::Families::Latin
-
-      TENS_CASE = 2
+      include NumbersAndWords::Translations::Families::Base
+      include NumbersAndWords::Translations::Extensions::FractionSignificance
 
-      def one options = {}
-        t(:one)
+      def zero(_options = {})
+        t('ones.male')[0]
       end
 
-      def ones number, options = {}
-        t(:ones)[number]
-      end
+      def ones(number, options = {})
+        return if options[:is_one_thousand]
+        return t('ones.apocopated') if number == 1 &&
+                                       options[:is_apocopated]
 
-      def tens numbers, options = {}
-        options[:alone] = true if options[:alone].nil?
-        (numbers == TENS_CASE && options[:alone]) ? t(:twenty) : super(numbers)
+        t([:ones, options[:gender]].join('.'))[number]
       end
 
-      def tens_with_ones numbers, options = {}
-        inter = numbers[1] == TENS_CASE ? "" : " y "
-        [tens(numbers[1], :alone => false), ones(numbers[0])].join inter
+      def tens_with_ones(numbers, options = {})
+        super numbers, options.merge(separator: " #{union} ")
       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 twenties_with_ones(numbers, options = {})
+        return t('twenties.apocopated') if options[:is_apocopated]
+
+        t([:twenties, options[:gender]].join('.'))[numbers[0]]
       end
 
-      def megs capacity, options = {}
-        options[:is_one] = false if options[:is_one].nil?
-        options[:is_one] ? t(:mega)[capacity] : t(:megas)[capacity]
+      def hundreds(number, options = {})
+        return t('hundreds.apocopated') if options[:is_apocopated]
+
+        t([:hundreds, options[:gender]].join('.'))[number]
       end
     end
   end

data/lib/numbers_and_words/translations/et.rb

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

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

@@ -1,22 +1,23 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Translations
     module Extensions
       module FractionSignificance
-
-        def micros capacity, number = nil, separator = '-'
+        def micros(capacity, number = nil)
           micro, prefix = capacity
-          micros = number ? t(micro(micro), :count => number) : micro(micro)
-          [micro_prefix(prefix), micros].compact.join separator
+          micros = number ? t(micro(micro), count: number) : micro(micro)
+          [micro_prefix(prefix), micros].compact.join(t('micro_prefix.union'))
         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)
+          when 2 then t('micro_prefix.hundreds')
+          when 1 then t('micro_prefix.tens')
           end
         end
       end