hideous 0.0.4 → 0.0.5

data/lib/hideous.rb

@@ -6,35 +6,39 @@ module Hideous
     require 'hideous/xor_knuth_hash'
     extend ClassMethods
     include InstanceMethods
+
     cattr_accessor :hideous_prime
     cattr_accessor :hideous_prime_inverse
     cattr_accessor :hideous_rndxor
     cattr_accessor :hideous_enabled
+    cattr_accessor :hideous_base
+
     self.hideous_prime = (options[:prime] || hideous_default_prime)
     self.hideous_prime_inverse = (options[:prime_inverse] || hideous_default_prime_inverse)
     self.hideous_rndxor = (options[:rndxor] || hideous_default_rndxor)
     self.hideous_enabled = (options[:auto].nil? ? true : options[:auto])
+    self.hideous_base = (options[:base] || hideous_default_base)
   end
 
-  def self.hide(id, hideous_prime, hideous_prime_inverse, hideous_rndxor)
-    XorKnuthHash.hash(id, hideous_prime, hideous_prime_inverse, hideous_rndxor)
+  def self.hide(id, hideous_prime, hideous_prime_inverse, hideous_rndxor, base)
+    XorKnuthHash.hash(id, hideous_prime, hideous_prime_inverse, hideous_rndxor, base)
   end
 
-  def self.show(id, hideous_prime, hideous_prime_inverse, hideous_rndxor)
-    XorKnuthHash.reverse_hash(id, hideous_prime, hideous_prime_inverse, hideous_rndxor)
+  def self.show(id, hideous_prime, hideous_prime_inverse, hideous_rndxor, base)
+    XorKnuthHash.reverse_hash(id, hideous_prime, hideous_prime_inverse, hideous_rndxor, base)
   end
 
 
   module ClassMethods
     def find(*args)
       if has_obfuscated_id?
-        args[0] = Hideous.show(args[0], self.hideous_prime, self.hideous_prime_inverse, self.hideous_rndxor)
+        args[0] = Hideous.show(args[0], self.hideous_prime, self.hideous_prime_inverse, self.hideous_rndxor, self.hideous_base)
       end
       super(*args)
     end
 
     def find_by_obfuscated_id(*args)
-      args[0] = Hideous.show(args[0].to_s, self.hideous_prime, self.hideous_prime_inverse, self.hideous_rndxor)
+      args[0] = Hideous.show(args[0].to_s, self.hideous_prime, self.hideous_prime_inverse, self.hideous_rndxor, self.hideous_base)
       find(*args)
     end
 
@@ -42,6 +46,8 @@ module Hideous
       self.hideous_enabled
     end
 
+    private
+
     def hideous_default_prime
       413_158_511
     end
@@ -53,12 +59,20 @@ module Hideous
     def hideous_default_rndxor
       652_109_907
     end
+
+    def hideous_default_base
+      16
+    end
   end
 
   module InstanceMethods
+    def obfuscated_id
+      Hideous.hide(self.id, self.hideous_prime, self.hideous_prime_inverse, self.hideous_rndxor, self.hideous_base)
+    end
+
     def to_param
       if self.hideous_enabled
-        Hideous.hide(self.id, self.hideous_prime, self.hideous_prime_inverse, self.hideous_rndxor)
+        obfuscated_id
       else
         super
       end
@@ -68,4 +82,4 @@ module Hideous
 
 end
 
-ActiveRecord::Base.extend Hideous
+ActiveRecord::Base.extend Hideous

data/lib/hideous/version.rb

@@ -1,3 +1,3 @@
 module Hideous
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/hideous/xor_knuth_hash.rb

@@ -1,34 +1,35 @@
 class XorKnuthHash
   MAXID = 2147483647
   # Convience class method pointing to the instance method
-  def self.hash(record_id, prime, prime_inverse, rndxor)
-    new(record_id, prime, prime_inverse, rndxor).hash
+  def self.hash(record_id, prime, prime_inverse, rndxor, base)
+    new(record_id, prime, prime_inverse, rndxor, base).hash
   end
 
   # Convience class method pointing to the instance method
-  def self.reverse_hash(hash, prime, prime_inverse, rndxor)
-    new(hash, prime, prime_inverse, rndxor).reverse_hash
+  def self.reverse_hash(hash, prime, prime_inverse, rndxor, base)
+    new(hash, prime, prime_inverse, rndxor, base).reverse_hash
   end
 
   def self.calculate_prime_inverse(prime)
     self.modinv(prime, MAXID+1)
   end
 
-  def initialize(id_or_hash, prime, prime_inverse, rndxor)
+  def initialize(id_or_hash, prime, prime_inverse, rndxor, base)
     @id_or_hash = id_or_hash
     @prime = prime
     @prime_inverse = prime_inverse
     @rndxor = rndxor
+    @base = base
   end
 
   # obfuscates an integer
   def hash
-    (((@id_or_hash * @prime) & MAXID) ^ @rndxor).to_s(16)
+    (((@id_or_hash * @prime) & MAXID) ^ @rndxor).to_s(@base)
   end
 
   # de-obfuscates an integer
   def reverse_hash
-    ((@id_or_hash.to_i(16) ^ @rndxor) * @prime_inverse) & MAXID
+    ((@id_or_hash.to_i(@base) ^ @rndxor) * @prime_inverse) & MAXID
   end
 
   private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hideous
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-05 00:00:00.000000000 Z
+date: 2012-08-09 00:00:00.000000000 Z
 dependencies: []
 description: Hide/Obfuscate ActiveRecord IDs in a url using a modified Knuth hash
 email:
@@ -39,18 +39,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1057310556346039001
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1057310556346039001
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23