number_to 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0a68f0393aaa50be1a3f8252373cae857d42068
-  data.tar.gz: 1966aa6f80a2de113df09b88b3361b21ce90366a
+  metadata.gz: 391e3244b38ab6d4414f46def1338935e2d7bc3b
+  data.tar.gz: 78f884c179f44e5025319f8f1cd3cc0cc870d713
 SHA512:
-  metadata.gz: 257dd29a7ab46c33499bd7577f4580266c6d40fa2cad09ea75cf4bffe85e3ac6feb23a182899f8ae41384f7a2bc5ea73d6020ccb98fd5d623ee92858ad4ad0e4
-  data.tar.gz: ef633b1dbf356e0164cd5e63b55f41e59bc1731e621c32a9b220824cd1bb9a4e8de2703fe5f0248ca680c9fbe114c6110743c6f532db2ccda8768e64284b035d
+  metadata.gz: 39ebd8705b73a33f7e0e54895a05e9b00a291683245f049fa2db17b898c00e0ab295cc05f9b7fdcaadd591701ac3d48f18d8f8c8bae9c820efba156b57eb1e89
+  data.tar.gz: 935a07d7185fb16eb97c6b878237492b10e11ceeb677fdf304e99e9ad42f455e3aefd8a4433e308b173de813d0ea91da7642a1cf55c8b05374481fc754535251

data/lib/data/number_words.yml

@@ -0,0 +1,71 @@
+:words:
+  '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
+  '20': twenty
+  '30': thirty
+  '40': forty
+  '50': fifty
+  '60': sixty
+  '70': seventy
+  '80': eighty
+  '90': ninety
+:large_nums:
+  1: thousand
+  2: million
+  3: billion
+  4: trillion
+:ordinals:
+  one: first
+  two: second
+  three: third
+  four: fourth
+  five: fifth
+  six: sixth
+  seven: seventh
+  eight: eighth
+  nine: ninth
+  One: First
+  Two: Second
+  Three: Third
+  Four: Fourth
+  Five: Fifth
+  Six: Sixth
+  Seven: Seventh
+  Eight: Eighth
+  Nine: Ninth
+  ten: tenth
+  twenty: twentieth
+  thirty: thirtieth
+  forty: fortieth
+  fifty: fiftieth
+  sixty: sixtieth
+  seventy: seventieth
+  eighty: eightieth
+  ninety: ninetieth
+  Ten: Tenth
+  Twenty: Twentieth
+  Thirty: Thirtieth
+  Forty: Fortieth
+  Fifty: Fiftieth
+  Sixty: Sixtieth
+  Seventy: Seventieth
+  Eighty: Eightieth
+  Ninety: Ninetieth

data/lib/modules/character_set.rb

@@ -0,0 +1,39 @@
+module CharacterSet
+  class CharacterSetConverter
+    attr_reader :characters, :options, :size
+    def initialize(characters, options = {})
+      @characters = characters
+      options[:repeat] = true unless options.include?(:repeat)
+      @options = options
+      @size = characters.size
+    end
+
+    def to_characters(num)
+      num = num.to_i
+      repetition = num > size ? calc_repetition(num) : 1
+      real_num = num > size ? num % size : num
+      real_num = size if real_num == 0
+      char = characters[real_num - 1]
+      options[:repeat] ? char * repetition : char
+    end
+
+    def calc_repetition(num)
+      num % size == 0 ? num / size : (num / size) + 1
+    end
+  end
+
+  ALPH = ("a" .. "z").to_a
+  ALPHABETTER = CharacterSetConverter.new(ALPH, {repeat: true})
+
+  def to_character_set(num, characters, options = {})
+    CharacterSetConverter.new(characters, options).to_characters(num)
+  end
+
+  def to_lower_alpha(num)
+    ALPHABETTER.to_characters(num)
+  end
+
+  def to_upper_alpha(num)
+    to_lower_alpha(num).upcase
+  end
+end

data/lib/modules/number_words.rb

@@ -1,68 +1,16 @@
 module NumberWords
-
-  WORDS = {
-    '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',
-    '20' => 'twenty',
-    '30' => 'thirty',
-    '40' => 'forty',
-    '50' => 'fifty',
-    '60' => 'sixty',
-    '70' => 'seventy',
-    '80' => 'eighty',
-    '90' => 'ninety'
-  }
-  LARGE_NUMS = {
-    1 => 'thousand',
-    2 => 'million',
-    3 => 'billion',
-    4 => 'trillion'
-  }
-  ORDINALS = {
-    'one' => 'first',
-    'two' => 'second',
-    'three' => 'third',
-    'four' => 'fourth',
-    'five' => 'fifth',
-    'six' => 'sixth',
-    'seven' => 'seventh',
-    'eight' => 'eighth',
-    'nine' => 'ninth',
-    'One' => 'First',
-    'Two' => 'Second',
-    'Three' => 'Third',
-    'Four' => 'Fourth',
-    'Five' => 'Fifth',
-    'Six' => 'Sixth',
-    'Seven' => 'Seventh',
-    'Eight' => 'Eighth',
-    'Nine' => 'Ninth'
-  }
+  DATA_FILE = File.read(File.join(File.dirname(__FILE__), '../data/number_words.yml'))
+  DAT = YAML.load(DATA_FILE)
+  WORDS = DAT[:words]
+  LARGE_NUMS = DAT[:large_nums]
+  ORDINALS = DAT[:ordinals]
 
   def to_words(num, options = {})
-    NumbersToWords.new(num, options).to_words
+    NumbersToWords.new(options).to_words(num)
   end
 
   def to_word_ordinal(num, options = {})
-    text = NumbersToWords.new(num, options).to_words
+    text = NumbersToWords.new(options).to_words(num)
     change_last_word(text)
   end
 
@@ -83,8 +31,7 @@ module NumberWords
     attr_reader :hundred, :large_nums
     DEFAULTS = {styled: false, case: 'lower', space: ' '}
 
-    def initialize(num, options = {})
-      @num = num.to_s
+    def initialize(options = {})
       @options = DEFAULTS.merge(options)
       set_style_opts
     end
@@ -100,8 +47,8 @@ module NumberWords
       large_nums
     end
 
-    def to_words
-      arr = num.each_char.to_a
+    def to_words(num)
+      arr = num.to_s.each_char.to_a
       groups = arr.reverse.each_slice(3).to_a
       collector = words_for_groups(groups)
       formatted_words(collector)
@@ -166,3 +113,4 @@ module NumberWords
     end
   end
 end
+

data/lib/number_to.rb

@@ -1,11 +1,11 @@
 require 'modules/roman_numerals'
-require 'modules/alphabetics'
 require 'modules/ordinals'
 require 'modules/number_words'
+require 'modules/character_set'
 
 module NumberTo
   extend RomanNumerals
-  extend Alphabetics
   extend Ordinals
   extend NumberWords
+  extend CharacterSet
 end

data/lib/number_to/fixnum.rb

@@ -20,5 +20,8 @@ class Fixnum
   def to_word_ordinal(options = {})
     NumberTo.to_word_ordinal(self, options)
   end
+  def to_character_set(characters, options = {})
+    NumberTo.to_character_set(self, characters, options)
+  end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: number_to
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Dan Corrigan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-18 00:00:00.000000000 Z
+date: 2014-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -74,10 +74,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/number_to.rb
+- lib/data/number_words.yml
 - lib/modules/roman_numerals.rb
 - lib/modules/number_words.rb
 - lib/modules/ordinals.rb
-- lib/modules/alphabetics.rb
+- lib/modules/character_set.rb
 - lib/number_to/fixnum.rb
 homepage: http://www.scribenet.com
 licenses:

data/lib/modules/alphabetics.rb

@@ -1,23 +0,0 @@
-module Alphabetics
-  def to_upper_alpha(num)
-    to_lower_alpha(num).upcase
-  end
-
-  def to_lower_alpha(num)
-    num_to_alph(num)
-  end
-
-  ALPH = ("a" .. "z").to_a
-
-  def num_to_alph(num)
-    num = num.to_i
-    repetition = num > 26 ? calc_repetition(num) : 1
-    real_num = num > 26 ? num % 26 : num
-    real_num = 26 if real_num == 0
-    ALPH[real_num - 1] * repetition
-  end
-
-  def calc_repetition(num)
-    num % 26 == 0 ? num / 26 : (num / 26) + 1
-  end
-end