numbers_and_words 0.11.6 → 0.11.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9948dcaf97539c2dfe2e51fbdd0438ad52628160feabfad193e83f9e34ccc777
-  data.tar.gz: 5949653822dc333caaae102a9a416a2fbbbe570a3a8ae198c5ef690e669b488a
+  metadata.gz: 8fbb352f4dff4e1515b73e36972350bb7161cf0c5d8f931565da3c9ace866b30
+  data.tar.gz: cab2aaac07c83e7f0c19d97f814608083c573ba36840a8499a7d6334875fa5cd
 SHA512:
-  metadata.gz: dd3a796b8e851fb295a45d88ee4d2d9316153560b20306c075e3c2df265033d06d787cffb666770b8a3e3ca4634338e0fbbec9d49ca95c50af4d231cfe46a9b5
-  data.tar.gz: 0f589eddd20bcbf1f5294a481d5ad5f8ec642356f36591019526a9e57352a60a7305ad08f7d2af1b48cc872cdd96c9fd02c90c067678a76a3e5ae3c0943943d4
+  metadata.gz: 85b1af1ea9a76b79bbcdcd98fbd57e10eb677d042ac12ab02648e693b77b83ec7551bfc008e3af7c3615e33cd56295cef1f01c5e2ad213adca7e8aef403efc0c
+  data.tar.gz: e7334d4acf4752d1974c55ae76f897c91a64a110b44fea55c42d82913a65fa621737617048067a9ae47ba7bea94d2908d3a937297a348339b4494ed39d01cbeb

data/README.rdoc

