hashids 0.0.2 → 0.0.3

data/README.md

@@ -184,6 +184,16 @@ hashids.encrypt 5 #=> a5
 
 ## Changelog
 
+**0.0.3**
+
+ - Default salt (Allows for `Hashids.new.encrypt(91) #=> "kBy"`)
+ - Further tweaking of the private methods (`tr/delete` over `gsub`, `scan` over `split`)
+
+**0.0.2**
+
+ - Minitest required if RUBY_VERSION < 1.9.3
+ - Using scan over split where appropriate
+
 **0.0.1**
   
 - First commit (Heavily based on the [CoffeeScript version](https://github.com/ivanakimov/hashids.coffee))

data/lib/hashids.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 class Hashids
-  VERSION          = "0.0.2"
+  VERSION          = "0.0.3"
   DEFAULT_ALPHABET = "xcS4F6h89aUbideAI7tkynuopqrXCgTE5GBKHLMjfRsz"
   PRIMES           = [2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43]
 
@@ -43,6 +43,10 @@ class Hashids
       raise Hashids::MinLengthError, "The min length must be a Fixnum"
     end
 
+    unless @min_length >= 0
+      raise Hashids::MinLengthError, "The min length must be 0 or more"
+    end
+
     unless @alphabet.kind_of?(String)
       raise Hashids::AlphabetError, "The alphabet must be a String"
     end
@@ -64,7 +68,7 @@ class Hashids
       break if char.nil?
 
       @seps << char
-      @alphabet.gsub!(char, ' ')
+      @alphabet.tr!(char, ' ')
     end
 
     [0, 4, 8, 12].each do |index|
@@ -76,7 +80,7 @@ class Hashids
       end
     end
 
-    @alphabet.gsub!(' ', '')
+    @alphabet.delete!(' ')
     @alphabet = consistent_shuffle(@alphabet, @salt)
   end
 
@@ -95,7 +99,7 @@ class Hashids
 
         ret += lottery_char = lottery[0]
 
-        alphabet = lottery_char + alphabet.gsub(lottery_char, '')
+        alphabet = "#{lottery_char}#{alphabet.delete(lottery_char)}"
       end
 
       alphabet = consistent_shuffle(alphabet, "#{lottery_char.ord & 12345}#{salt}")
@@ -120,7 +124,7 @@ class Hashids
 
       if ret.length < min_length
         guard_index = (guard_index + ret.length) % @guards.length
-        guard = @guards[guard_index]
+        guard       = @guards[guard_index]
 
         ret += guard
       end
@@ -128,10 +132,10 @@ class Hashids
 
     while ret.length < min_length
       pad_array = [alphabet[1].ord, alphabet[0].ord]
-      pad_left = encode(pad_array, alphabet, salt)
+      pad_left  = encode(pad_array, alphabet, salt)
       pad_right = encode(pad_array, alphabet, pad_array.join(''))
 
-      ret = pad_left + ret + pad_right
+      ret = "#{pad_left}#{ret}#{pad_right}"
       excess = ret.length - min_length
 
       ret = ret[(excess/2), min_length] if excess > 0
@@ -150,7 +154,7 @@ class Hashids
       lottery_char = ""
 
       @guards.each do |guard|
-        hash = hash.gsub(guard, ' ')
+        hash = hash.tr(guard, ' ')
       end
 
       hash_split = hash.split(' ')
@@ -158,7 +162,7 @@ class Hashids
       hash = hash_split[[3,2].include?(hash_split.length) ? 1 : 0]
 
       @seps.each do |sep|
-        hash = hash.gsub(sep, ' ')
+        hash = hash.tr(sep, ' ')
       end
 
       hash_array = hash.split(' ')
@@ -167,8 +171,8 @@ class Hashids
         if sub_hash.length > 0
           if i == 0
             lottery_char = hash[0]
-            sub_hash = sub_hash[1..-1]
-            alphabet = lottery_char + @alphabet.gsub(lottery_char, "")
+            sub_hash     = sub_hash[1..-1]
+            alphabet     = lottery_char + @alphabet.delete(lottery_char)
           end
 
           if alphabet.length > 0 && lottery_char.length > 0
@@ -195,7 +199,7 @@ class Hashids
     sorting_array  = []
 
     salt_array << "" if salt_array.empty?
-    salt_array.each { |char| sorting_array << char.ord }
+    salt_array.each { |char| sorting_array << (char.empty?? 0 : char.ord) }
 
     sorting_array.each_with_index do |int,i|
       add = true
@@ -235,7 +239,7 @@ class Hashids
     hash = ""
 
     while number > 0
-      hash   = alphabet[number % alphabet.length] + hash
+      hash   = "#{alphabet[number % alphabet.length]}#{hash}"
       number = number / alphabet.length
     end
 
@@ -245,7 +249,7 @@ class Hashids
   def unhash(hash, alphabet)
     number = 0
 
-    hash.split('').each_with_index do |char, i|
+    hash.scan(@chars_regex).each_with_index do |char, i|
       if pos = alphabet.index(char)
         number += pos * alphabet.length ** (hash.length - i - 1)
       end

data/spec/hashids_spec.rb

@@ -22,6 +22,10 @@ describe Hashids do
   }
 
   describe "setup" do
+    it "has a default salt" do
+      Hashids.new.encrypt(1,2,3).must_equal "katKSA"
+    end
+
     it "has a default alphabet" do
       Hashids::DEFAULT_ALPHABET.must_equal default_alphabet
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hashids
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -48,7 +48,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2124593182474944467
+      hash: -2635611476242162703
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24