basecustom 0.1.2 → 0.1.3

data/README

@@ -4,6 +4,8 @@ by Daniel P. Clark
 Inspired by:
 * base62 by "JT Zemp" and contributors "Saadiq Rodgers-King", "Derrick Camerino"
 
+Version 0.1.3 created from assistance and advice by my father Robert Clark.
+
 Description
 * Define any base conversion with any identifier for each value.
 

data/lib/basecustom/version.rb

@@ -1,10 +1,14 @@
 class BaseCustom
-	VERSION = "0.1.2"
+	VERSION = "0.1.3"
 end
 
+# Version 0.1.3
+# * Fixed multicharacter numbering units
+# * Added delimiter for multicharacter numbering units
+# * Safe base type creation.  Each situation checked for and proper error messages.
 # Version 0.1.2
-# * Added unique to string init decleration
-# * Added unique to array as well as all elements are string checking
+# * Added unique to string init declaration
+# * Added unique to array as well as checking that all array elements are strings
 # Version 0.1.1
 # * Flatten array's on input initialization
 # Version 0.1.0

data/lib/basecustom.rb

@@ -6,27 +6,37 @@ $: << File.join(File.dirname(__FILE__), "/basecustom")
 require 'basecustom/version'
 
 class BaseCustom
-  def initialize(array_in)
+  def initialize(array_in, delim = '')
     if array_in.is_a?(String)
-      array_in = array_in.split('').uniq
+      if not delim.empty?
+        raise "You must use an Array when defining with a delimiter."
+      end
+      array_in = array_in.split('')
     end
     if not array_in.is_a?(Array)
-      raise "Invalid type. Please provide a String or an Array."
+      raise "Invalid type! Please provide a String or an Array."
     end
+    array_in = array_in.flatten
     if array_in.any? { |i| not i.is_a?(String) }
-      raise "Invalid type. Each array element must be a string."
+      raise "Invalid type! Each array element must be a String."
+    end
+    if array_in.any? { |i| i.length > 1 }
+      if delim.empty?
+        raise "Error!  You must define a delimiter when using multiple characters for a base."
+      end
     end
-    @BASE_PRIMITIVES_ARRAY = array_in.flatten.uniq
+    @BASE_PRIMITIVES_ARRAY = array_in.uniq
     @BASE_PRIMITIVES_HASH = Hash[@BASE_PRIMITIVES_ARRAY.each_with_index.map {|x,idx| [x, idx]}]
+    @delim = delim
   end # initialize
 
   def base(input_val)
     if input_val.is_a?(String)
-      if input_val.split('').any? { |i| not @BASE_PRIMITIVES_ARRAY.include?(i) }
+      if input_val.split(@delim).any? { |i| not @BASE_PRIMITIVES_ARRAY.include?(i) }
         raise "Characters used are not in predefined base!"
       end
       i, i_out = 0, 0
-      input_val.split(//).reverse.each do |c|
+      input_val.split(@delim).reverse.each do |c|
         place = @BASE_PRIMITIVES_HASH.size ** i
         i_out += @BASE_PRIMITIVES_HASH[c] * place
         i += 1
@@ -38,7 +48,7 @@ class BaseCustom
        number = input_val
        result = ''
        while(number != 0)
-          result = @BASE_PRIMITIVES_ARRAY[number % @BASE_PRIMITIVES_ARRAY.size ].to_s + result
+          result = @BASE_PRIMITIVES_ARRAY[number % @BASE_PRIMITIVES_ARRAY.size ].to_s + @delim + result
           number /= @BASE_PRIMITIVES_ARRAY.size
        end
       result

data/test/test_bc.rb

@@ -30,5 +30,27 @@ class TestBaseCustom < Test::Unit::TestCase
     assert_raise RuntimeError, LoadError do base2.base(:nonexistant); end
     assert_raise RuntimeError, LoadError do base2.base('abc'); end
     assert_raise RuntimeError, LoadError do base2.base(4.5); end
+    assert_raise RuntimeError, LoadError do baseFail = BaseCustom.new(%w[:a :b :c]); end
+    assert_raise RuntimeError, LoadError do baseFail = BaseCustom.new(":a:b:c", ":"); end
+    assert_raise RuntimeError, LoadError do baseFail = BaseCustom.new(0..9); end
+    assert_raise RuntimeError, LoadError do baseFail = BaseCustom.new(['0','1',2]); end
+  end
+  
+  def test_delim
+    base = BaseCustom.new([ 'a', 'bb', 'ccc', 'dddd' ], ' ' )
+    assert base.base( 20 ) == 'bb bb a '
+    assert base.base( 'bb bb a ' ) == 20  
+  end
+  
+  def test_delim_music
+    baseMusic = BaseCustom.new( %w[A A# B C C# D D# E F F# G G#], ' ' )
+    baseMusic.base( (Math::PI * 100000000).to_i ) == "F F# B D# D A# D# F# "
+    baseMusic.base( "F F# B D# D A# D# F# " ) == (Math::PI * 100000000).to_i
+  end
+  
+  def test_multi_with_delim
+    baseMND = BaseCustom.new(%w(aa bb cc), ':')
+    baseMND.base(12) == "bb:bb:aa:"
+    baseMND.base("bb:bb:aa:") == 12
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: basecustom
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Daniel P. Clark / 6ftDan(TM)
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-31 00:00:00 Z
+date: 2012-11-22 00:00:00 Z
 dependencies: []
 
 description: Define any base conversion with any identifier for each value. Let the fun begin!