@@ -5,7 +5,7 @@
 {<img src="https://secure.travis-ci.org/kslazarev/numbers_and_words.svg?branch=master" />}[http://travis-ci.org/kslazarev/numbers_and_words]
 {<img src="https://coveralls.io/repos/kslazarev/numbers_and_words/badge.svg?branch=master" alt="Coverage Status" />}[https://coveralls.io/r/kslazarev/numbers_and_words]
 
-Convert numbers to words using the I18n library.
+Spell out numbers in several languages using the I18n gem.
 
 Перевод чисел в слова при помощи библиотеки I18n.
 
@@ -15,7 +15,9 @@ Számok betűvel írva az I18n könyvtár segítségével.
 
 I18n kütüphanesi ile sayıları yazıya çevirir.
 
-Converte números em letras utilizando a biblioteca I18n.
+Soletra números em vários idiomas utilizando a biblioteca I18n.
+
+Deletrea números en varios idiomas utilizando la gema I18n.
 
 == Supported Languages / Языки / Langues Supportées
 
@@ -32,18 +34,18 @@ Converte números em letras utilizando a biblioteca I18n.
 * Türkçe [tr]
 * Deutsch** [de]
 * Italiano** [it]
-* Nederlands** [nl]
+* Nederlands [nl]
 * Swedish** [se]
 * English (British)** [en-GB]
 * Česky [cs]
 * Português [pt]
 * Português Brasileiro [pt-BR]
 * հայերեն (Armenian) [hy]
+* Қазақша [kz]
 
 ** Experimental
 
 * {[en-AU], [en-CA], [en-IN], [en-US]}*** => [en]
-* {[es-419], [es-AR], [es-CL], [es-CO], [es-MX], [es-PE], [es-VE]}*** => [es]
 * {[fr-CA], [fr-CH]}*** => [fr]
 * {[de], [de-AT], [de-CH]}*** => [de]
 * {[it-CH]}*** => [it]
@@ -88,6 +90,9 @@ Converte números em letras utilizando a biblioteca I18n.
     I18n.with_locale(:hy) { 42.to_words }
     => "քառասուն երկու"
 
+    I18n.with_locale(:kz) { 42.to_words }
+    => "қырық екi"
+
     21.to_words
     => "twenty-one"
     => "veintiuno"
@@ -102,12 +107,13 @@ Converte números em letras utilizando a biblioteca I18n.
     => "ოცდაერთი"
     => "einundzwanzig"
     => "ventiuno"
-    => "éénentwintig"
+    => "eenentwintig"
     => "tjugo-en"
     => "dvacetjedna"
     => "vinte e um"
     => "hai mươi mốt"
     => "քսան մեկ"
+    => "жиырма бiр"
 
     231.to_words
     => "two hundred thirty-one"
@@ -123,12 +129,13 @@ Converte números em letras utilizando a biblioteca I18n.
     => "iki yüz otuz bir"
     => "zweihunderteinunddreißig"
     => "2 cento trentauno"
-    => "tweehonderdéénendertig"
+    => "tweehonderdeenendertig"
     => "två hundra trettio-en"
     => "dvě stě třicetjedna"
     => "duzentos e trinta e um"
     => "hai trăm ba mươi mốt"
     => "երկու հարյուր երեսուն մեկ"
+    => "екi жүз отыз бiр"
 
     4030.to_words
     => "four thousand thirty"
@@ -149,6 +156,7 @@ Converte números em letras utilizando a biblioteca I18n.
     => "čtyři tisíce třicet"
     => "bốn nghìn không trăm ba mươi"
     => "չորս հազար երեսուն"
+    => "төрт мың отыз"
 
     1000100.to_words
     => "one million one hundred"
@@ -169,6 +177,7 @@ Converte números em letras utilizando a biblioteca I18n.
     => "jeden milión jedno sto"
     => "một triệu một trăm"
     => "մեկ միլիոն հարյուր"
+    => "бiр миллион бiр жүз"
 
     1000000000000000000000000000000000.to_words
     => "one decillion"
@@ -186,6 +195,7 @@ Converte números em letras utilizando a biblioteca I18n.
     => "één decillion"
     => "en decillion"
     => "decilijon"
+    => "бiр дециллион"
 
     [1, 2, 3].to_words
     => ["one", "two", "three"]
@@ -200,6 +210,7 @@ Converte números em letras utilizando a biblioteca I18n.
     => ["jedna", "dva", "tři"]
     => ["một", "hai", "ba"]
     => ["մեկ", "երկու", "երեք"]
+    => ["бiр", "екi", "үш"]
 
     [11, 22, 133].to_words
     => ["eleven", "twenty-two", "one hundred thirty-three"]
@@ -215,11 +226,12 @@ Converte números em letras utilizando a biblioteca I18n.
     => ["on bir", "yirmi iki", "yüz otuz üç"]
     => ["elf", "zweiundzwanzig", "einhundertdreiunddreißig"]
     => ["undici", "ventidue", "1 cento trentatre"]
-    => ["elf", "tweeentwintig", "honderddrieendertig"]
+    => ["elf", "tweeëntwintig", "honderddrieëndertig"]
     => ["elva", "tjugo-två", "en hundra trettio-tre"]
     => ["jedenáct", "dvacetdva", "jedno sto třicettři"]
     => ["mười một", "hai mươi hai", "một trăm ba mươi ba"]
     => ["տասնմեկ", "քսան երկու", "հարյուր երեսուն երեք"]
+    => ["он бiр", "жиырма екi", "бiр жүз отыз үш"]
 
     21.77.to_words
     => "twenty-one and seventy-seven hundredths"
@@ -279,7 +291,7 @@ Converte números em letras utilizando a biblioteca I18n.
 
 * Brazilian Portuguese
 
-  Change gender form: (gender: [:female || :male || :neuter])
+  Change gender form: (gender: [:female || :male])
 
     I18n.with_locale(:'pt-BR') { 1000000001.to_words gender: :female }
     => "um bilhão e uma"
@@ -297,7 +309,6 @@ Converte números em letras utilizando a biblioteca I18n.
     I18n.with_locale(:'cs') { 1.to_words gender: :neuter }
     => "jedno"
 
-
   Remove 'zero' from integral part of float: (remove_zero: [true || false])
 
     I18n.with_locale(:cs) { 0.7.to_words }
@@ -314,18 +325,49 @@ Converte números em letras utilizando a biblioteca I18n.
     I18n.with_locale(:cs) { 21.to_words gender: :female, ordinal: true }
     => "dvacátá první"
 
+* Spanish
+
+  Change gender form: (gender: [:female || :male])
+
+    I18n.with_locale(:es) { 1.to_words gender: :female }
+    => "una"
+
+    I18n.with_locale(:es) { 1.to_words gender: :male }
+    => "uno"
+
+  Use the apocopated (shortened) form: (apocopated: [true || false])
+
+    I18n.with_locale(:es) { 1.to_words apocopated: true }
+    => "un"
+
+  Mix gender and apocopated forms:
+
+    I18n.with_locale(:es) { 201.to_words gender: :female, apocopated: true }
+    => "doscientas un"
+
+  Remove 'zero' from integral part of float: (remove_zero: [true || false])
+
+    I18n.with_locale(:es) { 0.7.to_words }
+    => "cero con siete décimas"
+
+    I18n.with_locale(:es) { 0.7.to_words remove_zero: true }
+    => "siete décimas"
+
 == Other options / Другие опции
 
-* precision
+* Precision
 
   You may pass argument :precision that added zeros to the end of float number:
 
     I18n.with_locale(:ru) { 0.1.to_words precision: 3 }
     => ноль целых и десять сотых
 
+    I18n.with_locale(:es) { 0.2.to_words precision: 2 }
+    => cero con veinte centésimas
+
 == Requirements / Требования / Configuration Requise
 
-* 2.3 <= Ruby (compatible with/совместимость с/compatible avec Ruby 2.3 and/и/et JRuby);
+* 2.5 <= Ruby (compatible with/совместимость с/compatible avec Ruby 2.5 and/и/et JRuby);
 * 0.5.0 <= I18n (earlier versions not tested/ранние версии не тестировались/versions précédentes non testées);
 
 == Installation / Установка / Installation

data/lib/numbers_and_words/helper_classes/array_extensions/helpers.rb

@@ -42,6 +42,10 @@ module NumbersAndWords
         self[0].to_i if self[0].to_i.positive?
       end
 
+      def only_ones
+        ones if !tens && !hundreds
+      end
+
       def teens
         tens_with_ones if tens == 1
       end

data/lib/numbers_and_words/helper_classes/figures_array.rb

@@ -14,8 +14,12 @@ module NumbersAndWords
       super.to_figures
     end
 
-    def local_language
-      ::I18n.with_locale(I18n.local_language) { yield }
+    def figures_array_in_capacity(capacity)
+      super.to_figures
+    end
+
+    def local_language(&block)
+      ::I18n.with_locale(I18n.local_language, &block)
     end
   end
 end

data/lib/numbers_and_words/helper_classes/words_array.rb

@@ -8,8 +8,8 @@ module NumbersAndWords
       local_language { Strategies.array_joiner.new(to_a, options).run }
     end
 
-    def local_language
-      ::I18n.with_locale(I18n.local_language) { yield }
+    def local_language(&block)
+      ::I18n.with_locale(I18n.local_language, &block)
     end
   end
 end

data/lib/numbers_and_words/i18n/locales/numbers.kz.yml

@@ -0,0 +1,7 @@
+kz:
+  numbers:
+    ones: [нөл, бiр, екi, үш, төрт, бес, алты, жетi, сегiз, тоғыз]
+    teens: [_, он бiр, он екi, он үш, он төрт, он бес, он алты, он жетi, он сегiз, он тоғыз]
+    tens: [_, он, жиырма, отыз, қырық, елу, алпыс, жетпiс, сексен, тоқсан]
+    hundreds: жүз
+    mega: [_, мың, миллион, миллиард, триллион, квадриллион, квинтиллион, секстиллион, септиллион, октиллион, нониллион, дециллион]

data/lib/numbers_and_words/i18n/locales/numbers.nl.yml

@@ -1,8 +1,10 @@
 nl:
   numbers:
-    ones: [nul, één, twee, drie, vier, vijf, zes, zeven, acht, negen]
+    ones: [nul, een, twee, drie, vier, vijf, zes, zeven, acht, negen]
+    loose_one: één
     teens: [_, elf, twaalf, dertien, veertien, vijftien, zestien, zeventien, achttien, negentien]
     tens: [_, tien, twintig, dertig, veertig, vijftig, zestig, zeventig, tachtig, negentig]
     hundreds: honderd
     mega: [_, duizend, miljoen, miljard, biljoen, biljard, triljoen, triljard, septiljoen, octillion, noniljoen, decillion]
     union: en
+    union2or3: ën

data/lib/numbers_and_words/i18n/pluralization.rb

@@ -14,7 +14,7 @@ module NumbersAndWords
 
       def init
         ::I18n.load_path << config_file
-        ::I18n::Backend::Simple.send :include, ::I18n::Backend::Pluralization
+        ::I18n::Backend::Simple.include ::I18n::Backend::Pluralization
       end
 
       def files

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

@@ -1,13 +1,11 @@
 # frozen_string_literal: true
 
-Hash[
-  NumbersAndWords::I18n::Pluralization.languages.map do |language|
-    [language.to_sym, {
-      i18n: {
-        plural: {
-          rule: Object.const_get("NumbersAndWords::I18n::Plurals::#{language.split('-').collect(&:capitalize).join}::RULE")
-        }
+NumbersAndWords::I18n::Pluralization.languages.map do |language|
+  [language.to_sym, {
+    i18n: {
+      plural: {
+        rule: Object.const_get("NumbersAndWords::I18n::Plurals::#{language.split('-').collect(&:capitalize).join}::RULE")
       }
-    }]
-  end
-]
+    }
+  }]
+end.to_h

data/lib/numbers_and_words/strategies/figures_converter.rb

@@ -25,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/figures_converter/languages.rb

@@ -22,6 +22,7 @@ require 'numbers_and_words/strategies/figures_converter/languages/pt'
 require 'numbers_and_words/strategies/figures_converter/languages/se'
 require 'numbers_and_words/strategies/figures_converter/languages/tr'
 require 'numbers_and_words/strategies/figures_converter/languages/hy'
+require 'numbers_and_words/strategies/figures_converter/languages/kz'
 
 require 'numbers_and_words/strategies/figures_converter/languages/families/cyrillic'
 require 'numbers_and_words/strategies/figures_converter/languages/ru'

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

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module NumbersAndWords
+  module Strategies
+    module FiguresConverter
+      module Languages
+        class Kz < Base
+        end
+      end
+    end
+  end
+end

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

@@ -10,9 +10,16 @@ module NumbersAndWords
           end
 
           def capacity_iteration
-            if FiguresArray::THOUSAND_CAPACITY == @current_capacity
-              capacity_words = words_in_capacity(@current_capacity)
-              capacity_words.empty? ? [] : [capacity_words, megs].join
+            return super if FiguresArray::THOUSAND_CAPACITY != @current_capacity
+            return megs if figures.number_in_capacity(@current_capacity) == 1
+
+            capacity_words = words_in_capacity(@current_capacity)
+            capacity_words.empty? ? [] : [capacity_words, megs].join
+          end
+
+          def simple_number_to_words
+            if @figures.only_ones && @figures.ones == 1
+              [@translations.t(:loose_one)]
             else
               super
             end

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

@@ -34,7 +34,7 @@ module NumbersAndWords
             nil
           end
 
-          def respond_to_missing?(method_name, include_private = false)
+          def respond_to_missing?(method_name, include_private: false)
             Object.const_get(proxy_class_name(method_name)) || super
           end
 

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

@@ -12,7 +12,7 @@ module NumbersAndWords
 
             def result(type)
               @type = type
-              MEGS_TYPE != type ? check_simple_numbers : check_megs_numbers
+              MEGS_TYPE == type ? check_megs_numbers : check_simple_numbers
             end
 
             private

data/lib/numbers_and_words/translations.rb

@@ -26,6 +26,7 @@ require 'numbers_and_words/translations/ka'
 require 'numbers_and_words/translations/cs'
 require 'numbers_and_words/translations/vi'
 require 'numbers_and_words/translations/hy'
+require 'numbers_and_words/translations/kz'
 
 module NumbersAndWords
   module Translations

data/lib/numbers_and_words/translations/base.rb

@@ -6,7 +6,7 @@ module NumbersAndWords
       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/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/nl.rb

@@ -6,7 +6,7 @@ module NumbersAndWords
       include NumbersAndWords::Translations::Families::Latin
 
       def tens_with_ones(numbers, _options = {})
-        [ones(numbers[0]), tens(numbers[1])].join(union)
+        [ones(numbers[0]), tens(numbers[1])].join(union(numbers[0]))
       end
 
       def hundreds(number, _options = {})
@@ -14,6 +14,14 @@ module NumbersAndWords
 
         super number, separator: ''
       end
+
+      private
+
+      def union(units)
+        return t :union2or3 if [2, 3].include?(units)
+
+        t :union
+      end
     end
   end
 end

data/lib/numbers_and_words/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module NumbersAndWords
-  VERSION = '0.11.6'
+  VERSION = '0.11.11'
 end

data/lib/numbers_and_words/wrappers/integer.rb

@@ -16,7 +16,7 @@ module NumbersAndWords
       private
 
       def to_figures_array
-        number.to_s.split(//).map(&:to_i).to_figures
+        number.to_s.chars.map(&:to_i).to_figures
       end
     end
   end

metadata

@@ -1,58 +1,58 @@
 --- !ruby/object:Gem::Specification
 name: numbers_and_words
 version: !ruby/object:Gem::Version
-  version: 0.11.6
+  version: 0.11.11
 platform: ruby
 authors:
 - Kirill Lazarev
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-04-14 00:00:00.000000000 Z
+date: 2021-07-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
@@ -238,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
@@ -256,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
@@ -264,15 +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: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.21
+signing_key:
 specification_version: 4
-summary: Convert numbers to words using I18N.
+summary: Spell out numbers in several languages
 test_files: []