numbers_and_words 0.11.3 → 0.11.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61c568842b41f624cae36c4bdb5648667bd03fb4
-  data.tar.gz: 9e5179969bd71542b5049171eff600ca785013dd
+  metadata.gz: 2f6672607ef61331dcab2560613f0983f852e521
+  data.tar.gz: caff72eea42948c2e55ecec50061eec8a9dfba34
 SHA512:
-  metadata.gz: 2d94f84e06d4f34094f0d1d034bfac68bce598f60c1fa0b7613eef49ead313d401e3a124e3e3bc1a4680aed936270dba1316bb9e3cfdf5849251b8562646b34a
-  data.tar.gz: 58cce919fac2b0f9a2efcabec8d35a6bd6ebf1f19503aeba6781bddb25ab90704438064150f604d9bfcd8665a981cfeec81d1e31ee89c54bdb6e1d585c134632
+  metadata.gz: 2d762972288f8b5213c880eab4d2d13bf2183f017e4955d5edc5373923e6aaf1e9e1685232e981fd4e0725151cd13d90dd314d04986e15e6d8516fd3d82981f2
+  data.tar.gz: f6e50fc911f8e55db858e17bcd653bfdfbc99952fa5f2965e80efff59c0b949dca1992389c802c881d2e702e138f2072c34101c1958fbb7e9ac8c86f06cef43f

data/README.rdoc

@@ -39,6 +39,7 @@ Converte números em letras utilizando a biblioteca I18n.
 * Česky [cs]
 * Português [pt]
 * Português Brasileiro [pt-BR]
+* հայերեն (Armenian) [hy]
 
 ** Experimental
 
@@ -85,6 +86,9 @@ Converte números em letras utilizando a biblioteca I18n.
     I18n.with_locale(:vi) { 42.to_words }
     => "bốn mươi hai"
 
+    I18n.with_locale(:hy) { 42.to_words }
+    => "քառասուն երկու"
+
     21.to_words
     => "twenty-one"
     => "veintiuno"
@@ -104,6 +108,7 @@ Converte números em letras utilizando a biblioteca I18n.
     => "dvacetjedna"
     => "vinte e um"
     => "hai mươi mốt"
+    => "քսան մեկ"
 
     231.to_words
     => "two hundred thirty-one"
@@ -124,6 +129,7 @@ Converte números em letras utilizando a biblioteca I18n.
     => "dvě stě třicetjedna"
     => "duzentos e trinta e um"
     => "hai trăm ba mươi mốt"
+    => "երկու հարյուր երեսուն մեկ"
 
     4030.to_words
     => "four thousand thirty"
@@ -143,6 +149,7 @@ Converte números em letras utilizando a biblioteca I18n.
     => "fyra tusen trettio"
     => "čtyři tisíce třicet"
     => "bốn nghìn không trăm ba mươi"
+    => "չորս հազար երեսուն"
 
     1000100.to_words
     => "one million one hundred"
@@ -162,6 +169,7 @@ Converte números em letras utilizando a biblioteca I18n.
     => "en miljoner en hundra"
     => "jeden milión jedno sto"
     => "một triệu một trăm"
+    => "միլիոն հարյուր"
 
     1000000000000000000000000000000000.to_words
     => "one decillion"
@@ -192,6 +200,7 @@ Converte números em letras utilizando a biblioteca I18n.
     => ["ერთი", "ორი", "სამი"]
     => ["jedna", "dva", "tři"]
     => ["một", "hai", "ba"]
+    => ["մեկ", "երկու", "երեք"]
 
     [11, 22, 133].to_words
     => ["eleven", "twenty-two", "one hundred thirty-three"]
@@ -211,6 +220,7 @@ Converte números em letras utilizando a biblioteca I18n.
     => ["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"]
+    => ["տասնմեկ", "քսան երկու", "հարյուր երեսուն երեք"]
 
     21.77.to_words
     => "twenty-one and seventy-seven hundredths"

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

@@ -0,0 +1,7 @@
+hy:
+  numbers:
+    ones: [զրո, մեկ, երկու, երեք, չորս, հինգ, վեց, յոթ, ութ, ինը]
+    teens: [_, տասնմեկ, տասներկու, տասներեք, տասնչորս, տասնհինգ, տասնվեց, տասնյոթ, տասնութ, տասնինը]
+    tens: [_, տասը, քսան, երեսուն, քառասուն, հիսուն, վաթսուն, յոթանասուն, ութսուն, իննսուն]
+    hundreds: հարյուր
+    mega: [_, հազար, միլիոն, միլիարդ, տրիլիոն, քառակուսի]

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

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

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

@@ -4,10 +4,10 @@ module NumbersAndWords
       module Fr
         module_function
 
-        RULE = ->(n) { one_conditions(n) ? :one : :other }
+        RULE = ->(number) { one_conditions(number) ? :one : :other }
 
