numbers_and_words 0.11.0 → 0.11.1

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

@@ -4,28 +4,24 @@ module NumbersAndWords
       module Languages
         module Families
           module Helpers
-            [:zero].each do |method_name|
-              define_method(method_name) { |*args|
-                options = args.first || {}
-                translate method_name, options
-              }
+            def zero(*args)
+              options = args.first || {}
+              translate :zero, options
             end
 
-            [:ones, :teens, :tens, :tens_with_ones, :hundreds].each do |method_name|
-              define_method(method_name) { |*args|
+            %i[ones teens tens tens_with_ones hundreds].each do |method_name|
+              define_method(method_name) do |*args|
                 options = args.first || {}
                 translate method_name, @figures.send(method_name), options
-              }
+              end
             end
 
-            [:megs].each do |method_name|
-              define_method(method_name) { |*args|
-                options = args.first || {}
-                translate method_name, @current_capacity, options
-              }
+            def megs(*args)
+              options = args.first || {}
+              translate :megs, @current_capacity, options
             end
 
-            def translate method_name, *args
+            def translate(method_name, *args)
               translations.send method_name, *args
             end
           end

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

@@ -11,27 +11,27 @@ module NumbersAndWords
             words = []
             capacity_words = words_in_capacity(@current_capacity)
             words.push(megs) unless capacity_words.empty?
-            words += capacity_words unless is_a_thousand? and is_a_one?
+            words += capacity_words unless thousand? && one?
             words
           end
 
-          def is_a_one?
-            [translations.ones(1)] == words_in_capacity(@current_capacity)
+          def one?
+            words_in_capacity(@current_capacity) == [translations.ones(1)]
           end
 
-          def is_a_thousand?
+          def thousand?
             FiguresArray::THOUSAND_CAPACITY == @current_capacity
           end
 
           def hundreds
-            super({:pluralize => simple_number_to_words.empty?})
+            super({ pluralize: simple_number_to_words.empty? })
           end
 
           def megs
-            super({:number => @figures.number_in_capacity(@current_capacity)})
+            super({ number: @figures.number_in_capacity(@current_capacity) })
           end
         end
       end
     end
   end
-end
+end

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

@@ -22,7 +22,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
               []
@@ -31,10 +31,10 @@ module NumbersAndWords
 
           def complex_number_to_words
             count = @figures.capacity_count
-            (1..count).map { |capacity|
+            (1..count).map do |capacity|
               @current_capacity = capacity
               capacity_iteration.flatten
-            }.reject(&:empty?)
+            end.reject(&:empty?)
           end
 
           def simple_number_to_words
@@ -47,13 +47,13 @@ module NumbersAndWords
             end
           end
 
-          [:zero, :ones, :teens, :tens, :tens_with_ones, :hundreds, :megs].each do |method_name|
-            define_method(method_name) {
-              super({:prefix => maybe_ordinal(method_name)})
-            }
+          %i[zero ones teens tens tens_with_ones hundreds megs].each do |method_name|
+            define_method(method_name) do
+              super({ prefix: maybe_ordinal(method_name) })
+            end
           end
 
-          def maybe_ordinal type
+          def maybe_ordinal(type)
             @options.ordinal.result type
           end
         end

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

@@ -11,28 +11,26 @@ module NumbersAndWords
             words = []
             capacity_words = words_in_capacity(@current_capacity)
             words.push(megs) unless capacity_words.empty?
-            words += capacity_words unless is_a_thousand? and is_a_one?
+            words += capacity_words unless thousand? && one?
             words
           end
 
-          def is_a_one?
-            [translations.ones(1)] == words_in_capacity(@current_capacity)
+          def one?
+            words_in_capacity(@current_capacity) == [translations.ones(1)]
           end
 
-          def is_a_thousand?
+          def thousand?
             FiguresArray::THOUSAND_CAPACITY == @current_capacity
           end
 
           def hundreds
-            super({only_hundreds: figures[0, 2] == [0, 0]})
+            super({ only_hundreds: figures[0, 2] == [0, 0] })
           end
 
           def megs
