numbers_and_words 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24a1ed3859badac70258bc6dc9e7022514766a51
-  data.tar.gz: 9a9ac6192b4b521abbffab58a6a391deee38673d
+  metadata.gz: 8b50a55c2c09583685e41253468a0b3461c8abdc
+  data.tar.gz: 0cdf8caaadf8489c87525c989cb169a9fd4987ae
 SHA512:
-  metadata.gz: 8bc908a953dad008f8755560f167ea8b5a10af08e6b9de6c4702267f9c170be4e6f07542ded27744779ccfac223801454d47e1a622f23443ef6c44ef0eefcbab
-  data.tar.gz: cf962a846fbc4a7a7f65464a810ebb9aaa1279c585622da2d0f89035c3441b1dd0637d10bc999027717a1030264d43154bf311b3be165d3c2ca1d09c24e0f0f0
+  metadata.gz: a7c2b223dd06568a4537c95c8b732f1bba9a1ca387715eb38c7d8c6c95cd472f15dfcabd84b40a2ddd67edbf47f932d7846c8b6925f7cf4ac0690c10daeda406
+  data.tar.gz: 56e6a9a53264ebb40db6e4e9bee0a19565a8d1d4e0d37eadd0e7e04d67442bb0dad1d2bb77db272a6cc08d50750fab6616a68491d0f500d078bc61bb761e804f

data/lib/numbers_and_words/core_ext/array.rb

@@ -1,6 +1,6 @@
 class Array
-  def to_words options = {}
-    map{|element| element.to_words options}
+  def to_words(options = {})
+    map { |element| element.to_words options }
   end
 
   def to_figures

data/lib/numbers_and_words/core_ext/float.rb

@@ -1,5 +1,5 @@
 class Float
-  def to_words options = {}
+  def to_words(options = {})
     NumbersAndWords::Wrappers::Float.new(self).to_words options
   end
 end

data/lib/numbers_and_words/core_ext/integer.rb

@@ -1,5 +1,5 @@
 class Integer
-  def to_words options = {}
+  def to_words(options = {})
     NumbersAndWords::Wrappers::Integer.new(self).to_words options
   end
 end

data/lib/numbers_and_words/helper_classes.rb

@@ -1,2 +1,2 @@
 require 'numbers_and_words/helper_classes/figures_array'
-require 'numbers_and_words/helper_classes/words_array'
+require 'numbers_and_words/helper_classes/words_array'

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

@@ -12,40 +12,40 @@ module NumbersAndWords
 
       def capacity_count
         count = capacity_length / FIGURES_IN_CAPACITY
-        0 == count ? nil : count
+        count.zero? ? nil : count
       end
 
-      def figures_array_in_capacity capacity
+      def figures_array_in_capacity(capacity)
         self[capacity * FIGURES_IN_CAPACITY, FIGURES_IN_CAPACITY]
       end
 
-      def number_in_capacity capacity
+      def number_in_capacity(capacity)
         figures_array_in_capacity(capacity).reverse.join.to_i
       end
 
-      def number_under_capacity capacity
+      def number_under_capacity(capacity)
         figures_array_under_capacity(capacity).reverse.join.to_i
       end
 
-      def is_opaque? capacity
+      def opaque?(capacity)
         figures_under = figures_array_under_capacity(capacity)
         figures_under.count(0) == figures_under.length
       end
 
-      def figures_array_under_capacity capacity
+      def figures_array_under_capacity(capacity)
         self[0..(capacity * FIGURES_IN_CAPACITY) - ONES_SHIFT]
       end
 
       def ones
-        self[0].to_i if 0 < self[0].to_i
+        self[0].to_i if self[0].to_i > 0
       end
 
       def teens
-        tens_with_ones if 1 == tens
+        tens_with_ones if tens == 1
       end
 
       def tens
-        self[1].to_i if self[1] && 0 < self[1].to_i
+        self[1].to_i if self[1] && self[1].to_i > 0
       end
 
       def tens_with_ones
@@ -53,7 +53,7 @@ module NumbersAndWords
       end
 
       def hundreds
-        self[2].to_i if 0 < self[2].to_i
+        self[2].to_i if self[2].to_i > 0
       end
 
       def round_hundred?
@@ -82,9 +82,8 @@ module NumbersAndWords
 
       def ordinal_capacity
         count = ordinal_index / FIGURES_IN_CAPACITY
