acts_as_secure 0.0.1 → 0.0.2

data/lib/acts_as_secure.rb

@@ -11,31 +11,13 @@ module ActiveRecord::Acts::ActsAsSecure
   end
   
   module ClassMethods
-    
-    @@secure_crypto_providers = {}
-        
+            
     def acts_as_secure(options = {})
       parse_options!(options)
       add_callbacks
+      extend(ActsAsSecureClassMethods)
       send(:include, InstanceMethods)
     end
-
-    def with_crypto_provider(provider)
-      begin
-        @@secure_crypto_providers[Thread.current.object_id] = provider
-        yield
-      ensure
-        @@secure_crypto_providers.delete(Thread.current.object_id)
-      end
-    end
-    
-    def secure_columns
-      columns.reject { |col| (col.type != @secure_storage_type) || @secure_except.include?(col.name) }
-    end
-    
-    def secure_crypto_provider
-      @@secure_crypto_providers[Thread.current.object_id] || @secure_class_crypto_provider
-    end
       
   private
             
@@ -43,6 +25,7 @@ module ActiveRecord::Acts::ActsAsSecure
       @secure_except = unsecure_columns(options.delete(:except))
       @secure_storage_type = options.delete(:storage_type) || :binary
       @secure_class_crypto_provider = options.delete(:crypto_provider)
+      @secure_crypto_providers = {}
       fail("Unknown option(s): #{ options.keys.join(', ') }") unless options.empty?
     end
     
@@ -56,6 +39,42 @@ module ActiveRecord::Acts::ActsAsSecure
     def unsecure_columns(*names)
       names.flatten.collect(&:to_s)
     end
+        
+    module ActsAsSecureClassMethods
+      
+      def inherited(sub)
+
+        [:secure_except, :secure_storage_type, :secure_class_crypto_provider, :secure_crypto_providers].each do |p|
+          sub.instance_variable_set("@#{ p }", instance_variable_get("@#{ p }"))
+        end
+
+        super
+
+      end
+      
+      def with_crypto_provider(provider)
+        begin
+          @secure_crypto_providers[secure_storage_id] = provider
+          yield
+        ensure
+          @secure_crypto_providers.delete(secure_storage_id)
+        end
+      end
+
+      def secure_columns
+        columns.reject { |col| (col.type != @secure_storage_type) || @secure_except.include?(col.name) }
+      end
+
+      def secure_crypto_provider
+        @secure_crypto_providers[secure_storage_id] || @secure_class_crypto_provider
+      end
+
+      def secure_storage_id
+        Thread.current.object_id
+      end
+      
+    end
+    
     
     module InstanceMethods
 

metadata

@@ -3,9 +3,9 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: acts_as_secure
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
-date: 2007-06-07 00:00:00 -04:00
-summary: acts_as_secure adds attributes encryption to ActiveRecord models
+  version: 0.0.2
+date: 2007-06-19 00:00:00 -04:00
+summary: Adds attribute encryption to ActiveRecord models
 require_paths: 
 - lib
 email: rails-trunk@revolution.com