🐛 Fix issue #12 by ensure base is parsed before value.

Author: trans

demo/issues/012_array_base.md

@@ -0,0 +1,13 @@
+# Encoding/decoding with custom character sets (#12)
+
+There is not problem converting a numeric value into a custom base.
+
+    c62 = (0..9).map{ |x| x.to_s } + ('a'..'z').to_a + ('A'..'Z').to_a
+
+    809145531659995.b(c62).to_s  #=> "3HLszsQsP"
+
+But there was a problem with decoding custom number back.
+
+    "3HLszsQsP".b(c62).to_i   #=> 809145531659995
+
+

lib/radix/float.rb

@@ -49,8 +49,8 @@ class Float < Numeric
     #
     # @return [void]    
     def initialize(value, base=10)
-      @value = parse_value(value, base)
       @base, @code = parse_base(base)
+      @value = parse_value(value, @base)
     end
 
     ##
@@ -77,10 +77,10 @@ def parse_value(value, base)
       end
     end
 
-    public
+  public
 
     ##
-    # Makes this Radix::Float a ruby Integer.
+    # Convert the Radix::Float a Ruby Integer.
     # 
     # @return [Integer] Base(10) value as Integer.
     def to_i
@@ -90,7 +90,7 @@ def to_i
     alias_method :to_int, :to_i
 
     ##
-    # Makes this Radix::Float a ruby float.
+    # Convert Radix::Float to a Ruby float.
     # 
     # @return [Float] Base(10) value as Float.
     def to_f

lib/radix/integer.rb

@@ -32,7 +32,7 @@ class Integer < Numeric
     # @return [Array<String>, nil] Substitution chars or nil if default.
     attr :code
 
-    private
+  private
 
     ##
     # Starts a new instance of the Radix::Integer class
@@ -45,8 +45,8 @@ class Integer < Numeric
     #
     # @return [void]
     def initialize(value, base=10)
-      @value = parse_value(value, base)
       @base, @code = parse_base(base)
+      @value = parse_value(value, @base)
     end
 
     ##
@@ -94,8 +94,7 @@ def parse_array(value, base)
 
     ## digits << #Radix.convert(d, base, 10).to_i
 
-    public
-
+  public
 
     ##
     # Makes this Radix::Integer a ruby integer.

lib/radix/numeric.rb

@@ -68,7 +68,7 @@ def /(other)
       operation(:/, other)
     end
 
-    private
+  private
 
     ##
     # Parses the value of the base and character set to use.
@@ -85,7 +85,7 @@ def /(other)
     #   1 - Nil, or Array of characters representing the base values.
     def parse_base(base)
       case base
-       when Array
+      when Array
         code = base
         base = base.size
       else
@@ -192,7 +192,7 @@ def base_encode(digits)
     end
 
     ##
-    # Decode an encoded array. Defaults to BASE::B62 if self.code is not set.
+    # Decode an encoded array. Defaults to BASE::B62 if @code is not set.
     # 
     # @param [Array<String, Numeric>] digits The encoded characters. 
     #

lib/radix/rational.rb

@@ -40,7 +40,7 @@ def self.[](n,d=nil,b=10)
     # @return [Array<String>, nil] Substitution chars or nil if default.
     attr :code
 
-    private
+  private
 
     ##
     # Create a new Radix::Rational instance.