numbers_and_words 0.5.0 → 0.6.0

data/lib/numbers_and_words/wrappers.rb

@@ -0,0 +1,2 @@
+require 'numbers_and_words/wrappers/integer'
+require 'numbers_and_words/wrappers/float'

data/lib/numbers_and_words/wrappers/float.rb

@@ -0,0 +1,60 @@
+module NumbersAndWords
+  module Wrappers
+    class Float
+      attr_accessor :number
+
+      def initialize number
+        @number = number
+      end
+
+      def to_words options = {}
+        words = []
+        words << integral_part_with(options) if integral_part_with(options).present?
+        words << fractional_part_with(options) unless fractional_part_is_nil?
+        NumbersAndWords::WordsArray.new(words).join options
+      end
+
+      private
+
+      def parts
+        number.to_s.split '.'
+      end
+
+      def exponential?
+        number.to_s =~ /[eE]{1}\+/
+      end
+
+      def integral_part
+        parts.first
+      end
+
+      def fractional_part
+        parts.last
+      end
+
+      def integral_part_with options
+        integral_part.to_i.to_words options.merge(integral_options)
+      end
+
+      def fractional_part_with options
+        fractional_part.to_i.to_words options.merge(fractional_options)
+      end
+
+      def integral_options
+        {:integral => {}}
+      end
+
+      def fractional_options
+        {:fractional => {:length => fractional_part.length}}
+      end
+
+      def integral_part_is_nil?
+        0 == integral_part.to_i
+      end
+
+      def fractional_part_is_nil?
+        0 == fractional_part.to_i
+      end
+    end
+  end
+end

data/lib/numbers_and_words/wrappers/integer.rb

