num_words 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0d117daa9a0ef678984f1a03b1b1456047e7ea67b4b13f610ab8cfb90634646
-  data.tar.gz: 4732ef7b105d1ae22b208529fe6098cbab124aef3547ee4650f3d24dd4b3a89e
+  metadata.gz: c707e6c57aaf783107cb3290b903a117e012ce6c187d01eb9c6845c709c247a3
+  data.tar.gz: 8cde67422c55d5ebc89d90a70992af08a5f8404cdc121b250adf901e5ded661d
 SHA512:
-  metadata.gz: 75c3b9d42dc93e10d5a413d2f1a03b04921f8277dd1ae056bcf4f020c9672e6e4737752d82d02541e9ac9b0560e0facb5888e64cb3de72ee83dcb881855f27b0
-  data.tar.gz: 666c1624f2d5c82ac29cd479f3c1625f0f43941be7876d190b3483ff87de195d4c949b9d88b74b9c10e8886f64e2657d91812ce85a2041fd5705d4038900208c
+  metadata.gz: f7d41d25b31437a63ac7ae7efd4e91c9ae930fc52b087f5c83951d28a4accf70b8e5c1bb88019822630afdb5a846da9406f81ee99c9564760a0f90b60afd4961
+  data.tar.gz: 2d94b537a8db62c48749bb0ae149efb58d91c976e334fb0aec48f1e9649b6146b5d89671d9ef1f8b063ee8144ea53086166f98e7a2a7ce2c3391ea5cc6183fea

data/README.md

@@ -9,9 +9,6 @@
 - Convert integers and decimals to words.
 - Supports multiple country numbering systems:
   - **US / American** – `thousand, million, billion`
-  - **European** – `thousand, million, milliard, billion`
-  - **UK** – `thousand, million, billion`
-  - **France** – `mille, million, milliard`
   - **India** – `thousand, lakh, crore`
 - Supports multiple languages:
   - **English** (`:en`)

data/lib/num_words/converter.rb

@@ -20,13 +20,16 @@ module NumWords
     90=>"नब्बे",91=>"इक्यानवे",92=>"बयानवे",93=>"तिरेनवे",94=>"चौरानवे",95=>"पचानवे",96=>"छियानवे",97=>"सत्तानवे",98=>"अट्ठानवे",99=>"निन्यानवे"
   }.freeze
 
+  # --- Units ---
   INDIAN_UNITS_HI = ['', 'हज़ार', 'लाख', 'करोड़', 'अरब', 'खरब'].freeze
+  INDIAN_UNITS_EN = ['', 'thousand', 'lakh', 'crore', 'arab', 'kharab'].freeze
+
+  # --- English exponents ---
   AM_EXPONENTS = {
     3 => 'thousand', 6 => 'million', 9 => 'billion', 12 => 'trillion',
     15 => 'quadrillion', 18 => 'quintillion', 21 => 'sexillion', 24 => 'septillion',
     27 => 'octillion', 30 => 'nonillion', 33 => 'decillion', 36 => 'undecillion'
   }.freeze
