encrypted_strings 0.0.5 → 0.1.0

data/CHANGELOG.rdoc

@@ -1,5 +1,9 @@
 == master
 
+== 0.1.0 / 2008-07-06
+
+* Remove dependency on active_support
+
 == 0.0.5 / 2008-07-05
 
 * Add automatic stringification of salts for SHA encryption

data/Rakefile

@@ -5,7 +5,7 @@ require 'rake/contrib/sshpublisher'
 
 spec = Gem::Specification.new do |s|
   s.name              = 'encrypted_strings'
-  s.version           = '0.0.5'
+  s.version           = '0.1.0'
   s.platform          = Gem::Platform::RUBY
   s.summary           = 'Dead-simple string encryption/decryption syntax.'
   

data/lib/encrypted_strings/asymmetric_encryptor.rb

@@ -50,16 +50,16 @@ module PluginAWeek #:nodoc:
     # found or the key could not decrypt the private key file.
     class AsymmetricEncryptor < Encryptor
       # The default private key to use during encryption.  Default is nil.
-      @@default_private_key_file = nil
-      cattr_accessor :default_private_key_file
+      @default_private_key_file = nil
+      class << self; attr_accessor :default_private_key_file; end
       
       # The default public key to use during encryption.  Default is nil.
-      @@default_public_key_file = nil
-      cattr_accessor :default_public_key_file
+      @default_public_key_file = nil
+      class << self; attr_accessor :default_public_key_file; end
       
       # The default algorithm to use.  Default is nil.
-      @@default_algorithm = nil
-      cattr_accessor :default_algorithm
+      @default_algorithm = nil
+      class << self; attr_accessor :default_algorithm; end
       
       # Private key used for decrypting data
       attr_reader :private_key_file
@@ -79,18 +79,14 @@ module PluginAWeek #:nodoc:
       # * +key+ - The key to use in the symmetric encryptor
       # * +algorithm+ - Algorithm to use symmetrically encrypted strings
       def initialize(options = {})
-        options = options.symbolize_keys
-        options.assert_valid_keys(
-          :private_key_file,
-          :public_key_file,
-          :key,
-          :algorithm
-        )
-        options.reverse_merge!(
-          :private_key_file => self.class.default_private_key_file,
-          :public_key_file => self.class.default_public_key_file,
-          :algorithm => self.class.default_algorithm
-        )
+        invalid_options = options.keys - [:private_key_file, :public_key_file, :key, :algorithm]
+        raise ArgumentError, "Unknown key(s): #{invalid_options.join(", ")}" unless invalid_options.empty?
+        
+        options = {
+          :private_key_file => AsymmetricEncryptor.default_private_key_file,
+          :public_key_file => AsymmetricEncryptor.default_public_key_file,
+          :algorithm => AsymmetricEncryptor.default_algorithm
+        }.merge(options)
         
         @public_key = @private_key = nil
         

data/lib/encrypted_strings/extensions/string.rb

@@ -188,8 +188,8 @@ module PluginAWeek #:nodoc:
           
           def encryptor_from_args(*args) #:nodoc:
             options = args.last.is_a?(Hash) ? args.pop : {}
-            mode = (args.first || :sha).to_sym
-            "PluginAWeek::EncryptedStrings::#{mode.to_s.classify}Encryptor".constantize.new(options)
+            mode = (args.first || :sha).to_s.gsub(/(?:^|_)(.)/) {$1.upcase}
+            PluginAWeek::EncryptedStrings.const_get("#{mode}Encryptor").new(options)
           end
       end
     end

data/lib/encrypted_strings/sha_encryptor.rb

@@ -29,8 +29,8 @@ module PluginAWeek #:nodoc:
     #   password == input                                   # => true
     class ShaEncryptor < Encryptor
       # The default salt value to use during encryption
-      @@default_salt = 'salt'
-      cattr_accessor :default_salt
+      @default_salt = 'salt'
+      class << self; attr_accessor :default_salt; end
       
       # The salt value to use for encryption
       attr_accessor :salt
@@ -38,9 +38,10 @@ module PluginAWeek #:nodoc:
       # Configuration options:
       # * +salt+ - Salt value to use for encryption
       def initialize(options = {})
-        options = options.symbolize_keys
-        options.assert_valid_keys(:salt)
-        options.reverse_merge!(:salt => self.class.default_salt)
+        invalid_options = options.keys - [:salt]
+        raise ArgumentError, "Unknown key(s): #{invalid_options.join(", ")}" unless invalid_options.empty?
+        
+        options = {:salt => ShaEncryptor.default_salt}.merge(options)
         
         self.salt = options[:salt].to_s
         

data/lib/encrypted_strings/symmetric_encryptor.rb

@@ -40,12 +40,12 @@ module PluginAWeek #:nodoc:
     # An exception will be raised if no key is specified.
     class SymmetricEncryptor < Encryptor
       # The default algorithm to use for encryption.  Default is DES
-      @@default_algorithm = 'DES-EDE3-CBC'
-      cattr_accessor :default_algorithm
+      @default_algorithm = 'DES-EDE3-CBC'
+      class << self; attr_accessor :default_algorithm; end
       
       # The default key to use.  Default is nil
-      @@default_key = nil
-      cattr_accessor :default_key
+      @default_key = nil
+      class << self; attr_accessor :default_key; end
       
       # The algorithm to use for encryption/decryption
       attr_accessor :algorithm
@@ -57,13 +57,13 @@ module PluginAWeek #:nodoc:
       # * +key+ - Private key
       # * +algorithm+ - Algorithm to use
       def initialize(options = {})
-        options = options.symbolize_keys
-        options.assert_valid_keys(
-          :key,
-          :algorithm
-        )
-        options.reverse_merge!(:key => self.class.default_key)
-        options[:algorithm] ||= self.class.default_algorithm
+        invalid_options = options.keys - [:key, :algorithm]
+        raise ArgumentError, "Unknown key(s): #{invalid_options.join(", ")}" unless invalid_options.empty?
+        
+        options = {
+          :key => SymmetricEncryptor.default_key,
+          :algorithm => SymmetricEncryptor.default_algorithm
+        }.merge(options)
         
         self.key = options[:key]
         raise NoKeyError if key.nil?

data/test/asymmetric_encryptor_test.rb

@@ -18,7 +18,7 @@ class AsymmetricEncryptorByDefaultTest < Test::Unit::TestCase
   end
   
   def test_should_use_the_default_algorithm
-    assert_equal 'DES-EDE3-CBC', @asymmetric_encryptor.default_algorithm
+    assert_equal 'DES-EDE3-CBC', @asymmetric_encryptor.algorithm
   end
   
   def test_should_not_have_a_key

data/test/sha_encryptor_test.rb

@@ -49,6 +49,8 @@ class ShaEncryptorWithCustomSaltTest < Test::Unit::TestCase
 end
 
 class ShaEncryptorWithNonStringSaltTest < Test::Unit::TestCase
+  require 'time'
+  
   def setup
     @sha_encryptor = PluginAWeek::EncryptedStrings::ShaEncryptor.new(:salt => Time.parse('Tue Jan 01 00:00:00 UTC 2008'))
   end

data/test/test_helper.rb

@@ -1,6 +1,4 @@
 require 'test/unit'
-require 'rubygems'
-require 'active_support'
 
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 require File.dirname(__FILE__) + '/../init'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: encrypted_strings
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors: 
 - Aaron Pfeifer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-05 00:00:00 -04:00
+date: 2008-07-07 00:00:00 -04:00
 default_executable: 
 dependencies: []