obfuscated 0.1.7 → 0.1.8

data/lib/obfuscated.rb

@@ -1,37 +1,22 @@
 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
   end
-  
-  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
 
@@ -77,3 +62,18 @@ 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,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: obfuscated
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 1
-  - 7
-  version: 0.1.7
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - Jon Collier