obfuscated 0.1.8 → 0.2.0

data/lib/obfuscated.rb

@@ -1,22 +1,38 @@
 require 'digest/sha1'
 require 'active_record'
 
-# ActiveRecord::Base.logger = ActiveSupport::BufferedLogger.new( STDOUT )
-
 module Obfuscated
   mattr_accessor :salt
 
   def self.append_features(base)
     super
     base.extend(ClassMethods)
+    base.extend(Finder) 
   end
   
   def self.supported?
-    @@mysql_support ||= ActiveRecord::Base.connection.class.to_s.downcase.include?('mysql') ? true : false
+    db = ActiveRecord::Base.connection.class.to_s.downcase
+    @@db_support ||= db.include?('mysql') || db.include?('postgresql') ? true : false
   end
 
-  module ClassMethods
+  module Finder
+    def find( *primary_key )
+      # Sale.find( '7e2d2c4da1b0' )
+      if primary_key.is_a?(String) && primary_key.length == 12
+        find_by_hashed_id( primary_key )
+
+      # Sale.includes(:store).find( '7e2d2c4da1b0' )
+      elsif primary_key.is_a?(Array) && primary_key.length == 1 && primary_key[0].is_a?(String) && primary_key[0].length == 12
+        find_by_hashed_id( primary_key[0] )
+
+      # Other queries
+      else
+        super
+      end
+    end
+  end
 
+  module ClassMethods
     def has_obfuscated_id( options={} )
       class_eval do
 
@@ -31,14 +47,18 @@ module Obfuscated
           return find_by_id(hash, options) unless Obfuscated::supported?
           
           # Update the conditions to use the hash calculation
-          options.update(:conditions => ["SUBSTRING(SHA1(CONCAT('---',#{self.table_name}.id,'-WICKED-#{self.table_name}-#{Obfuscated::salt}')),1,12) = ?", hash])
-          
+          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
           # 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
@@ -50,9 +70,7 @@ 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
@@ -62,18 +80,3 @@ module Obfuscated
 end
 
 ActiveRecord::Base.class_eval { include Obfuscated }
-
-# This will work for both ActiveRecord::Base as well as ActiveRecord::Relation.
-module ActiveRecord
-  module FinderMethods
-    def find( *args )
-      if block_given?
-        to_a.find { |*block_args| yield(*block_args) }
-      elsif args.length == 1 && args[0].is_a?(String) && args[0].length == 12
-        @klass.find_by_hashed_id( args[0] )
-      else
-        find_with_ids( *args )
-      end      
-    end
-  end
-end

metadata

@@ -1,80 +1,61 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: obfuscated
-version: !ruby/object:Gem::Version 
-  hash: 11
+version: !ruby/object:Gem::Version
+  version: 0.2.0
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 8
-  version: 0.1.8
 platform: ruby
-authors: 
+authors:
 - Jon Collier
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-05-11 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-05-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 3
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.3.0
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.0
 description: Obfuscate your autoincrementing primary key ids.
 email: github@joncollier.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/obfuscated.rb
 homepage: https://github.com/imnotquitejack/obfuscated
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Primary Key Obfuscation
 test_files: []
-