-  INDIAN_UNITS_EN = ['', 'thousand', 'lakh', 'crore', 'arab', 'kharab'].freeze
 
   COUNTRY_EXPONENTS = {
     us: AM_EXPONENTS,
@@ -35,30 +38,26 @@ module NumWords
 
   class << self
     # Convert number to words
+    # Default language: :en
     def to_words(number, country: :us, language: :en, include_and: true)
-      if [:in].include?(country) && language == :hi
-        return to_words_indian(number)
-      end
-
       val = number.to_i.abs
-      return 'zero' if val.zero?
+      return language == :hi ? HINDI_NUMBERS_1_TO_99[0] : 'zero' if val.zero?
+
+      if country == :in
+        return language == :hi ? to_words_indian(number) : to_words_indian(number, language: :en)
+      end
 
       exp_hash = COUNTRY_EXPONENTS[country] || AM_EXPONENTS
       ones_array = language == :hi ? HINDI_NUMBERS_1_TO_99 : ONES_EN
       tens_array = language == :hi ? HINDI_NUMBERS_1_TO_99 : TENS_EN
-      units = language == :hi ? INDIAN_UNITS_HI : INDIAN_UNITS_EN
-
-      if country == :in
-        to_words_indian(number, language: language)
-      else
-        to_words_generic(val, exp_hash, include_and, ones_array, tens_array)
-      end
+      to_words_generic(val, exp_hash, include_and, ones_array, tens_array)
     end
 
-    # Indian system (Hindi & English)
+    # Indian system (supports English & Hindi)
     def to_words_indian(num, language: :hi)
       num = num.to_i
-      return HINDI_NUMBERS_1_TO_99[num] if num <= 99
+      return HINDI_NUMBERS_1_TO_99[num] if language == :hi && num <= 99
+      return ONES_EN[num] if language == :en && num <= 19
 
       words = []
       unit_index = 0
@@ -66,8 +65,9 @@ module NumWords
       loop do
         break if num.zero?
         num, remainder = unit_index.zero? ? num.divmod(1000) : num.divmod(100)
-        part = convert_hindi_sub_thousand(remainder)
-        words.unshift("#{part} #{INDIAN_UNITS_HI[unit_index]}".strip) if remainder.positive?
+        part = language == :hi ? convert_hindi_sub_thousand(remainder) : convert_english_sub_thousand(remainder)
+        unit_name = language == :hi ? INDIAN_UNITS_HI[unit_index] : INDIAN_UNITS_EN[unit_index]
+        words.unshift("#{part} #{unit_name}".strip) if remainder.positive?
         unit_index += 1
       end
 
@@ -78,7 +78,6 @@ module NumWords
 
     def convert_hindi_sub_thousand(num)
       return HINDI_NUMBERS_1_TO_99[num] if num <= 99
-
       words = []
       if num >= 100
         words << "#{HINDI_NUMBERS_1_TO_99[num / 100]} सौ"
@@ -88,7 +87,19 @@ module NumWords
       words.join(' ').strip
     end
 
-    # Generic system (English or other)
+    def convert_english_sub_thousand(num)
+      return ONES_EN[num] if num < 20
+      words = []
+      if num >= 100
+        words << "#{ONES_EN[num / 100]} hundred"
+        num %= 100
+      end
+      words << TENS_EN[num / 10] if num >= 20
+      num %= 10 if num >= 20
+      words << ONES_EN[num] if num.positive?
+      words.join(' ').strip
+    end
+
     def to_words_generic(val, exp_hash, include_and, ones_array, tens_array)
       chunks = []
       while val.positive?
@@ -99,25 +110,11 @@ module NumWords
       result = []
       chunks.each_with_index do |chunk, index|
         next if chunk.zero?
-        words = hundreds_to_words(chunk, include_and && index.zero?, ones_array, tens_array)
+        words = convert_english_sub_thousand(chunk)
+        words = "and #{words}" if include_and && index.zero? && chunk >= 100
         result.unshift("#{words} #{exp_hash[index * 3]}".strip)
       end
       result.join(' ').strip
     end
-
-    def hundreds_to_words(val, include_and, ones_array, tens_array)
-      return '' if val.zero?
-
-      words = []
-      if val >= 100
-        words << "#{ones_array[val / 100]} #{ones_array == HINDI_NUMBERS_1_TO_99 ? 'सौ' : 'hundred'}"
-        val %= 100
-        words << 'and' if val.positive? && include_and && ones_array != HINDI_NUMBERS_1_TO_99
-      end
-
-      words << tens_array[val] if val > 0 && val <= 99 && ones_array == HINDI_NUMBERS_1_TO_99
-      words << ones_array[val] if val > 0 && val < 20 && ones_array != HINDI_NUMBERS_1_TO_99
-      words.join(' ').strip
-    end
   end
 end

data/lib/num_words/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module NumWords
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: num_words
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - mrmalvi
@@ -9,8 +9,8 @@ bindir: exe
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies: []
-description: NumWords gem converts integers and decimals to words. Supports US, EU,
-  UK, FR, and Indian number systems with proper handling of decimals.
+description: NumWords gem converts integers and decimals to words. Supports US and
+  Indian number systems with proper handling of decimals.
 email:
 - malviyak00@gmail.com
 executables: