polish-number 0.0.2 → 0.1.0

data/README.rdoc

@@ -2,19 +2,23 @@
 Translates numbers to Polish words
 
 = Installation
+  Tested with Ruby 1.8.7 and 1.9.2.
+
   gem install polish-number
 
 = Usage
   require 'polish_number'
-  
+
   PolishNumber.translate(1234) #=> tysiąc dwieście trzydzieści cztery
+  PolishNumber.translate(34, :currency => :PLN) #=> trzydzieści cztery złote
+  PolishNumber.translate(12, :currency => :PLN) #=> dwanaście złotych
 
 = Running specs
 
   rake test
 
 = TODO
-- currently works for number 0-1999. Make it work with millions, billions, etc
+- currently works for numbers 0-999999. Make it work with millions, billions, etc
 - optional noun pluralization
 
 = GitHub

data/lib/polish_number.rb

@@ -15,35 +15,43 @@ module PolishNumber
 
   ZERO = 'zero'
 
-  THOUSANDS = ['', 'tysiąc ', 'tysiące ', 'tysięcy ']
+  THOUSANDS = {:one => 'tysiąc', :few => 'tysiące', :many => 'tysięcy'}
 
-  AND = 'i '
-  DECIMALS = ['', 'dziesiąta ', 'dziesiąte ', 'dziesiątych ']
+  CURRENCIES = {
+    :PLN => {:one => 'złoty', :few => 'złote', :many => 'złotych'}
+  }
 
-  def self.translate(number)
-    number = number.to_f
-
-    unless (0..999999.99).include? number
-      raise ArgumentError, 'number should be in 0..999999.99 range'
+  def self.translate(number, options={})
+    if options[:currency] && !CURRENCIES.has_key?(options[:currency])
+      raise ArgumentError, "unknown :currency option '#{options[:currency].inspect}'. Choose one from: #{CURRENCIES.inspect}"
     end
 
-    return ZERO.dup if number == 0.0
+    number = number.to_i
 
-    formatted_number = sprintf("%09.2f", number)
-    digits = formatted_number.chars.map { |char| char.to_i }
+    unless (0..999999).include? number
+      raise ArgumentError, 'number should be in 0..999999 range'
+    end
 
-    result = ''
-    result << process_0_999(digits[0..2])
-    result << pluralize(digits[1..2], THOUSANDS)
-    result << process_0_999(digits[3..5])
-    # skip the 6th digit - it was a decimal dot
-    fraction = process_0_99(digits[7..8])
-    unless fraction == ''
-      result << AND
-      result << fraction
-      result << pluralize(digits[7..8], DECIMALS)
+    if number == 0
+      result = ZERO.dup
+    else
+      formatted_number = sprintf('%06.0f', number)
+      digits = formatted_number.chars.map { |char| char.to_i }
+
+      result = ''
+      result << process_0_999(digits[0..2])
+      result << thousands(number/1000, digits[0..2])
+      result << ' '
+      result << process_0_999(digits[3..5])
+      result.strip!
+    end
+
+    if options[:currency]
+      currency = CURRENCIES[options[:currency]]
+      result << ' '
+      result << currency[classify(number, digits)]
     end
-    result.strip!
+
     result
   end
 
@@ -52,29 +60,33 @@ module PolishNumber
   def self.process_0_999(digits)
     result = ''
     result << HUNDREDS[digits[0]]
-    result << process_0_99(digits[1..2])
+
+    if digits[1] == 1 && digits[2] != 0
+      result << TEENS[digits[2]]
+    else
+      result << TENS[digits[1]]
+      result << UNITIES[digits[2]]
+    end
+
     result
   end
 
-  def self.process_0_99(digits)
-    if digits[0] == 1 && digits[1] != 0
-      TEENS[digits[1]]
+  def self.thousands(number, digits)
+    if number == 0
+      ''
     else
-      TENS[digits[0]] + UNITIES[digits[1]]
+      THOUSANDS[classify(number, digits)]
     end
   end
 
-  def self.pluralize(digits, words)
-    if digits[0] == 0 && digits[1] == 0
-      thousand_id = 0
-    elsif digits[1] == 0 && digits[2] == 1
-      thousand_id = 1
-    elsif digits[1] != 1 && (2..4).include?(digits[2])
-      thousand_id = 2
+  def self.classify(number, digits)
+    if number == 1
+      :one
+    # all numbers with 2, 3 or 4 at the end, but not teens
+    elsif digits && (2..4).include?(digits[-1]) && digits[-2] != 1
+      :few
     else
-      thousand_id = 3
+      :many
     end
-    words[thousand_id]
   end
 end
-

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 2
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors: 
 - Wojciech Piekutowski
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-10 00:00:00 +02:00
+date: 2010-10-04 00:00:00 +02:00
 default_executable: 
 dependencies: []