-        def one_conditions(n)
-          n % 10 == 1 && n % 100 != 11
+        def one_conditions(number)
+          number % 10 == 1 && number % 100 != 11
         end
       end
     end

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

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

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

@@ -4,10 +4,10 @@ module NumbersAndWords
       module Lv
         module_function
 
-        RULE = ->(n) { one_conditions(n) ? :one : :other }
+        RULE = ->(number) { one_conditions(number) ? :one : :other }
 
-        def one_conditions(n)
-          n % 10 == 1 && n % 100 != 11
+        def one_conditions(number)
+          number % 10 == 1 && number % 100 != 11
         end
       end
     end

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

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

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

@@ -19,6 +19,7 @@ require 'numbers_and_words/strategies/figures_converter/languages/pt-BR'
 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/families/cyrillic'
 require 'numbers_and_words/strategies/figures_converter/languages/ru'

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

@@ -0,0 +1,27 @@
+module NumbersAndWords
+  module Strategies
+    module FiguresConverter
+      module Languages
+        class Hy < Base
+          def capacity_iteration
+            words = []
+            capacity_words = words_in_capacity(@current_capacity)
+            words.push(megs) unless capacity_words.empty?
+            words += capacity_words unless thousand? && one?
+            words
+          end
+
+          private
+
+          def one?
+            words_in_capacity(@current_capacity) == [translations.ones(1)]
+          end
+
+          def thousand?
+            FiguresArray::THOUSAND_CAPACITY <= @current_capacity
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -16,9 +16,7 @@ module NumbersAndWords
           end
 
           def megs
-            prefix = if @figures.hundreds || @figures.tens || @figures.ones
-                       :partials
-                     end
+            prefix = (:partials if @figures.hundreds || @figures.tens || @figures.ones)
 
             super(prefix: prefix)
           end

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

@@ -82,12 +82,10 @@ module NumbersAndWords
 
           def without_connector?
             return false if with_comma?
-            # without connector when there is hundreds and 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 && figures.tens
-            # without connector when there is hundreds and ones
-            return true if figures.hundreds && figures.ones
+            return true if figures.hundreds &&
+                           (figures.tens_with_ones ||
+                            figures.tens ||
+                            figures.ones)
             false
           end
 

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

@@ -22,7 +22,7 @@ module NumbersAndWords
           def method_missing(method_name, *args, &block)
             Object.const_get(proxy_class_name(method_name)).new self, args, block
           rescue NameError
-            return nil
+            nil
           end
 
           private

data/lib/numbers_and_words/translations.rb

@@ -23,6 +23,7 @@ require 'numbers_and_words/translations/pt-BR'
 require 'numbers_and_words/translations/ka'
 require 'numbers_and_words/translations/cs'
 require 'numbers_and_words/translations/vi'
+require 'numbers_and_words/translations/hy'
 
 module NumbersAndWords
   module Translations

data/lib/numbers_and_words/translations/hy.rb

@@ -0,0 +1,19 @@
+module NumbersAndWords
+  module Translations
+    class Hy < Base
+      include NumbersAndWords::Translations::Families::Latin
+
+      def tens_with_ones(numbers, options = {})
+        options[:separator] ||= ''
+        super
+      end
+
+      def hundreds(number, _options = {})
+        parts = [t(:hundreds)]
+        parts.unshift(t(:ones)[number]) if number > 1
+
+        parts.join(' ')
+      end
+    end
+  end
+end

data/lib/numbers_and_words/version.rb

@@ -1,3 +1,3 @@
 module NumbersAndWords
-  VERSION = '0.11.3'.freeze
+  VERSION = '0.11.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: numbers_and_words
 version: !ruby/object:Gem::Version
-  version: 0.11.3
+  version: 0.11.4
 platform: ruby
 authors:
 - Kirill Lazarev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-03 00:00:00.000000000 Z
+date: 2018-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -81,6 +81,7 @@ files:
 - lib/numbers_and_words/i18n/locales/numbers.et.yml
 - lib/numbers_and_words/i18n/locales/numbers.fr.yml
 - lib/numbers_and_words/i18n/locales/numbers.hu.yml
+- 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.lt.yml
@@ -172,6 +173,7 @@ files:
 - lib/numbers_and_words/strategies/figures_converter/languages/families/helpers.rb
 - lib/numbers_and_words/strategies/figures_converter/languages/fr.rb
 - lib/numbers_and_words/strategies/figures_converter/languages/hu.rb
+- 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/lt.rb
@@ -229,6 +231,7 @@ files:
 - lib/numbers_and_words/translations/families/latin.rb
 - lib/numbers_and_words/translations/fr.rb
 - lib/numbers_and_words/translations/hu.rb
+- 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/lt.rb
@@ -265,7 +268,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Convert numbers to words using I18N.