@@ -0,0 +1,21 @@
+module NumbersAndWords
+  module Wrappers
+    class Integer
+      attr_accessor :number
+
+      def initialize number
+        @number = number
+      end
+
+      def to_words options = {}
+        to_figures_array.to_words options
+      end
+
+      private
+
+      def to_figures_array
+        number.to_s.split(//).map(&:to_i).to_figures
+      end
+    end
+  end
+end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: numbers_and_words
 version: !ruby/object:Gem::Version
-  version: 0.5.0
-  prerelease: 
+  version: 0.6.0
 platform: ruby
 authors:
 - Kirill Lazarev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-19 00:00:00.000000000 Z
+date: 2013-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -84,79 +75,125 @@ extra_rdoc_files:
 - README.rdoc
 files:
 - lib/numbers_and_words.rb
-- lib/numbers_and_words/array_additions.rb
-- lib/numbers_and_words/array_additions/helpers.rb
-- lib/numbers_and_words/array_additions/validations.rb
 - lib/numbers_and_words/core_ext.rb
 - lib/numbers_and_words/core_ext/array.rb
+- lib/numbers_and_words/core_ext/float.rb
 - lib/numbers_and_words/core_ext/integer.rb
-- lib/numbers_and_words/figures_array.rb
+- lib/numbers_and_words/helper_classes.rb
+- lib/numbers_and_words/helper_classes/array_extensions/helpers.rb
+- lib/numbers_and_words/helper_classes/array_extensions/validations.rb
+- lib/numbers_and_words/helper_classes/figures_array.rb
+- lib/numbers_and_words/helper_classes/words_array.rb
 - lib/numbers_and_words/i18n.rb
 - lib/numbers_and_words/i18n/initialization.rb
 - lib/numbers_and_words/i18n/locales/numbers.en.yml
+- lib/numbers_and_words/i18n/locales/numbers.es.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.it.yml
 - lib/numbers_and_words/i18n/locales/numbers.nl.yml
 - lib/numbers_and_words/i18n/locales/numbers.ru.yml
+- lib/numbers_and_words/i18n/locales/numbers.se.yml
 - lib/numbers_and_words/i18n/locales/numbers.tr.yml
 - lib/numbers_and_words/i18n/locales/numbers.ua.yml
 - lib/numbers_and_words/i18n/pluralization.rb
+- lib/numbers_and_words/i18n/plurals/es.rb
 - lib/numbers_and_words/i18n/plurals/fr.rb
 - lib/numbers_and_words/i18n/plurals/plurals.rb
 - lib/numbers_and_words/i18n/plurals/ru.rb
 - lib/numbers_and_words/i18n/plurals/ua.rb
 - lib/numbers_and_words/strategies.rb
-- lib/numbers_and_words/strategies/base.rb
-- lib/numbers_and_words/strategies/en.rb
-- lib/numbers_and_words/strategies/families/base.rb
-- lib/numbers_and_words/strategies/families/cyrillic.rb
-- lib/numbers_and_words/strategies/families/latin.rb
-- lib/numbers_and_words/strategies/fr.rb
-- lib/numbers_and_words/strategies/it.rb
-- lib/numbers_and_words/strategies/nl.rb
-- lib/numbers_and_words/strategies/ru.rb
-- lib/numbers_and_words/strategies/tr.rb
-- lib/numbers_and_words/strategies/ua.rb
-- lib/numbers_and_words/translations_helpers.rb
-- lib/numbers_and_words/translations_helpers/base.rb
-- lib/numbers_and_words/translations_helpers/en.rb
-- lib/numbers_and_words/translations_helpers/families/base.rb
-- lib/numbers_and_words/translations_helpers/families/cyrillic.rb
-- lib/numbers_and_words/translations_helpers/families/latin.rb
-- lib/numbers_and_words/translations_helpers/fr.rb
-- lib/numbers_and_words/translations_helpers/it.rb
-- lib/numbers_and_words/translations_helpers/nl.rb
-- lib/numbers_and_words/translations_helpers/ru.rb
-- lib/numbers_and_words/translations_helpers/tr.rb
-- lib/numbers_and_words/translations_helpers/ua.rb
+- lib/numbers_and_words/strategies/array_joiner.rb
+- lib/numbers_and_words/strategies/figures_converter.rb
+- lib/numbers_and_words/strategies/figures_converter/decorators.rb
+- lib/numbers_and_words/strategies/figures_converter/decorators/base.rb
+- lib/numbers_and_words/strategies/figures_converter/decorators/en.rb
+- lib/numbers_and_words/strategies/figures_converter/decorators/en/base.rb
+- lib/numbers_and_words/strategies/figures_converter/decorators/en/fractional.rb
+- lib/numbers_and_words/strategies/figures_converter/decorators/en/integral.rb
+- lib/numbers_and_words/strategies/figures_converter/decorators/hu.rb
+- lib/numbers_and_words/strategies/figures_converter/decorators/hu/base.rb
+- lib/numbers_and_words/strategies/figures_converter/decorators/hu/fractional.rb
+- lib/numbers_and_words/strategies/figures_converter/decorators/hu/integral.rb
+- lib/numbers_and_words/strategies/figures_converter/decorators/ru.rb
+- lib/numbers_and_words/strategies/figures_converter/decorators/ru/base.rb
+- lib/numbers_and_words/strategies/figures_converter/decorators/ru/fractional.rb
+- lib/numbers_and_words/strategies/figures_converter/decorators/ru/integral.rb
+- lib/numbers_and_words/strategies/figures_converter/decorators/ua.rb
+- lib/numbers_and_words/strategies/figures_converter/decorators/ua/base.rb
+- lib/numbers_and_words/strategies/figures_converter/decorators/ua/fractional.rb
+- lib/numbers_and_words/strategies/figures_converter/decorators/ua/integral.rb
+- lib/numbers_and_words/strategies/figures_converter/languages.rb
+- lib/numbers_and_words/strategies/figures_converter/languages/base.rb
+- lib/numbers_and_words/strategies/figures_converter/languages/en.rb
+- lib/numbers_and_words/strategies/figures_converter/languages/es.rb
+- lib/numbers_and_words/strategies/figures_converter/languages/families/base.rb
+- lib/numbers_and_words/strategies/figures_converter/languages/families/cyrillic.rb
+- lib/numbers_and_words/strategies/figures_converter/languages/families/helpers.rb
+- lib/numbers_and_words/strategies/figures_converter/languages/families/latin.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/it.rb
+- lib/numbers_and_words/strategies/figures_converter/languages/nl.rb
+- lib/numbers_and_words/strategies/figures_converter/languages/ru.rb
+- lib/numbers_and_words/strategies/figures_converter/languages/se.rb
+- lib/numbers_and_words/strategies/figures_converter/languages/tr.rb
+- lib/numbers_and_words/strategies/figures_converter/languages/ua.rb
+- lib/numbers_and_words/strategies/figures_converter/options.rb
+- lib/numbers_and_words/strategies/figures_converter/options/en.rb
+- lib/numbers_and_words/strategies/figures_converter/options/en/hundreds_with_union.rb
+- lib/numbers_and_words/strategies/figures_converter/options/en/ordinal.rb
+- lib/numbers_and_words/strategies/figures_converter/options/en/remove_hyphen.rb
+- lib/numbers_and_words/strategies/figures_converter/options/en/remove_zero.rb
+- lib/numbers_and_words/strategies/figures_converter/options/hu.rb
+- lib/numbers_and_words/strategies/figures_converter/options/hu/ordinal.rb
+- lib/numbers_and_words/strategies/figures_converter/options/ru.rb
+- lib/numbers_and_words/strategies/figures_converter/options/ru/gender.rb
+- lib/numbers_and_words/strategies/figures_converter/options/ua.rb
+- lib/numbers_and_words/strategies/figures_converter/options/ua/gender.rb
+- lib/numbers_and_words/translations.rb
+- lib/numbers_and_words/translations/base.rb
+- lib/numbers_and_words/translations/en.rb
+- lib/numbers_and_words/translations/es.rb
+- lib/numbers_and_words/translations/extensions/fraction_significance.rb
+- lib/numbers_and_words/translations/families/base.rb
+- lib/numbers_and_words/translations/families/cyrillic.rb
+- 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/it.rb
+- lib/numbers_and_words/translations/nl.rb
+- lib/numbers_and_words/translations/ru.rb
+- lib/numbers_and_words/translations/se.rb
+- lib/numbers_and_words/translations/tr.rb
+- lib/numbers_and_words/translations/ua.rb
 - lib/numbers_and_words/version.rb
+- lib/numbers_and_words/wrappers.rb
+- lib/numbers_and_words/wrappers/float.rb
+- lib/numbers_and_words/wrappers/integer.rb
 - LICENSE.txt
 - README.rdoc
 homepage: http://github.com/kslazarev/numbers_and_words
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4516807369747815083
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 3
 summary: Convert numbers to words using I18N.

data/lib/numbers_and_words/array_additions.rb

@@ -1,2 +0,0 @@
-require 'numbers_and_words/array_additions/helpers'
-require 'numbers_and_words/array_additions/validations'

data/lib/numbers_and_words/array_additions/helpers.rb

@@ -1,44 +0,0 @@
-module NumbersAndWords
-  module ArrayAdditions
-    module Helpers
-      THOUSAND_CAPACITY = 1
-
-      def capacity_count
-        count = (self.length.to_f / 3).ceil - 1
-        0 == count ? nil : count
-      end
-
-      def figures_array_in_capacity capacity
-        self[capacity * 3, 3]
-      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] if 0 < self[0].to_i
-      end
-
-      def teens
-        tens_with_ones if 1 == tens
-      end
-
-      def tens
-        self[1] if self[1] and 0 < self[1].to_i
-      end
-
-      def tens_with_ones
-        [ones, tens] if ones and tens
-      end
-
-      def hundreds
-        self[2] if 0 < self[2].to_i
-      end
-    end
-  end
-end

