num2words 0.1.6 → 0.3.0

data/lib/num2words/converter.rb

@@ -2,6 +2,7 @@
 
 require "date"
 require "time"
+require "bigdecimal"
 
 module Num2words
   class Converter
@@ -15,14 +16,19 @@ module Num2words
         style = opts[:style] || :fraction
         word_case = opts[:word_case] || :default
         date_format = opts[:format] || :default
+        date_case = opts[:date_case] || :default
+        joiner = opts[:joiner] || :default
+
+        validate_option!(:date_case, date_case, %i[default genitive])
+        validate_option!(:joiner, joiner, %i[default and])
 
         locale_data = Locales[locale]
 
         result = case detect_type(number)
-                 when :float then to_words_fractional(number, locale, feminine, locale_data, style: style)
+                 when :float then to_words_fractional(number, locale, feminine, locale_data, style: style, joiner: joiner)
                  when :integer then to_words_integer(number, locale, feminine, locale_data)
-                 when :datetime then to_words_datetime(number, locale, locale_data, format: date_format, only: type_only, short: type_short)
-                 when :date then to_words_date(number, locale, locale_data, format: date_format)
+                 when :datetime then to_words_datetime(number, locale, locale_data, format: date_format, only: type_only, short: type_short, date_case: date_case)
+                 when :date then to_words_date(number, locale, locale_data, format: date_format, date_case: date_case)
                  when :time then to_words_time(number, locale, locale_data, short: type_short)
                  else nil
                  end
@@ -36,6 +42,9 @@ module Num2words
         locale = args.first.is_a?(Symbol) ? args.first : opts[:locale] || I18n.default_locale
         word_case = opts[:word_case] || :downcase
         currency = (opts[:code] || Num2words.default_currency(locale)).to_s.upcase.to_sym
