sankhya 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d2e0c7d806546a25964eb799e9ac93539551e28
-  data.tar.gz: ae607af6d1fd20ab6502d7d2b5dbb1290810b3cd
+  metadata.gz: 78a4f985011da8598c53c68f0d3b0811f717d50c
+  data.tar.gz: 553f1c68691e7e7a8413cf5ad1d2c42394ce8cf7
 SHA512:
-  metadata.gz: 29322362d617f075f04b66026f628b0ae277d305a7ec7dc4cebb231781cb061cab0f17e13169e92c17e730832c8183d9c299eedfab5a5b62b76635f914b71cd7
-  data.tar.gz: 08506902eeebf36dea735e625e4461df50649f8df502f5cc3539e52632a84ba0084ef50f9432a3d09ae6393be8dd0b91602be5ad0a09ea535b8485cb5ec7fedd
+  metadata.gz: 4b5db5eb2714e808c586fc155028717c2041e6044c32ce0400f1fcd1e8aed684f7fe2784fa69b4488c1ea98ac6c75fb568416c8d94a0e101f8fa9e13ebb1a01d
+  data.tar.gz: 6f29b000505cdf23733284b73d720fb28e3c05be137498d6cb281dca9234d2878d0b0b1f528234d558ba818c0a5eb11f8d56e208ed976bd681d719fcdf80a58d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sankhya (0.1.0)
+    sankhya (0.2.0)
 
 GEM
   remote: https://rubygems.org/

data/lib/sankhya/numbers.rb

@@ -3,21 +3,29 @@ module Sankhya
   class Numbers
     extend Words
 
-    def self.translate(number, scale)
-      scale ||= 2
+    def self.translate(number, options)
+      parse options
 
       if number.integer?
-        # integer
         words_of(number)
-      else
-        # float
-        numbers = number.to_s.split('.')
-        [words_of(numbers.first.to_i), words_of(numbers.last.ljust(scale,'0')[0..scale].to_i)]
+      else # if float
+        integer = number.floor
+        decimal = (number * (10 ** @scale)).floor - (integer * (10 ** @scale))
+        [words_of(integer), words_of(decimal)]
       end
     end
 
   private
 
+    def self.is_number?(number)
+      true if Float(number) rescue false
+    end
+
+    def self.parse(options)
+      @comma = options.has_key?(:comma) ? options[:comma] : true
+      @scale = is_number?(options[:scale]) ? ([options[:scale], 0].max) : 2
+    end
+
     def self.words_of(number)
       if number < 20
         self.to_english(number)
@@ -48,7 +56,8 @@ module Sankhya
           end
         end
 
-        words.reverse.join(' ').gsub(/, ,|,$/, '')
+        regex = @comma ? /, ,|,$/ : /, ,|,/
+        words.reverse.join(' ').gsub(/#{regex}/, '')
       end
     end
 

data/lib/sankhya/version.rb

@@ -1,3 +1,3 @@
 module Sankhya
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/sankhya.rb

@@ -4,7 +4,7 @@ require "sankhya/numbers"
 
 module Sankhya
   def to_words(options = {})
-    Numbers::translate self, options[:scale]
+    Numbers::translate self, options
   end
 end
 

data/spec/sankhya_spec.rb

@@ -66,4 +66,47 @@ describe Sankhya do
     (2071432997924.58).to_words.should eql(["two lakh, seven thousand, one hundred and forty three crore, twenty nine lakh, ninety seven thousand, nine hundred and twenty four", "fifty eight"])
   end
 
+  # it "converts 22,99,11,123,45,67,890.76 to words" do
+  #   (2299111234567890.76).to_words.should eql(["twenty two crore, ninety nine lakh, eleven thousand, one hundred and twenty three crore, forty five lakh, sixty seven thousand, eight hundred and ninety", "seventy six"])
+  # end
+
+  it "converts 21,89,14,967,50,95,052.8 to words" do
+    (2189149675095052.8).to_words.should eql(["twenty one crore, eighty nine lakh, fourteen thousand, nine hundred and sixty seven crore, fifty lakh, ninety five thousand and fifty two", "eighty"])
+  end
+
+  it "converts 10,10,110.10 to words without comma" do
+    (1010110.10).to_words(comma: false).should eql(["ten lakh ten thousand one hundred and ten", "ten"])
+  end
+
+  it "converts 10,10,110.10 to words without comma, if comma option is a truthy value" do
+    (1010110.10).to_words(comma: "false").should eql(["ten lakh, ten thousand, one hundred and ten", "ten"])
+  end
+
+  it "converts 10,10,110.10 to words with scale -2" do
+    (1010110.10).to_words(scale: -2).should eql(["ten lakh, ten thousand, one hundred and ten", "zero"])
+  end
+
+  it "converts 10,10,110.10 to words with scale -1" do
+    (1010110.10).to_words(scale: -1).should eql(["ten lakh, ten thousand, one hundred and ten", "zero"])
+  end
+
+  it "converts 10,10,110.10 to words with scale 0" do
+    (1010110.10).to_words(scale: 0).should eql(["ten lakh, ten thousand, one hundred and ten", "zero"])
+  end
+
+  it "converts 10,10,110.10 to words with scale 2, if scale option is an invalid value" do
+    (1010110.10).to_words(scale: "one").should eql(["ten lakh, ten thousand, one hundred and ten", "ten"])
+  end
+
+  it "converts 10,10,110.10 to words with scale 1" do
+    (1010110.10).to_words(scale: 1).should eql(["ten lakh, ten thousand, one hundred and ten", "one"])
+  end
+
+  it "converts 10,10,110.10 to words with scale 2" do
+    (1010110.10).to_words(scale: 2).should eql(["ten lakh, ten thousand, one hundred and ten", "ten"])
+  end
+
+  it "converts 10,10,110.10 to words with scale 3" do
+    (1010110.10).to_words(scale: 3).should eql(["ten lakh, ten thousand, one hundred and ten", "one hundred"])
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sankhya
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Geordee Naliyath
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-18 00:00:00.000000000 Z
+date: 2014-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler