numbers_and_words 0.5.0 → 0.6.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MGQyNDhhNTY5MjhjZTcyYjZjMjg0Y2RhNGVmYWJiNzAwZTU4NWZjNw==
+  data.tar.gz: !binary |-
+    NzNkZTQ1YTUzMDRkMDI2MTY4MjMzZmU1ZDI0ZWZkNGU4MjBlMzFiYQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    MDhjMTY3MTg4Mjc1NTBhNDczOTVlYjJhNWMxOWIyOTBjNDI4MjBhYmQxNWRl
+    MGQ1YWMyNzJkMzBkMjAwYTdhMzcyZTAzMjExZGI5Yzg2ZmFiN2ExZTQ1Yjkw
+    NjJmMzk5YmJkMzljOWRiMjMxYjEzZTdmZDgxNDJiYzQ4MzcyZjM=
+  data.tar.gz: !binary |-
+    NDdmN2Y5ODgyYzA4YjI0OWVlM2ZmNjgxMWEyODE5NGJmNDkyOWExZjJjZGZk
+    YWQzMWIzN2MzOTUwNmJkYzkxNjhhZjBiODNmNGVmNDk4ZWFjYjM1YzZhOTI3
+    ZGViYzkyNWMxOTU3MzY2ZDM2ZjlkY2Q0ODNhOWFhOWFjZWI0MzE=

data/README.rdoc

