numbers_and_words 0.11.0 → 0.11.1

data/lib/numbers_and_words/i18n/plurals/fr.rb

@@ -2,11 +2,11 @@ module NumbersAndWords
   module I18n
     module Plurals
       module Fr
-        RULE = lambda { |n| one_conditions(n) ? :one : :other }
+        module_function
 
-        extend self
+        RULE = ->(n) { one_conditions(n) ? :one : :other }
 
-        def one_conditions n
+        def one_conditions(n)
           n % 10 == 1 && n % 100 != 11
         end
       end

data/lib/numbers_and_words/i18n/plurals/lt.rb

@@ -2,23 +2,26 @@ module NumbersAndWords
   module I18n
     module Plurals
       module Lt
+        module_function
+
         RULE = lambda do |n|
-           one_conditions(n) ?
-            :one : ones_conditions(n) ?
-              :ones : :other
+          if one_conditions(n)
+            :one
+          elsif ones_conditions(n)
+            :ones
+          else
+            :other
+          end
         end
 
-        extend self
-
-        def one_conditions n
+        def one_conditions(n)
           n % 10 == 1 && n % 100 != 11
         end
 
-        def ones_conditions n
+        def ones_conditions(n)
           [2, 3, 4, 5, 6, 7, 8, 9].include?(n % 10) && ![12, 13, 14, 15, 16, 17, 18, 19].include?(n % 100)
         end
       end
     end
   end
 end
-

data/lib/numbers_and_words/i18n/plurals/lv.rb

@@ -2,11 +2,11 @@ module NumbersAndWords
   module I18n
     module Plurals
       module Lv
-        RULE = lambda { |n| one_conditions(n) ? :one : :other }
+        module_function
 
-        extend self
+        RULE = ->(n) { one_conditions(n) ? :one : :other }
 
-        def one_conditions n
+        def one_conditions(n)
           n % 10 == 1 && n % 100 != 11
         end
       end

data/lib/numbers_and_words/i18n/plurals/ru.rb

@@ -2,25 +2,30 @@ module NumbersAndWords
   module I18n
     module Plurals
       module Ru
+        module_function
+
         RULE = lambda do |n|
-           one_conditions(n) ?
-            :one : few_conditions(n) ?
-              :few : many_conditions(n) ?
-                :many : :other
+          if one_conditions(n)
+            :one
+          elsif few_conditions(n)
+            :few
+          elsif many_conditions(n)
+            :many
+          else
+            :other
+          end
         end
 
-        extend self
-
-        def one_conditions n
+        def one_conditions(n)
           n % 10 == 1 && n % 100 != 11
         end
 
-        def few_conditions n
+        def few_conditions(n)
           [2, 3, 4].include?(n % 10) && ![12, 13, 14].include?(n % 100)
         end
 
-        def many_conditions n
-          n % 10 == 0 || [5, 6, 7, 8, 9].include?(n % 10) || [11, 12, 13, 14].include?(n % 100)
+        def many_conditions(n)
+          (n % 10).zero? || [5, 6, 7, 8, 9].include?(n % 10) || [11, 12, 13, 14].include?(n % 100)
         end
       end
     end

data/lib/numbers_and_words/strategies.rb

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

data/lib/numbers_and_words/strategies/array_joiner.rb

@@ -4,10 +4,9 @@ module NumbersAndWords
   module Strategies
     module ArrayJoiner
       class Base
-
         attr_accessor :options, :elements, :translations, :language
 
-        def initialize elements, options = {}
+        def initialize(elements, options = {})
           @elements = elements
           @options = options
           @translations = Translations.factory

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

@@ -4,6 +4,8 @@ require 'numbers_and_words/strategies/array_joiner/languages/base'
 
 require 'numbers_and_words/strategies/array_joiner/languages/en'
 require 'numbers_and_words/strategies/array_joiner/languages/en-GB'
+require 'numbers_and_words/strategies/array_joiner/languages/es'
+require 'numbers_and_words/strategies/array_joiner/languages/fr'
 require 'numbers_and_words/strategies/array_joiner/languages/hu'
 require 'numbers_and_words/strategies/array_joiner/languages/ru'
 require 'numbers_and_words/strategies/array_joiner/languages/ua'
@@ -14,7 +16,7 @@ module NumbersAndWords
     module ArrayJoiner
       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/array_joiner/languages/base.rb

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

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

@@ -0,0 +1,10 @@
+module NumbersAndWords
+  module Strategies
+    module ArrayJoiner
+      module Languages
+        class Es < Base
+        end
+      end
+    end
+  end
+end

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

@@ -4,7 +4,6 @@ module NumbersAndWords
       module Languages
         module Families
           module Base
-
             def elements_logic
               @elements.first.empty? ? @elements.last : @elements.join(union_element)
             end

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

@@ -0,0 +1,10 @@
+module NumbersAndWords
+  module Strategies
+    module ArrayJoiner
+      module Languages
+        class Fr < Base
+        end
+      end
+    end
+  end
+end

data/lib/numbers_and_words/strategies/figures_converter.rb

@@ -6,10 +6,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)

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

@@ -1,6 +1,8 @@
 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/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'
@@ -11,23 +13,23 @@ module NumbersAndWords
     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
+          def decorator_class(method_name)
             method_name ? Object.const_get(decorator_class_name(method_name)) : Decorators::Base
           end
 
-          def decorator_class_name method_name
+          def decorator_class_name(method_name)
             "#{name}::#{I18n.language_class_name}::#{method_name.to_s.split('_').collect(&:capitalize).join}"
           end
         end

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

@@ -3,7 +3,7 @@ module NumbersAndWords
     module FiguresConverter
       module Decorators
         class Base
-          def initialize strategy, options
+          def initialize(strategy, options)
             @strategy = strategy
             @options = options
           end
@@ -15,4 +15,4 @@ module NumbersAndWords
       end
     end
   end
-end
+end

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

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

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

@@ -4,7 +4,6 @@ module NumbersAndWords
       module Decorators
         module En
           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/en/integral.rb

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

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

@@ -0,0 +1,3 @@
+require 'numbers_and_words/strategies/figures_converter/decorators/es/base'
+require 'numbers_and_words/strategies/figures_converter/decorators/es/fractional'
+require 'numbers_and_words/strategies/figures_converter/decorators/es/integral'

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

@@ -0,0 +1,12 @@
+module NumbersAndWords
+  module Strategies
+    module FiguresConverter
+      module Decorators
+        module Es
+          class Base < Decorators::Base
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,38 @@
+module NumbersAndWords
+  module Strategies
+    module FiguresConverter
+      module Decorators
+        module Es
+          class Fractional < Base
+            def run
+              @options[:gender] = :female
+              "#{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
+            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/es/integral.rb

@@ -0,0 +1,12 @@
+module NumbersAndWords
+  module Strategies
+    module FiguresConverter
+      module Decorators
+        module Es
+          class Integral < Base
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,3 @@
+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/fr/base.rb

@@ -0,0 +1,12 @@
+module NumbersAndWords
+  module Strategies
+    module FiguresConverter
+      module Decorators
+        module Fr
+          class Base < Decorators::Base
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,37 @@
+module NumbersAndWords
+  module Strategies
+    module FiguresConverter
+      module Decorators
+        module Fr
+          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/fr/integral.rb

@@ -0,0 +1,12 @@
+module NumbersAndWords
+  module Strategies
+    module FiguresConverter
+      module Decorators
+        module Fr
+          class Integral < Base
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,3 +1,3 @@
 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/hu/base.rb

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