sankhya 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78a4f985011da8598c53c68f0d3b0811f717d50c
-  data.tar.gz: 553f1c68691e7e7a8413cf5ad1d2c42394ce8cf7
+  metadata.gz: 9f633c8fe0e823c5f3b348d601b3ea5bebc69586
+  data.tar.gz: 19c17dca7750feaacfe3597df03dace9bf7594bc
 SHA512:
-  metadata.gz: 4b5db5eb2714e808c586fc155028717c2041e6044c32ce0400f1fcd1e8aed684f7fe2784fa69b4488c1ea98ac6c75fb568416c8d94a0e101f8fa9e13ebb1a01d
-  data.tar.gz: 6f29b000505cdf23733284b73d720fb28e3c05be137498d6cb281dca9234d2878d0b0b1f528234d558ba818c0a5eb11f8d56e208ed976bd681d719fcdf80a58d
+  metadata.gz: 6c7ef2eed787b50fe71cac7e1e4a3d754e82647601337bad530f14e89ffc34331c79fb27a0b4bf0a80c7c9f99f1b2c0607642d399bbffa6026b47ed379a32a54
+  data.tar.gz: 42c443e851da1c2c9f77f929438ac4540be63d701c5ceaf1a1b419f32fef57ae1ca95f9536167631bd2e7fcc00582192d0f5a6fdf0819a6f0b9b8f465bad670f

data/.rubocop.yml

@@ -0,0 +1,14 @@
+Documentation:
+  Enabled: false
+
+LineLength:
+  Max: 360
+
+WordArray:
+  MinSize: 8
+
+MethodLength:
+  Enabled: false
+
+CyclomaticComplexity:
+  Enabled: false

data/Gemfile.lock

@@ -1,21 +1,21 @@
 PATH
   remote: .
   specs:
-    sankhya (0.2.0)
+    sankhya (0.3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.2.5)
-    rake (10.1.1)
+    rake (10.3.1)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.7)
+    rspec-core (2.14.8)
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.5)
+    rspec-mocks (2.14.6)
 
 PLATFORMS
   ruby

data/README.md

@@ -18,7 +18,9 @@ Or install it yourself as:
 
 ## Usage
 
-Sankhya add a 'to_words' method to Integer and Float classes.
+Sankhya adds a couple of methods to Integer and Float classes.
+
+### to_words
 
     10101101.to_words    # "one crore, one lakh, one thousand, one hundred and one"
     0.to_words           # "zero"
@@ -27,6 +29,11 @@ Sankhya add a 'to_words' method to Integer and Float classes.
     1.1.to_words         # ["one", "one"]
     1.01.to_words        # ["one", "one"]
 
+### to_amount
+
+    10101101.to_amount   # "10,101,101"
+    10101.01.to_amount   # "10,101.01"
+    0.to_amount          # "0.00"
 
 Please see the spec for more examples.
 

data/lib/sankhya.rb

@@ -1,10 +1,14 @@
-require "sankhya/version"
-require "sankhya/words"
-require "sankhya/numbers"
+require 'sankhya/version'
+require 'sankhya/words'
+require 'sankhya/numbers'
 
 module Sankhya
   def to_words(options = {})
-    Numbers::translate self, options
+    Numbers.translate self, options
+  end
+
+  def to_amount(options = {})
+    Numbers.amount self, options
   end
 end
 

data/lib/sankhya/numbers.rb

@@ -1,5 +1,4 @@
 module Sankhya
-
   class Numbers
     extend Words
 
@@ -10,57 +9,70 @@ module Sankhya
         words_of(number)
       else # if float
         integer = number.floor
-        decimal = (number * (10 ** @scale)).floor - (integer * (10 ** @scale))
+        decimal = (number * (10**@scale)).floor - (integer * (10**@scale))
         [words_of(integer), words_of(decimal)]
       end
     end
 
-  private
+    def self.amount(number, options)
+      parse options
+
+      numbers = format "%.#{@scale}f", number
+      integers, decimals = numbers.split('.')
 
