numbers_and_words 0.11.5 → 0.11.10

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

data/lib/numbers_and_words/translations/cs.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Translations
     class Cs < Base

data/lib/numbers_and_words/translations/de.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Translations
     class De < Base

data/lib/numbers_and_words/translations/en-GB.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Translations
     class EnGb < Base

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,3 +1,5 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Translations
     class Es < Base
@@ -5,13 +7,14 @@ module NumbersAndWords
       include NumbersAndWords::Translations::Extensions::FractionSignificance
 
       def zero(_options = {})
-        t(%i[ones male].join('.'))[0]
+        t('ones.male')[0]
       end
 
       def ones(number, options = {})
         return if options[:is_one_thousand]
-        return t(%i[ones apocopated].join('.')) if number == 1 &&
-                                                   options[:is_apocopated]
+        return t('ones.apocopated') if number == 1 &&
+                                       options[:is_apocopated]
+
         t([:ones, options[:gender]].join('.'))[number]
       end
 
@@ -20,12 +23,14 @@ module NumbersAndWords
       end
 
       def twenties_with_ones(numbers, options = {})
-        return t(%i[twenties apocopated].join('.')) if options[:is_apocopated]
+        return t('twenties.apocopated') if options[:is_apocopated]
+
         t([:twenties, options[:gender]].join('.'))[numbers[0]]
       end
 
       def hundreds(number, options = {})
-        return t(%i[hundreds apocopated].join('.')) if options[:is_apocopated]
+        return t('hundreds.apocopated') if options[:is_apocopated]
+
         t([:hundreds, options[:gender]].join('.'))[number]
       end
     end

data/lib/numbers_and_words/translations/et.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Translations
     class Et < Base

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Translations
     module Extensions

data/lib/numbers_and_words/translations/families/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Translations
     module Families

data/lib/numbers_and_words/translations/families/cyrillic.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Translations
     module Families

data/lib/numbers_and_words/translations/families/latin.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Translations
     module Families

data/lib/numbers_and_words/translations/fr.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Translations
     class Fr < Base
@@ -8,16 +10,15 @@ module NumbersAndWords
 
       def tens(number, options = {})
         return t(:eighty) if number == SPECIAL_TENS_CASE && options[:alone].nil?
+
         super number, options
       end
 
-      def tens_with_ones(numbers, _options = {})
-        if [7, 9].include? numbers[1]
-          [tens(numbers[1] - 1, alone: false), teens(numbers)].join('-')
-        else
-          separator = numbers[0] == 1 ? " #{union} " : '-'
-          [tens(numbers[1], alone: false), ones(numbers[0])].join(separator)
-        end
+      def tens_with_ones(numbers, options = {})
+        return [tens(numbers[1] - 1, alone: false), teens(numbers)].join('-') if [7, 9].include? numbers[1]
+
+        separator = numbers[0] == 1 ? " #{union} " : '-'
+        super numbers, options.merge(separator: separator)
       end
 
       def hundreds(number, options = {})
@@ -25,6 +26,7 @@ module NumbersAndWords
         hundreds = t(:hundreds, count: count)
 
         return hundreds if number == 1
+
         [t(:ones)[number], hundreds].join(' ')
       end
     end

data/lib/numbers_and_words/translations/hu.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Translations
     class Hu < Base

data/lib/numbers_and_words/translations/hy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Translations
     class Hy < Base

data/lib/numbers_and_words/translations/it.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Translations
     class It < Base

data/lib/numbers_and_words/translations/ka.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Translations
     class Ka < Base
@@ -40,7 +42,7 @@ module NumbersAndWords
       def tens_with_ones(numbers, _options = {})
         range = vigesimal_range(numbers[1])
 
-        minor = if numbers[1] - range[:multiplicative] > 0
+        minor = if (numbers[1] - range[:multiplicative]).positive?
                   teens(numbers)
                 else
                   ones(numbers[0])

data/lib/numbers_and_words/translations/kz.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module NumbersAndWords
+  module Translations
+    class Kz < Base
+      include NumbersAndWords::Translations::Families::Latin
+    end
+  end
+end

data/lib/numbers_and_words/translations/lt.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Translations
     class Lt < Base

data/lib/numbers_and_words/translations/lv.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Translations
     class Lv < Base

data/lib/numbers_and_words/translations/nl.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Translations
     class Nl < Base
@@ -9,6 +11,7 @@ module NumbersAndWords
 
       def hundreds(number, _options = {})
         return t(:hundreds) if number == 1
+
         super number, separator: ''
       end
     end

data/lib/numbers_and_words/translations/pt-BR.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Translations
     class PtBr < Base
@@ -14,6 +16,7 @@ module NumbersAndWords
 
       def ones(number, options = {})
         return if options[:is_one_thousand]
+
         t([options[:prefix], :ones, options[:gender]].join('.'))[number]
       end
 
@@ -24,25 +27,29 @@ module NumbersAndWords
       end
 
       def teens(number, options = {})
-        return [tens(1, options), ' ', ones(number[0], options)].join if ordinal? options
+        return [tens(1, options), ones(number[0], options)].join(' ') if ordinal? options
+
         super(number, options)
       end
 
       def tens_with_ones(numbers, options = {})
         connector = ordinal?(options) ? ' ' : " #{union} "
-        [tens(numbers[1], options), connector, ones(numbers[0], options)].join
+        [tens(numbers[1], options), ones(numbers[0], options)].join(connector)
       end
 
       def hundreds(number, options = {})
         return t(:one_hundred) if options[:is_one_hundred] && !ordinal?(options)
+
         hundreds = t([options[:prefix], :hundreds, options[:gender]].join('.'))[number]
         return hundreds if ordinal?(options) || options[:is_hundred]
+
         [hundreds, union].join(' ')
       end
 
       def megs(capacity, options = {})
         return t([options[:prefix], :mega, options[:gender]].join('.'))[capacity] if ordinal?(options)
         return super(capacity, options) if options[:is_opaque] || options[:is_without_connector]
+
         suffix = options[:is_with_comma] ? ',' : " #{union}"
         super(capacity, options) + suffix
       end

data/lib/numbers_and_words/translations/pt.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Translations
     class Pt < Base
@@ -10,6 +12,7 @@ module NumbersAndWords
       def hundreds(number, options = {})
         return t(:one_hundred) if options[:is_one_hundred]
         return t(:hundreds)[number] if options[:is_hundred]
+
         [t(:hundreds)[number], union].join(' ')
       end
     end

data/lib/numbers_and_words/translations/ru.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Translations
     class Ru < Base

data/lib/numbers_and_words/translations/se.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Translations
     class Se < Base

data/lib/numbers_and_words/translations/tr.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Translations
     class Tr < Base

data/lib/numbers_and_words/translations/ua.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Translations
     class Ua < Base

data/lib/numbers_and_words/translations/vi.rb

@@ -1,11 +1,14 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Translations
     class Vi < Base
       include NumbersAndWords::Translations::Families::Latin
       include NumbersAndWords::Translations::Extensions::FractionSignificance
       def ones_of_tens(number, options = {})
-        return t(%i[units tens one].join('.')) if number == 1
-        return t(%i[units tens five].join('.')) if number == 5
+        return t('units.tens.one') if number == 1
+        return t('units.tens.five') if number == 5
+
         ones(number, options)
       end
 

data/lib/numbers_and_words/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
-  VERSION = '0.11.5'.freeze
+  VERSION = '0.11.10'
 end

data/lib/numbers_and_words/wrappers.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 require 'numbers_and_words/wrappers/integer'
 require 'numbers_and_words/wrappers/float'

data/lib/numbers_and_words/wrappers/float.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Wrappers
     class Float
-      ZERO_SYMBOL = '0'.freeze
+      ZERO_SYMBOL = '0'
 
       attr_accessor :number
 

data/lib/numbers_and_words/wrappers/integer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NumbersAndWords
   module Wrappers
     class Integer

metadata

@@ -1,58 +1,58 @@
 --- !ruby/object:Gem::Specification
 name: numbers_and_words
 version: !ruby/object:Gem::Version
-  version: 0.11.5
+  version: 0.11.10
 platform: ruby
 authors:
 - Kirill Lazarev
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-03-22 00:00:00.000000000 Z
+date: 2021-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: Convert numbers to words using I18N.
+        version: '12'
+description: This gem spells out numbers in several languages using the I18n gem.
 email: k.s.lazarev@gmail.com
 executables: []
 extensions: []
@@ -84,6 +84,7 @@ files:
 - lib/numbers_and_words/i18n/locales/numbers.hy.yml
 - lib/numbers_and_words/i18n/locales/numbers.it.yml
 - lib/numbers_and_words/i18n/locales/numbers.ka.yml
+- lib/numbers_and_words/i18n/locales/numbers.kz.yml
 - lib/numbers_and_words/i18n/locales/numbers.lt.yml
 - lib/numbers_and_words/i18n/locales/numbers.lv.yml
 - lib/numbers_and_words/i18n/locales/numbers.nl.yml
@@ -176,6 +177,7 @@ files:
 - lib/numbers_and_words/strategies/figures_converter/languages/hy.rb
 - lib/numbers_and_words/strategies/figures_converter/languages/it.rb
 - lib/numbers_and_words/strategies/figures_converter/languages/ka.rb
+- lib/numbers_and_words/strategies/figures_converter/languages/kz.rb
 - lib/numbers_and_words/strategies/figures_converter/languages/lt.rb
 - lib/numbers_and_words/strategies/figures_converter/languages/lv.rb
 - lib/numbers_and_words/strategies/figures_converter/languages/nl.rb
@@ -187,6 +189,10 @@ files:
 - lib/numbers_and_words/strategies/figures_converter/languages/ua.rb
 - lib/numbers_and_words/strategies/figures_converter/languages/vi.rb
 - lib/numbers_and_words/strategies/figures_converter/options.rb
+- lib/numbers_and_words/strategies/figures_converter/options/base.rb
+- lib/numbers_and_words/strategies/figures_converter/options/base/gender.rb
+- lib/numbers_and_words/strategies/figures_converter/options/base/ordinal.rb
+- lib/numbers_and_words/strategies/figures_converter/options/base/remove_zero.rb
 - lib/numbers_and_words/strategies/figures_converter/options/cs.rb
 - lib/numbers_and_words/strategies/figures_converter/options/cs/gender.rb
 - lib/numbers_and_words/strategies/figures_converter/options/cs/ordinal.rb
@@ -234,6 +240,7 @@ files:
 - lib/numbers_and_words/translations/hy.rb
 - lib/numbers_and_words/translations/it.rb
 - lib/numbers_and_words/translations/ka.rb
+- lib/numbers_and_words/translations/kz.rb
 - lib/numbers_and_words/translations/lt.rb
 - lib/numbers_and_words/translations/lv.rb
 - lib/numbers_and_words/translations/nl.rb
@@ -252,7 +259,7 @@ homepage: http://github.com/kslazarev/numbers_and_words
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -260,16 +267,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 3.2.4
+signing_key:
 specification_version: 4
-summary: Convert numbers to words using I18N.
+summary: Spell out numbers in several languages
 test_files: []