-            if @figures.hundreds || @figures.tens || @figures.ones
-              prefix = :partials
-            else
-              prefix = nil
-            end
+            prefix = if @figures.hundreds || @figures.tens || @figures.ones
+                       :partials
+                     end
 
             super(prefix: prefix)
           end

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

@@ -11,24 +11,24 @@ module NumbersAndWords
             words = []
             capacity_words = words_in_capacity(@current_capacity)
             words.push(megs) unless capacity_words.empty?
-            words += capacity_words unless is_a_thousand? and is_a_one?
+            words += capacity_words unless thousand? && one?
             words
           end
 
-          def is_a_one?
-            [translations.ones(1)] == words_in_capacity(@current_capacity)
+          def one?
+            words_in_capacity(@current_capacity) == [translations.ones(1)]
           end
 
-          def is_a_thousand?
+          def thousand?
             FiguresArray::THOUSAND_CAPACITY == @current_capacity
           end
 
           def hundreds
-            super({:is_hundred => (figures[1,2] == [0,1] && simple_number_to_words.empty?)})
+            super({ is_hundred: (figures[1, 2] == [0, 1] && simple_number_to_words.empty?) })
           end
 
           def megs
-            super({:number => @figures.number_in_capacity(@current_capacity)})
+            super({ number: @figures.number_in_capacity(@current_capacity) })
           end
         end
       end

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

@@ -16,11 +16,11 @@ module NumbersAndWords
           end
 
           def hundreds
-            super({:is_hundred => (figures[1,2] == [0,1] && simple_number_to_words.empty?)})
+            super({ is_hundred: (figures[1, 2] == [0, 1] && simple_number_to_words.empty?) })
           end
 
           def megs
-            super({:number => @figures.number_in_capacity(@current_capacity)})
+            super({ number: @figures.number_in_capacity(@current_capacity) })
           end
         end
       end

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

@@ -5,10 +5,10 @@ module NumbersAndWords
         class PtBr < Base
           include Families::Latin
 
-          [:teens, :tens, :tens_with_ones].each do |method_name|
-            define_method(method_name) {
+          %i[teens tens tens_with_ones].each do |method_name|
+            define_method(method_name) do
               super(internal_options)
-            }
+            end
           end
 
           def zero
@@ -20,7 +20,7 @@ module NumbersAndWords
           end
 
           def complex_number_to_words
-            super.reject { |x| x.nil? }
+            super.reject(&:nil?)
           end
 
           def capacity_iteration
@@ -31,26 +31,24 @@ module NumbersAndWords
           end
 
           def ones
-            super internal_options.merge({:is_one_thousand => is_one_thousand?})
+            super internal_options.merge(is_one_thousand: one_thousand?)
           end
 
           def hundreds
-            super(internal_options.merge({:is_hundred => is_hundred?, :is_one_hundred => is_one_hundred?, :gender => gender}))
+            super(internal_options.merge(is_hundred: hundred?, is_one_hundred: one_hundred?, gender: gender))
           end
 
           def megs
-            super(internal_options.merge({
-              :is_one => words_in_capacity(current_capacity) == [translations.ones(1, internal_options)],
-              :is_opaque => is_opaque?,
-              :is_without_connector => is_without_connector?,
-              :is_with_comma => is_with_comma?
-            }))
+            super(internal_options.merge(is_one: words_in_capacity(current_capacity) == [translations.ones(1, internal_options)],
+                                         is_opaque: opaque?,
+                                         is_without_connector: without_connector?,
+                                         is_with_comma: with_comma?))
           end
 
           private
 
           def internal_options
-            {:gender => gender, :prefix => maybe_ordinal}
+            { gender: gender, prefix: maybe_ordinal }
           end
 
           def maybe_ordinal
@@ -68,34 +66,34 @@ module NumbersAndWords
             end
           end
 
-          def is_hundred?
-            figures[0] == 0 && figures[1] == 0 && simple_number_to_words.empty?
+          def hundred?
+            figures[0].zero? && figures[1].zero? && simple_number_to_words.empty?
           end
 
-          def is_one_hundred?
-            is_hundred? && figures[2] == 1
+          def one_hundred?
+            hundred? && figures[2] == 1
           end
 
-          def is_opaque?
-            figures.is_opaque? current_capacity
+          def opaque?
+            figures.opaque? current_capacity
           end
 