-        0 == count ? nil : count
+        count.zero? ? nil : count
       end
     end
   end
 end
-

data/lib/numbers_and_words/helper_classes/figures_array.rb

@@ -1,13 +1,10 @@
 require 'numbers_and_words/helper_classes/array_extensions/helpers'
-require 'numbers_and_words/helper_classes/array_extensions/validations'
 
 module NumbersAndWords
   class FiguresArray < Array
     include ArrayExtensions::Helpers
-    include ArrayExtensions::Validations
 
-    def to_words options = {}
-      validate_figure_array!
+    def to_words(options = {})
       local_language { Strategies.figures_converter.new(self, options).run }
     end
 

data/lib/numbers_and_words/helper_classes/words_array.rb

@@ -1,11 +1,9 @@
 require 'numbers_and_words/helper_classes/array_extensions/helpers'
-require 'numbers_and_words/helper_classes/array_extensions/validations'
 
 module NumbersAndWords
   class WordsArray < Array
-
-    def join options = {}
-      local_language { Strategies.array_joiner.new(self.to_a, options).run }
+    def join(options = {})
+      local_language { Strategies.array_joiner.new(to_a, options).run }
     end
 
     def local_language

data/lib/numbers_and_words/i18n.rb

@@ -3,13 +3,13 @@ require 'numbers_and_words/i18n/initialization'
 
 module NumbersAndWords
   module I18n
-    extend self
+    module_function
 
     def languages
-      @languages ||= (locale_files.map { |path| path.split(/[\/.]/)[-2].to_sym })
+      @languages ||= (locale_files.map { |path| path.split(%r{[/.]})[-2].to_sym })
     end
 
-    def local_language locale = ::I18n.locale
+    def local_language(locale = ::I18n.locale)
       if languages.include?(locale)
         locale
       else
@@ -26,7 +26,7 @@ module NumbersAndWords
       files 'locales', '*.*'
     end
 
-    def files directory, ext
+    def files(directory, ext)
       Dir[File.join File.dirname(__FILE__), "i18n/#{directory}", "**/#{ext}"]
     end
   end

data/lib/numbers_and_words/i18n/initialization.rb

@@ -1,10 +1,10 @@
 module NumbersAndWords
   module I18n
     module Initialization
-      extend self
+      module_function
 
       def init
-        I18n.locale_files.each { |locale_file| ::I18n.load_path << locale_file}
+        I18n.locale_files.each { |locale_file| ::I18n.load_path << locale_file }
         NumbersAndWords::I18n::Pluralization.init
       end
     end

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

@@ -55,13 +55,13 @@ en:
     undecillionths:
       one: undecillionth
       other: undecillionths
-    duodecillion:
+    duodecillionths:
       one: duodecillionth
       other: duodecillionths
-    tredecillion:
+    tredecillionths:
       one: tredecillionth
       other: tredecillionths
-    quattuordecillion:
+    quattuordecillionths:
       one: quattuordecillionth
       other: quattuordecillionths
     union: and

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

@@ -1,42 +1,103 @@
 es:
   numbers:
-    one: un
-    ones: [cero, uno, dos, tres, cuatro, cinco, seis, siete, ocho, nueve]
-    one_twenties: ún
-    ones_twenties: [_, uno, dós, trés, cuatro, cinco, séis, siete, ocho, nueve]
-    teens: [diez, once, doce, trece, catorce, quince, dieciséis, diecisiete, dieciocho, diecinueve]
-    tens: [_, diez, veinti, treinta, cuarenta, cincuenta, sesenta, setenta, ochenta, noventa]
-    twenty: veinte
-    hundreds: [ciento, doscientos, trescientos, cuatrocientos, quinientos, seiscientos, setecientos, ochocientos, novecientos]
-    one_hundred: cien
-    mega: [_, thousand, million, billion, trillion, quadrillion, quintillion, sextillion, septillion, octillion, nonillion, decillion, undecillion, duodecillion, tredecillion, quattuordecillion]
-    thousand: mil
-    million:
+    ones:
+      apocopated: un
+      male: [cero, uno, dos, tres, cuatro, cinco, seis, siete, ocho, nueve]
+      female: [cero, una, dos, tres, cuatro, cinco, seis, siete, ocho, nueve]
+    teens: [_, once, doce, trece, catorce, quince, dieciséis, diecisiete, dieciocho, diecinueve]
+    tens: [_, diez, veinte, treinta, cuarenta, cincuenta, sesenta, setenta, ochenta, noventa]
+    twenties:
+      apocopated: veintiún
+      male: [_, veintiuno, veintidós, veintitrés, veinticuatro, veinticinco, veintiséis, veintisiete, veintiocho, veintinueve]
+      female: [_, veintiuna, veintidós, veintitrés, veinticuatro, veinticinco, veintiséis, veintisiete, veintiocho, veintinueve]
+    hundreds:
+      apocopated: cien
+      male: [_, ciento, doscientos, trescientos, cuatrocientos, quinientos, seiscientos, setecientos, ochocientos, novecientos]
+      female: [_, ciento, doscientas, trescientas, cuatrocientas, quinientas, seiscientas, setecientas, ochocientas, novecientas]
+    mega: [_, thousands, millions, billions, trillions, quadrillions, quintillions, sextillions, septillions, octillions, nonillions, decillions, undecillions, duodecillions, tredecillions, quattuordecillions]
+    thousands: mil
+    millions:
       one: millón
       other: millones
-    billion: mil millones
-    trillion:
+    billions: mil millones
+    trillions:
       one: billón
       other: billones
-    quadrillion: mil billones
-    quintillion:
+    quadrillions: mil billones
+    quintillions:
       one: trillón
       other: trillones
-    sextillion: mil trillones
-    septillion:
+    sextillions: mil trillones
+    septillions:
       one: cuatrillón
       other: cuatrillones
-    octillion: mil cuatrillones
-    nonillion:
+    octillions: mil cuatrillones
+    nonillions:
       one: quintillón
       other: quintillones
-    decillion: mil quintillones
-    undecillion:
+    decillions: mil quintillones
+    undecillions:
       one: sextillón
       other: sextillones
-    duodecillion: mil sextillones
-    tredecillion:
+    duodecillions: mil sextillones
+    tredecillions:
       one: septillón
       other: septillones
-    quattuordecillion: mil septillones
+    quattuordecillions: mil septillones
+    union_separator: con
+    micro: [_, tenths, hundredths, thousandths, millionths, billionths, trillionths, quadrillionths, quintillionths, sextillionths, septillionths, octillionths, nonillionths, decillionths, undecillionths, duodecillionths, tredecillionths, quattuordecillionths]
+    micro_prefix:
+      tens: diez
+      hundreds: cien
+    tenths:
+      one: décima
+      other: décimas
+    hundredths:
+      one: centésima
+      other: centésimas
+    thousandths:
+      one: milésima
+      other: milésimas
+    millionths:
+      one: millonésima
+      other: millonésimas
+    billionths:
+      one: milmillonésima
+      other: milmillonésimas
+    trillionths:
+      one: billonésima
+      other: billonésimas
+    quadrillionths:
+      one: milbillonésima
+      other: milbillonésimas
+    quintillionths:
+      one: trillonésima
+      other: trillonésimas
+    sextillionths:
+      one: miltrillonésima
+      other: miltrillonésimas
+    septillionths:
+      one: cuatrillonésima
+      other: cuatrillonésimas
+    octillionths:
+      one: milcuatrillonésima
+      other: milcuatrillonésimas
+    nonillionths:
+      one: quintillonésima
+      other: quintillonésimas
+    decillionths:
+      one: milquintillonésima
+      other: milquintillonésimas
+    undecillionths:
+      one: sextillonésima
+      other: sextillonésimas
+    duodecillionths:
+      one: milsextillonésima
+      other: milsextillonésimas
+    tredecillionths:
+      one: septillonésima
+      other: septillonésimas
+    quattuordecillionths:
+      one: milseptillonésima
+      other: milseptillonésimas
     union: y

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

@@ -5,13 +5,66 @@ fr:
     tens: [zéro, dix, vingt, trente, quarante, cinquante, soixante, soixante-dix, quatre-vingt, quatre-vingt-dix]
     mega: [ones, thousands, millions, billions, trillions, quadrillions, quintillion, sextillions, septillions, octillions, nonillions, decillions]
     eighty: quatre-vingts
