acts_as_secure 0.0.2 → 0.0.3

data/lib/acts_as_secure.rb

@@ -24,8 +24,7 @@ module ActiveRecord::Acts::ActsAsSecure
     def parse_options!(options)
       @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 = {}
+      @secure_crypto_provider = options.delete(:crypto_provider)
       fail("Unknown option(s): #{ options.keys.join(', ') }") unless options.empty?
     end
     
@@ -44,7 +43,7 @@ module ActiveRecord::Acts::ActsAsSecure
       
       def inherited(sub)
 
-        [:secure_except, :secure_storage_type, :secure_class_crypto_provider, :secure_crypto_providers].each do |p|
+        [:secure_except, :secure_storage_type, :secure_crypto_provider].each do |p|
           sub.instance_variable_set("@#{ p }", instance_variable_get("@#{ p }"))
         end
 
@@ -54,10 +53,11 @@ module ActiveRecord::Acts::ActsAsSecure
       
       def with_crypto_provider(provider)
         begin
-          @secure_crypto_providers[secure_storage_id] = provider
+          original_provider = @secure_crypto_provider
+          @secure_crypto_provider = provider
           yield
         ensure
-          @secure_crypto_providers.delete(secure_storage_id)
+          @secure_crypto_provider = original_provider
         end
       end
 
@@ -66,11 +66,7 @@ module ActiveRecord::Acts::ActsAsSecure
       end
 
       def secure_crypto_provider
-        @secure_crypto_providers[secure_storage_id] || @secure_class_crypto_provider
-      end
-
-      def secure_storage_id
-        Thread.current.object_id
+        @secure_crypto_provider
       end
       
     end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: acts_as_secure
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
-date: 2007-06-19 00:00:00 -04:00
+  version: 0.0.3
+date: 2007-06-26 00:00:00 -04:00
 summary: Adds attribute encryption to ActiveRecord models
 require_paths: 
 - lib