-    def self.is_number?(number)
-      true if Float(number) rescue false
-    end
+      result = []
+      result << integers.reverse[3..-1].to_s.gsub(/(\d{2})(?=\d)/, '\\1,').reverse
+      result << integers.reverse[0..2].reverse
 
-    def self.parse(options)
-      @comma = options.has_key?(:comma) ? options[:comma] : true
-      @scale = is_number?(options[:scale]) ? ([options[:scale], 0].max) : 2
+      result.select { |x| !x.empty? }.join(',') + '.' + decimals
     end
 
-    def self.words_of(number)
-      if number < 20
-        self.to_english(number)
-      else
-        words = []
+    class << self
+      private
 
-        units = [{divisor: 100, prefix: ', and' },
-                 {divisor: 10,  suffix: 'hundred,' },
-                 {divisor: 100, suffix: 'thousand,' },
-                 {divisor: 100, suffix: 'lakh,' }]
+      def number?(number)
+        true if Float(number) rescue false
+      end
+
+      def parse(options)
+        @comma = options.key?(:comma) ? options[:comma] : true
+        @scale = number?(options[:scale]) ? ([options[:scale], 0].max) : 2
+      end
 
-        i = 0
-        while i < units.length
-          number, segment = number.divmod(units[i][:divisor])
-          parts = segment < 20 ? segment.divmod(100) : segment.divmod(10)
+      def words_of(number)
+        if number < 20
+          to_english(number)
+        else
+          words = []
 
-          words << units[i][:suffix]                 if units[i][:suffix] and segment > 0
-          words << self.to_english(parts.last)       if parts.last > 0
-          words << self.to_english(10 * parts.first) if parts.first > 0
-          words << units[i][:prefix]                 if units[i][:prefix] and segment > 0 and number > 0
+          units = [{ divisor: 100, prefix: ', and' },
+                   { divisor: 10,  suffix: 'hundred,' },
+                   { divisor: 100, suffix: 'thousand,' },
+                   { divisor: 100, suffix: 'lakh,' }]
 
-          if i == units.length - 1 and number > 0
-            # suffix crore and and start over
-            words << 'crore,'
-            i = 0 
-          else
-            i += 1
+          i = 0
+          while i < units.length
+            number, segment = number.divmod(units[i][:divisor])
+            parts = segment < 20 ? segment.divmod(100) : segment.divmod(10)
+
+            words << units[i][:suffix]            if units[i][:suffix] && segment > 0
+            words << to_english(parts.last)       if parts.last > 0
+            words << to_english(10 * parts.first) if parts.first > 0
+            words << units[i][:prefix]            if units[i][:prefix] && segment > 0 && number > 0
+
+            if i == units.length - 1 && number > 0
+              # suffix crore and start over
+              words << 'crore,'
+              i = 0
+            else
+              i += 1
+            end
           end
-        end
 