-          def is_one_thousand?
+          def one_thousand?
             current_capacity == 1 && figures[0] == 1 && figures.hundreds.nil? && figures.tens.nil?
           end
 
-          def is_without_connector?
-            return false if is_with_comma?
+          def without_connector?
+            return false if with_comma?
             # without connector when there is hundreds and tens_with_ones
-            return true if figures.hundreds and figures.tens_with_ones
+            return true if figures.hundreds && figures.tens_with_ones
             # without connector when there is hundreds and tens
-            return true if figures.hundreds and figures.tens
+            return true if figures.hundreds && figures.tens
             # without connector when there is hundreds and ones
-            return true if figures.hundreds and figures.ones
+            return true if figures.hundreds && figures.ones
             false
           end
 
-          def is_with_comma?
+          def with_comma?
             return false unless @current_capacity > 1
             # if any lower capacity is single word, in portuguese only tens are single words
             number_under_capacity = figures.number_under_capacity(@current_capacity)

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

@@ -6,23 +6,22 @@ module NumbersAndWords
           include Families::Latin
 
           def hundreds
-            super({:is_hundred => (is_hundred?), :is_one_hundred => (is_one_hundred?)})
+            super({ is_hundred: hundred?, is_one_hundred: one_hundred? })
           end
 
           def megs
-            super({:is_one => words_in_capacity(@current_capacity) == [@translations.ones(1)]})
+            super({ is_one: words_in_capacity(@current_capacity) == [@translations.ones(1)] })
           end
 
           private
 
-          def is_hundred?
-            figures[0] == 0 && figures[1] == 0 && simple_number_to_words.empty?
+          def hundred?
+            figures[0].zero? && figures[1].zero? && simple_number_to_words.empty?
           end
 
-          def is_one_hundred?
-            is_hundred? && figures[2] == 1
+          def one_hundred?
+            hundred? && figures[2] == 1
           end
-
         end
       end
     end

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

@@ -11,15 +11,15 @@ module NumbersAndWords
             words = []
             capacity_words = words_in_capacity(@current_capacity)
             words.push(megs) unless capacity_words.empty?
-            words += capacity_words unless is_a_thousand? and is_a_one?
+            words += capacity_words unless thousand? && one?
             words
           end
 
-          def is_a_one?
-            [translations.ones(1)] == words_in_capacity(@current_capacity)
+          def one?
+            words_in_capacity(@current_capacity) == [translations.ones(1)]
           end
 
-          def is_a_thousand?
+          def thousand?
             FiguresArray::THOUSAND_CAPACITY == @current_capacity
           end
         end

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

@@ -1,9 +1,10 @@
 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/ru'
+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/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'
 
 module NumbersAndWords
   module Strategies
@@ -12,12 +13,12 @@ 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
+          def method_missing(method_name, *args, &block)
             Object.const_get(proxy_class_name(method_name)).new self, args, block
           rescue NameError
             return nil
@@ -25,7 +26,7 @@ module NumbersAndWords
 
           private
 
-          def proxy_class_name method_name
+          def proxy_class_name(method_name)
             "#{module_name}::#{I18n.language_class_name}::#{method_name.to_s.split('_').collect(&:capitalize).join}"
           end
 

data/lib/numbers_and_words/strategies/figures_converter/options/en-GB/hundreds_with_union.rb

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

data/lib/numbers_and_words/strategies/figures_converter/options/en-GB/ordinal.rb

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

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

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

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

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

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

@@ -6,12 +6,12 @@ module NumbersAndWords
           class HundredsWithUnion
             attr_accessor :strategy, :options
 
-            def initialize proxy, *args, &block
+            def initialize(proxy, *_args)
               @strategy = proxy.strategy
               @options = proxy.options
             end
 
-            def modify_or_leave hundreds
+            def modify_or_leave(hundreds)
               hundreds = "#{hundreds} #{translations.union}" if active? && !round_hundred?
               hundreds
             end
@@ -34,4 +34,4 @@ module NumbersAndWords
       end
     end
   end
-end
+end

data/lib/numbers_and_words/strategies/figures_converter/options/en/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