@@ -1,4 +1,10 @@
-== numbers_and_words {<img src="https://secure.travis-ci.org/kslazarev/numbers_and_words.png" />}[http://travis-ci.org/kslazarev/numbers_and_words] {<img src="https://codeclimate.com/badge.png" />}[https://codeclimate.com/github/kslazarev/numbers_and_words]
+== numbers_and_words
+
+{<img src="https://badge.fury.io/rb/numbers_and_words.png" alt="Gem Version" />}[http://badge.fury.io/rb/numbers_and_words]
+{<img src="https://gemnasium.com/kslazarev/numbers_and_words.png" alt="Dependency Status" />}[https://gemnasium.com/kslazarev/numbers_and_words]
+{<img src="https://codeclimate.com/github/kslazarev/numbers_and_words.png" />}[https://codeclimate.com/github/kslazarev/numbers_and_words]
+{<img src="https://secure.travis-ci.org/kslazarev/numbers_and_words.png" />}[http://travis-ci.org/kslazarev/numbers_and_words]
+{<img src="https://coveralls.io/repos/kslazarev/numbers_and_words/badge.png?branch=development" alt="Coverage Status" />}[https://coveralls.io/r/kslazarev/numbers_and_words]
 
 Convert numbers to words using the I18n library.
 
@@ -6,15 +12,20 @@ Convert numbers to words using the I18n library.
 
 Converti les nombres en lettres en utilisant la librairie I18n.
 
+Számok betűvel írva az I18n könyvtár segítségével.
+
 == Supported Languages / Языки / Langues Supportées
 
 * English
+* Spanish
 * Русский
 * Français
 * Українська
+* Magyar
 * Türkçe**
 * Italiano**
 * Nederlands**
+* Swedish**
 
 ** Experimental
 
@@ -23,70 +34,147 @@ Converti les nombres en lettres en utilisant la librairie I18n.
     I18n.with_locale(:en) { 42.to_words }
     => "forty-two"
 
+    I18n.with_locale(:es) { 42.to_words }
+    => "cuarenta y dos"
+
     I18n.with_locale(:ru) { 42.to_words }
     => "сорок два"
 
     I18n.with_locale(:fr) { 42.to_words }
     => "quarante-deux"
 
+    I18n.with_locale(:hu) { 42.to_words }
+    => "negyvenkettő"
+
     21.to_words
     => "twenty-one"
+    => "veintiuno"
     => "двадцать один"
     => "vingt et un"
     => "двадцять один"
+    => "huszonegy"
     => "yirmi bir"
     => "ventiuno"
     => "éénentwintig"
+    => "tjugo-en"
 
     231.to_words
     => "two hundred thirty-one"
+    => "doscientos treinta y uno"
     => "двести тридцать один"
     => "deux cent trente-trois"
     => "двiстi тридцять один"
+    => "kettőszázharmincegy"
     => "iki yüz otuz bir"
     => "2 cento trentauno"
     => "tweehonderdéénendertig"
+    => "två hundra trettio-en"
 
     4030.to_words
     => "four thousand thirty"
+    => "cuatro mil treinta"
     => "четыре тысячи тридцать"
     => "quatre mille trente"
     => "чотири тисячi тридцять"
+    => "négyezer-harminc"
     => "dört bin otuz"
     => "quattro mille trenta"
     => "vierthousanddertig"
+    => "fyra tusen trettio"
 
     1000100.to_words
     => "one million one hundred"
+    => "un millón cien"
     => "один миллион сто"
     => "un million cent"
     => "один мiльйон сто"
+    => "egymillió-egyszáz"
     => "bir milyon bir yüz"
     => "uno milione 1 cento"
     => "één miljoen honderd"
+    => "en miljoner en hundra"
 
     1000000000000000000000000000000000.to_words
     => "one decillion"
+    => "un quintillardo"
     => "один дециллион"
     => "un quintilliard"
     => "один децильйон"
+    => "egykvintilliárd"
     => "bir desilyon"
     => "uno decillion"
     => "één decillion"
+    => "en decillion"
 
     [1, 2, 3].to_words
     => ["one", "two", "three"]
+    => ["uno", "dos", "tres"]
     => ["один", "два", "три"]
     => ["un", "deux", "trois"]
+    => ["egy", "kettő", "három"]
 
     [11, 22, 133].to_words
     => ["eleven", "twenty-two", "one hundred thirty-three"] 
+    => ["once", "veintidos", "ciento treinta y tres"]
     => ["одиннадцать", "двадцать два", "сто тридцать три"]
     => ["onze", "vingt-deux", "cent trente-trois"]
     => ["одинадцять", "двадцять два", "сто тридцять три"]
+    => ["tizenegy", "huszonkettő", "egyszázharminchárom"]
     => ["on bir", "yirmi iki", "bir yüz otuz üç"]
     => ["undici", "ventidue", "1 cento trentatre"]
     => ["elf", "tweeentwintig", "honderddrieendertig"]
+    => ["elva", "tjugo-två", "en hundra trettio-tre"]
+
+    21.77.to_words
+    => "twenty-one and seventy-seven hundredths"
+    => "двадцать одна целая и семьдесят семь сотых"
+    => "двадцять одна цiла i сiмдесят сiм сотих"
+    => "huszonegy egész hetvenhét század"
+
+== Language options / Языковые опции
+
+* English
+
+  Ordinal form: (ordinal: [true || false])
+
+    I18n.with_locale(:en) { 21.to_words ordinal: true }
+    => "twenty-first"
+
+  Remove hyphen between tens and ones: (remove_hyphen: [true || false])
+
+    I18n.with_locale(:en) { 21.to_words remove_hyphen: true }
+    => "twenty one"
+
+  Add 'and' between hundreds and tens: (hundreds_with_union: [true || false])
+
+    I18n.with_locale(:en) { 111.to_words hundreds_with_union: true }
+    => "one hundred and eleven"
+
+  Remove 'zero' from integral part of float: (remove_zero: [true || false])
+
+    I18n.with_locale(:en) { 0.7.to_words remove_zero: true }
+    => "seven tenths"
+
+* Russian
+
+  Change gender form: (gender: [:female || :male || :neuter])
+
+    I18n.with_locale(:ru) { 1001.to_words gender: :neuter }
+    => "одна тысяча одно"
+
+* Ukranian
+
+  Change gender form: (gender: [:female || :male || :neuter])
+
+    I18n.with_locale(:ru) { 1001.to_words gender: :neuter }
+    => "одна тисяча одне"
+
+* Hungarian
+
+  Ordinal form: (ordinal: [true || false])
+
+    I18n.with_locale(:hu) { 21.to_words ordinal: true }
+    => "huszonegyedik"
 
 == Requirements / Требования / Configuration Requise
 
@@ -115,3 +203,4 @@ Send a pull request. Bonus points for topic branches.
 * Daniel Doubrovkine (link:http://github.com/dblock)
 * Sergey Shkirando (mailto:shkirando.s@yandex.ru)
 * Ulrich Sossou (Github[http://github.com/sorich87], {Personal Page}[http://ulrichsossou.com/])
+* eLod (link:http://github.com/eLod)

data/lib/numbers_and_words.rb

@@ -2,12 +2,13 @@ require 'rubygems'
 require 'i18n'
 require 'i18n/backend/pluralization'
 require 'active_support/inflector'
+require 'active_support/core_ext/object'
 
-require 'numbers_and_words/translations_helpers'
+require 'numbers_and_words/translations'
 require 'numbers_and_words/strategies'
-require 'numbers_and_words/array_additions'
-require 'numbers_and_words/figures_array'
+require 'numbers_and_words/helper_classes'
 require 'numbers_and_words/core_ext'
+require 'numbers_and_words/wrappers'
 require 'numbers_and_words/i18n'
 require 'numbers_and_words/version'
 

data/lib/numbers_and_words/core_ext.rb

@@ -1,2 +1,3 @@
 require 'numbers_and_words/core_ext/integer'
+require 'numbers_and_words/core_ext/float'
 require 'numbers_and_words/core_ext/array'

data/lib/numbers_and_words/core_ext/array.rb

@@ -1,5 +1,5 @@
 class Array
-  def to_words
+  def to_words options = {}
     map &:to_words
   end
 

data/lib/numbers_and_words/core_ext/float.rb

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

data/lib/numbers_and_words/core_ext/integer.rb

@@ -1,12 +1,5 @@
 class Integer
-
-  def to_words
-    to_figures_array.to_words NumbersAndWords::Strategies::Base.factory
-  end
-
-  private
-
-  def to_figures_array
-    to_s.split(//).map(&:to_i).to_figures
+  def to_words options = {}
+    NumbersAndWords::Wrappers::Integer.new(self).to_words options
   end
 end

data/lib/numbers_and_words/helper_classes.rb

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

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

@@ -0,0 +1,81 @@
+module NumbersAndWords
+  module ArrayExtensions
+    module Helpers
+      MICRO_CAPACITY_SHIFT = 2
+      FIGURES_IN_CAPACITY = 3
+      THOUSAND_CAPACITY = 1
+      ONES_SHIFT = 1
+
+      def capacity_length
+        length - ONES_SHIFT
+      end
+
+      def capacity_count
+        count = capacity_length / FIGURES_IN_CAPACITY
+        0 == count ? nil : count
+      end
+
+      def figures_array_in_capacity capacity
+        self[capacity * FIGURES_IN_CAPACITY, FIGURES_IN_CAPACITY]
+      end
+
+      def number_in_capacity capacity
+        figures_array_in_capacity(capacity).reverse.join.to_i
+      end
+
+      def is_a_thousand_capacity? capacity
+        THOUSAND_CAPACITY == capacity
+      end
+
+      def ones
+        self[0].to_i if 0 < self[0].to_i
+      end
+
+      def teens
+        tens_with_ones if 1 == tens
+      end
+
+      def tens
+        self[1].to_i if self[1] && 0 < self[1].to_i
+      end
+
+      def tens_with_ones
+        [ones, tens] if ones && tens
+      end
+
+      def hundreds
+        self[2].to_i if 0 < self[2].to_i
+      end
+
+      def sub_capacity
+        capacity_length % FIGURES_IN_CAPACITY
+      end
+
+      def fraction_index
+        index '.'
+      end
+
+      def fraction_capacity
+        [fraction_capacity_count, fraction_sub_capacity]
+      end
+
+      def fraction_capacity_count
+        capacity_count.nil? ? sub_capacity : capacity_count + MICRO_CAPACITY_SHIFT
+      end
+
+      def fraction_sub_capacity
+        sub_capacity unless capacity_count.nil?
+      end
+
+      def ordinal_index
+        index { |figure| figure != 0 }
+      end
+
+      def ordinal_capacity
+        count = ordinal_index / FIGURES_IN_CAPACITY
+        0 == count ? nil : count
+      end
+    end
+  end
+end
+

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

@@ -0,0 +1,19 @@
+module NumbersAndWords
+  module ArrayExtensions
+    module Validations
+      #VALID_CHARACTERS = ("0".."9").to_a.push(".").freeze
+
+      def validate_figure_array!
+        #if invalid_characters.any?
+        #  invalid = invalid_characters.uniq.join ', '
+        #  raise "Figures may contain only numbers and `.` (invalid characters: #{invalid})."
+        #end
+        #raise "Figures may contain only 1 `.` (#{count '.'} found)." if count(".") > 1
+      end
+
+      #def invalid_characters
+      #  reject { |character| VALID_CHARACTERS.include? character }
+      #end
+    end
+  end
+end

data/lib/numbers_and_words/helper_classes/figures_array.rb

@@ -0,0 +1,18 @@
+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!
+      Strategies.figures_converter.new(self, options).run
+    end
+
+    def reverse
+      super.to_figures
+    end
+  end
+end

data/lib/numbers_and_words/helper_classes/words_array.rb

@@ -0,0 +1,11 @@
+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 = {}
+      Strategies.array_joiner.new(self.to_a, options).run
+    end
+  end
+end

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

@@ -5,3 +5,51 @@ en:
     tens: [zero, ten, twenty, thirty, forty, fifty, sixty, seventy, eighty, ninety]
     hundreds: hundred
     mega: [ones, thousand, million, billion, trillion, quadrillion, quintillion, sextillion, septillion, octillion, nonillion, decillion]
+    ordinal:
+      ones: [zeroth, first, second, third, fourth, fifth, sixth, seventh, eighth, ninth]
+      teens: [tenth, eleventh, twelfth, thirteenth, fourteenth, fifteenth, sixteenth, seventeenth, eighteenth, nineteenth]
+      tens: [zeroth, tenth, twentieth, thirtieth, fortieth, fiftieth, sixtieth, seventieth, eightieth, ninetieth]
+      hundreds: hundredth
+      mega: [zeroth, thousandth, millionth, billionth, trillionth, quadrillionth, quintillionth, sextillionth, septillionth, octillionth, nonillionth, decillionth]
+    fraction_separator: and
+    micro: [_, tenths, hundredths, thousandths, millionths, billionths, trillionths, quadrillionths, quintillionths, sextillionths, septillionths, octillionths, nonillionths, decillionths]
+    tenths:
+      one: tenth
+      other: tenths
+    hundredths:
+      one: hundredth
+      other: hundredths
+    thousandths:
+      one: thousandth
+      other: thousandths
+    millionths:
+      one: millionth
+      other: millionths
+    billionths:
+      one: billionth
+      other: billionths
+    trillionths:
+      one: trillionth
+      other: trillionths
+    quadrillionths:
+      one: quadrillionth
+      other: quadrillionths
+    quintillionths:
+      one: quintillionth
+      other: quintillionths
+    sextillionths:
+      one: sextillionth
+      other: sextillionths
+    septillionths:
+      one: septillionth
+      other: septillionths
+    octillionths:
+      one: octillionth
+      other: octillionths
+    nonillionths:
+      one: nonillionth
+      other: nonillionths
+    decillionths:
+      one: decillionth
+      other: decillionths
+    union: and