-        regex = @comma ? /, ,|,$/ : /, ,|,/
-        words.reverse.join(' ').gsub(/#{regex}/, '')
+          regex = @comma ? /, ,|,$/ : /, ,|,/
+          words.reverse.join(' ').gsub(/#{regex}/, '')
+        end
       end
     end
-
   end
-
 end

data/lib/sankhya/version.rb

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

data/lib/sankhya/words.rb

@@ -1,39 +1,39 @@
 module Sankhya
   module Words
     def to_english(number)
-      {0 =>  'zero',
-       1 =>  'one',
-       2 =>  'two',
-       3 =>  'three',
-       4 =>  'four',
-       5 =>  'five',
-       6 =>  'six',
-       7 =>  'seven',
-       8 =>  'eight',
-       9 =>  'nine',
-       10 => 'ten',
-       11 => 'eleven',
-       12 => 'twelve',
-       13 => 'thirteen',
-       14 => 'fourteen',
-       15 => 'fifteen',
-       16 => 'sixteen',
-       17 => 'seventeen',
-       18 => 'eighteen',
-       19 => 'nineteen',
-       10 =>  'ten',
-       20 =>  'twenty',
-       30 =>  'thirty',
-       40 =>  'forty',
-       50 =>  'fifty',
-       60 =>  'sixty',
-       70 =>  'seventy',
-       80 =>  'eighty',
-       90 =>  'ninety',
-       100 =>  'hundred',
-       1000 =>  'thousand',
-       100000 =>  'lakh',
-       10000000 =>  'crore'
+      { 0 =>  'zero',
+        1 =>  'one',
+        2 =>  'two',
+        3 =>  'three',
+        4 =>  'four',
+        5 =>  'five',
+        6 =>  'six',
+        7 =>  'seven',
+        8 =>  'eight',
+        9 =>  'nine',
+        10 => 'ten',
+        11 => 'eleven',
+        12 => 'twelve',
+        13 => 'thirteen',
+        14 => 'fourteen',
+        15 => 'fifteen',
+        16 => 'sixteen',
+        17 => 'seventeen',
+        18 => 'eighteen',
+        19 => 'nineteen',
+        10 =>  'ten',
+        20 =>  'twenty',
+        30 =>  'thirty',
+        40 =>  'forty',
+        50 =>  'fifty',
+        60 =>  'sixty',
+        70 =>  'seventy',
+        80 =>  'eighty',
+        90 =>  'ninety',
+        100 =>  'hundred',
+        1_000 =>  'thousand',
+        100_000 =>  'lakh',
+        10_000_000 =>  'crore'
       }[number]
     end
   end

data/spec/sankhya_spec.rb

@@ -2,111 +2,147 @@ require 'spec_helper'
 
 describe Sankhya do
 
-  it "converts 0 to words" do
-    0.to_words.should eql("zero")
+  it 'converts 0 to words' do
+    0.to_words.should eql('zero')
   end
 
-  it "converts 5,36,24,133 to words" do
-    53624133.to_words.should eql("five crore, thirty six lakh, twenty four thousand, one hundred and thirty three")
+  it 'converts 5,36,24,133 to words' do
+    53_624_133.to_words.should eql('five crore, thirty six lakh, twenty four thousand, one hundred and thirty three')
   end
 
-  it "converts 12,12,012 to words" do
-    1212012.to_words.should eql("twelve lakh, twelve thousand and twelve")
+  it 'converts 12,12,012 to words' do
+    1_212_012.to_words.should eql('twelve lakh, twelve thousand and twelve')
   end
 
-  it "converts 7,00,007 to words" do
-    700007.to_words.should eql("seven lakh and seven")
+  it 'converts 7,00,007 to words' do
+    700_007.to_words.should eql('seven lakh and seven')
   end
 
-  it "converts 1,01,01,101 to words" do
-    10101101.to_words.should eql("one crore, one lakh, one thousand, one hundred and one")
+  it 'converts 1,01,01,101 to words' do
+    10_101_101.to_words.should eql('one crore, one lakh, one thousand, one hundred and one')
   end
 
-  it "converts 33,00,00,000 to words" do
-    330000000.to_words.should eql("thirty three crore")
+  it 'converts 33,00,00,000 to words' do
+    330_000_000.to_words.should eql('thirty three crore')
   end
 
-  it "converts 10,00,000 to words" do
-    1000000.to_words.should eql("ten lakh")
+  it 'converts 10,00,000 to words' do
+    1_000_000.to_words.should eql('ten lakh')
   end
 
-  it "converts 99,000 to words" do
-    99000.to_words.should eql("ninety nine thousand")
+  it 'converts 99,000 to words' do
+    99_000.to_words.should eql('ninety nine thousand')
   end
 
-  it "converts 0.0 to words" do
-    (0.0).to_words.should eql(["zero", "zero"])
+  it 'converts 0.0 to words' do
+    (0.0).to_words.should eql(['zero', 'zero'])
   end
 
-  it "converts 1.1 to words" do
-    (1.1).to_words.should eql(["one", "ten"])
+  it 'converts 1.1 to words' do
+    (1.1).to_words.should eql(['one', 'ten'])
   end
 
-  it "converts 1.1 with scale 1 to words" do
-    (1.1).to_words(scale: 1).should eql(["one", "one"])
+  it 'converts 1.1 with scale 1 to words' do
+    (1.1).to_words(scale: 1).should eql(['one', 'one'])
   end
 
-  it "converts 1.01 with scale 2 to words" do
-    (1.01).to_words(scale: 2).should eql(["one", "one"])
+  it 'converts 1.01 with scale 2 to words' do
+    (1.01).to_words(scale: 2).should eql(['one', 'one'])
   end
 
-  it "converts 3.14 to words" do
-    (3.14).to_words.should eql(["three", "fourteen"])
+  it 'converts 3.14 to words' do
+    (3.14).to_words.should eql(['three', 'fourteen'])
   end
 
-  it "converts 29,97,924.58 to words" do
-    (2997924.58).to_words.should eql(["twenty nine lakh, ninety seven thousand, nine hundred and twenty four", "fifty eight"])
+  it 'converts 29,97,924.58 to words' do
+    (2_997_924.58).to_words.should eql(['twenty nine lakh, ninety seven thousand, nine hundred and twenty four', 'fifty eight'])
   end
 
-  it "converts 143,29,97,924.58 to words" do
-    (1432997924.58).to_words.should eql(["one hundred and forty three crore, twenty nine lakh, ninety seven thousand, nine hundred and twenty four", "fifty eight"])
+  it 'converts 143,29,97,924.58 to words' do
+    (1_432_997_924.58).to_words.should eql(['one hundred and forty three crore, twenty nine lakh, ninety seven thousand, nine hundred and twenty four', 'fifty eight'])
   end
 
-  it "converts 2,07,143,29,97,924.58 to words" 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"])
+  it 'converts 2,07,143,29,97,924.58 to words' do
+    (2_071_432_997_924.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"])
+  # 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"])
+  it 'converts 21,89,14,967,50,95,052.8 to words' do
+    (2_189_149_675_095_052.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"])
+  it 'converts 10,10,110.10 to words without comma' do
+    (1_010_110.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"])
+  it 'converts 10,10,110.10 to words without comma, if comma option is a truthy value' do
+    (1_010_110.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"])
+  it 'converts 10,10,110.10 to words with scale -2' do
+    (1_010_110.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"])
+  it 'converts 10,10,110.10 to words with scale -1' do
+    (1_010_110.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"])
+  it 'converts 10,10,110.10 to words with scale 0' do
+    (1_010_110.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"])
+  it 'converts 10,10,110.10 to words with scale 2, if scale option is an invalid value' do
+    (1_010_110.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"])
+  it 'converts 10,10,110.10 to words with scale 1' do
+    (1_010_110.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"])
+  it 'converts 10,10,110.10 to words with scale 2' do
+    (1_010_110.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"])
+  it 'converts 10,10,110.10 to words with scale 3' do
+    (1_010_110.10).to_words(scale: 3).should eql(['ten lakh, ten thousand, one hundred and ten', 'one hundred'])
+  end
+
+  it 'converts 1 to amount' do
+    (1).to_amount.should eql('1.00')
+  end
+
+  it 'converts 10.10 to amount' do
+    (10.10).to_amount.should eql('10.10')
+  end
+
+  it 'converts 10.100 to amount' do
+    (10.100).to_amount.should eql('10.10')
+  end
+
+  it 'converts 100.10 to amount' do
+    (100.10).to_amount.should eql('100.10')
+  end
+
+  it 'converts 1000.10 to amount' do
+    (1_000.10).to_amount.should eql('1,000.10')
+  end
+
+  it 'converts 10000.10 to amount' do
+    (10_000.10).to_amount.should eql('10,000.10')
+  end
+
+  it 'converts 10000000.10 to amount' do
+    (10_000_000.10).to_amount.should eql('1,00,00,000.10')
+  end
+
+  it 'converts 100000000.10 to amount' do
+    (100_000_000.10).to_amount.should eql('10,00,00,000.10')
+  end
+
+  it 'converts 100000000.10 to amount' do
+    (100_000_000.10).to_amount(scale: 3).should eql('10,00,00,000.100')
   end
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: sankhya
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Geordee Naliyath
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-21 00:00:00.000000000 Z
+date: 2014-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Sankhya means numbers in Sanskrit and other Indian languages. This is
@@ -60,7 +60,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- ".rubocop.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -83,17 +84,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A little gem to convert number to words in Indian English