obfuscated 0.2.0 → 0.2.1

data/lib/obfuscated.rb

@@ -11,10 +11,9 @@ module Obfuscated
   end
   
   def self.supported?
-    db = ActiveRecord::Base.connection.class.to_s.downcase
-    @@db_support ||= db.include?('mysql') || db.include?('postgresql') ? true : false
+    @@mysql_support ||= ActiveRecord::Base.connection.class.to_s.downcase.include?('mysql') ? true : false
   end
-
+  
   module Finder
     def find( *primary_key )
       # Sale.find( '7e2d2c4da1b0' )
@@ -47,18 +46,14 @@ module Obfuscated
           return find_by_id(hash, options) unless Obfuscated::supported?
           
           # Update the conditions to use the hash calculation
-          db = ActiveRecord::Base.connection.class.to_s.downcase
-          if db.include?('postgresql')
-            options.update(:conditions => ["substring(encode(digest(concat('---',id::text,'-WICKED-#{self.table_name}-#{Obfuscated::salt}'), 'sha1'), 'hex'), 1, 12) = ?", hash])
-          elsif db.include?('mysql')
-            options.update(:conditions => ["SUBSTRING(SHA1(CONCAT('---',#{self.table_name}.id,'-WICKED-#{self.table_name}-#{Obfuscated::salt}')),1,12) = ?", hash])
-          end
+          options.update(:conditions => ["SUBSTRING(SHA1(CONCAT('---',#{self.table_name}.id,'-WICKED-#{self.table_name}-#{Obfuscated::salt}')),1,12) = ?", hash])
+          
           # Find it!
           first(options) or raise ActiveRecord::RecordNotFound, "Couldn't find #{self.class.to_s} with Hashed ID=#{hash}"
         end
       end
     end
-# select substring(encode(digest(concat('---',to_char(id),'-WICKED-clouds-abc123'), 'sha1'), 'hex'), 1, 12) from clouds
+
   end
   
   module InstanceMethods
@@ -70,7 +65,9 @@ module Obfuscated
       return id unless Obfuscated::supported?
       
       # Use SHA1 to generate a consistent hash based on the id and the table name
-      @hashed_id ||= Digest::SHA1.hexdigest("---#{id}-WICKED-#{self.class.table_name}-#{Obfuscated::salt}")[0..11]
+      @hashed_id ||= Digest::SHA1.hexdigest(
+        "---#{id}-WICKED-#{self.class.table_name}-#{Obfuscated::salt}"
+      )[0..11]  
     end
 
     def to_param
@@ -79,4 +76,4 @@ module Obfuscated
   end
 end
 
-ActiveRecord::Base.class_eval { include Obfuscated }
+ActiveRecord::Base.class_eval { include Obfuscated }

metadata

@@ -1,11 +1,12 @@
 --- !ruby/object:Gem::Specification
 name: obfuscated
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
 - Jon Collier
+- Forrest Grant
 autorequire: 
 bindir: bin
 cert_chain: []