radix62 1.0.0 → 1.0.1

data/CHANGELOG.md

@@ -0,0 +1,15 @@
+# Changelog
+
+## v1.0.1
+
+* Performance improvements (courtesy of [sfcgeorge](https://github.com/sfcgeorge))
+* No functional changes
+
+## v1.0.0
+
+* Testing and gem structure improvements
+* No functional changes
+
+## v0.1.0
+
+* Initial release

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Matias Korhonen
+Copyright © 2010-2013 Matias Korhonen & contributors
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -30,10 +30,10 @@ Radix62 also adds the `decode62` and `encode62` convenience methods to the Strin
 
 ## Tests and compatibility
 
-The tests pass on 1.8.7, 1.9.2, Rubinius 1.0.1, and JRuby 1.5.2/1.6.0.
+[![Build Status](https://travis-ci.org/k33l0r/radix62.png)](https://travis-ci.org/k33l0r/radix62) [![Code Climate](https://codeclimate.com/github/k33l0r/radix62.png)](https://codeclimate.com/github/k33l0r/radix62)
 
-## License and copyright
+The gem is tested against MRI 1.8/1.9/2.0, JRuby, and Rubinius. See [Travis CI](https://travis-ci.org/k33l0r/radix62) for details.
 
-Copyright © 2010-2012 Matias Korhonen
+## License
 
 Licensed under the MIT license, see the LICENSE file for details.

data/lib/radix62.rb

@@ -5,6 +5,15 @@ require "radix62/core_ext/integer"
 # Convert integers to base 62 strings and back.
 module Radix62
   ALPHABET = ('0'..'9').to_a + ('a'..'z').to_a + ('A'..'Z').to_a
+  ALPHABET_HASH = {}
+  ALPHABET.each_with_index { |v,k| ALPHABET_HASH[v] = k }
+
+  KeyError = begin
+    KeyError
+  rescue NameError
+    IndexError
+  end
+  
   
   # Encode an Integer to a base 62 string. The input value *must* be a positive 
   # integer.
@@ -15,36 +24,34 @@ module Radix62
     unless number.is_a? Integer
       raise TypeError.new "number not an integer"
     end
-    
-    if number < 0
-      raise RangeError.new "number must be greater than or equal to 0"
+  
+    if number > 0
+      base62 = ""
+      while number > 0
+        base62 << ALPHABET[number % 62]
+        number /= 62
+      end
+      base62.reverse
     elsif number == 0
-      return "0"
-    end
-
-    base62 = ""
-      
-    while number > 0
-      base62 << ALPHABET[number.modulo(62)]
-      number /= 62
+      "0"
+    else
+      raise RangeError.new "number must be greater than or equal to 0"
     end
-    
-    base62.reverse
   end
+
   
   # Decode a base 62 String to a base 10 Integer. The input value 
   # <b>must not</b> contain illegal characters.
   # 
   # If the input is not alphanumeric, an ArgumentError will be raised.
   def self.decode62(string)
-    if !!string.match(/^([a-z0-9]+)$/i)
+    begin
       integer = 0
-      string.split(//).reverse.each_with_index do |char,index|
-        place = ALPHABET.size ** index
-        integer += ALPHABET.find_index(char) * place
+      string.split(//).each do |char|
+        integer = integer * 62 + ALPHABET_HASH.fetch(char)
       end
       integer
-    else
+    rescue KeyError
       raise ArgumentError.new "Input is not alphanumeric."
     end
   end

data/lib/radix62/version.rb

@@ -1,3 +1,3 @@
 module Radix62
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/spec/radix62_spec.rb

@@ -18,6 +18,21 @@ describe Radix62 do
     end
   end
   
+  context "alphabet_hash" do
+    it "has the ALPHABET_HASH hash" do
+      Radix62::ALPHABET_HASH.should be_kind_of Hash
+    end
+    
+    it "has 62 items" do
+      Radix62::ALPHABET_HASH.should_not be_empty
+      Radix62::ALPHABET_HASH.count.should == 62
+    end
+    
+    it "has the right contents" do
+      Radix62::ALPHABET_HASH.should == {"0"=>0, "1"=>1, "2"=>2, "3"=>3, "4"=>4, "5"=>5, "6"=>6, "7"=>7, "8"=>8, "9"=>9, "a"=>10, "b"=>11, "c"=>12, "d"=>13, "e"=>14, "f"=>15, "g"=>16, "h"=>17, "i"=>18, "j"=>19, "k"=>20, "l"=>21, "m"=>22, "n"=>23, "o"=>24, "p"=>25, "q"=>26, "r"=>27, "s"=>28, "t"=>29, "u"=>30, "v"=>31, "w"=>32, "x"=>33, "y"=>34, "z"=>35, "A"=>36, "B"=>37, "C"=>38, "D"=>39, "E"=>40, "F"=>41, "G"=>42, "H"=>43, "I"=>44, "J"=>45, "K"=>46, "L"=>47, "M"=>48, "N"=>49, "O"=>50, "P"=>51, "Q"=>52, "R"=>53, "S"=>54, "T"=>55, "U"=>56, "V"=>57, "W"=>58, "X"=>59, "Y"=>60, "Z"=>61}
+    end
+  end
+  
   context "encode62" do
     it "raises an exception with negative numbers" do
       (-1000..-1).step(100).each do |n|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: radix62
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,14 +9,14 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-09 00:00:00.000000000 Z
+date: 2013-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
@@ -24,7 +24,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -32,7 +32,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
@@ -40,7 +40,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -69,6 +69,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -92,16 +93,13 @@ require_paths:
 required_ruby_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3220946439689542333
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []