english_number 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad1e9753922557166b6fd050738d7dec6a4d0b70
-  data.tar.gz: fa8ce30e3cc5af982efa6d566dac4f6b360a3b4d
+  metadata.gz: cdf0d7574ca5907f46a01d20ff33b5dcffc4052e
+  data.tar.gz: e1e587b04a8245be90a070af212ed889399259bc
 SHA512:
-  metadata.gz: 96b2a71799d08d7702f97d7b1d31cb997f96a5a72a033d810928752f209a7c27dc811ac2458fff1f075697e3eeda2f8cd4ff6fe10185f58ea8ed17b6fb753d23
-  data.tar.gz: f7c05cf0299f4abf37a01e14d77cbaa37906d903e74f66071c7fbe244c950fef85be8fbb017d191517a7d7604e707c05373900cb39218c68b173bdc40b0f2c88
+  metadata.gz: 8b3d9cf1988aa803f1063ea1e4eeeed11481a92ef67975b76e2fddcdf78eeca882a584c6aed94854993f94e6c73b3b5e0d0f84f844324f20ac8392cd440cc6b6
+  data.tar.gz: 1ad634b277764c301d46ee8a515ba3ed062c156847a62b5b1a5a8163205fb53b671bfa9e34b1bd2e45233fca36ac39c2de29ffe8d03ea0fe0f0e99fce7f5f5ac

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+- 2.3.0
+script:
+- bundle exec rspec -fd

data/{README.md → README.rdoc}

@@ -1,13 +1,9 @@
 == english_number
 
