alphadecimal 1.0.2 → 1.1.0

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.1.0

data/alphadecimal.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{alphadecimal}
-  s.version = "1.0.2"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mike Mondragon", "Jack Danger Canty"]
-  s.date = %q{2010-05-03}
+  s.date = %q{2011-01-31}
   s.default_executable = %q{alphadecimal}
   s.description = %q{Convert integers to base62 strings (A-Za-z0-9) and back. Ideal for url shorteners like Shawty-server.}
   s.email = %q{rubygems@6brand.com}
@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/JackDanger/alphadecimal}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Convert integers to base62 strings (A-Za-z0-9) and back.  A handy way to shorten long numbers.}
   s.test_files = [
     "test/test_alphadecimal.rb"
@@ -43,7 +43,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
     else
     end
   else

data/lib/alphadecimal.rb

@@ -1,8 +1,10 @@
+# coding: utf-8
+
 module Alphadecimal
-  B62_0, B62_9 = '0'[0], '9'[0]
-  B62_A, B62_Z = 'A'[0], 'Z'[0]
-  B62_a, B62_z = 'a'[0], 'z'[0]
-  B62_CHRS = [(B62_0..B62_9).map, (B62_A..B62_Z).map,  (B62_a..B62_z).map].flatten
+  B62_0, B62_9 = '0'.bytes.first, '9'.bytes.first
+  B62_A, B62_Z = 'A'.bytes.first, 'Z'.bytes.first
+  B62_a, B62_z = 'a'.bytes.first, 'z'.bytes.first
+  B62_CHRS = [(B62_0..B62_9).map{|i|i}, (B62_A..B62_Z).map{|i|i}, (B62_a..B62_z).map{|i|i}].flatten
 
   module Number
     def alphadecimal
@@ -27,8 +29,7 @@ module Alphadecimal
       return self unless is_alphadecimal?
       val = 0
       key = reverse
-      (0...key.size).each do |i|
-         char = key[i]
+      key.bytes.each_with_index do |char, i|
          case
          when (B62_0..B62_9).include?(char) then norm = char - B62_0
          when (B62_A..B62_Z).include?(char) then norm = char - B62_A + 10
@@ -41,10 +42,10 @@ module Alphadecimal
     
     def is_alphadecimal?
       return false if nil?
-      string = self.dup
+      string = dup
       return false if string.length <= 0
-      (0...string.size).each do |i|
-        return false unless B62_CHRS.include?(string[i])
+      string.bytes.to_a.each do |b|
+        return false unless B62_CHRS.include?(b)
       end
       true
     end

data/test/test_alphadecimal.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'test/unit'
 require File.dirname(__FILE__) + "/../lib/alphadecimal"
 
@@ -35,15 +37,14 @@ class TestAlphadecimal < Test::Unit::TestCase
   end
 
   def test_alphabet_characters_should_only_validate
-    alphabet = (('0'[0]..'9'[0]).collect << 
-                ('A'[0]..'Z'[0]).collect << 
-                ('a'[0]..'z'[0]).collect).flatten
+    alphabet = (('0'.bytes.first..'9'.bytes.first).map{|i|i} + 
+                ('A'.bytes.first..'Z'.bytes.first).map{|i|i} +
+                ('a'.bytes.first..'z'.bytes.first).map{|i|i}).flatten
     (0..255).each do |i|
-      case
-        when alphabet.include?(i)
-           assert i.chr.is_alphadecimal?, "char #{i} is not valid as string #{i.chr}"
-        else
-           assert !i.chr.is_alphadecimal?, "char #{i} is valid as string #{i.chr}"
+      if alphabet.include?(i)
+         assert i.chr.is_alphadecimal?, "char #{i} is not valid as string #{i.chr}"
+      else
+         assert !i.chr.is_alphadecimal?, "char #{i} is valid as string #{i.chr}"
       end
     end 
   end
@@ -52,7 +53,7 @@ class TestAlphadecimal < Test::Unit::TestCase
     (0...62).each do |i|
       encode = i.alphadecimal
       decode = encode.alphadecimal
-      assert_equal i, decode, "integer #{i} was encoded as #{encode} and was decoded to #{decode}"
+      assert_equal i, decode, "integer #{i.inspect} was encoded as #{encode.inspect} and was decoded to #{decode.inspect}"
     end
   end
 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: alphadecimal
 version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: false
   segments: 
   - 1
+  - 1
   - 0
-  - 2
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors: 
 - Mike Mondragon
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-03 00:00:00 -07:00
+date: 2011-01-31 00:00:00 -08:00
 default_executable: alphadecimal
 dependencies: []
 
@@ -49,23 +50,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Convert integers to base62 strings (A-Za-z0-9) and back.  A handy way to shorten long numbers.