+    union_separator: et
+    union: et
+    micro: [_, tenths, hundredths, thousandths, millionths, billionths, trillionths, quadrillionths, quintillionths, sextillionths, septillionths, octillionths, nonillionths, decillionths, undecillionths, duodecillionths, tredecillionths, quattuordecillionths]
+    tenths:
+      one: dixième
+      other: dixièmes
+    hundredths:
+      one: centième
+      other: centièmes
+    thousandths:
+      one: millième
+      other: millièmes
+    millionths:
+      one: millionième
+      other: millionièmes
+    billionths:
+      one: milliardième
+      other: milliardièmes
+    trillionths:
+      one: billionième
+      other: billionièmes
+    quadrillionths:
+      one: billiardième
+      other: billiardièmes
+    quintillionths:
+      one: trillionième
+      other: trillionièmes
+    sextillionths:
+      one: trilliardième
+      other: trilliardièmes
+    septillionths:
+      one: quadrillionième
+      other: quadrillionièmes
+    octillionths:
+      one: quadrilliardième
+      other: quadrilliardièmes
+    nonillionths:
+      one: quintillionième
+      other: quintillionièmes
+    decillionths:
+      one: quintilliardième
+      other: quintilliardièmes
+    undecillionths:
+      one: sextillionième
+      other: sextillionièmes
+    duodecillionths:
+      one: sextilliardième
+      other: sextilliardièmes
+    tredecillionths:
+      one: septillionième
+      other: septillionièmes
+    quattuordecillionths:
+      one: septilliardième
+      other: septilliardièmes
     hundreds:
       one: cent
       other: cents
     thousands:
       one: mille
       other: mille
-      other: mille
     millions:
       one: million
       other: millions

data/lib/numbers_and_words/i18n/locales/numbers.pt-BR.yml

@@ -8,7 +8,6 @@ pt-BR:
     ones:
       male: [zero, um, dois, três, quatro, cinco, seis, sete, oito, nove]
       female: [zero, uma, duas, três, quatro, cinco, seis, sete, oito, nove]
-    ones_twenties: [zero, um, dois, três, quatro, cinco, seis, sete, oito, nove]
     one: um
     teens: [dez, onze, doze, treze, quatorze, quinze, dezesseis, dezessete, dezoito, dezenove]
     tens: [zero, dez, vinte, trinta, quarenta, cinquenta, sessenta, setenta, oitenta, noventa]
@@ -39,6 +38,7 @@ pt-BR:
       hundreds:
         one: centésimo
         other: centésimos
+      separator: de
     tenths:
       one: décimo
       other: décimos
@@ -81,12 +81,12 @@ pt-BR:
     undecillionths:
       one: undecilionésimo
       other: undecilionésimos
-    duodecillion:
+    duodecillionths:
       one: duodecilionésimo
       other: duodecilionésimos
-    tredecillion:
+    tredecillionths:
       one: trecentilionésimo
       other: trecentilionésimos
-    quattuordecillion:
+    quattuordecillionths:
       one: quadringentilionésimo
       other: quadringentilionésimos

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

@@ -2,7 +2,6 @@ pt:
   numbers:
     union: e
     ones: [zero, um, dois, três, quatro, cinco, seis, sete, oito, nove]
-    ones_twenties: [zero, um, dois, três, quatro, cinco, seis, sete, oito, nove]
     one: um
     teens: [dez, onze, doze, treze, quatorze, quinze, dezesseis, dezessete, dezoito, dezenove]
     tens: [zero, dez, vinte, trinta, quarenta, cinquenta, sessenta, setenta, oitenta, noventa]

data/lib/numbers_and_words/i18n/pluralization.rb

@@ -3,12 +3,11 @@ require 'numbers_and_words/i18n/plurals/ua'
 require 'numbers_and_words/i18n/plurals/fr'
 require 'numbers_and_words/i18n/plurals/lv'
 require 'numbers_and_words/i18n/plurals/lt'
-require 'numbers_and_words/i18n/plurals/pt-BR'
 
 module NumbersAndWords
   module I18n
     module Pluralization
-      extend self
+      module_function
 
       def init
         ::I18n.load_path << config_file
@@ -28,7 +27,7 @@ module NumbersAndWords
       end
 
       def languages
-        plurals_files.map{|path| path.split(/[\/.]/)[-2]}
+        plurals_files.map { |path| path.split(%r{[/.]})[-2] }
       end
     end
   end