ariejan-valerii 1.0.0 → 1.1.0

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

data/lib/valerii.rb

@@ -1,16 +1,12 @@
 require 'enumerator'
 
 class Valerii
-  # The encode character set
+
   ENCODE_CHARS = 
-    %w( 0 1 2 3 4 5 6 7 
-        8 9 A B C D E F 
-        G H J K M N P Q 
-        R S T V W X Y Z 
-        a b c d e f h i 
-        j k l m n o p q 
-        r s t u v w x y 
-        z = - + [ ] $ # )
+    %w( B C D F G H J K 
+        M N P Q R S T V 
+        W Z b c d f h j
+        k m n p r x t v )
     
   DECODE_MAP = ENCODE_CHARS.to_enum(:each_with_index).inject({}) do |h,(c,i)|
     h[c] = i; h
@@ -21,7 +17,7 @@ class Valerii
   #   Valerii.encode(1234) # => "KJ"
   #
   def self.encode(number, opts = {})
-    str = number.to_s(2).reverse.scan(/.{1,6}/).map do |bits|
+    str = number.to_s(2).reverse.scan(/.{1,5}/).map do |bits|
       ENCODE_CHARS[bits.reverse.to_i(2)]
     end.reverse.join
 
@@ -35,6 +31,6 @@ class Valerii
   def self.decode(string)
     string.split(//).map { |char| 
       DECODE_MAP[char] or return nil 
-    }.inject(0) { |result,val| (result << 6) + val }
+    }.inject(0) { |result,val| (result << 5) + val }
   end
 end

data/test/valerii_test.rb

@@ -0,0 +1,27 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class ValeriiTest < Test::Unit::TestCase
+
+  def test_encoding_and_decoding_single_chars
+    from = (0..31).to_a
+    to = %w( B C D F G H J K M N P Q R S T V W Z b c d f h j k m n p r x t v )
+    
+    from.zip(to) do |symbol_value, encode_symbol|
+      assert_equal encode_symbol, Valerii.encode(symbol_value)
+      assert_equal symbol_value, Valerii.decode(encode_symbol)
+    end
+  end
+
+  def test_encoding_larger_numbers
+    assert_equal("CB", Valerii.encode(32))
+    assert_equal("CJb", Valerii.encode(1234))
+    assert_equal("GbNfdbmNWprxRHbVCJGmkHvKDhTMDKDDJcrfPmGJDHMHnKZBBBBBBBBBBBBBBBBBBBB", Valerii.encode(10**100))
+  end
+
+  def test_decoding_strings
+    assert_equal(32, Valerii.decode("CB"))
+    assert_equal(1234, Valerii.decode("CJb"))
+    assert_equal(10**100, Valerii.decode("GbNfdbmNWprxRHbVCJGmkHvKDhTMDKDDJcrfPmGJDHMHnKZBBBBBBBBBBBBBBBBBBBB"))
+  end
+
+end

data/valerii.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{valerii}
-  s.version = "1.0.0"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ariejan de Vroom"]
-  s.date = %q{2009-09-03}
+  s.date = %q{2009-09-04}
   s.description = %q{Convert integers to short strings and vice versa.}
   s.email = %q{ariejan@ariejan.net}
   s.extra_rdoc_files = [
@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
      "VERSION",
      "lib/valerii.rb",
      "test/test_helper.rb",
-     "test/test_valerii.rb",
+     "test/valerii_test.rb",
      "valerii.gemspec"
   ]
   s.has_rdoc = true
@@ -35,7 +35,7 @@ Gem::Specification.new do |s|
   s.summary = %q{Convert integers to short strings and vice versa.}
   s.test_files = [
     "test/test_helper.rb",
-     "test/test_valerii.rb"
+     "test/valerii_test.rb"
   ]
 
   if s.respond_to? :specification_version then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ariejan-valerii
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Ariejan de Vroom
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-03 00:00:00 -07:00
+date: 2009-09-04 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -30,7 +30,7 @@ files:
 - VERSION
 - lib/valerii.rb
 - test/test_helper.rb
-- test/test_valerii.rb
+- test/valerii_test.rb
 - valerii.gemspec
 has_rdoc: true
 homepage: http://github.com/ariejan/valerii
@@ -61,4 +61,4 @@ specification_version: 2
 summary: Convert integers to short strings and vice versa.
 test_files: 
 - test/test_helper.rb
-- test/test_valerii.rb
+- test/valerii_test.rb

data/test/test_valerii.rb

@@ -1,27 +0,0 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
-
-class TestValerii < Test::Unit::TestCase
-
-  def test_encoding_and_decoding_single_chars
-    from = (0..63).to_a
-    to = %w(0 1 2 3 4 5 6 7 8 9 A B C D E F G H J K M N P Q R S T V W X Y Z a b c d e f h i j k l m n o p q r s t u v w x y z = - + [ ] $ # )
-    
-    from.zip(to) do |symbol_value, encode_symbol|
-      assert_equal encode_symbol, Valerii.encode(symbol_value)
-      assert_equal symbol_value, Valerii.decode(encode_symbol)
-    end
-  end
-
-  def test_encoding_larger_numbers
-    assert_equal("a", Valerii.encode(32))
-    assert_equal("KJ", Valerii.encode(1234))
-    assert_equal("4eho9SK3ZEnB9zK4uaqucn=0dc4TZAltGrcjBj[G0000000000000000", Valerii.encode(10**100))
-  end
-
-  def test_decoding_strings
-    assert_equal(32, Valerii.decode("a"))
-    assert_equal(1234, Valerii.decode("KJ"))
-    assert_equal(10**100, Valerii.decode("4eho9SK3ZEnB9zK4uaqucn=0dc4TZAltGrcjBj[G0000000000000000"))
-  end
-
-end