+        minor = opts[:minor] || :always
+
+        validate_option!(:minor, minor, %i[always nonzero never])
 
         unless Num2words.available_currencies(locale).include?(currency)
           warn I18n.t("num2words.warnings.currency_not_available",
@@ -46,22 +55,46 @@ module Num2words
         currency_data = I18n.t("num2words.currencies.#{currency}", locale: locale) or
           raise ArgumentError, "Currency #{currency} not defined in locale #{locale}"
 
-        major_value, minor_value = sprintf('%.2f', amount.abs).split('.').map(&:to_i)
+        decimal_amount = decimal_currency_amount(amount)
+        major_value, minor_value = format('%.2f', decimal_amount.abs).split('.').map(&:to_i)
+        major_feminine = locale_currency_major_feminine?(Locales[locale], currency)
+        minor_feminine = locale_currency_minor_feminine?(Locales[locale], currency)
 
         parts = [
-          to_words(major_value, locale: locale),
-          pluralize(major_value, *currency_data[:major_unit]),
-          to_words(minor_value, locale: locale, feminine: true),
-          pluralize(minor_value, *currency_data[:minor_unit])
+          locale_currency_number_words(Locales[locale], major_value, currency, unit: :major, locale: locale, feminine: major_feminine),
+          locale_pluralize(Locales[locale], major_value, currency_data[:major_unit])
         ]
 
-        parts.unshift(Locales[locale]::GRAMMAR[:minus] || "minus") if amount.negative?
+        include_minor = minor == :always || (minor == :nonzero && minor_value.positive?)
+        if include_minor
+          parts.concat([
+            locale_currency_number_words(Locales[locale], minor_value, currency, unit: :minor, locale: locale, feminine: minor_feminine),
+            locale_pluralize(Locales[locale], minor_value, currency_data[:minor_unit])
+          ])
+        end
+
+        parts.unshift(locale_minus_word(Locales[locale])) if decimal_amount.negative?
 
-        apply_case(parts.join(" ").strip, word_case)
+        apply_case(locale_join_currency_parts(Locales[locale], parts), word_case)
       end
 
       private
 
+      def validate_option!(name, value, allowed_values)
+        return if allowed_values.include?(value)
+
+        raise ArgumentError, "Unsupported #{name} option: #{value.inspect}"
+      end
+
+      def decimal_currency_amount(amount)
+        return amount if amount.is_a?(BigDecimal)
+
+        normalized_amount = amount.is_a?(String) ? amount.tr(",", ".") : amount.to_s
+        BigDecimal(normalized_amount)
+      rescue ArgumentError
+        raise ArgumentError, "Unsupported currency amount: #{amount.inspect}"
+      end
+
       def pluralize(number, singular, few, plural)
         number = number.abs
         return plural if (11..14).include?(number % 100)
@@ -73,10 +106,103 @@ module Num2words
         end
       end
 
+      def locale_pluralize(locale_data, number, forms)
+        return locale_data.pluralize(number, *forms) if locale_data.respond_to?(:pluralize)
+
+        pluralize(number, *forms)
+      end
+
+      def locale_currency_major_feminine?(locale_data, currency)
+        return locale_data.currency_major_feminine?(currency) if locale_data.respond_to?(:currency_major_feminine?)
+
+        false
+      end
+
+      def locale_currency_minor_feminine?(locale_data, currency)
+        return locale_data.currency_minor_feminine?(currency) if locale_data.respond_to?(:currency_minor_feminine?)
+
+        true
+      end
+
+      def locale_currency_number_words(locale_data, number, currency, unit:, locale:, feminine:)
+        if locale_data.respond_to?(:currency_number_words)
+          return locale_data.currency_number_words(number, currency, unit: unit)
+        end
+
+        to_words(number, locale: locale, feminine: feminine)
+      end
+
+      def locale_join_currency_parts(locale_data, parts)
+        return locale_data.join_currency_parts(parts) if locale_data.respond_to?(:join_currency_parts)
+
+        parts.join(" ").strip
+      end
+
+      def locale_time_unit_feminine?(locale_data, unit, default)
+        return locale_data.time_unit_feminine?(unit) if locale_data.respond_to?(:time_unit_feminine?)
+
+        default
+      end
+
+      def locale_time_number_words(locale_data, number, unit, locale, feminine)
+        if locale_data.respond_to?(:time_number_words)
+          return locale_data.time_number_words(number, unit: unit)
+        end
+
+        to_words_integer(number, locale, feminine, locale_data)
+      end
+
+      def locale_join_time_words(locale_data, number_words, unit_words)
+        return locale_data.join_time_words(number_words, unit_words) if locale_data.respond_to?(:join_time_words)
+
+        [number_words, unit_words].join(" ")
+      end
+
+      def locale_minus_word(locale_data)
+        return locale_data.minus_word if locale_data.respond_to?(:minus_word)
+
+        locale_data::GRAMMAR[:minus]
+      end
+
+      def locale_fraction_joiner(locale_data, joiner)
+        return locale_data.fraction_joiner(joiner) if locale_data.respond_to?(:fraction_joiner)
+
+        locale_data::GRAMMAR[:conjunction]
+      end
+
+      def locale_default_fraction_word(locale_data)
+        return locale_data.default_fraction_word if locale_data.respond_to?(:default_fraction_word)
+
+        locale_data::GRAMMAR[:default_fraction]
+      end
+
+      def locale_decimal_separator_word(locale_data)
+        return locale_data.decimal_separator_word if locale_data.respond_to?(:decimal_separator_word)
+
+        locale_data::GRAMMAR[:decimal_separator]
+      end
+
+      def locale_join_decimal_words(locale_data, words)
+        return locale_data.join_decimal_words(words) if locale_data.respond_to?(:join_decimal_words)
+
+        words.compact.reject(&:empty?).join(" ")
+      end
+
+      def locale_join_fraction_words(locale_data, words)
+        return locale_data.join_fraction_words(words) if locale_data.respond_to?(:join_fraction_words)
+
+        words.reject(&:empty?).join(" ")
+      end
+
       # n — 0..999, scale_idx — индекс разряда (0 — единицы, 1 — тысячи, ...)
       # feminine: true — использовать женский род для единиц (нужно для тысяч/копеек)
-      def triple_to_words(n, scale_idx, local_data, feminine: false)
+      def triple_to_words(n, scale_idx, local_data, feminine: false, locale: nil)
         return [] if n.zero?
+
+        if local_data.respond_to?(:triple_to_words)
+          return local_data.triple_to_words(n, scale_idx, feminine: feminine)
+        end
+
         words = []
 
         words << local_data::HUNDREDS[n / 100] if n >= 100
@@ -90,19 +216,21 @@ module Num2words
           words << (feminine ? local_data::ONES_FEM[ones] : local_data::ONES_MASC[ones]) if ones.positive?
         end
 
-        words << pluralize(n, *local_data::SCALES[scale_idx]) unless scale_idx.zero?
+        words << locale_pluralize(local_data, n, local_data::SCALES[scale_idx]) unless scale_idx.zero?
         words.compact
       end
 
-      def to_words_fractional(number, locale, feminine, locale_data, style: :fraction)
-        minus_word = locale_data::GRAMMAR[:minus] || "minus"
-        conjunction_word = locale_data::GRAMMAR[:conjunction] || "and"
-        default_fraction = locale_data::GRAMMAR[:default_fraction] || "parts"
+      def to_words_fractional(number, locale, feminine, locale_data, style: :fraction, joiner: :default)
+        minus_word = locale_minus_word(locale_data)
+        conjunction_word = locale_fraction_joiner(locale_data, joiner)
+        default_fraction = locale_default_fraction_word(locale_data)
         fractions_data = locale_data::FRACTIONS || {}
 
-        sign_word = number.negative? ? minus_word : ""
+        negative = number.is_a?(String) ? number.start_with?("-") : number.negative?
+        sign_word = negative ? minus_word : ""
 
-        integer_string, fraction_string = number.abs.to_s.split('.', 2)
+        absolute_number = number.is_a?(String) ? number.sub(/\A-/, "").tr(",", ".") : number.abs.to_s
+        integer_string, fraction_string = absolute_number.split('.', 2)
         integer_value = integer_string.to_i
 
         return to_words_integer(integer_value, locale, feminine, locale_data) if fraction_string.to_i.zero?
@@ -113,23 +241,29 @@ module Num2words
 
         integer_words = to_words_integer(integer_value, locale, feminine, locale_data)
 
-        if locale.to_sym == :en && style == :decimal
-          fraction_digits = fraction_string.chars.map { |d| to_words_integer(d.to_i, locale, feminine, locale_data) }
-          full_string = [sign_word, integer_words, "point", fraction_digits.join(" ")].reject(&:empty?).join(" ")
-          return full_string
+        if style == :decimal && locale_data.respond_to?(:decimal_fraction_words)
+          fraction_digits = locale_data.decimal_fraction_words(fraction_string)
+          return locale_join_decimal_words(locale_data, [sign_word, integer_words, locale_decimal_separator_word(locale_data), fraction_digits])
         end
 
-        numerator_words = to_words_integer(numerator, locale, (locale.to_sym == :ru ? true : feminine), locale_data)
+        numerator_feminine = locale_data.respond_to?(:fraction_numerator_feminine?) ? locale_data.fraction_numerator_feminine? : feminine
+        numerator_words = to_words_integer(numerator, locale, numerator_feminine, locale_data)
 
         denom_forms = fractions_data[denominator] || fractions_data[denominator.to_s] # массив склонений
-        denominator_words = denom_forms.is_a?(Array) ? pluralize(numerator, *denom_forms) : default_fraction
+        denominator_words = denom_forms.is_a?(Array) ? locale_pluralize(locale_data, numerator, denom_forms) : default_fraction
 
-        [sign_word, integer_words, conjunction_word, numerator_words, denominator_words].reject(&:empty?).join(" ")
+        locale_join_fraction_words(locale_data, [sign_word, integer_words, conjunction_word, numerator_words, denominator_words])
       end
 
       def to_words_integer(number, locale, feminine, locale_data)
+        return locale_data.integer_to_words(number, feminine: feminine) if locale_data.respond_to?(:integer_to_words)
+
         integer_value = Integer(number)
 
+        minus_word = locale_minus_word(locale_data)
+        negative = integer_value.negative?
+        integer_value = integer_value.abs
+
         return (feminine ? locale_data::ONES_FEM[0] : locale_data::ONES_MASC[0]) if integer_value.zero?
 
         groups = integer_value.to_s
@@ -139,14 +273,15 @@ module Num2words
         words = []
         groups.each_with_index do |group_value, index|
           scale_index = groups.size - index - 1
-          group_feminine = (scale_index == 1) || feminine
-          words.concat triple_to_words(group_value, scale_index, locale_data, feminine: group_feminine)
+          group_feminine = (locale_data.respond_to?(:feminine_group?) && locale_data.feminine_group?(scale_index)) || feminine
+          words.concat triple_to_words(group_value, scale_index, locale_data, feminine: group_feminine, locale: locale)
         end
 
+        words.unshift(minus_word) if negative
         words.join(" ")
       end
 
-      def to_words_date(date, locale, locale_data, format: :default)
+      def to_words_date(date, locale, locale_data, format: :default, date_case: :default)
         date = Date.parse(date.to_s) unless date.is_a?(Date)
 
         day, month, year = [date.day, date.month, date.year]
@@ -159,9 +294,18 @@ module Num2words
         raise ArgumentError, "Months not found for locale #{locale}" unless months
         raise ArgumentError, "Template not found for locale #{locale}" unless template
 
-        day_words = to_words_ordinal(day, locale, format, locale_data, gender: :neuter)
+        day_gender = date_case.to_sym == :genitive ? :masculine : :neuter
+        day_words = if locale_data.respond_to?(:date_day)
+                      locale_data.date_day(day, format: format, date_case: date_case)
+                    else
+                      to_words_ordinal(day, locale, format, locale_data, gender: day_gender)
+                    end
         month_words = months[month - 1]
-        year_words = to_words_ordinal(year, locale, format, locale_data)
+        year_words = if locale_data.respond_to?(:date_year)
+                       locale_data.date_year(year, format: format)
+                     else
+                       to_words_ordinal(year, locale, format, locale_data)
+                     end
 
         template % { day: day_words, month: month_words, year: year_words }
       end
@@ -173,7 +317,7 @@ module Num2words
         gender_data = ordinals[gender] || ordinals[:masculine]
         raise ArgumentError, "Gender #{gender} not found for locale #{locale}, format #{format}" unless gender_data
 
-        return gender_data[value - 1] if gender_data[value]
+        return gender_data[value - 1] if value.between?(1, gender_data.length)
 
         if value > 31
           thousands = (value / 100) * 100
@@ -197,18 +341,22 @@ module Num2words
         words = locale_data::TIME[:words]
         template = locale_data::TIME_TEMPLATE
 
-        hours = [
-          to_words_integer(time.hour, locale, false, locale_data),
-          pluralize(time.hour, *words[:hour])
-        ].join(" ")
-        minutes = [
-          to_words_integer(time.min, locale, true, locale_data),
-          pluralize(time.min, *words[:minute])
-        ].join(" ")
-        seconds = [
-          to_words_integer(time.sec, locale, true, locale_data),
-          pluralize(time.sec, *words[:second])
-        ].join(" ")
+        hour_feminine = locale_time_unit_feminine?(locale_data, :hour, false)
+        minute_feminine = locale_time_unit_feminine?(locale_data, :minute, true)
+        second_feminine = locale_time_unit_feminine?(locale_data, :second, true)
+
+        hours = locale_join_time_words(locale_data,
+          locale_time_number_words(locale_data, time.hour, :hour, locale, hour_feminine),
+          locale_pluralize(locale_data, time.hour, words[:hour])
+        )
+        minutes = locale_join_time_words(locale_data,
+          locale_time_number_words(locale_data, time.min, :minute, locale, minute_feminine),
+          locale_pluralize(locale_data, time.min, words[:minute])
+        )
+        seconds = locale_join_time_words(locale_data,
+          locale_time_number_words(locale_data, time.sec, :second, locale, second_feminine),
+          locale_pluralize(locale_data, time.sec, words[:second])
+        )
 
         format = if short
                    time.min.zero? && time.sec.zero? ? :hours_only : :hours_minutes
@@ -228,13 +376,13 @@ module Num2words
         end
       end
 
-      def to_words_datetime(datetime, locale, locale_data, format: :default, only: nil, short: false)
+      def to_words_datetime(datetime, locale, locale_data, format: :default, only: nil, short: false, date_case: :default)
         datetime = DateTime.parse(datetime) if datetime.is_a?(String)
 
         date_format = short && only == :date ? :short : format
         time_format = short && only == :time ? :short : :default
 
-        date_part = to_words_date(datetime.to_date, locale, locale_data, format: date_format)
+        date_part = to_words_date(datetime.to_date, locale, locale_data, format: date_format, date_case: date_case)
         time_part = to_words_time(datetime.to_time, locale, locale_data, format: time_format, short: short)
 
         return date_part if only == :date
@@ -260,12 +408,12 @@ module Num2words
         case value
         when Integer then :integer
         when Float then :float
+        when DateTime then :datetime
         when Date then :date
         when Time then :time
-        when DateTime then :datetime
         when String
           return :integer if value.match?(/\A-?\d+\z/)
-          return :float if value.match?(/\A-?\d+\.\d+\z/)
+          return :float if value.match?(/\A-?\d+[\.,]\d+\z/)
           return :time if value.match?(/\A\d{1,2}:\d{2}(:\d{2})?\z/)
 
           # Форматы даты

data/lib/num2words/locales/ar.rb

@@ -20,6 +20,136 @@ module Num2words
       DATETIME_TEMPLATE = I18n.t("num2words.datetime.template", locale: :ar)
 
       ORDINALS = I18n.t("num2words.numbers.ordinals", locale: :ar)
+
+      module_function
+
+      def integer_to_words(number, feminine: false)
+        integer_value = Integer(number)
+        negative = integer_value.negative?
+        integer_value = integer_value.abs
+
+        return (feminine ? ONES_FEM[0] : ONES_MASC[0]) if integer_value.zero?
+
+        groups = integer_value.to_s
+                              .chars.reverse.each_slice(3).map(&:reverse)
+                              .map(&:join).map!(&:to_i).reverse
+
+        words = []
+        groups.each_with_index do |group_value, index|
+          next if group_value.zero?
+
+          scale_idx = groups.size - index - 1
+          words << scale_group_to_words(group_value, scale_idx, feminine: feminine && scale_idx.zero?)
+        end
+
+        result = words.join(" و")
+        negative ? [minus_word, result].join(" ") : result
+      end
+
+      def triple_to_words(number, scale_idx, feminine: false)
+        scale_group_to_words(number, scale_idx, feminine: feminine).split
+      end
+
+      def scale_group_to_words(number, scale_idx, feminine: false)
+        return under_thousand(number, feminine: feminine) if scale_idx.zero?
+
+        scale_forms = SCALES[scale_idx]
+        case number
+        when 1
+          scale_forms[0]
+        when 2
+          scale_forms[1]
+        else
+          scale_form = number.between?(3, 10) ? scale_forms[2] : scale_forms[0]
+          [under_thousand(number), scale_form].join(" ")
+        end
+      end
+
+      def under_thousand(number, feminine: false)
+        hundreds = number / 100
+        rest = number % 100
+
+        return under_hundred(rest, feminine: feminine) if hundreds.zero?
+        return HUNDREDS[hundreds] if rest.zero?
+
+        [HUNDREDS[hundreds], under_hundred(rest, feminine: feminine)].join(" و")
+      end
+
+      def under_hundred(number, feminine: false)
+        ones_data = feminine ? ONES_FEM : ONES_MASC
+
+        return ones_data[number] if number < 10
+        return TEENS[number - 10] if number < 20
+
+        tens = number / 10
+        ones = number % 10
+
+        return TENS[tens] if ones.zero?
+
+        [ones_data[ones], TENS[tens]].join(" و")
+      end
+
+      def minus_word
+        GRAMMAR[:minus]
+      end
+
+      def fraction_joiner(joiner)
+        joiner.to_sym == :and ? "و" : GRAMMAR[:conjunction]
+      end
+
+      def default_fraction_word
+        GRAMMAR[:default_fraction]
+      end
+
+      def decimal_separator_word
+        GRAMMAR[:conjunction]
+      end
+
+      def decimal_fraction_words(fraction_string)
+        fraction_string.chars.map { |digit| integer_to_words(digit.to_i) }.join(" ")
+      end
+
+      def join_fraction_words(words)
+        parts = words.reject(&:empty?)
+        joiner_index = parts.index("و")
+
+        if joiner_index && parts[joiner_index + 1]
+          parts[joiner_index + 1] = "و#{parts[joiner_index + 1]}"
+          parts.delete_at(joiner_index)
+        end
+
+        parts.join(" ")
+      end
+
+      def fraction_numerator_feminine?
+        false
+      end
+
+      def date_day(day, format:, date_case:)
+        ordinal(day, format)
+      end
+
+      def date_year(year, format:)
+        integer_to_words(year)
+      end
+
+      def ordinal(value, format, gender: :masculine)
+        ordinals = ORDINALS[format] || ORDINALS[:default]
+        gender_data = ordinals[gender] || ordinals[:masculine]
+
+        return gender_data[value - 1] if value.between?(1, gender_data.length)
+
+        integer_to_words(value)
+      end
+
+      def pluralize(number, singular, dual, plural)
+        number = number.abs
+        return singular if number == 1
+        return dual if number == 2
+        return plural if number.zero? || number.between?(3, 10)
+
+        singular
+      end
     end
 
     register :ar, AR

data/lib/num2words/locales/be.rb

@@ -20,6 +20,107 @@ module Num2words
       DATETIME_TEMPLATE = I18n.t("num2words.datetime.template", locale: :be)
 
       ORDINALS = I18n.t("num2words.numbers.ordinals", locale: :be)
+
+      module_function
+
+      def feminine_group?(scale_idx)
+        scale_idx == 1
+      end
+
+      def fraction_numerator_feminine?
+        true
+      end
+
+      def minus_word
+        GRAMMAR[:minus]
+      end
+
+      def fraction_joiner(joiner)
+        joiner.to_sym == :and ? "і" : GRAMMAR[:conjunction]
+      end
+
+      def default_fraction_word
+        GRAMMAR[:default_fraction]
+      end
+
+      def triple_to_words(number, scale_idx, feminine: false)
+        words = []
+
+        words << HUNDREDS[number / 100] if number >= 100
+        rest = number % 100
+
+        if rest.between?(10, 19)
+          words << TEENS[rest - 10]
+        else
+          words << TENS[rest / 10] if rest >= 20
+          ones = rest % 10
+          words << (feminine ? ONES_FEM[ones] : ONES_MASC[ones]) if ones.positive?
+        end
+
+        words << pluralize(number, *SCALES[scale_idx]) unless scale_idx.zero?
+        words.compact
+      end
+
+      def date_day(day, format:, date_case:)
+        return ordinal(day, :default, gender: :masculine) if date_case.to_sym == :genitive
+
+        ordinal(day, :nominative, gender: :neuter)
+      end
+
+      def date_year(year, format:)
+        ordinal(year, :default)
+      end
+
+      def ordinal(value, format, gender: :masculine)
+        ordinals = ORDINALS[format]
+        gender_data = ordinals[gender] || ordinals[:masculine]
+
+        return gender_data[value - 1] if value.between?(1, gender_data.length)
+
+        if value > 31
+          thousands = (value / 100) * 100
+          last_two = value % 100
+          base_year = cardinal(thousands)
+          last_ordinal = gender_data[last_two - 1] || cardinal(last_two)
+
+          return [base_year, last_ordinal].join(" ")
+        end
+
+        cardinal(value)
+      end
+
+      def cardinal(number, feminine: false)
+        integer_value = Integer(number)
+        negative = integer_value.negative?
+        integer_value = integer_value.abs
+
+        return (feminine ? ONES_FEM[0] : ONES_MASC[0]) if integer_value.zero?
+
+        groups = integer_value.to_s
+                              .chars.reverse.each_slice(3).map(&:reverse)
+                              .map(&:join).map!(&:to_i).reverse
+
+        words = []
+        groups.each_with_index do |group_value, index|
+          scale_idx = groups.size - index - 1
+          group_feminine = feminine_group?(scale_idx) || feminine
+          words.concat triple_to_words(group_value, scale_idx, feminine: group_feminine)
+        end
+
+        words.unshift(minus_word) if negative
+        words.join(" ")
+      end
+
+      def pluralize(number, singular, few, plural)
+        number = number.abs
+        return plural if (11..14).include?(number % 100)
+
+        case number % 10
+        when 1 then singular
+        when 2..4 then few
+        else plural
+        end
+      end
     end
 
     register :be, BE