data/lib/numbers_and_words/array_additions/validations.rb

@@ -1,9 +0,0 @@
-module NumbersAndWords
-  module ArrayAdditions
-    module Validations
-      def validate_figure_array!
-
-      end
-    end
-  end
-end

data/lib/numbers_and_words/figures_array.rb

@@ -1,15 +0,0 @@
-module NumbersAndWords
-  class FiguresArray < Array
-    include NumbersAndWords::ArrayAdditions::Helpers
-    include NumbersAndWords::ArrayAdditions::Validations
-
-    def to_words strategy, options = nil
-      validate_figure_array!
-      strategy.convert self
-    end
-
-    def reverse
-      super.to_figures
-    end
-  end
-end

data/lib/numbers_and_words/strategies/base.rb

@@ -1,18 +0,0 @@
-module NumbersAndWords
-  module Strategies
-    class Base
-      attr_accessor :figures, :words
-
-      def self.factory
-        "NumbersAndWords::Strategies::#{::I18n.locale.to_s.titleize}".constantize.new
-      end
-
-      def convert figures
-        @figures = figures.reverse
-        @words = strings
-
-        @words.empty? ? zero : @words.reverse.join(' ')
-      end
-    end
-  end
-end

data/lib/numbers_and_words/strategies/en.rb

@@ -1,8 +0,0 @@
-module NumbersAndWords
-  module Strategies
-    class En < Base
-      include Families::Latin
-      include NumbersAndWords::TranslationsHelpers::En
-    end
-  end
-end

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

@@ -1,71 +0,0 @@
-module NumbersAndWords
-  module Strategies
-    module Families
-      module Base
-
-        private
-
-        def strings
-          if figures.capacity_count
-            number_without_capacity_to_words + complex_number_to_words
-          elsif figures.hundreds
-            hundreds_number_to_words
-          elsif figures.tens or figures.ones
-            simple_number_to_words
-          else
-            []
-          end
-        end
-
-        def complex_number_to_words
-          (1..figures.capacity_count).map{|capacity| capacity_iteration(capacity)}.flatten
-        end
-
-        def capacity_iteration capacity
-          words = []
-          capacity_words = words_in_capacity(capacity)
-          words.push(translation_megs(capacity)) unless capacity_words.empty?
-          words + capacity_words
-        end
-
-        def words_in_capacity capacity = 0
-          save_parent_figures do |parent_figures|
-            @figures = parent_figures.figures_array_in_capacity(capacity)
-            strings
-          end
-        end
-
-        alias_method :number_without_capacity_to_words, :words_in_capacity
-
-        def hundreds_number_to_words
-          simple_number_to_words + [translation_hundreds(figures.hundreds)]
-        end
-
-        def complex_tens
-          figures.ones ?
-            translation_tens_with_ones(figures.tens_with_ones) :
-            translation_tens(figures.tens)
-        end
-
-        def simple_number_to_words
-          if figures.teens
-            [translation_teens(figures.ones)]
-          elsif figures.tens
-            [complex_tens]
-          elsif figures.ones
-            [translation_ones(figures.ones)]
-          else
-            []
-          end
-        end
-
-        def save_parent_figures
-          parent_figures = @figures
-          result = yield(parent_figures)
-          @figures = parent_figures
-          result
-        end
-      end
-    end
-  end
-end