-<!--TODO:-->
-<!--{<img src="https://badge.fury.io/rb/numbers_and_words.svg?branch=master" alt="Gem Version" />}[http://badge.fury.io/rb/numbers_and_words]-->
-<!--{<img src="https://gemnasium.com/kslazarev/numbers_and_words.svg?branch=master" alt="Dependency Status" />}[https://gemnasium.com/kslazarev/numbers_and_words]-->
-<!--{<img src="https://codeclimate.com/github/kslazarev/numbers_and_words.svg?branch=master" />}[https://codeclimate.com/github/kslazarev/numbers_and_words]-->
-<!--{<img src="https://secure.travis-ci.org/kslazarev/numbers_and_words.svg?branch=master" />}[http://travis-ci.org/kslazarev/numbers_and_words]-->
-<!--{<img src="https://coveralls.io/repos/kslazarev/numbers_and_words/badge.svg?branch=master" alt="Coverage Status" />}[https://coveralls.io/r/kslazarev/numbers_and_words]-->
-
-Convert numbers to words in English. Limit of digits handled can be set. For now works for up to 3 digits. Additionally EnglishNumber objects can be added, subtracted, multiplied and divided.
+{<img src="https://travis-ci.org/bryszard/english_number.svg?branch=master" alt="Build Status" />}[https://travis-ci.org/bryszard/english_number]
+{<img src="https://codeclimate.com/github/bryszard/english_number/badges/gpa.svg" />}[https://codeclimate.com/github/bryszard/english_number]
+
+Convert numbers to words in English. Limit of digits handled can be set. For now works for up to 5 digits. Additionally EnglishNumber objects can be added, subtracted, multiplied and divided.
 
 
 == Supported Languages

data/english_number.gemspec

@@ -1,16 +1,17 @@
 Gem::Specification.new do |s|
   s.name        = 'english_number'
-  s.version     = '0.0.3'
+  s.version     = '0.0.4'
   s.date        = '2016-05-15'
   s.summary     = "Converting English numbers to strings"
   s.description = "Example: EnglishNumber.new(63).in_english # => 'sixty-three'.\n 
                    EnglishNumber objects can be added, subtracted, multiplied, divided.\n
-                   For now gem is deliberately limited to numbers maximum three digits long.\n"
+                   For now gem is deliberately limited to numbers maximum five digits long.\n
+                   Lower limit might be set manually (see the source code)"
   
   s.authors     = ["Piotr Brych"]
   s.email       = 'pbrych@gmail.com'
   s.files       = `git ls-files`.split($/)
-  s.homepage    = 'http://rubygems.org/gems/english-number.rb'
+  s.homepage    = 'https://github.com/bryszard/english_number'
   
   s.add_dependency      'activesupport', '~> 4.2.6'
   s.add_development_dependency      'rspec', '~> 3.4.0'

data/lib/digits/digits.rb

@@ -0,0 +1,14 @@
+require 'modules/compute'
+require 'modules/translate'
+
+class Digits
+  include Compute
+  include Translate
+  
+  attr_reader :num
+  
+  def initialize(num)
+    @num = num
+  end
+  
+end

data/lib/digits/five_digits.rb

@@ -0,0 +1,38 @@
+class FiveDigits < Digits
+
+  def self.run(num)
+    new(num).in_words
+  end
+  
+  def in_words
+    num_mod(10000).zero? ? simple_ten_thous : complex_ten_thous
+  end
+  
+  private
+  
+  attr_reader :num
+  
+  def initialize(num)
+    @num = num
+  end
+  
+  def first_two_digits
+    TwoDigits.new(in_array[0,2].join.to_i).in_english
+  end
+  
+  def rest_digits
+    in_array[-3..-1].join.to_i
+  end
+  
+  def rest
+    rest_digits < 10 ? single_digits(rest_digits) : Digits.new(rest_digits).in_english
+  end
+  
+  def simple_ten_thous
+    [first_two_digits, prefix(power_of_ten)].join('-')
+  end
+  
+  def complex_ten_thous
+    [simple_ten_thous, rest].join('-')
+  end
+end

data/lib/digits/four_digits.rb

@@ -0,0 +1,39 @@
+class FourDigits < Digits
+
+  def self.run(num)
+    new(num).in_words
+  end
+  
+  def in_words
+    num_mod(1000).zero? ? simple_thousends : complex_thousends
+  end
+  
+  private
+  
+  attr_reader :num
+  
+  def initialize(num)
+    @num = num
+  end
+  
+  def first_digit
+    single_digits(in_array[0].to_i)
+  end
+  
+  def rest_digits
+    in_array[1..-1].join.to_i
+  end
+  
+  def rest
+    rest_digits < 10 ? single_digits(rest_digits) : Digits.new(rest_digits).in_english
+  end
+  
+  def simple_thousends
+    [first_digit, prefix(power_of_ten)].join('-')
+  end
+  
+  def complex_thousends
+    [first_digit, prefix(power_of_ten), rest].join('-')
+  end
+  
+end

data/lib/digits/three_digits.rb

@@ -1,9 +1,4 @@
-require 'modules/compute'
-require 'modules/translate'
-
-class ThreeDigits
-  include Compute
-  include Translate
+class ThreeDigits < Digits
 
   def self.run(num)
     new(num).in_words
@@ -30,7 +25,7 @@ class ThreeDigits
   end
   
   def rest
-    rest_digits < 10 ? single_digits(rest_digits) : TwoDigits.run(rest_digits)
+    rest_digits < 10 ? single_digits(rest_digits) : Digits.new(rest_digits).in_english
   end
   
   def simple_hundreds

data/lib/digits/two_digits.rb

@@ -1,9 +1,4 @@
-require 'modules/compute'
-require 'modules/translate'
-
-class TwoDigits
-  include Compute
-  include Translate
+class TwoDigits < Digits
 
   def self.run(num)
     new(num).in_words

data/lib/english_number.rb

@@ -1,10 +1,9 @@
 require 'yaml'
 require 'active_support/inflector'
 
-require 'digits/two_digits'
-require 'digits/three_digits'
 require 'modules/compute'
 require 'modules/translate'
+Dir["./lib/digits/*.rb"].each {|file| require file }
 
 class EnglishNumber
   include Compute

data/lib/modules/compute.rb

@@ -3,9 +3,11 @@
 module Compute
   OPERATIONS = [:+, :-, :*, :/]
   
-  def method_missing(method, arg)
+  def method_missing(method, arg=nil)
     if OPERATIONS.include?(method)
       self.class.new(num.send(method, arg.num))
+    else
+      super
     end
   end
   

data/lib/modules/languages/english_numbers.yml

@@ -1,4 +1,4 @@
 ones: [zero, one, two, three, four, five, six, seven, eight, nine]
 tenss: [ten, eleven, twelve, thirteen, fourteen, fifteen, sixteen, seventeen, eighteen, nineteen]
 tens: [zero, ten, twenty, thirty, forty, fifty, sixty, seventy, eighty, ninety]
-powers: [one, ten, hundred, thousand, ten-thousand, hundred-thousand, million, ten-million, hundred-million, billion]
+powers: [one, ten, hundred, thousand, thousand, thousand, million, million, million, billion]

data/lib/modules/translate.rb

@@ -1,6 +1,6 @@
 module Translate
   # Set the limit of translated number of digits
-  DIGITS_LIMIT = 2
+  DIGITS_LIMIT = 5
 
   def in_english
     return nil if over_limit?

data/spec/unit_tests/five_digits_spec.rb

@@ -0,0 +1,68 @@
+RSpec.describe FiveDigits do
+  subject(:five_dig) { described_class }
+  
+  context 'modules' do
+    
+    it 'includes Compute module' do
+      expect(five_dig.included_modules).to include(Compute)
+    end
+    
+    it 'includes Translate module' do
+      expect(five_dig.included_modules).to include(Translate)
+    end
+    
+  end
+  
+  context '#run' do
+    let(:limit) { 10**Translate::DIGITS_LIMIT }
+    let(:num) { rand(limit/10..limit) }
+    let(:inst) { instance_double('FiveDigits') }
+  
+    it 'responds to class method #run(num)' do
+      expect(five_dig).to respond_to(:run).with(1).argument
+      five_dig.run(num)
+    end
+    
+    it 'when #run used it it invokes #in_words on new instance' do
+      allow(five_dig).to receive(:new).with(num) { inst }
+      expect(inst).to receive(:in_words)
+      five_dig.run(num)
+    end
+  
+  end
+  
+  context '#in_words', if: Translate::DIGITS_LIMIT > 4 do
+
+    context 'works for five-digit numbers:' do
+      it '10000' do
+        expect(five_dig.new(10000).in_words).to eq('ten-thousand')
+      end
+      it '10010' do
+        expect(five_dig.new(10010).in_words).to eq('ten-thousand-ten')
+      end
+      it '15210' do
+        expect(five_dig.new(15210).in_words).to eq('fifteen-thousand-two-hundred-ten')
+      end
+      it '27378' do
+        expect(five_dig.new(27378).in_words).to eq('twenty-seven-thousand-three-hundred-seventy-eight')
+      end
+      it '30000' do
+        expect(five_dig.new(30000).in_words).to eq('thirty-thousand')
+      end
+      it '31500' do
+        expect(five_dig.new(31500).in_words).to eq('thirty-one-thousand-five-hundred')
+      end
+      it '60000' do
+        expect(five_dig.new(60000).in_words).to eq('sixty-thousand')
+      end
+      it '87324' do
+        expect(five_dig.new(87324).in_words).to eq('eighty-seven-thousand-three-hundred-twenty-four')
+      end
+      it '99999' do
+        expect(five_dig.new(99999).in_words).to eq('ninety-nine-thousand-nine-hundred-ninety-nine')
+      end
+    end
+  
+  end
+  
+end

data/spec/unit_tests/four_digits_spec.rb

@@ -0,0 +1,68 @@
+RSpec.describe FourDigits do
+  subject(:four_dig) { described_class }
+  
+  context 'modules' do
+    
+    it 'includes Compute module' do
+      expect(four_dig.included_modules).to include(Compute)
+    end
+    
+    it 'includes Translate module' do
+      expect(four_dig.included_modules).to include(Translate)
+    end
+    
+  end
+  
+  context '#run' do
+    let(:limit) { 10**Translate::DIGITS_LIMIT }
+    let(:num) { rand(limit/10..limit) }
+    let(:inst) { instance_double('FourDigits') }
+  
+    it 'responds to class method #run(num)' do
+      expect(four_dig).to respond_to(:run).with(1).argument
+      four_dig.run(num)
+    end
+    
+    it 'when #run used it it invokes #in_words on new instance' do
+      allow(four_dig).to receive(:new).with(num) { inst }
+      expect(inst).to receive(:in_words)
+      four_dig.run(num)
+    end
+  
+  end
+  
+  context '#in_words', if: Translate::DIGITS_LIMIT > 3 do
+
+    context 'works for four-digit numbers:' do
+      it '1000' do
+        expect(four_dig.new(1000).in_words).to eq('one-thousand')
+      end
+      it '1010' do
+        expect(four_dig.new(1010).in_words).to eq('one-thousand-ten')
+      end
+      it '1210' do
+        expect(four_dig.new(1210).in_words).to eq('one-thousand-two-hundred-ten')
+      end
+      it '2378' do
+        expect(four_dig.new(2378).in_words).to eq('two-thousand-three-hundred-seventy-eight')
+      end
+      it '3000' do
+        expect(four_dig.new(3000).in_words).to eq('three-thousand')
+      end
+      it '3500' do
+        expect(four_dig.new(3500).in_words).to eq('three-thousand-five-hundred')
+      end
+      it '6000' do
+        expect(four_dig.new(6001).in_words).to eq('six-thousand-one')
+      end
+      it '8732' do
+        expect(four_dig.new(8732).in_words).to eq('eight-thousand-seven-hundred-thirty-two')
+      end
+      it '9999' do
+        expect(four_dig.new(9999).in_words).to eq('nine-thousand-nine-hundred-ninety-nine')
+      end
+    end
+  
+  end
+  
+end

data/spec/unit_tests/three_digits_spec.rb

@@ -14,7 +14,8 @@ RSpec.describe ThreeDigits do
   end
   
   context '#run' do
-    let(:num) { rand }
+    let(:limit) { 10**Translate::DIGITS_LIMIT }
+    let(:num) { rand(limit/10..limit) }
     let(:inst) { instance_double('ThreeDigits') }
   
     it 'responds to class method #run(num)' do

data/spec/unit_tests/two_digits_spec.rb

@@ -14,7 +14,8 @@ RSpec.describe TwoDigits do
   end
   
   context '#run' do
-    let(:num) { rand }
+    let(:limit) { 10**Translate::DIGITS_LIMIT }
+    let(:num) { rand(limit/10..limit) }
     let(:inst) { instance_double('TwoDigits') }
   
     it 'responds to class method #run(num)' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: english_number
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Piotr Brych
@@ -54,7 +54,8 @@ dependencies:
         version: 0.11.2
 description: "Example: EnglishNumber.new(63).in_english # => 'sixty-three'.\n \n                   EnglishNumber
   objects can be added, subtracted, multiplied, divided.\n\n                   For
-  now gem is deliberately limited to numbers maximum three digits long.\n"
+  now gem is deliberately limited to numbers maximum five digits long.\n\n                   Lower
+  limit might be set manually (see the source code)"
 email: pbrych@gmail.com
 executables: []
 extensions: []
@@ -62,10 +63,14 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
-- README.md
+- README.rdoc
 - english_number.gemspec
+- lib/digits/digits.rb
+- lib/digits/five_digits.rb
+- lib/digits/four_digits.rb
 - lib/digits/three_digits.rb
 - lib/digits/two_digits.rb
 - lib/english_number.rb
@@ -76,10 +81,12 @@ files:
 - spec/spec_helper.rb
 - spec/unit_tests/compute_spec.rb
 - spec/unit_tests/english_number_unit_spec.rb
+- spec/unit_tests/five_digits_spec.rb
+- spec/unit_tests/four_digits_spec.rb
 - spec/unit_tests/three_digits_spec.rb
 - spec/unit_tests/translate_spec.rb
 - spec/unit_tests/two_digits_spec.rb
-homepage: http://rubygems.org/gems/english-number.rb
+homepage: https://github.com/bryszard/english_number
 licenses:
 - MIT
 metadata: {}