Fix class-level defaults not working when inherited

Author: obrie

CHANGELOG.rdoc

@@ -1,5 +1,7 @@
 == master
 
+* Fix class-level defaults not working when inherited
+
 == 0.2.0 / 2008-12-01
 
 * Remove AsymmetricEncryptor.default_algorithm, instead relying on SymmetricEncryptor.default_algorithm

lib/encrypted_strings/asymmetric_cipher.rb

@@ -86,8 +86,8 @@ def initialize(options = {})
         raise ArgumentError, "Unknown key(s): #{invalid_options.join(", ")}" unless invalid_options.empty?
 
         options = {
-          :private_key_file => self.class.default_private_key_file,
-          :public_key_file => self.class.default_public_key_file
+          :private_key_file => AsymmetricCipher.default_private_key_file,
+          :public_key_file => AsymmetricCipher.default_public_key_file
         }.merge(options)
 
         @public_key = @private_key = nil

lib/encrypted_strings/sha_cipher.rb

@@ -47,7 +47,7 @@ def initialize(options = {})
         invalid_options = options.keys - [:salt]
         raise ArgumentError, "Unknown key(s): #{invalid_options.join(", ")}" unless invalid_options.empty?
 
-        options = {:salt => self.class.default_salt}.merge(options)
+        options = {:salt => ShaCipher.default_salt}.merge(options)
 
         self.salt = options[:salt].to_s
 

lib/encrypted_strings/symmetric_cipher.rb

@@ -68,8 +68,8 @@ def initialize(options = {})
         raise ArgumentError, "Unknown key(s): #{invalid_options.join(", ")}" unless invalid_options.empty?
 
         options = {
-          :algorithm => self.class.default_algorithm,
-          :password => self.class.default_password
+          :algorithm => SymmetricCipher.default_algorithm,
+          :password => SymmetricCipher.default_password
         }.merge(options)
 
         self.algorithm = options[:algorithm]