hashids 0.0.1 → 0.0.2

data/.gitignore

@@ -1,4 +1,5 @@
 *.gem
+Gemfile.lock
 *.rbc
 .bundle
 .config

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+bundler_args: --without documentation
+rvm:
+  - 1.9.2
+  - 1.9.3
+  - jruby-19mode # JRuby in 1.9 mode
+  - rbx-19mode
+  - ruby-head

data/Gemfile

@@ -2,3 +2,8 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in hashids.gemspec
 gemspec
+
+group :development do
+  gem "rake"
+  gem "minitest" if RUBY_VERSION < '1.9.3'
+end

data/README.md

@@ -5,10 +5,15 @@ Use hashids when you do not want to expose your database ids to the user.
 
 [http://www.hashids.org/ruby/](http://www.hashids.org/ruby/)
 
+[![Build Status](https://secure.travis-ci.org/peterhellberg/hashids.rb.png)](http://travis-ci.org/peterhellberg/hashids.rb)
+(1.9.2, 1.9.3, jruby-19mode, rbx-19mode and ruby-head)
+
 ## What is it?
 
 hashids (Hash ID's) creates short, unique, decryptable hashes from unsigned integers.
 
+_(NOTE: This is **NOT** a true cryptographic hash, since it is reversible)_
+
 It was designed for websites to use in URL shortening, tracking stuff, or 
 making pages private (or at least unguessable).
 

data/hashids.gemspec

@@ -12,6 +12,8 @@ Gem::Specification.new do |gem|
   gem.description   = %q{Use hashids when you do not want to expose your database ids to the user.}
   gem.homepage      = "https://github.com/peterhellberg/hashids.rb"
 
+  gem.required_ruby_version = '>= 1.9.2'
+
   gem.files         = `git ls-files`.split($/)
   gem.test_files    = gem.files.grep(%r{^(spec)/})
   gem.require_paths = ["lib"]

data/lib/hashids.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 class Hashids
-  VERSION          = "0.0.1"
+  VERSION          = "0.0.2"
   DEFAULT_ALPHABET = "xcS4F6h89aUbideAI7tkynuopqrXCgTE5GBKHLMjfRsz"
   PRIMES           = [2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43]
 
@@ -10,22 +10,22 @@ class Hashids
   class AlphabetError  < ArgumentError; end
 
   def initialize(salt = "", min_length = 0, alphabet = DEFAULT_ALPHABET)
-    @salt       = salt
-    @min_length = min_length
-    @alphabet   = alphabet
+    @salt        = salt
+    @min_length  = min_length
+    @alphabet    = alphabet
+
+    @chars_regex = /./
 
     validate_attributes
     setup_alphabet
   end
 
   def encrypt(*numbers)
-    return "" unless numbers.any?
-
-    numbers.each do |number|
-      return "" if !number.kind_of?(Fixnum) || number < 0
+    if numbers.empty? || numbers.reject { |n| Integer(n) && n > 0 }.any?
+      ""
+    else
+      encode(numbers, @alphabet, @salt, @min_length)
     end
-
-    encode(numbers, @alphabet, @salt, @min_length)
   end
 
   def decrypt(hash)
@@ -52,7 +52,7 @@ class Hashids
     @seps   = []
     @guards = []
 
-    @alphabet = @alphabet.split('').uniq.join
+    @alphabet = @alphabet.scan(@chars_regex).uniq.join('')
 
     if @alphabet.length < 4
       raise AlphabetError, "Alphabet must contain at least 4 unique characters."
@@ -63,7 +63,7 @@ class Hashids
 
       break if char.nil?
 
-      @seps.push char
+      @seps << char
       @alphabet.gsub!(char, ' ')
     end
 
@@ -71,7 +71,7 @@ class Hashids
       separator = @seps[index]
 
       unless separator.nil?
-        @guards.push(separator)
+        @guards << separator
         @seps.delete_at(index)
       end
     end
@@ -83,13 +83,13 @@ class Hashids
   def encode(numbers, alphabet, salt, min_length = 0)
     ret = ""
 
-    seps = consistent_shuffle(@seps, numbers).split("")
+    seps = consistent_shuffle(@seps, numbers).scan(@chars_regex)
     lottery_char = ""
 
     numbers.each_with_index do |number, i|
       if i == 0
         lottery_salt = numbers.join('-')
-        numbers.each { |n| lottery_salt += "-" + ((n.to_i + 1) * 2).to_s }
+        numbers.each { |n| lottery_salt += "-#{(n + 1) * 2}" }
 
         lottery = consistent_shuffle(alphabet, lottery_salt)
 
@@ -172,8 +172,8 @@ class Hashids
           end
 
           if alphabet.length > 0 && lottery_char.length > 0
-            alphabet = consistent_shuffle(alphabet, (lottery_char.ord & 12345).to_s + "" + @salt)
-            ret.push unhash(sub_hash, alphabet)
+            alphabet = consistent_shuffle(alphabet, (lottery_char.ord & 12345).to_s + @salt)
+            ret << unhash(sub_hash, alphabet)
           end
         end
       end
@@ -187,24 +187,21 @@ class Hashids
   def consistent_shuffle(alphabet, salt)
     ret = ""
 
-    alphabet = alphabet.join "" if alphabet.respond_to? :join
-    salt = salt.join "" if salt.respond_to? :join
+    alphabet = alphabet.join("") if alphabet.respond_to? :join
+    salt = salt.join("") if salt.respond_to? :join
 
-    alphabet_array = alphabet.split('')
-    salt_array = salt.split('')
-    sorting_array = []
+    alphabet_array = alphabet.scan(@chars_regex)
+    salt_array     = salt.scan(@chars_regex)
+    sorting_array  = []
 
-    salt_array.push "" unless salt_array.any?
-
-    salt_array.each do |salt_char|
-      sorting_array.push salt_char.ord || 0
-    end
+    salt_array << "" if salt_array.empty?
+    salt_array.each { |char| sorting_array << char.ord }
 
     sorting_array.each_with_index do |int,i|
       add = true
       k   = i
 
-      while k != (sorting_array.length + i - 1)
+      while k != sorting_array.length + i - 1
         next_index = (k + 1) % sorting_array.length
 
         if add
@@ -223,9 +220,8 @@ class Hashids
     i = 0
 
     while alphabet_array.length > 0
-      alphabet_size = alphabet_array.length
       pos = sorting_array[i]
-      pos %= alphabet_size if pos >= alphabet_size
+      pos %= alphabet_array.length if pos >= alphabet_array.length
       ret += alphabet_array[pos]
 
       alphabet_array.delete_at(pos)
@@ -237,11 +233,10 @@ class Hashids
 
   def hash(number, alphabet)
     hash = ""
-    alphabet_length = alphabet.length
 
     while number > 0
-      hash   = alphabet[number % alphabet_length] + hash
-      number = number / alphabet_length
+      hash   = alphabet[number % alphabet.length] + hash
+      number = number / alphabet.length
     end
 
     hash
@@ -250,15 +245,12 @@ class Hashids
   def unhash(hash, alphabet)
     number = 0
 
-    hash.split('').each_with_index { |char, i|
-      pos = alphabet.index char
-
-      return if pos.nil?
-
-      number += pos * alphabet.length ** (hash.length - i - 1)
-    }
+    hash.split('').each_with_index do |char, i|
+      if pos = alphabet.index(char)
+        number += pos * alphabet.length ** (hash.length - i - 1)
+      end
+    end
 
     number
   end
-
 end

data/spec/hashids_profile.rb

@@ -0,0 +1,21 @@
+# encoding: utf-8
+
+# Profile with perftools.rb
+#
+#  CPUPROFILE=/tmp/hashids_profile \
+#  RUBYOPT="-r`gem which 'perftools.rb' | tail -1`" \
+#  ruby spec/hashids_profile.rb
+#
+# Generate diagram
+#
+#  pprof.rb --gif /tmp/hashids_profile > /tmp/hashids_profile.gif && \
+#  open /tmp/hashids_profile.gif
+#
+
+require_relative "../lib/hashids"
+
+h = Hashids.new('this is my salt')
+
+10_000.times do |n|
+  h.decrypt(h.encrypt(n))
+end

data/spec/hashids_spec.rb

@@ -89,15 +89,15 @@ describe Hashids do
       h.encrypt(1,2,3,4,5).must_equal 'adcdacddcdaacdad'
     end
 
-    it "doesn’t produce repeating patterns for identical numbers" do
+    it "does not produce repeating patterns for identical numbers" do
       hashids.encrypt(5,5,5,5).must_equal 'GLh5SMs9'
     end
 
-    it "doesn’t produce repeating patterns for incremented numbers" do
+    it "does not produce repeating patterns for incremented numbers" do
       hashids.encrypt(*(1..10).to_a).must_equal 'zEUzfySGIpuyhpF6HaC7'
     end
 
-    it "doesn’t produce similarities between incrementing number hashes" do
+    it "does not produce similarities between incrementing number hashes" do
       hashids.encrypt(1).must_equal 'LX'
       hashids.encrypt(2).must_equal 'ed'
       hashids.encrypt(3).must_equal 'o9'
@@ -126,7 +126,7 @@ describe Hashids do
       }
     end
 
-    it "doesn’t decrypt with a different salt" do
+    it "does not decrypt with a different salt" do
       peppers = Hashids.new('this is my pepper')
       hashids.decrypt('ryBo').must_equal [12345]
       peppers.decrypt('ryBo').must_equal []

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hashids
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -19,12 +19,14 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - hashids.gemspec
 - lib/hashids.rb
+- spec/hashids_profile.rb
 - spec/hashids_spec.rb
 homepage: https://github.com/peterhellberg/hashids.rb
 licenses: []
@@ -37,13 +39,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2124593182474944467
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -51,5 +56,5 @@ signing_key:
 specification_version: 3
 summary: Generate YouTube-like hashes from one or many numbers.
 test_files:
+- spec/hashids_profile.rb
 - spec/hashids_spec.rb
-has_rdoc: